ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.57 by root, Thu Jan 4 00:08:08 2007 UTC vs.
Revision 1.90 by root, Fri Apr 27 00:49:58 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel	5	* Copyright (C) 2001 Mark Wedel
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author can be reached via e-mail to <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/**	25	/**
25	* \file	26	* \file
26	* Client handling.	27	* Client handling.
27	*	28	*
…		…
35	* have the prototype of (char *data, int datalen, int client_num). This	36	* have the prototype of (char *data, int datalen, int client_num). This
36	* way, we can use one dispatch table.	37	* way, we can use one dispatch table.
37	*	38	*
38	* esrv_map_new starts updating the map	39	* esrv_map_new starts updating the map
39	*	40	*
40	* esrv_map_setbelow allows filling in all of the faces for the map.
41	* if a face has not already been sent to the client, it is sent now.
42	*
43	*/	41	*/
44		42
45	#include <global.h>	43	#include <global.h>
46	#include <sproto.h>	44	#include <sproto.h>
47		45
…		…
100	* that much difference in bandwidth.	98	* that much difference in bandwidth.
101	*/	99	*/
102	mx = ns->mapx;	100	mx = ns->mapx;
103	my = ns->mapy;	101	my = ns->mapy;
104		102
105	if (ns->mapmode == Map1aCmd)
106	{
107	mx += MAX_HEAD_OFFSET;
108	my += MAX_HEAD_OFFSET;
109	}
110
111	/* the x and y here are coordinates for the new map, i.e. if we moved	103	/* the x and y here are coordinates for the new map, i.e. if we moved
112	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	104	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
113	* if the destination x or y coordinate is outside the viewable	105	* if the destination x or y coordinate is outside the viewable
114	* area, we clear the values - otherwise, the old values	106	* area, we clear the values - otherwise, the old values
115	* are preserved, and the check_head thinks it needs to clear them.	107	* are preserved, and the check_head thinks it needs to clear them.
…		…
140	static void	132	static void
141	clear_map (player *pl)	133	clear_map (player *pl)
142	{	134	{
143	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144		136
		137	pl->ns->force_newmap = false;
		138
145	if (pl->ns->newmapcmd == 1)	139	if (pl->ns->newmapcmd == 1)
146	pl->ns->send_packet ("newmap");	140	pl->ns->send_packet ("newmap");
147		141
148	pl->ns->floorbox_reset ();	142	pl->ns->floorbox_reset ();
149	}	143	}
150		144
151	/** check for map change and send new map data */	145	/** check for map/region change and send new map data */
152	static void	146	static void
153	check_map_change (player *pl)	147	check_map_change (player *pl)
154	{	148	{
155	client &socket = *pl->ns;	149	client &socket = *pl->ns;
156	object *ob = pl->ob;	150	object *ob = pl->ob;
157	char buf[MAX_BUF]; /* eauugggh */	151	char buf[MAX_BUF]; /* eauugggh */
158		152
159	if (socket.current_map != ob->map)	153	if (socket.current_map != ob->map || socket.force_newmap)
160	{	154	{
		155	clear_map (pl);
161	socket.current_map = ob->map;	156	socket.current_map = ob->map;
162
163	clear_map (pl);
164		157
165	if (socket.mapinfocmd)	158	if (socket.mapinfocmd)
166	{	159	{
167	if (ob->map && ob->map->path[0])	160	if (ob->map && ob->map->path[0])
168	{	161	{
169	int flags = 0;	162	int flags = 0;
170		163
171	if (ob->map->tile_path[0])	164	if (ob->map->tile_path[0]) flags |= 1;
172	flags |= 1;
173	if (ob->map->tile_path[1])	165	if (ob->map->tile_path[1]) flags |= 2;
174	flags |= 2;
175	if (ob->map->tile_path[2])	166	if (ob->map->tile_path[2]) flags |= 4;
176	flags |= 4;
177	if (ob->map->tile_path[3])	167	if (ob->map->tile_path[3]) flags |= 8;
178	flags |= 8;
179		168
180	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	169	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);	170	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182	}	171	}
183	else	172	else
…		…
200	}	189	}
201	}	190	}
202		191
203	socket.current_x = ob->x;	192	socket.current_x = ob->x;
204	socket.current_y = ob->y;	193	socket.current_y = ob->y;
		194
		195	region *reg = ob->region ();
		196	if (socket.current_region != reg)
		197	{
		198	socket.current_region = reg;
		199	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		200	}
205	}	201	}
206		202
207	/**	203	/**
208	* RequestInfo is sort of a meta command. There is some specific	204	* RequestInfo is sort of a meta command. There is some specific
209	* request of information, but we call other functions to provide	205	* request of information, but we call other functions to provide
…		…
290	{	286	{
291	int dir = *buf++;	287	int dir = *buf++;
292		288
293	switch (dir)	289	switch (dir)
294	{	290	{
295	case '1':	291	case '1':
296	dx = 0;	292	dx = 0;
297	dy = -1;	293	dy = -1;
298	map = get_map_from_coord (map, &dx, &dy);	294	map = map->xy_find (dx, dy);
299	map && (mapy -= map->height);	295	map && (mapy -= map->height);
300	break;	296	break;
301	case '2':	297	case '2':
302	mapx += map->width;	298	mapx += map->width;
303	dx = map->width;	299	dx = map->width;
304	dy = 0;	300	dy = 0;
305	map = get_map_from_coord (map, &dx, &dy);	301	map = map->xy_find (dx, dy);
306	break;	302	break;
307	case '3':	303	case '3':
308	mapy += map->height;	304	mapy += map->height;
309	dx = 0;	305	dx = 0;
310	dy = map->height;	306	dy = map->height;
311	map = get_map_from_coord (map, &dx, &dy);	307	map = map->xy_find (dx, dy);
312	break;	308	break;
313	case '4':	309	case '4':
314	dx = -1;	310	dx = -1;
315	dy = 0;	311	dy = 0;
316	map = get_map_from_coord (map, &dx, &dy);	312	map = map->xy_find (dx, dy);
317	map && (mapx -= map->width);	313	map && (mapx -= map->width);
318	break;	314	break;
319	}	315	}
320		316
321	--max_distance;	317	--max_distance;
322	}	318	}
323		319
…		…
325	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);	321	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326	else if (map && map->path[0])	322	else if (map && map->path[0])
327	{	323	{
328	int flags = 0;	324	int flags = 0;
329		325
330	if (map->tile_path[0])	326	if (map->tile_path[0]) flags |= 1;
331	flags |= 1;
332	if (map->tile_path[1])	327	if (map->tile_path[1]) flags |= 2;
333	flags |= 2;
334	if (map->tile_path[2])	328	if (map->tile_path[2]) flags |= 4;
335	flags |= 4;
336	if (map->tile_path[3])	329	if (map->tile_path[3]) flags |= 8;
337	flags |= 8;
338		330
339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);	331	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340	}	332	}
341	else	333	else
342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	334	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
…		…
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	337	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346		338
347	pl->ns->send_packet (bigbuf);	339	pl->ns->send_packet (bigbuf);
348	}	340	}
349		341
350	/** This is the Setup cmd - easy first implementation */	342	/** This is the Setup cmd */
351	void	343	void
352	SetUp (char *buf, int len, client * ns)	344	SetUp (char *buf, int len, client * ns)
353	{	345	{
354	int s, slen;	346	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
355	char *cmd, *param, cmdback[HUGE_BUF];
356
357	/* run through the cmds of setup
358	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
359	*
360	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
361	* The client then must sort this out
362	*/
363
364	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
365
366	strcpy (cmdback, "setup");
367	for (s = 0; s < len; )
368	{
369	cmd = &buf[s];
370
371	/* find the next space, and put a null there */
372	for (; buf[s] && buf[s] != ' '; s++)
373	;
374
375	buf[s++] = 0;
376
377	while (buf[s] == ' ')
378	s++;
379
380	if (s >= len)
381	break;
382
383	param = &buf[s];
384
385	for (; buf[s] && buf[s] != ' '; s++)
386	;
387
388	buf[s++] = 0;
389
390	while (buf[s] == ' ')
391	s++;
392
393	slen = strlen (cmdback);
394	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
395	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
396	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
397
398	if (!strcmp (cmd, "sound"))
399	{
400	ns->sound = atoi (param);
401	safe_strcat (cmdback, param, &slen, HUGE_BUF);
402	}
403	else if (!strcmp (cmd, "exp64"))
404	safe_strcat (cmdback, param, &slen, HUGE_BUF);
405	else if (!strcmp (cmd, "spellmon"))
406	{
407	ns->monitor_spells = atoi (param);
408	safe_strcat (cmdback, param, &slen, HUGE_BUF);
409	}
410	else if (!strcmp (cmd, "darkness"))
411	{
412	ns->darkness = atoi (param);
413	safe_strcat (cmdback, param, &slen, HUGE_BUF);
414	}
415	else if (!strcmp (cmd, "map1cmd"))
416	{
417	if (atoi (param))
418	ns->mapmode = Map1Cmd;
419	/* if beyond this size, need to use map1cmd no matter what */
420	if (ns->mapx > 11 || ns->mapy > 11)
421	ns->mapmode = Map1Cmd;
422	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
423	}
424	else if (!strcmp (cmd, "map1acmd"))
425	{
426	if (atoi (param))
427	ns->mapmode = Map1aCmd;
428	/* if beyond this size, need to use map1acmd no matter what */
429	if (ns->mapx > 11 || ns->mapy > 11)
430	ns->mapmode = Map1aCmd;
431	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
432	}
433	else if (!strcmp (cmd, "newmapcmd"))
434	{
435	ns->newmapcmd = atoi (param);
436	safe_strcat (cmdback, param, &slen, HUGE_BUF);
437	// } else if (!strcmp(cmd,"plugincmd")) {
438	// ns->plugincmd = atoi(param);
439	// safe_strcat(cmdback, param, &slen, HUGE_BUF);
440	}
441	else if (!strcmp (cmd, "mapinfocmd"))
442	{
443	ns->mapinfocmd = atoi (param);
444	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
445	}
446	else if (!strcmp (cmd, "extcmd"))
447	{
448	ns->extcmd = atoi (param);
449	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
450	}
451	else if (!strcmp (cmd, "extmap"))
452	{
453	ns->extmap = atoi (param);
454	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
455	}
456	else if (!strcmp (cmd, "facecache"))
457	{
458	ns->facecache = atoi (param);
459	safe_strcat (cmdback, param, &slen, HUGE_BUF);
460	}
461	else if (!strcmp (cmd, "faceset"))
462	{
463	char tmpbuf[20];
464	int q = atoi (param);
465
466	if (is_valid_faceset (q))
467	ns->faceset = q;
468	sprintf (tmpbuf, "%d", ns->faceset);
469	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
470	/* if the client is using faceset, it knows about image2 command */
471	ns->image2 = 1;
472	}
473	else if (!strcmp (cmd, "itemcmd"))
474	{
475	/* Version of the item protocol command to use. Currently,
476	* only supported versions are 1 and 2. Using a numeric
477	* value will make it very easy to extend this in the future.
478	*/
479	char tmpbuf[20];
480	int q = atoi (param);
481
482	if (q < 1 || q > 2)
483	{
484	strcpy (tmpbuf, "FALSE");
485	}
486	else
487	{
488	ns->itemcmd = q;
489	sprintf (tmpbuf, "%d", ns->itemcmd);
490	}
491	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
492	}
493	else if (!strcmp (cmd, "mapsize"))
494	{
495	int x, y = 0;
496	char tmpbuf[MAX_BUF], *cp;
497
498	x = atoi (param);
499	for (cp = param; *cp != 0; cp++)
500	if (*cp == 'x' || *cp == 'X')
501	{
502	y = atoi (cp + 1);
503	break;
504	}
505	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
506	{
507	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
508	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
509	}
510	else
511	{
512	ns->mapx = x;
513	ns->mapy = y;
514	/* better to send back what we are really using and not the
515	* param as given to us in case it gets parsed differently.
516	*/
517	sprintf (tmpbuf, "%dx%d", x, y);
518	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
519	/* If beyond this size and still using orig map command, need to
520	* go to map1cmd.
521	*/
522	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
523	ns->mapmode = Map1Cmd;
524	}
525	}
526	else if (!strcmp (cmd, "extendedMapInfos"))
527	{
528	/* Added by tchize
529	* prepare to use the mapextended command
530	*/
531	char tmpbuf[20];
532
533	ns->ext_mapinfos = (atoi (param));
534	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
535	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
536	}
537	else if (!strcmp (cmd, "extendedTextInfos"))
538	{
539	/* Added by tchize
540	* prepare to use the extended text commands
541	* Client toggle this to non zero to get exttext
542	*/
543	char tmpbuf[20];
544
545	ns->has_readable_type = (atoi (param));
546	sprintf (tmpbuf, "%d", ns->has_readable_type);
547	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
548	}
549	else
550	{
551	/* Didn't get a setup command we understood -
552	* report a failure to the client.
553	*/
554	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
555	}
556	} /* for processing all the setup commands */
557
558	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
559	ns->send_packet (cmdback);
560	}	347	}
561		348
562	/**	349	/**
563	* The client has requested to be added to the game.	350	* The client has requested to be added to the game.
564	* This is what takes care of it. We tell the client how things worked out.	351	* This is what takes care of it. We tell the client how things worked out.
565	* I am not sure if this file is the best place for this function. however,	352	* I am not sure if this file is the best place for this function. however,
566	* it either has to be here or init_sockets needs to be exported.	353	* it either has to be here or init_sockets needs to be exported.
567	*/	354	*/
568	void	355	void
569	AddMeCmd (char *buf, int len, client * ns)	356	AddMeCmd (char *buf, int len, client *ns)
570	{	357	{
571	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	358	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
572	}	359	}
573		360
574	/** Reply to ExtendedInfos command */	361	/** Reply to ExtendedInfos command */
…		…
686		473
687	ns->send_packet (cmdback);	474	ns->send_packet (cmdback);
688	}	475	}
689		476
690	/**	477	/**
691	* A lot like the old AskSmooth (in fact, now called by AskSmooth).	478	* client requested an image. send it rate-limited
692	* Basically, it makes no sense to wait for the client to request a	479	* before flushing.
693	* a piece of data from us that we know the client wants. So
694	* if we know the client wants it, might as well push it to the
695	* client.
696	*/
697	static void
698	SendSmooth (client *ns, uint16 face)
699	{
700	uint16 smoothface;
701
702	/* If we can't find a face, return and set it so we won't try to send this
703	* again.
704	*/	480	*/
705	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	481	void
706	{	482	AskFaceCmd (char *buf, int len, client *ns)
707		483	{
708	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);	484	ns->askface.push_back (atoi (buf));
709	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
710	return;
711	}
712
713	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
714	esrv_send_face (ns, smoothface, 0);
715
716	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
717
718	packet sl ("smooth");
719
720	sl << uint16 (face)
721	<< uint16 (smoothface);
722
723	ns->send_packet (sl);
724	}	485	}
725		486
726	/**	487	/**
727	* Tells client the picture it has to use	488	* Tells client the picture it has to use
728	* to smooth a picture number given as argument.	489	* to smooth a picture number given as argument.
729	*/	490	*/
730	void	491	void
731	AskSmooth (char *buf, int len, client *ns)	492	AskSmooth (char *buf, int len, client *ns)
732	{	493	{
733	SendSmooth (ns, atoi (buf));	494	ns->send_face (atoi (buf));
		495	ns->flush_fx ();
734	}	496	}
735		497
736	/**	498	/**
737	* This handles the general commands from the client (ie, north, fire, cast,	499	* This handles the general commands from the client (ie, north, fire, cast,
738	* etc.)	500	* etc.)
…		…
797	* commands.	559	* commands.
798	*/	560	*/
799	pl->count = 0;	561	pl->count = 0;
800		562
801	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	563	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
802	int time = FABS (pl->ob->speed) < 0.001	564	int time = fabs (pl->ob->speed) < 0.001
803	? time = MAX_TIME * 100	565	? time = MAX_TIME * 100
804	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	566	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
805		567
806	/* Send confirmation of command execution now */	568	/* Send confirmation of command execution now */
807	packet sl ("comc");	569	packet sl ("comc");
808	sl << uint16 (cmdid) << uint32 (time);	570	sl << uint16 (cmdid) << uint32 (time);
809	pl->ns->send_packet (sl);	571	pl->ns->send_packet (sl);
…		…
841	{	603	{
842	case ST_PLAYING:	604	case ST_PLAYING:
843	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	605	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
844	break;	606	break;
845		607
846	case ST_CHANGE_CLASS:
847	key_change_class (pl->ob, buf[0]);
848	break;
849
850	case ST_CONFIRM_QUIT:
851	key_confirm_quit (pl->ob, buf[0]);
852	break;
853
854	case ST_GET_PARTY_PASSWORD: /* Get password for party */	608	case ST_GET_PARTY_PASSWORD: /* Get password for party */
855	receive_party_password (pl->ob, 13);	609	receive_party_password (pl->ob, 13);
856	break;	610	break;
857		611
858	default:	612	default:
…		…
879	ns->cs_version = atoi (buf);	633	ns->cs_version = atoi (buf);
880	ns->sc_version = ns->cs_version;	634	ns->sc_version = ns->cs_version;
881		635
882	LOG (llevDebug, "connection from client <%s>\n", buf);	636	LOG (llevDebug, "connection from client <%s>\n", buf);
883		637
884
885	//TODO: should log here just for statistics	638	//TODO: should log here just for statistics
886		639
887	//if (VERSION_CS != ns->cs_version)	640	//if (VERSION_CS != ns->cs_version)
888	// unchecked;	641	// unchecked;
889		642
…		…
898		651
899	cp = strchr (cp + 1, ' ');	652	cp = strchr (cp + 1, ' ');
900		653
901	if (cp)	654	if (cp)
902	{	655	{
903	assign (ns->version, cp + 1);	656	ns->version = cp + 1;
904		657
905	if (ns->sc_version < 1026)	658	if (ns->sc_version < 1026)
906	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	659	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
907	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	660	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
908	}	661	}
…		…
968	/**	721	/**
969	* Asks the client to query the user. This way, the client knows	722	* Asks the client to query the user. This way, the client knows
970	* it needs to send something back (vs just printing out a message)	723	* it needs to send something back (vs just printing out a message)
971	*/	724	*/
972	void	725	void
973	send_query (client *ns, uint8 flags, char *text)	726	send_query (client *ns, uint8 flags, const char *text)
974	{	727	{
975	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	728	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
976	}	729	}
977		730
978	#define AddIfInt64(Old,New,Type) if (Old != New) {\	731	#define AddIfInt64(Old,New,Type) if (Old != New) {\
…		…
1010	esrv_update_stats (player *pl)	763	esrv_update_stats (player *pl)
1011	{	764	{
1012	char buf[MAX_BUF];	765	char buf[MAX_BUF];
1013	uint16 flags;	766	uint16 flags;
1014		767
		768	client *ns = pl->ns;
1015	if (!pl->ns)	769	if (!ns)
1016	return;	770	return;
1017		771
		772	object *ob = pl->ob;
		773	if (!ob)
		774	return;
		775
1018	packet sl ("stats");	776	packet sl ("stats");
1019		777
1020	if (pl->ob)
1021	{
1022	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	778	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1023	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	779	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1024	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	780	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1025	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	781	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1026	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	782	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1027	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	783	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1028	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	784	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1029	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	785	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1030	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	786	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1031	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);	787	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1032	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);	788	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1033	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);	789	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1034	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	790	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1035	}
1036		791
1037	for (int s = 0; s < NUM_SKILLS; s++)	792	for (int s = 0; s < NUM_SKILLS; s++)
1038	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	793	if (object *skill = pl->last_skill_ob[s])
		794	if (skill->stats.exp != ns->last_skill_exp [s])
1039	{	795	{
		796	ns->last_skill_exp [s] = skill->stats.exp;
		797
1040	/* Always send along the level if exp changes. This is only	798	/* Always send along the level if exp changes. This is only
1041	* 1 extra byte, but keeps processing simpler.	799	* 1 extra byte, but keeps processing simpler.
1042	*/	800	*/
1043	sl << uint8 (s + CS_STAT_SKILLINFO)	801	sl << uint8 (s + CS_STAT_SKILLINFO)
1044	<< uint8 (pl->last_skill_ob[s]->level)	802	<< uint8 (skill->level)
1045	<< uint64 (pl->last_skill_ob[s]->stats.exp);	803	<< uint64 (skill->stats.exp);
1046
1047	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1048	}	804	}
1049		805
1050	AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);	806	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1051	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	807	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1052	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	808	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1053	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	809	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1054	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	810	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1055	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	811	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1056	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	812	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1057	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	813	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1058	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	814	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		815
1059	flags = 0;	816	flags = 0;
1060		817
1061	if (pl->fire_on)	818	if (pl->fire_on)
1062	flags |= SF_FIREON;	819	flags |= SF_FIREON;
1063		820
1064	if (pl->run_on)	821	if (pl->run_on)
1065	flags |= SF_RUNON;	822	flags |= SF_RUNON;
1066		823
1067	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	824	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1068		825
1069	if (pl->ns->sc_version < 1025)	826	if (ns->sc_version < 1025)
1070	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	827	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1071	else	828	else
1072	for (int i = 0; i < NROFATTACKS; i++)	829	for (int i = 0; i < NROFATTACKS; i++)
1073	{	830	{
1074	/* Skip ones we won't send */	831	/* Skip ones we won't send */
1075	if (atnr_cs_stat[i] == -1)	832	if (atnr_cs_stat[i] == -1)
1076	continue;	833	continue;
1077		834
1078	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	835	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1079	}	836	}
1080		837
1081	if (pl->ns->monitor_spells)	838	if (pl->ns->monitor_spells)
1082	{	839	{
1083	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	840	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1084	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	841	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1085	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	842	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1086	}	843	}
1087		844
1088	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	845	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1089	AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);	846	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1090	set_title (pl->ob, buf);	847	set_title (ob, buf);
1091	AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);	848	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1092		849
1093	/* Only send it away if we have some actual data */	850	/* Only send it away if we have some actual data */
1094	if (sl.length () > 6)	851	if (sl.length () > 6)
1095	pl->ns->send_packet (sl);	852	ns->send_packet (sl);
1096	}	853	}
1097		854
1098	/**	855	/**
1099	* Tells the client that here is a player it should start using.	856	* Tells the client that here is a player it should start using.
1100	*/	857	*/
1101	void	858	void
1102	esrv_new_player (player *pl, uint32 weight)	859	esrv_new_player (player *pl, uint32 weight)
1103	{	860	{
1104	pl->last_weight = weight;
1105
1106	packet sl ("player");	861	packet sl ("player");
1107		862
1108	sl << uint32 (pl->ob->count)	863	sl << uint32 (pl->ob->count)
1109	<< uint32 (weight)	864	<< uint32 (weight)
1110	<< uint32 (pl->ob->face->number)	865	<< uint32 (pl->ob->face)
1111	<< data8 (pl->ob->name);	866	<< data8 (pl->ob->name);
1112		867
		868	pl->ns->last_weight = weight;
1113	pl->ns->send_packet (sl);	869	pl->ns->send_packet (sl);
1114	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	870	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1115	}	871	}
1116
1117	/**
1118	* Need to send an animation sequence to the client.
1119	* We will send appropriate face commands to the client if we haven't
1120	* sent them the face yet (this can become quite costly in terms of
1121	* how much we are sending - on the other hand, this should only happen
1122	* when the player logs in and picks stuff up.
1123	*/
1124	void
1125	esrv_send_animation (client * ns, short anim_num)
1126	{
1127	/* Do some checking on the anim_num we got. Note that the animations
1128	* are added in contigous order, so if the number is in the valid
1129	* range, it must be a valid animation.
1130	*/
1131	if (anim_num < 0 || anim_num > num_animations)
1132	{
1133	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1134	return;
1135	}
1136
1137	packet sl ("anim");
1138
1139	sl << uint16 (anim_num)
1140	<< uint16 (0); /* flags - not used right now */
1141
1142	/* Build up the list of faces. Also, send any information (ie, the
1143	* the face itself) down to the client.
1144	*/
1145	for (int i = 0; i < animations[anim_num].num_animations; i++)
1146	{
1147	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1148	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1149
1150	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1151	}
1152
1153	ns->send_packet (sl);
1154
1155	ns->anims_sent[anim_num] = 1;
1156	}
1157
1158		872
1159	/******************************************************************************	873	/******************************************************************************
1160	*	874	*
1161	* Start of map related commands.	875	* Start of map related commands.
1162	*	876	*
1163	******************************************************************************/	877	******************************************************************************/
1164		878
1165	/**
1166	* This adds face_num to a map cell at x,y. If the client doesn't have
1167	* the face yet, we will also send it.
1168	*/
1169	static void
1170	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1171	{
1172	if (newmap->cells[x][y].count >= MAP_LAYERS)
1173	{
1174	//TODO: one or the other, can't both have abort and return, verify and act
1175	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1176	return;
1177	abort ();
1178	}
1179
1180	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1181	newmap->cells[x][y].count++;
1182
1183	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1184	esrv_send_face (ns, face_num, 0);
1185	}
1186
1187	/** Clears a map cell */	879	/** Clears a map cell */
1188	static void	880	static void
1189	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	881	map_clearcell (struct MapCell *cell, int count)
1190	{	882	{
1191	cell->faces[0] = face0;	883	cell->faces[0] = 0;
1192	cell->faces[1] = face1;	884	cell->faces[1] = 0;
1193	cell->faces[2] = face2;	885	cell->faces[2] = 0;
		886	cell->smooth[0] = 0;
		887	cell->smooth[1] = 0;
		888	cell->smooth[2] = 0;
1194	cell->count = count;	889	cell->count = count;
1195	cell->stat_hp = 0;	890	cell->stat_hp = 0;
1196	cell->flags = 0;	891	cell->flags = 0;
1197	cell->player = 0;	892	cell->player = 0;
1198	}	893	}
1199		894
1200	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1201	#define MAX_LAYERS 3	895	#define MAX_LAYERS 3
1202
1203	/* Using a global really isn't a good approach, but saves the over head of
1204	* allocating and deallocating such a block of data each time run through,
1205	* and saves the space of allocating this in the socket object when we only
1206	* need it for this cycle. If the server is ever threaded, this needs to be
1207	* re-examined.
1208	*/
1209	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1210
1211	/**
1212	* Returns true if any of the heads for this
1213	* space is set. Returns false if all are blank - this is used
1214	* for empty space checking.
1215	*/
1216	static inline int
1217	have_head (int ax, int ay)
1218	{
1219	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1220	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1221	return 1;
1222
1223	return 0;
1224	}
1225
1226	/**
1227	* check_head is a bit simplistic version of update_space below.
1228	* basically, it only checks the that the head on space ax,ay at layer
1229	* needs to get sent - if so, it adds the data, sending the head
1230	* if needed, and returning 1. If this no data needs to get
1231	* sent, it returns zero.
1232	*/
1233	static int
1234	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1235	{
1236	short face_num;
1237
1238	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1239	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1240	else
1241	face_num = 0;
1242
1243	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1244	{
1245	sl << uint16 (face_num);
1246	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1247	esrv_send_face (&ns, face_num, 0);
1248
1249	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1250	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1251	return 1;
1252	}
1253
1254	return 0; /* No change */
1255	}
1256		896
1257	/**	897	/**
1258	* Removes the need to replicate the same code for each layer.	898	* Removes the need to replicate the same code for each layer.
1259	* this returns true if this space is now in fact different than	899	* this returns true if this space is now in fact different than
1260	* it was.	900	* it was.
1261	* sl is the socklist this data is going into.	901	* sl is the socklist this data is going into.
1262	* ns is the socket we are working on - all the info we care	902	* ns is the socket we are working on - all the info we care
1263	* about is in this socket structure, so now need not pass the	903	* about is in this socket structure, so now need not pass the
1264	* entire player object.	904	* entire player object.
1265	* mx and my are map coordinate offsets for map mp
1266	* sx and sy are the offsets into the socket structure that
1267	* holds the old values.
1268	* layer is the layer to update, with 2 being the floor and 0 the	905	* layer is the layer to update, with 2 being the floor and 0 the
1269	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	906	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1270	* take. Interesting to note that before this function, the map1 function	907	* take. Interesting to note that before this function, the map1 function
1271	* numbers the spaces differently - I think this was a leftover from	908	* numbers the spaces differently - I think this was a leftover from
1272	* the map command, where the faces stack up. Sinces that is no longer	909	* the map command, where the faces stack up. Sinces that is no longer
1273	* the case, it seems to make more sense to have these layer values	910	* the case, it seems to make more sense to have these layer values
1274	* actually match.	911	* actually match.
1275	*/	912	*/
1276	static int	913	static int
1277	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	914	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1278	{	915	{
1279	object *ob, *head;	916	object *ob = ms.faces_obj [layer];
1280	uint16 face_num;
1281	int bx, by, i;
1282
1283	/* If there is a multipart object stored away, treat that as more important.
1284	* If not, then do the normal processing.
1285	*/
1286	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1287
1288	/* Check to see if this head is part of the set of objects
1289	* we would normally send for this space. If so, then
1290	* don't use the head value. We need to do the check
1291	* here and not when setting up the heads[] value for two reasons -
1292	* 1) the heads[] values will get used even if the space is not visible.
1293	* 2) its possible the head is not on the same map as a part, and I'd
1294	* rather not need to do the map translation overhead.
1295	* 3) We need to do some extra checking to make sure that we will
1296	* otherwise send the image as this layer, eg, either it matches
1297	* the head value, or is not multipart.
1298	*/
1299	if (head && !head->more)
1300	{
1301	for (i = 0; i < MAP_LAYERS; i++)
1302	{
1303	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1304	if (!ob)
1305	continue;
1306
1307	if (ob->head)
1308	ob = ob->head;
1309
1310	if (ob == head)
1311	{
1312	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1313	head = NULL;
1314	break;
1315	}
1316	}
1317	}
1318
1319	ob = head;
1320	if (!ob)
1321	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1322		917
1323	/* If there is no object for this space, or if the face for the object	918	/* If there is no object for this space, or if the face for the object
1324	* is the blank face, set the face number to zero.	919	* is the blank face, set the face number to zero.
1325	* else if we have the stored head object for this space, that takes	920	* else if we have the stored head object for this space, that takes
1326	* precedence over the other object for this space.	921	* precedence over the other object for this space.
1327	* otherwise, we do special head processing	922	* otherwise, we do special head processing
1328	*/	923	*/
1329	if (!ob || ob->face == blank_face)	924	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1330	face_num = 0;
1331	else if (head)
1332	{
1333	/* if this is a head that had previously been stored */
1334	face_num = ob->face->number;
1335	}
1336	else
1337	{
1338	/* if the faces for the different parts of a multipart object
1339	* are the same, we only want to send the bottom right most
1340	* portion of the object. That info is in the tail_.. values
1341	* of the head. Note that for the head itself, ob->head will
1342	* be null, so we only do this block if we are working on
1343	* a tail piece.
1344	*/
1345
1346	/* tail_x and tail_y will only be set in the head object. If
1347	* this is the head object and these are set, we proceed
1348	* with logic to only send bottom right. Similarly, if
1349	* this is one of the more parts but the head has those values
1350	* set, we want to do the processing. There can be cases where
1351	* the head is not visible but one of its parts is, so we just
1352	* can always expect that ob->arch->tail_x will be true for all
1353	* object we may want to display.
1354	*/
1355	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1356	{
1357
1358	if (ob->head)
1359	head = ob->head;
1360	else
1361	head = ob;
1362
1363	/* Basically figure out where the offset is from where we are right
1364	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1365	* piece is from the head, and the tail is where the tail is from the
1366	* head. Note that bx and by will equal sx and sy if we are already working
1367	* on the bottom right corner. If ob is the head, the clone values
1368	* will be zero, so the right thing will still happen.
1369	*/
1370	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1371	by = sy + head->arch->tail_y - ob->arch->clone.y;
1372
1373	/* I don't think this can ever happen, but better to check for it just
1374	* in case.
1375	*/
1376	if (bx < sx || by < sy)
1377	{
1378	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1379	face_num = 0;
1380	}
1381	/* single part object, multipart object with non merged faces,
1382	* of multipart object already at lower right.
1383	*/
1384	else if (bx == sx && by == sy)
1385	{
1386	face_num = ob->face->number;
1387
1388	/* if this face matches one stored away, clear that one away.
1389	* this code relies on the fact that the map1 commands
1390	* goes from 2 down to 0.
1391	*/
1392	for (i = 0; i < MAP_LAYERS; i++)
1393	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1394	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1395	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1396	}
1397	else
1398	{
1399	/* If this head is stored away, clear it - otherwise,
1400	* there can be cases where a object is on multiple layers -
1401	* we only want to send it once.
1402	*/
1403	face_num = head->face->number;
1404	for (i = 0; i < MAP_LAYERS; i++)
1405	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1406	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1407	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1408
1409	/* First, try to put the new head on the same layer. If that is used up,
1410	* then find another layer.
1411	*/
1412	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1413	{
1414	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1415	}
1416	else
1417	for (i = 0; i < MAX_LAYERS; i++)
1418	{
1419	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1420	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1421	{
1422	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1423	}
1424	}
1425	face_num = 0; /* Don't send this object - we'll send the head later */
1426	}
1427	}
1428	else
1429	{
1430	/* In this case, we are already at the lower right or single part object,
1431	* so nothing special
1432	*/
1433	face_num = ob->face->number;
1434
1435	/* clear out any head entries that have the same face as this one */
1436	for (bx = 0; bx < layer; bx++)
1437	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1438	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1439	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1440	}
1441	} /* else not already head object or blank face */
1442
1443	/* This is a real hack. Basically, if we have nothing to send for this layer,
1444	* but there is a head on the next layer, send that instead.
1445	* Without this, what happens is you can get the case where the player stands
1446	* on the same space as the head. However, if you have overlapping big objects
1447	* of the same type, what happens then is it doesn't think it needs to send
1448	* This tends to make stacking also work/look better.
1449	*/
1450	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1451	{
1452	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1453	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1454	}
1455
1456	/* Another hack - because of heads and whatnot, this face may match one
1457	* we already sent for a lower layer. In that case, don't send
1458	* this one.
1459	*/
1460	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1461	face_num = 0;
1462		925
1463	/* We've gotten what face we want to use for the object. Now see if	926	/* We've gotten what face we want to use for the object. Now see if
1464	* if it has changed since we last sent it to the client.	927	* if it has changed since we last sent it to the client.
1465	*/	928	*/
1466	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	929	if (lastcell.faces[layer] != face_num)
1467	{	930	{
1468	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	931	lastcell.faces[layer] = face_num;
		932
1469	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	933	if (!ns.faces_sent[face_num])
		934	if (ob)
		935	ns.send_faces (ob);
		936	else
1470	esrv_send_face (&ns, face_num, 0);	937	ns.send_face (face_num);
1471		938
1472	sl << uint16 (face_num);	939	sl << uint16 (face_num);
1473	return 1;
1474	}
1475
1476	/* Nothing changed */
1477	return 0;
1478	}
1479
1480	/**
1481	* This function is mainly a copy of update_space,
1482	* except it handles update of the smoothing updates,
1483	* not the face updates.
1484	* Removes the need to replicate the same code for each layer.
1485	* this returns true if this smooth is now in fact different
1486	* than it was.
1487	* sl is the socklist this data is going into.
1488	* ns is the socket we are working on - all the info we care
1489	* about is in this socket structure, so know need to pass the
1490	* entire player object.
1491	* mx and my are map coordinate offsets for map mp
1492	* sx and sy are the offsets into the socket structure that
1493	* holds the old values.
1494	* layer is the layer to update, with 2 being the floor and 0 the
1495	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1496	* take.
1497	*/
1498
1499	static inline int
1500	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1501	{
1502	object *ob;
1503	int smoothlevel; /* old face_num; */
1504
1505	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1506
1507	/* If there is no object for this space, or if the face for the object
1508	* is the blank face, set the smoothlevel to zero.
1509	*/
1510	if (!ob || ob->face == blank_face)
1511	smoothlevel = 0;
1512	else
1513	{
1514	smoothlevel = ob->smoothlevel;
1515	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1516	SendSmooth (&ns, ob->face->number);
1517	} /* else not already head object or blank face */
1518
1519	/* We've gotten what face we want to use for the object. Now see if
1520	* if it has changed since we last sent it to the client.
1521	*/
1522	if (smoothlevel > 255)
1523	smoothlevel = 255;
1524	else if (smoothlevel < 0)
1525	smoothlevel = 0;
1526
1527	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1528	{
1529	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1530	sl << uint8 (smoothlevel);
1531	return 1;	940	return 1;
1532	}	941	}
1533		942
1534	/* Nothing changed */	943	/* Nothing changed */
1535	return 0;	944	return 0;
…		…
1550	if (ns->EMI_smooth)	959	if (ns->EMI_smooth)
1551	result += 1; /*One byte for smoothlevel */	960	result += 1; /*One byte for smoothlevel */
1552	}	961	}
1553		962
1554	return result;	963	return result;
		964	}
		965
		966	// prefetch (and touch) all maps within a specific distancd
		967	static void
		968	prefetch_surrounding_maps (maptile *map, int distance)
		969	{
		970	map->last_access = runtime;
		971
		972	if (--distance)
		973	for (int dir = 4; --dir; )
		974	if (const shstr &path = map->tile_path [dir])
		975	if (maptile *&neigh = map->tile_map [dir])
		976	prefetch_surrounding_maps (neigh, distance);
		977	else
		978	neigh = maptile::find_async (path, map);
		979	}
		980
		981	// prefetch a generous area around the player
		982	static void
		983	prefetch_surrounding_maps (object *op)
		984	{
		985	prefetch_surrounding_maps (op->map, 3);
1555	}	986	}
1556		987
1557	/**	988	/**
1558	* This function uses the new map1 protocol command to send the map	989	* This function uses the new map1 protocol command to send the map
1559	* to the client. It is necessary because the old map command supports	990	* to the client. It is necessary because the old map command supports
…		…
1577	* look like.	1008	* look like.
1578	*/	1009	*/
1579	void	1010	void
1580	draw_client_map1 (object *pl)	1011	draw_client_map1 (object *pl)
1581	{	1012	{
1582	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1013	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1583	sint16 nx, ny;	1014	sint16 nx, ny;
1584	int estartlen, eoldlen;	1015	int estartlen, eoldlen;
1585	uint16 mask, emask;
1586	uint8 eentrysize;	1016	uint8 eentrysize;
1587	uint16 ewhatstart, ewhatflag;	1017	uint16 ewhatstart, ewhatflag;
1588	uint8 extendedinfos;	1018	uint8 extendedinfos;
1589	maptile *m;	1019	maptile *m;
1590		1020
1591	client &socket = *pl->contr->ns;	1021	client &socket = *pl->contr->ns;
1592		1022
		1023	if (!pl->active)
		1024	return;
		1025
1593	check_map_change (pl->contr);	1026	check_map_change (pl->contr);
		1027	prefetch_surrounding_maps (pl);
1594		1028
1595	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1029	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1596	packet esl;	1030	packet esl;
1597		1031
1598	startlen = sl.length ();	1032	startlen = sl.length ();
…		…
1613	<< uint8 (extendedinfos)	1047	<< uint8 (extendedinfos)
1614	<< uint8 (eentrysize);	1048	<< uint8 (eentrysize);
1615		1049
1616	estartlen = esl.length ();	1050	estartlen = esl.length ();
1617	}	1051	}
1618	else
1619	{
1620	/* suppress compiler warnings */
1621	ewhatstart = 0;
1622	ewhatflag = 0;
1623	estartlen = 0;
1624	}
1625
1626	/* Init data to zero */
1627	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1628		1052
1629	/* x,y are the real map locations. ax, ay are viewport relative	1053	/* x,y are the real map locations. ax, ay are viewport relative
1630	* locations.	1054	* locations.
1631	*/	1055	*/
1632	ay = 0;	1056	ay = 0;
…		…
1635	* but that started to get a bit messy to look at.	1059	* but that started to get a bit messy to look at.
1636	*/	1060	*/
1637	max_x = pl->x + (socket.mapx + 1) / 2;	1061	max_x = pl->x + (socket.mapx + 1) / 2;
1638	max_y = pl->y + (socket.mapy + 1) / 2;	1062	max_y = pl->y + (socket.mapy + 1) / 2;
1639		1063
1640	if (socket.mapmode == Map1aCmd)	1064	maptile *plmap = pl->map;
1641	{
1642	max_x += MAX_HEAD_OFFSET;
1643	max_y += MAX_HEAD_OFFSET;
1644	}
1645		1065
1646	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1066	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1647	{	1067	{
1648	ax = 0;	1068	ax = 0;
1649	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1069	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1650	{	1070	{
		1071	int emask, mask;
1651	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1072	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1652		1073
1653	/* If this space is out of the normal viewable area, we only check
1654	* the heads value ax or ay will only be greater than what
1655	* the client wants if using the map1a command - this is because
1656	* if the map1a command is not used, max_x and max_y will be
1657	* set to lower values.
1658	*/
1659	if (ax >= socket.mapx || ay >= socket.mapy)
1660	{
1661	int i, got_one;
1662
1663	oldlen = sl.length ();
1664
1665	sl << uint16 (mask);
1666
1667	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1668	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1669	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1670
1671	/* If all we are doing is sending 0 (blank) faces, we don't
1672	* actually need to send that - just the coordinates
1673	* with no faces tells the client to blank out the
1674	* space.
1675	*/
1676	got_one = 0;
1677	for (i = oldlen + 2; i < sl.length (); i++)
1678	if (sl[i])
1679	got_one = 1;
1680
1681	if (got_one && (mask & 0xf))
1682	sl[oldlen + 1] = mask & 0xff;
1683	else
1684	{ /*either all faces blank, either no face at all */
1685	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1686	sl.reset (oldlen + 2);
1687	else
1688	sl.reset (oldlen);
1689	}
1690
1691	/*What concerns extendinfos, nothing to be done for now
1692	* (perhaps effects layer later)
1693	*/
1694	continue; /* don't do processing below */
1695	}
1696
1697	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1074	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1698
1699	d = pl->contr->blocked_los[ax][ay];
1700		1075
1701	/* If the coordinates are not valid, or it is too dark to see,	1076	/* If the coordinates are not valid, or it is too dark to see,
1702	* we tell the client as such	1077	* we tell the client as such
1703	*/	1078	*/
1704	nx = x;	1079	nx = x;
1705	ny = y;	1080	ny = y;
1706	m = get_map_from_coord (pl->map, &nx, &ny);	1081	m = get_map_from_coord (plmap, &nx, &ny);
1707		1082
1708	if (!m)	1083	if (!m)
1709	{	1084	{
1710	/* space is out of map. Update space and clear values	1085	/* space is out of map. Update space and clear values
1711	* if this hasn't already been done. If the space is out	1086	* if this hasn't already been done. If the space is out
1712	* of the map, it shouldn't have a head	1087	* of the map, it shouldn't have a head
1713	*/	1088	*/
1714	if (lastcell.count != -1)	1089	if (lastcell.count != -1)
1715	{	1090	{
1716	sl << uint16 (mask);	1091	sl << uint16 (mask);
1717	map_clearcell (&lastcell, 0, 0, 0, -1);	1092	map_clearcell (&lastcell, -1);
1718	}	1093	}
		1094
		1095	continue;
1719	}	1096	}
		1097
		1098	m->touch ();
		1099
		1100	int d = pl->contr->blocked_los[ax][ay];
		1101
1720	else if (d > 3)	1102	if (d > 3)
1721	{	1103	{
1722	m->touch ();
1723		1104
1724	int need_send = 0, count;	1105	int need_send = 0, count;
1725		1106
1726	/* This block deals with spaces that are not visible for whatever	1107	/* This block deals with spaces that are not visible for whatever
1727	* reason. Still may need to send the head for this space.	1108	* reason. Still may need to send the head for this space.
1728	*/	1109	*/
1729		1110
1730	oldlen = sl.length ();	1111	oldlen = sl.length ();
1731		1112
1732	sl << uint16 (mask);	1113	sl << uint16 (mask);
…		…
1734	if (lastcell.count != -1)	1115	if (lastcell.count != -1)
1735	need_send = 1;	1116	need_send = 1;
1736		1117
1737	count = -1;	1118	count = -1;
1738		1119
1739	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1740	{
1741	/* Now check to see if any heads need to be sent */
1742
1743	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1744	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1745	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1746
1747	lastcell.count = count;
1748	}
1749	else
1750	{
1751	/* properly clear a previously sent big face */	1120	/* properly clear a previously sent big face */
1752	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1121	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1753	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1122	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1754	need_send = 1;	1123	need_send = 1;
1755		1124
1756	map_clearcell (&lastcell, 0, 0, 0, count);	1125	map_clearcell (&lastcell, count);
1757	}
1758		1126
1759	if ((mask & 0xf) || need_send)	1127	if ((mask & 0xf) || need_send)
1760	sl[oldlen + 1] = mask & 0xff;	1128	sl[oldlen + 1] = mask & 0xff;
1761	else	1129	else
1762	sl.reset (oldlen);	1130	sl.reset (oldlen);
1763	}	1131	}
1764	else	1132	else
1765	{	1133	{
1766	m->touch ();
1767
1768	/* In this block, the space is visible or there are head objects	1134	/* In this block, the space is visible.
1769	* we need to send.
1770	*/	1135	*/
1771		1136
1772	/* Rather than try to figure out what everything that we might	1137	/* Rather than try to figure out what everything that we might
1773	* need to send is, then form the packet after that,	1138	* need to send is, then form the packet after that,
1774	* we presume that we will in fact form a packet, and update	1139	* we presume that we will in fact form a packet, and update
…		…
1777	* is done.	1142	* is done.
1778	* I think this is simpler than doing a bunch of checks to see	1143	* I think this is simpler than doing a bunch of checks to see
1779	* what if anything we need to send, setting the bits, then	1144	* what if anything we need to send, setting the bits, then
1780	* doing those checks again to add the real data.	1145	* doing those checks again to add the real data.
1781	*/	1146	*/
1782	oldlen = sl.length ();	1147	oldlen = sl.length ();
1783	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1784	eoldlen = esl.length ();	1148	eoldlen = esl.length ();
1785	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1149
1786	sl << uint16 (mask);	1150	sl << uint16 (mask);
1787
1788	if (socket.ext_mapinfos)
1789	esl << uint16 (emask);
1790		1151
1791	unsigned char dummy;	1152	unsigned char dummy;
1792	unsigned char *last_ext = &dummy;	1153	unsigned char *last_ext = &dummy;
1793		1154
1794	/* Darkness changed */	1155	/* Darkness changed */
…		…
1806	sl << uint8 (255 - 64 * d);	1167	sl << uint8 (255 - 64 * d);
1807	}	1168	}
1808		1169
1809	lastcell.count = d;	1170	lastcell.count = d;
1810		1171
		1172	mapspace &ms = m->at (nx, ny);
		1173
1811	if (socket.extmap)	1174	if (socket.extmap)
1812	{	1175	{
1813	uint8 stat_hp = 0;	1176	uint8 stat_hp = 0;
1814	uint8 stat_width = 0;	1177	uint8 stat_width = 0;
1815	uint8 flags = 0;	1178	uint8 flags = 0;
1816	UUID player = 0;	1179	tag_t player = 0;
1817		1180
1818	// send hp information, if applicable	1181	// send hp information, if applicable
1819	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1182	if (object *op = ms.faces_obj [0])
1820	{	1183	{
1821	if (op->head || op->invisible)	1184	if (op->head || op->invisible)
1822	; // do not show	1185	; // do not show
1823	else if (op->type == PLAYER	1186	else if (op->type == PLAYER
1824	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1187	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
…		…
1862		1225
1863	mask |= 0x8;	1226	mask |= 0x8;
1864	*last_ext |= 0x80;	1227	*last_ext |= 0x80;
1865	last_ext = &sl[sl.length ()];	1228	last_ext = &sl[sl.length ()];
1866		1229
1867	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1230	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1868	}	1231	}
1869		1232
1870	if (lastcell.flags != flags)	1233	if (lastcell.flags != flags)
1871	{	1234	{
1872	lastcell.flags = flags;	1235	lastcell.flags = flags;
…		…
1878	sl << uint8 (8) << uint8 (flags);	1241	sl << uint8 (8) << uint8 (flags);
1879	}	1242	}
1880	}	1243	}
1881		1244
1882	/* Floor face */	1245	/* Floor face */
1883	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1246	if (update_space (sl, socket, ms, lastcell, 2))
1884	mask |= 0x4;	1247	mask |= 0x4;
1885		1248
1886	if (socket.EMI_smooth)
1887	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1888	emask |= 0x4;
1889
1890	/* Middle face */	1249	/* Middle face */
1891	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1250	if (update_space (sl, socket, ms, lastcell, 1))
1892	mask |= 0x2;	1251	mask |= 0x2;
1893		1252
1894	if (socket.EMI_smooth)	1253	if (ms.player () == pl
1895	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1254	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1896	emask |= 0x2;
1897
1898	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1899	{	1255	{
		1256	// force player to be visible to himself if invisible
1900	if (lastcell.faces[0] != pl->face->number)	1257	if (lastcell.faces[0] != pl->face)
1901	{	1258	{
1902	lastcell.faces[0] = pl->face->number;	1259	lastcell.faces[0] = pl->face;
		1260
1903	mask |= 0x1;	1261	mask |= 0x1;
1904
1905	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1906	esrv_send_face (&socket, pl->face->number, 0);
1907
1908	sl << uint16 (pl->face->number);	1262	sl << uint16 (pl->face);
		1263
		1264	socket.send_faces (pl);
1909	}	1265	}
1910	}	1266	}
1911	else
1912	{
1913	/* Top face */	1267	/* Top face */
1914	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1268	else if (update_space (sl, socket, ms, lastcell, 0))
1915	mask |= 0x1;	1269	mask |= 0x1;
1916
1917	if (socket.EMI_smooth)
1918	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1919	emask |= 0x1;
1920	}	1270
1921		1271
1922	/* Check to see if we are in fact sending anything for this	1272	/* Check to see if we are in fact sending anything for this
1923	* space by checking the mask. If so, update the mask.	1273	* space by checking the mask. If so, update the mask.
1924	* if not, reset the len to that from before adding the mask	1274	* if not, reset the len to that from before adding the mask
1925	* value, so we don't send those bits.	1275	* value, so we don't send those bits.
…		…
1927	if (mask & 0xf)	1277	if (mask & 0xf)
1928	sl[oldlen + 1] = mask & 0xff;	1278	sl[oldlen + 1] = mask & 0xff;
1929	else	1279	else
1930	sl.reset (oldlen);	1280	sl.reset (oldlen);
1931		1281
		1282	if (socket.ext_mapinfos)
		1283	esl << uint16 (emask);
		1284
		1285	if (socket.EMI_smooth)
		1286	{
		1287	for (int layer = 2+1; layer--; )
		1288	{
		1289	object *ob = ms.faces_obj [layer];
		1290
		1291	// If there is no object for this space, or if the face for the object
		1292	// is the blank face, set the smoothlevel to zero.
		1293	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1294
		1295	// We've gotten what face we want to use for the object. Now see if
		1296	// if it has changed since we last sent it to the client.
		1297	if (lastcell.smooth[layer] != smoothlevel)
		1298	{
		1299	lastcell.smooth[layer] = smoothlevel;
		1300	esl << uint8 (smoothlevel);
		1301	emask |= 1 << layer;
		1302	}
		1303	}
		1304
1932	if (emask & 0xf)	1305	if (emask & 0xf)
1933	esl[eoldlen + 1] = emask & 0xff;	1306	esl[eoldlen + 1] = emask & 0xff;
1934	else	1307	else
1935	esl.reset (eoldlen);	1308	esl.reset (eoldlen);
		1309	}
1936	} /* else this is a viewable space */	1310	} /* else this is a viewable space */
1937	} /* for x loop */	1311	} /* for x loop */
1938	} /* for y loop */	1312	} /* for y loop */
		1313
		1314	socket.flush_fx ();
1939		1315
1940	/* Verify that we in fact do need to send this */	1316	/* Verify that we in fact do need to send this */
1941	if (socket.ext_mapinfos)	1317	if (socket.ext_mapinfos)
1942	{	1318	{
1943	if (!(sl.length () > startlen || socket.sent_scroll))	1319	if (!(sl.length () > startlen || socket.sent_scroll))
1944	{	1320	{
1945	/* No map data will follow, so don't say the client	1321	/* No map data will follow, so don't say the client
1946	* it doesn't need draw!	1322	* it doesn't need draw!
1947	*/	1323	*/
1948	ewhatflag &= (~EMI_NOREDRAW);	1324	ewhatflag &= ~EMI_NOREDRAW;
1949	esl[ewhatstart + 1] = ewhatflag & 0xff;	1325	esl[ewhatstart + 1] = ewhatflag & 0xff;
1950	}	1326	}
1951		1327
1952	if (esl.length () > estartlen)	1328	if (esl.length () > estartlen)
1953	socket.send_packet (esl);	1329	socket.send_packet (esl);
…		…
1965	*/	1341	*/
1966	void	1342	void
1967	draw_client_map (object *pl)	1343	draw_client_map (object *pl)
1968	{	1344	{
1969	int i, j;	1345	int i, j;
1970	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1346	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1971	New_Face *face, *floor;
1972	New_Face *floor2;
1973	int d, mflags;	1347	int mflags;
1974	struct Map newmap;	1348	struct Map newmap;
1975	maptile *m, *pm;	1349	maptile *m, *pm;
1976		1350
1977	if (pl->type != PLAYER)	1351	if (pl->type != PLAYER)
1978	{	1352	{
…		…
2159		1533
2160	/* appends the spell *spell to the Socklist we will send the data to. */	1534	/* appends the spell *spell to the Socklist we will send the data to. */
2161	static void	1535	static void
2162	append_spell (player *pl, packet &sl, object *spell)	1536	append_spell (player *pl, packet &sl, object *spell)
2163	{	1537	{
2164	int len, i, skill = 0;	1538	int i, skill = 0;
2165		1539
2166	if (!(spell->name))	1540	if (!(spell->name))
2167	{	1541	{
2168	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1542	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2169	return;	1543	return;
…		…
2181	if (!strcmp (spell->skill, skill_names[i]))	1555	if (!strcmp (spell->skill, skill_names[i]))
2182	{	1556	{
2183	skill = i + CS_STAT_SKILLINFO;	1557	skill = i + CS_STAT_SKILLINFO;
2184	break;	1558	break;
2185	}	1559	}
		1560	}
		1561
		1562	// spells better have a face
		1563	if (!spell->face)
		1564	{
		1565	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1566	spell->face = face_find ("burnout.x11", blank_face);
2186	}	1567	}
2187		1568
2188	/* send the current values */	1569	/* send the current values */
2189	sl << uint32 (spell->count)	1570	sl << uint32 (spell->count)
2190	<< uint16 (spell->level)	1571	<< uint16 (spell->level)
…		…
2192	<< uint16 (spell->last_sp)	1573	<< uint16 (spell->last_sp)
2193	<< uint16 (spell->last_grace)	1574	<< uint16 (spell->last_grace)
2194	<< uint16 (spell->last_eat)	1575	<< uint16 (spell->last_eat)
2195	<< uint8 (skill)	1576	<< uint8 (skill)
2196	<< uint32 (spell->path_attuned)	1577	<< uint32 (spell->path_attuned)
2197	<< uint32 (spell->face ? spell->face->number : 0)	1578	<< uint32 (spell->face)
2198	<< data8 (spell->name)	1579	<< data8 (spell->name)
2199	<< data16 (spell->msg);	1580	<< data16 (spell->msg);
2200	}	1581	}
2201		1582
2202	/**	1583	/**
…		…
2217		1598
2218	packet sl ("addspell");	1599	packet sl ("addspell");
2219		1600
2220	if (!spell)	1601	if (!spell)
2221	{	1602	{
2222	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1603	for (spell = pl->ob->inv; spell; spell = spell->below)
2223	{	1604	{
2224	/* were we to simply keep appending data here, we could exceed	1605	/* were we to simply keep appending data here, we could exceed
2225	* MAXSOCKBUF if the player has enough spells to add, we know that	1606	* MAXSOCKBUF if the player has enough spells to add, we know that
2226	* append_spells will always append 19 data bytes, plus 4 length	1607	* append_spells will always append 19 data bytes, plus 4 length
2227	* bytes and 3 strings (because that is the spec) so we need to	1608	* bytes and 3 strings (because that is the spec) so we need to

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines