Cube  Diff

Differences From Artifact [8a230870d2]:

To Artifact [e48be73a93]:


14
15
16
17
18
19
20

21

22
23
24
25
26
27
28
	disconnect();
}

void
changemapserv(char *name, int mode) // forced map change from the server
{
	gamemode = mode;

	load_world(name);

}

void
changemap(OFString *name) // request map change, server may ignore
{
	toservermap = name;
}







>
|
>







14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
	disconnect();
}

void
changemapserv(char *name, int mode) // forced map change from the server
{
	gamemode = mode;
	@autoreleasepool {
		load_world(@(name));
	}
}

void
changemap(OFString *name) // request map change, server may ignore
{
	toservermap = name;
}
360
361
362
363
364
365
366

367

368
369
370
371
372
373
374
			break;

		case SV_RECVMAP: {
			sgetstr();
			conoutf(@"received map \"%s\" from server, reloading..",
			    text);
			int mapsize = getint(p);

			writemap(text, mapsize, p);

			p += mapsize;
			changemapserv(text, gamemode);
			break;
		}

		case SV_SERVMSG:
			sgetstr();







>
|
>







362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
			break;

		case SV_RECVMAP: {
			sgetstr();
			conoutf(@"received map \"%s\" from server, reloading..",
			    text);
			int mapsize = getint(p);
			@autoreleasepool {
				writemap(@(text), mapsize, p);
			}
			p += mapsize;
			changemapserv(text, gamemode);
			break;
		}

		case SV_SERVMSG:
			sgetstr();