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.59 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.97 by root, Thu May 17 14:14:56 2007 UTC

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

Diff Legend

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