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.50 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.87 by root, Thu Apr 19 11:12:46 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	{
…		…
176	flags |= 4;	169	flags |= 4;
177	if (ob->map->tile_path[3])	170	if (ob->map->tile_path[3])
178	flags |= 8;	171	flags |= 8;
179		172
180	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	173	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);	174	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182	}	175	}
183	else	176	else
184	snprintf (buf, MAX_BUF, "mapinfo current");	177	snprintf (buf, MAX_BUF, "mapinfo current");
185		178
186	socket.send_packet (buf);	179	socket.send_packet (buf);
…		…
200	}	193	}
201	}	194	}
202		195
203	socket.current_x = ob->x;	196	socket.current_x = ob->x;
204	socket.current_y = ob->y;	197	socket.current_y = ob->y;
		198
		199	region *reg = ob->region ();
		200	if (socket.current_region != reg)
		201	{
		202	socket.current_region = reg;
		203	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		204	}
205	}	205	}
206		206
207	/**	207	/**
208	* RequestInfo is sort of a meta command. There is some specific	208	* RequestInfo is sort of a meta command. There is some specific
209	* request of information, but we call other functions to provide	209	* request of information, but we call other functions to provide
…		…
290	{	290	{
291	int dir = *buf++;	291	int dir = *buf++;
292		292
293	switch (dir)	293	switch (dir)
294	{	294	{
295	case '1':	295	case '1':
296	dx = 0;	296	dx = 0;
297	dy = -1;	297	dy = -1;
298	map = get_map_from_coord (map, &dx, &dy);	298	map = map->xy_find (dx, dy);
299	map && (mapy -= map->height);	299	map && (mapy -= map->height);
300	break;	300	break;
301	case '2':	301	case '2':
302	mapx += map->width;	302	mapx += map->width;
303	dx = map->width;	303	dx = map->width;
304	dy = 0;	304	dy = 0;
305	map = get_map_from_coord (map, &dx, &dy);	305	map = map->xy_find (dx, dy);
306	break;	306	break;
307	case '3':	307	case '3':
308	mapy += map->height;	308	mapy += map->height;
309	dx = 0;	309	dx = 0;
310	dy = map->height;	310	dy = map->height;
311	map = get_map_from_coord (map, &dx, &dy);	311	map = map->xy_find (dx, dy);
312	break;	312	break;
313	case '4':	313	case '4':
314	dx = -1;	314	dx = -1;
315	dy = 0;	315	dy = 0;
316	map = get_map_from_coord (map, &dx, &dy);	316	map = map->xy_find (dx, dy);
317	map && (mapx -= map->width);	317	map && (mapx -= map->width);
318	break;	318	break;
319	}	319	}
320		320
321	--max_distance;	321	--max_distance;
322	}	322	}
323		323
…		…
334	if (map->tile_path[2])	334	if (map->tile_path[2])
335	flags |= 4;	335	flags |= 4;
336	if (map->tile_path[3])	336	if (map->tile_path[3])
337	flags |= 8;	337	flags |= 8;
338		338
339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);	339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340	}	340	}
341	else	341	else
342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343	}	343	}
344	else	344	else
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346		346
347	pl->ns->send_packet (bigbuf);	347	pl->ns->send_packet (bigbuf);
348	}	348	}
349		349
350	/** This is the Setup cmd - easy first implementation */	350	/** This is the Setup cmd */
351	void	351	void
352	SetUp (char *buf, int len, client * ns)	352	SetUp (char *buf, int len, client * ns)
353	{	353	{
354	int s, slen;	354	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	{
405	ns->exp64 = atoi (param);
406	safe_strcat (cmdback, param, &slen, HUGE_BUF);
407	}
408	else if (!strcmp (cmd, "spellmon"))
409	{
410	ns->monitor_spells = atoi (param);
411	safe_strcat (cmdback, param, &slen, HUGE_BUF);
412	}
413	else if (!strcmp (cmd, "darkness"))
414	{
415	ns->darkness = atoi (param);
416	safe_strcat (cmdback, param, &slen, HUGE_BUF);
417	}
418	else if (!strcmp (cmd, "map1cmd"))
419	{
420	if (atoi (param))
421	ns->mapmode = Map1Cmd;
422	/* if beyond this size, need to use map1cmd no matter what */
423	if (ns->mapx > 11 || ns->mapy > 11)
424	ns->mapmode = Map1Cmd;
425	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
426	}
427	else if (!strcmp (cmd, "map1acmd"))
428	{
429	if (atoi (param))
430	ns->mapmode = Map1aCmd;
431	/* if beyond this size, need to use map1acmd no matter what */
432	if (ns->mapx > 11 || ns->mapy > 11)
433	ns->mapmode = Map1aCmd;
434	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
435	}
436	else if (!strcmp (cmd, "newmapcmd"))
437	{
438	ns->newmapcmd = atoi (param);
439	safe_strcat (cmdback, param, &slen, HUGE_BUF);
440	// } else if (!strcmp(cmd,"plugincmd")) {
441	// ns->plugincmd = atoi(param);
442	// safe_strcat(cmdback, param, &slen, HUGE_BUF);
443	}
444	else if (!strcmp (cmd, "mapinfocmd"))
445	{
446	ns->mapinfocmd = atoi (param);
447	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
448	}
449	else if (!strcmp (cmd, "extcmd"))
450	{
451	ns->extcmd = atoi (param);
452	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
453	}
454	else if (!strcmp (cmd, "extmap"))
455	{
456	ns->extmap = atoi (param);
457	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
458	}
459	else if (!strcmp (cmd, "facecache"))
460	{
461	ns->facecache = atoi (param);
462	safe_strcat (cmdback, param, &slen, HUGE_BUF);
463	}
464	else if (!strcmp (cmd, "faceset"))
465	{
466	char tmpbuf[20];
467	int q = atoi (param);
468
469	if (is_valid_faceset (q))
470	ns->faceset = q;
471	sprintf (tmpbuf, "%d", ns->faceset);
472	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
473	/* if the client is using faceset, it knows about image2 command */
474	ns->image2 = 1;
475	}
476	else if (!strcmp (cmd, "itemcmd"))
477	{
478	/* Version of the item protocol command to use. Currently,
479	* only supported versions are 1 and 2. Using a numeric
480	* value will make it very easy to extend this in the future.
481	*/
482	char tmpbuf[20];
483	int q = atoi (param);
484
485	if (q < 1 || q > 2)
486	{
487	strcpy (tmpbuf, "FALSE");
488	}
489	else
490	{
491	ns->itemcmd = q;
492	sprintf (tmpbuf, "%d", ns->itemcmd);
493	}
494	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
495	}
496	else if (!strcmp (cmd, "mapsize"))
497	{
498	int x, y = 0;
499	char tmpbuf[MAX_BUF], *cp;
500
501	x = atoi (param);
502	for (cp = param; *cp != 0; cp++)
503	if (*cp == 'x' || *cp == 'X')
504	{
505	y = atoi (cp + 1);
506	break;
507	}
508	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
509	{
510	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
511	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
512	}
513	else
514	{
515	ns->mapx = x;
516	ns->mapy = y;
517	/* better to send back what we are really using and not the
518	* param as given to us in case it gets parsed differently.
519	*/
520	sprintf (tmpbuf, "%dx%d", x, y);
521	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
522	/* If beyond this size and still using orig map command, need to
523	* go to map1cmd.
524	*/
525	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
526	ns->mapmode = Map1Cmd;
527	}
528	}
529	else if (!strcmp (cmd, "extendedMapInfos"))
530	{
531	/* Added by tchize
532	* prepare to use the mapextended command
533	*/
534	char tmpbuf[20];
535
536	ns->ext_mapinfos = (atoi (param));
537	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
538	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
539	}
540	else if (!strcmp (cmd, "extendedTextInfos"))
541	{
542	/* Added by tchize
543	* prepare to use the extended text commands
544	* Client toggle this to non zero to get exttext
545	*/
546	char tmpbuf[20];
547
548	ns->has_readable_type = (atoi (param));
549	sprintf (tmpbuf, "%d", ns->has_readable_type);
550	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
551	}
552	else
553	{
554	/* Didn't get a setup command we understood -
555	* report a failure to the client.
556	*/
557	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
558	}
559	} /* for processing all the setup commands */
560
561	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
562	ns->send_packet (cmdback);
563	}	355	}
564		356
565	/**	357	/**
566	* The client has requested to be added to the game.	358	* The client has requested to be added to the game.
567	* This is what takes care of it. We tell the client how things worked out.	359	* This is what takes care of it. We tell the client how things worked out.
568	* I am not sure if this file is the best place for this function. however,	360	* I am not sure if this file is the best place for this function. however,
569	* it either has to be here or init_sockets needs to be exported.	361	* it either has to be here or init_sockets needs to be exported.
570	*/	362	*/
571	void	363	void
572	AddMeCmd (char *buf, int len, client * ns)	364	AddMeCmd (char *buf, int len, client *ns)
573	{	365	{
574	if (INVOKE_CLIENT (ADDME, ns))	366	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575	return;
576
577	if (ns->pl || add_player (ns))
578	ns->send_packet ("addme_failed");
579	else
580	ns->send_packet ("addme_success");
581	}	367	}
582		368
583	/** Reply to ExtendedInfos command */	369	/** Reply to ExtendedInfos command */
584	void	370	void
585	ToggleExtendedInfos (char *buf, int len, client * ns)	371	ToggleExtendedInfos (char *buf, int len, client * ns)
…		…
695		481
696	ns->send_packet (cmdback);	482	ns->send_packet (cmdback);
697	}	483	}
698		484
699	/**	485	/**
700	* A lot like the old AskSmooth (in fact, now called by AskSmooth).	486	* client requested an image. send it rate-limited
701	* Basically, it makes no sense to wait for the client to request a	487	* before flushing.
702	* a piece of data from us that we know the client wants. So
703	* if we know the client wants it, might as well push it to the
704	* client.
705	*/
706	static void
707	SendSmooth (client *ns, uint16 face)
708	{
709	uint16 smoothface;
710
711	/* If we can't find a face, return and set it so we won't try to send this
712	* again.
713	*/	488	*/
714	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	489	void
715	{	490	AskFaceCmd (char *buf, int len, client *ns)
716		491	{
717	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);	492	ns->askface.push_back (atoi (buf));
718	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
719	return;
720	}
721
722	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
723	esrv_send_face (ns, smoothface, 0);
724
725	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
726
727	packet sl ("smooth");
728
729	sl << uint16 (face)
730	<< uint16 (smoothface);
731
732	ns->send_packet (sl);
733	}	493	}
734		494
735	/**	495	/**
736	* Tells client the picture it has to use	496	* Tells client the picture it has to use
737	* to smooth a picture number given as argument.	497	* to smooth a picture number given as argument.
738	*/	498	*/
739	void	499	void
740	AskSmooth (char *buf, int len, client *ns)	500	AskSmooth (char *buf, int len, client *ns)
741	{	501	{
742	SendSmooth (ns, atoi (buf));	502	ns->send_face (atoi (buf));
		503	ns->flush_fx ();
743	}	504	}
744		505
745	/**	506	/**
746	* This handles the general commands from the client (ie, north, fire, cast,	507	* This handles the general commands from the client (ie, north, fire, cast,
747	* etc.)	508	* etc.)
…		…
806	* commands.	567	* commands.
807	*/	568	*/
808	pl->count = 0;	569	pl->count = 0;
809		570
810	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	571	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
811	int time = FABS (pl->ob->speed) < 0.001	572	int time = fabs (pl->ob->speed) < 0.001
812	? time = MAX_TIME * 100	573	? time = MAX_TIME * 100
813	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	574	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
814		575
815	/* Send confirmation of command execution now */	576	/* Send confirmation of command execution now */
816	packet sl ("comc");	577	packet sl ("comc");
817	sl << uint16 (cmdid) << uint32 (time);	578	sl << uint16 (cmdid) << uint32 (time);
818	pl->ns->send_packet (sl);	579	pl->ns->send_packet (sl);
…		…
850	{	611	{
851	case ST_PLAYING:	612	case ST_PLAYING:
852	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	613	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
853	break;	614	break;
854		615
855	case ST_PLAY_AGAIN:
856	/* We can check this for return value (2==quit). Maybe we
857	* should, and do something appropriate?
858	*/
859	receive_play_again (pl->ob, buf[0]);
860	break;
861
862	case ST_ROLL_STAT:
863	key_roll_stat (pl->ob, buf[0]);
864	break;
865
866	case ST_CHANGE_CLASS:	616	case ST_CHANGE_CLASS:
867	key_change_class (pl->ob, buf[0]);	617	key_change_class (pl->ob, buf[0]);
868	break;
869
870	case ST_CONFIRM_QUIT:
871	key_confirm_quit (pl->ob, buf[0]);
872	break;
873
874	case ST_CONFIGURE:
875	LOG (llevError, "In client input handling, but into configure state\n");
876	ns->state = ST_PLAYING;
877	break;
878
879	case ST_GET_NAME:
880	receive_player_name (pl->ob, 13);
881	break;
882
883	case ST_GET_PASSWORD:
884	case ST_CONFIRM_PASSWORD:
885	receive_player_password (pl->ob, 13);
886	break;	618	break;
887		619
888	case ST_GET_PARTY_PASSWORD: /* Get password for party */	620	case ST_GET_PARTY_PASSWORD: /* Get password for party */
889	receive_party_password (pl->ob, 13);	621	receive_party_password (pl->ob, 13);
890	break;	622	break;
…		…
913	ns->cs_version = atoi (buf);	645	ns->cs_version = atoi (buf);
914	ns->sc_version = ns->cs_version;	646	ns->sc_version = ns->cs_version;
915		647
916	LOG (llevDebug, "connection from client <%s>\n", buf);	648	LOG (llevDebug, "connection from client <%s>\n", buf);
917		649
918
919	//TODO: should log here just for statistics	650	//TODO: should log here just for statistics
920		651
921	//if (VERSION_CS != ns->cs_version)	652	//if (VERSION_CS != ns->cs_version)
922	// unchecked;	653	// unchecked;
923		654
…		…
948	{	679	{
949	ns->sound = atoi (buf);	680	ns->sound = atoi (buf);
950	}	681	}
951		682
952	/** client wants the map resent */	683	/** client wants the map resent */
953
954	void	684	void
955	MapRedrawCmd (char *buf, int len, player *pl)	685	MapRedrawCmd (char *buf, int len, player *pl)
956	{	686	{
957	/* This function is currently disabled; just clearing the map state results in	687	/* This function is currently disabled; just clearing the map state results in
958	* display errors. It should clear the cache and send a newmap command.	688	* display errors. It should clear the cache and send a newmap command.
…		…
1003	/**	733	/**
1004	* Asks the client to query the user. This way, the client knows	734	* Asks the client to query the user. This way, the client knows
1005	* it needs to send something back (vs just printing out a message)	735	* it needs to send something back (vs just printing out a message)
1006	*/	736	*/
1007	void	737	void
1008	send_query (client *ns, uint8 flags, char *text)	738	send_query (client *ns, uint8 flags, const char *text)
1009	{	739	{
1010	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	740	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1011	}	741	}
1012		742
1013	#define AddIfInt64(Old,New,Type) if (Old != New) {\	743	#define AddIfInt64(Old,New,Type) if (Old != New) {\
…		…
1045	esrv_update_stats (player *pl)	775	esrv_update_stats (player *pl)
1046	{	776	{
1047	char buf[MAX_BUF];	777	char buf[MAX_BUF];
1048	uint16 flags;	778	uint16 flags;
1049		779
		780	client *ns = pl->ns;
		781	if (!ns)
		782	return;
		783
		784	object *ob = pl->ob;
		785	if (!ob)
		786	return;
		787
1050	packet sl ("stats");	788	packet sl ("stats");
1051		789
1052	if (pl->ob)
1053	{
1054	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	790	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1055	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	791	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1056	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	792	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1057	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	793	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1058	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	794	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1059	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	795	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1060	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	796	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1061	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1062	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1063	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1064	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	797	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1065	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	798	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		799	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		800	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		801	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1066	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	802	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1067	}
1068		803
1069	if (pl->ns->exp64)
1070	for (int s = 0; s < NUM_SKILLS; s++)	804	for (int s = 0; s < NUM_SKILLS; s++)
1071	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	805	if (object *skill = pl->last_skill_ob[s])
		806	if (skill->stats.exp != ns->last_skill_exp [s])
1072	{	807	{
		808	ns->last_skill_exp [s] = skill->stats.exp;
		809
1073	/* Always send along the level if exp changes. This is only	810	/* Always send along the level if exp changes. This is only
1074	* 1 extra byte, but keeps processing simpler.	811	* 1 extra byte, but keeps processing simpler.
1075	*/	812	*/
1076	sl << uint8 (s + CS_STAT_SKILLINFO)	813	sl << uint8 (s + CS_STAT_SKILLINFO)
1077	<< uint8 (pl->last_skill_ob[s]->level)	814	<< uint8 (skill->level)
1078	<< uint64 (pl->last_skill_ob[s]->stats.exp);	815	<< uint64 (skill->stats.exp);
1079
1080	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1081	}	816	}
1082		817
1083	if (pl->ns->exp64)
1084	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	818	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1085	else
1086	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1087
1088	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	819	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1089	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	820	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1090	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	821	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1091	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	822	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1092	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	823	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1093	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	824	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1094	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	825	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1095	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	826	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		827
1096	flags = 0;	828	flags = 0;
1097		829
1098	if (pl->fire_on)	830	if (pl->fire_on)
1099	flags |= SF_FIREON;	831	flags |= SF_FIREON;
1100		832
1101	if (pl->run_on)	833	if (pl->run_on)
1102	flags |= SF_RUNON;	834	flags |= SF_RUNON;
1103		835
1104	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	836	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1105		837
1106	if (pl->ns->sc_version < 1025)	838	if (ns->sc_version < 1025)
1107	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	839	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1108	else	840	else
1109	for (int i = 0; i < NROFATTACKS; i++)	841	for (int i = 0; i < NROFATTACKS; i++)
1110	{	842	{
1111	/* Skip ones we won't send */	843	/* Skip ones we won't send */
1112	if (atnr_cs_stat[i] == -1)	844	if (atnr_cs_stat[i] == -1)
1113	continue;	845	continue;
1114		846
1115	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	847	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1116	}	848	}
1117		849
1118	if (pl->ns->monitor_spells)	850	if (pl->ns->monitor_spells)
1119	{	851	{
1120	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	852	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1121	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	853	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1122	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	854	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1123	}	855	}
1124		856
1125	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	857	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1126	AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);	858	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1127	set_title (pl->ob, buf);	859	set_title (ob, buf);
1128	AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);	860	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1129		861
1130	/* Only send it away if we have some actual data */	862	/* Only send it away if we have some actual data */
1131	if (sl.length () > 6)	863	if (sl.length () > 6)
1132	pl->ns->send_packet (sl);	864	ns->send_packet (sl);
1133	}	865	}
1134		866
1135	/**	867	/**
1136	* Tells the client that here is a player it should start using.	868	* Tells the client that here is a player it should start using.
1137	*/	869	*/
1138	void	870	void
1139	esrv_new_player (player *pl, uint32 weight)	871	esrv_new_player (player *pl, uint32 weight)
1140	{	872	{
1141	pl->last_weight = weight;
1142
1143	packet sl ("player");	873	packet sl ("player");
1144		874
1145	sl << uint32 (pl->ob->count)	875	sl << uint32 (pl->ob->count)
1146	<< uint32 (weight)	876	<< uint32 (weight)
1147	<< uint32 (pl->ob->face->number)	877	<< uint32 (pl->ob->face)
1148	<< data8 (pl->ob->name);	878	<< data8 (pl->ob->name);
1149		879
		880	pl->ns->last_weight = weight;
1150	pl->ns->send_packet (sl);	881	pl->ns->send_packet (sl);
1151	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	882	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1152	}	883	}
1153
1154	/**
1155	* Need to send an animation sequence to the client.
1156	* We will send appropriate face commands to the client if we haven't
1157	* sent them the face yet (this can become quite costly in terms of
1158	* how much we are sending - on the other hand, this should only happen
1159	* when the player logs in and picks stuff up.
1160	*/
1161	void
1162	esrv_send_animation (client * ns, short anim_num)
1163	{
1164	/* Do some checking on the anim_num we got. Note that the animations
1165	* are added in contigous order, so if the number is in the valid
1166	* range, it must be a valid animation.
1167	*/
1168	if (anim_num < 0 || anim_num > num_animations)
1169	{
1170	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1171	return;
1172	}
1173
1174	packet sl ("anim");
1175
1176	sl << uint16 (anim_num)
1177	<< uint16 (0); /* flags - not used right now */
1178
1179	/* Build up the list of faces. Also, send any information (ie, the
1180	* the face itself) down to the client.
1181	*/
1182	for (int i = 0; i < animations[anim_num].num_animations; i++)
1183	{
1184	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1185	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1186
1187	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1188	}
1189
1190	ns->send_packet (sl);
1191
1192	ns->anims_sent[anim_num] = 1;
1193	}
1194
1195		884
1196	/******************************************************************************	885	/******************************************************************************
1197	*	886	*
1198	* Start of map related commands.	887	* Start of map related commands.
1199	*	888	*
1200	******************************************************************************/	889	******************************************************************************/
1201		890
1202	/**
1203	* This adds face_num to a map cell at x,y. If the client doesn't have
1204	* the face yet, we will also send it.
1205	*/
1206	static void
1207	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1208	{
1209	if (newmap->cells[x][y].count >= MAP_LAYERS)
1210	{
1211	//TODO: one or the other, can't both have abort and return, verify and act
1212	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1213	return;
1214	abort ();
1215	}
1216
1217	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1218	newmap->cells[x][y].count++;
1219
1220	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1221	esrv_send_face (ns, face_num, 0);
1222	}
1223
1224	/** Clears a map cell */	891	/** Clears a map cell */
1225	static void	892	static void
1226	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	893	map_clearcell (struct MapCell *cell, int count)
1227	{	894	{
1228	cell->faces[0] = face0;	895	cell->faces[0] = 0;
1229	cell->faces[1] = face1;	896	cell->faces[1] = 0;
1230	cell->faces[2] = face2;	897	cell->faces[2] = 0;
		898	cell->smooth[0] = 0;
		899	cell->smooth[1] = 0;
		900	cell->smooth[2] = 0;
1231	cell->count = count;	901	cell->count = count;
1232	cell->stat_hp = 0;	902	cell->stat_hp = 0;
1233	cell->flags = 0;	903	cell->flags = 0;
1234	cell->player = 0;	904	cell->player = 0;
1235	}	905	}
1236		906
1237	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1238	#define MAX_LAYERS 3	907	#define MAX_LAYERS 3
1239
1240	/* Using a global really isn't a good approach, but saves the over head of
1241	* allocating and deallocating such a block of data each time run through,
1242	* and saves the space of allocating this in the socket object when we only
1243	* need it for this cycle. If the server is ever threaded, this needs to be
1244	* re-examined.
1245	*/
1246	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1247
1248	/**
1249	* Returns true if any of the heads for this
1250	* space is set. Returns false if all are blank - this is used
1251	* for empty space checking.
1252	*/
1253	static inline int
1254	have_head (int ax, int ay)
1255	{
1256	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1257	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1258	return 1;
1259
1260	return 0;
1261	}
1262
1263	/**
1264	* check_head is a bit simplistic version of update_space below.
1265	* basically, it only checks the that the head on space ax,ay at layer
1266	* needs to get sent - if so, it adds the data, sending the head
1267	* if needed, and returning 1. If this no data needs to get
1268	* sent, it returns zero.
1269	*/
1270	static int
1271	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1272	{
1273	short face_num;
1274
1275	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1276	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1277	else
1278	face_num = 0;
1279
1280	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1281	{
1282	sl << uint16 (face_num);
1283	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1284	esrv_send_face (&ns, face_num, 0);
1285
1286	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1287	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1288	return 1;
1289	}
1290
1291	return 0; /* No change */
1292	}
1293		908
1294	/**	909	/**
1295	* Removes the need to replicate the same code for each layer.	910	* Removes the need to replicate the same code for each layer.
1296	* this returns true if this space is now in fact different than	911	* this returns true if this space is now in fact different than
1297	* it was.	912	* it was.
1298	* sl is the socklist this data is going into.	913	* sl is the socklist this data is going into.
1299	* ns is the socket we are working on - all the info we care	914	* ns is the socket we are working on - all the info we care
1300	* about is in this socket structure, so now need not pass the	915	* about is in this socket structure, so now need not pass the
1301	* entire player object.	916	* entire player object.
1302	* mx and my are map coordinate offsets for map mp
1303	* sx and sy are the offsets into the socket structure that
1304	* holds the old values.
1305	* layer is the layer to update, with 2 being the floor and 0 the	917	* layer is the layer to update, with 2 being the floor and 0 the
1306	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	918	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1307	* take. Interesting to note that before this function, the map1 function	919	* take. Interesting to note that before this function, the map1 function
1308	* numbers the spaces differently - I think this was a leftover from	920	* numbers the spaces differently - I think this was a leftover from
1309	* the map command, where the faces stack up. Sinces that is no longer	921	* the map command, where the faces stack up. Sinces that is no longer
1310	* the case, it seems to make more sense to have these layer values	922	* the case, it seems to make more sense to have these layer values
1311	* actually match.	923	* actually match.
1312	*/	924	*/
1313	static int	925	static int
1314	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	926	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1315	{	927	{
1316	object *ob, *head;	928	object *ob = ms.faces_obj [layer];
1317	uint16 face_num;
1318	int bx, by, i;
1319
1320	/* If there is a multipart object stored away, treat that as more important.
1321	* If not, then do the normal processing.
1322	*/
1323	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1324
1325	/* Check to see if this head is part of the set of objects
1326	* we would normally send for this space. If so, then
1327	* don't use the head value. We need to do the check
1328	* here and not when setting up the heads[] value for two reasons -
1329	* 1) the heads[] values will get used even if the space is not visible.
1330	* 2) its possible the head is not on the same map as a part, and I'd
1331	* rather not need to do the map translation overhead.
1332	* 3) We need to do some extra checking to make sure that we will
1333	* otherwise send the image as this layer, eg, either it matches
1334	* the head value, or is not multipart.
1335	*/
1336	if (head && !head->more)
1337	{
1338	for (i = 0; i < MAP_LAYERS; i++)
1339	{
1340	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1341	if (!ob)
1342	continue;
1343
1344	if (ob->head)
1345	ob = ob->head;
1346
1347	if (ob == head)
1348	{
1349	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1350	head = NULL;
1351	break;
1352	}
1353	}
1354	}
1355
1356	ob = head;
1357	if (!ob)
1358	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1359		929
1360	/* If there is no object for this space, or if the face for the object	930	/* If there is no object for this space, or if the face for the object
1361	* is the blank face, set the face number to zero.	931	* is the blank face, set the face number to zero.
1362	* else if we have the stored head object for this space, that takes	932	* else if we have the stored head object for this space, that takes
1363	* precedence over the other object for this space.	933	* precedence over the other object for this space.
1364	* otherwise, we do special head processing	934	* otherwise, we do special head processing
1365	*/	935	*/
1366	if (!ob || ob->face == blank_face)	936	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1367	face_num = 0;
1368	else if (head)
1369	{
1370	/* if this is a head that had previously been stored */
1371	face_num = ob->face->number;
1372	}
1373	else
1374	{
1375	/* if the faces for the different parts of a multipart object
1376	* are the same, we only want to send the bottom right most
1377	* portion of the object. That info is in the tail_.. values
1378	* of the head. Note that for the head itself, ob->head will
1379	* be null, so we only do this block if we are working on
1380	* a tail piece.
1381	*/
1382
1383	/* tail_x and tail_y will only be set in the head object. If
1384	* this is the head object and these are set, we proceed
1385	* with logic to only send bottom right. Similarly, if
1386	* this is one of the more parts but the head has those values
1387	* set, we want to do the processing. There can be cases where
1388	* the head is not visible but one of its parts is, so we just
1389	* can always expect that ob->arch->tail_x will be true for all
1390	* object we may want to display.
1391	*/
1392	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1393	{
1394
1395	if (ob->head)
1396	head = ob->head;
1397	else
1398	head = ob;
1399
1400	/* Basically figure out where the offset is from where we are right
1401	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1402	* piece is from the head, and the tail is where the tail is from the
1403	* head. Note that bx and by will equal sx and sy if we are already working
1404	* on the bottom right corner. If ob is the head, the clone values
1405	* will be zero, so the right thing will still happen.
1406	*/
1407	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1408	by = sy + head->arch->tail_y - ob->arch->clone.y;
1409
1410	/* I don't think this can ever happen, but better to check for it just
1411	* in case.
1412	*/
1413	if (bx < sx || by < sy)
1414	{
1415	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1416	face_num = 0;
1417	}
1418	/* single part object, multipart object with non merged faces,
1419	* of multipart object already at lower right.
1420	*/
1421	else if (bx == sx && by == sy)
1422	{
1423	face_num = ob->face->number;
1424
1425	/* if this face matches one stored away, clear that one away.
1426	* this code relies on the fact that the map1 commands
1427	* goes from 2 down to 0.
1428	*/
1429	for (i = 0; i < MAP_LAYERS; i++)
1430	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1431	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1432	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1433	}
1434	else
1435	{
1436	/* If this head is stored away, clear it - otherwise,
1437	* there can be cases where a object is on multiple layers -
1438	* we only want to send it once.
1439	*/
1440	face_num = head->face->number;
1441	for (i = 0; i < MAP_LAYERS; i++)
1442	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1443	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1444	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1445
1446	/* First, try to put the new head on the same layer. If that is used up,
1447	* then find another layer.
1448	*/
1449	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1450	{
1451	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1452	}
1453	else
1454	for (i = 0; i < MAX_LAYERS; i++)
1455	{
1456	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1457	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1458	{
1459	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1460	}
1461	}
1462	face_num = 0; /* Don't send this object - we'll send the head later */
1463	}
1464	}
1465	else
1466	{
1467	/* In this case, we are already at the lower right or single part object,
1468	* so nothing special
1469	*/
1470	face_num = ob->face->number;
1471
1472	/* clear out any head entries that have the same face as this one */
1473	for (bx = 0; bx < layer; bx++)
1474	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1475	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1476	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1477	}
1478	} /* else not already head object or blank face */
1479
1480	/* This is a real hack. Basically, if we have nothing to send for this layer,
1481	* but there is a head on the next layer, send that instead.
1482	* Without this, what happens is you can get the case where the player stands
1483	* on the same space as the head. However, if you have overlapping big objects
1484	* of the same type, what happens then is it doesn't think it needs to send
1485	* This tends to make stacking also work/look better.
1486	*/
1487	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1488	{
1489	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1490	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1491	}
1492
1493	/* Another hack - because of heads and whatnot, this face may match one
1494	* we already sent for a lower layer. In that case, don't send
1495	* this one.
1496	*/
1497	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1498	face_num = 0;
1499		937
1500	/* We've gotten what face we want to use for the object. Now see if	938	/* We've gotten what face we want to use for the object. Now see if
1501	* if it has changed since we last sent it to the client.	939	* if it has changed since we last sent it to the client.
1502	*/	940	*/
1503	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	941	if (lastcell.faces[layer] != face_num)
1504	{	942	{
1505	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	943	lastcell.faces[layer] = face_num;
		944
1506	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	945	if (!ns.faces_sent[face_num])
		946	if (ob)
		947	ns.send_faces (ob);
		948	else
1507	esrv_send_face (&ns, face_num, 0);	949	ns.send_face (face_num);
1508		950
1509	sl << uint16 (face_num);	951	sl << uint16 (face_num);
1510	return 1;
1511	}
1512
1513	/* Nothing changed */
1514	return 0;
1515	}
1516
1517	/**
1518	* This function is mainly a copy of update_space,
1519	* except it handles update of the smoothing updates,
1520	* not the face updates.
1521	* Removes the need to replicate the same code for each layer.
1522	* this returns true if this smooth is now in fact different
1523	* than it was.
1524	* sl is the socklist this data is going into.
1525	* ns is the socket we are working on - all the info we care
1526	* about is in this socket structure, so know need to pass the
1527	* entire player object.
1528	* mx and my are map coordinate offsets for map mp
1529	* sx and sy are the offsets into the socket structure that
1530	* holds the old values.
1531	* layer is the layer to update, with 2 being the floor and 0 the
1532	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1533	* take.
1534	*/
1535
1536	static inline int
1537	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1538	{
1539	object *ob;
1540	int smoothlevel; /* old face_num; */
1541
1542	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1543
1544	/* If there is no object for this space, or if the face for the object
1545	* is the blank face, set the smoothlevel to zero.
1546	*/
1547	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1548	smoothlevel = 0;
1549	else
1550	{
1551	smoothlevel = ob->smoothlevel;
1552	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1553	SendSmooth (&ns, ob->face->number);
1554	} /* else not already head object or blank face */
1555
1556	/* We've gotten what face we want to use for the object. Now see if
1557	* if it has changed since we last sent it to the client.
1558	*/
1559	if (smoothlevel > 255)
1560	smoothlevel = 255;
1561	else if (smoothlevel < 0)
1562	smoothlevel = 0;
1563
1564	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1565	{
1566	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1567	sl << uint8 (smoothlevel);
1568	return 1;	952	return 1;
1569	}	953	}
1570		954
1571	/* Nothing changed */	955	/* Nothing changed */
1572	return 0;	956	return 0;
…		…
1587	if (ns->EMI_smooth)	971	if (ns->EMI_smooth)
1588	result += 1; /*One byte for smoothlevel */	972	result += 1; /*One byte for smoothlevel */
1589	}	973	}
1590		974
1591	return result;	975	return result;
		976	}
		977
		978	// prefetch (and touch) all maps within a specific distancd
		979	static void
		980	prefetch_surrounding_maps (maptile *map, int distance)
		981	{
		982	map->last_access = runtime;
		983
		984	if (--distance)
		985	for (int dir = 4; --dir; )
		986	if (const shstr &path = map->tile_path [dir])
		987	if (maptile *&neigh = map->tile_map [dir])
		988	prefetch_surrounding_maps (neigh, distance);
		989	else
		990	neigh = maptile::find_async (path, map);
		991	}
		992
		993	// prefetch a generous area around the player
		994	static void
		995	prefetch_surrounding_maps (object *op)
		996	{
		997	prefetch_surrounding_maps (op->map, 3);
1592	}	998	}
1593		999
1594	/**	1000	/**
1595	* This function uses the new map1 protocol command to send the map	1001	* This function uses the new map1 protocol command to send the map
1596	* to the client. It is necessary because the old map command supports	1002	* to the client. It is necessary because the old map command supports
…		…
1614	* look like.	1020	* look like.
1615	*/	1021	*/
1616	void	1022	void
1617	draw_client_map1 (object *pl)	1023	draw_client_map1 (object *pl)
1618	{	1024	{
1619	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1025	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1620	sint16 nx, ny;	1026	sint16 nx, ny;
1621	int estartlen, eoldlen;	1027	int estartlen, eoldlen;
1622	uint16 mask, emask;
1623	uint8 eentrysize;	1028	uint8 eentrysize;
1624	uint16 ewhatstart, ewhatflag;	1029	uint16 ewhatstart, ewhatflag;
1625	uint8 extendedinfos;	1030	uint8 extendedinfos;
1626	maptile *m;	1031	maptile *m;
1627		1032
1628	client &socket = *pl->contr->ns;	1033	client &socket = *pl->contr->ns;
1629		1034
		1035	if (!pl->active)
		1036	return;
		1037
1630	check_map_change (pl->contr);	1038	check_map_change (pl->contr);
		1039	prefetch_surrounding_maps (pl);
1631		1040
1632	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1041	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1633	packet esl;	1042	packet esl;
1634		1043
1635	startlen = sl.length ();	1044	startlen = sl.length ();
…		…
1650	<< uint8 (extendedinfos)	1059	<< uint8 (extendedinfos)
1651	<< uint8 (eentrysize);	1060	<< uint8 (eentrysize);
1652		1061
1653	estartlen = esl.length ();	1062	estartlen = esl.length ();
1654	}	1063	}
1655	else
1656	{
1657	/* suppress compiler warnings */
1658	ewhatstart = 0;
1659	ewhatflag = 0;
1660	estartlen = 0;
1661	}
1662
1663	/* Init data to zero */
1664	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1665		1064
1666	/* x,y are the real map locations. ax, ay are viewport relative	1065	/* x,y are the real map locations. ax, ay are viewport relative
1667	* locations.	1066	* locations.
1668	*/	1067	*/
1669	ay = 0;	1068	ay = 0;
…		…
1672	* but that started to get a bit messy to look at.	1071	* but that started to get a bit messy to look at.
1673	*/	1072	*/
1674	max_x = pl->x + (socket.mapx + 1) / 2;	1073	max_x = pl->x + (socket.mapx + 1) / 2;
1675	max_y = pl->y + (socket.mapy + 1) / 2;	1074	max_y = pl->y + (socket.mapy + 1) / 2;
1676		1075
1677	if (socket.mapmode == Map1aCmd)	1076	maptile *plmap = pl->map;
1678	{
1679	max_x += MAX_HEAD_OFFSET;
1680	max_y += MAX_HEAD_OFFSET;
1681	}
1682		1077
1683	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1078	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1684	{	1079	{
1685	ax = 0;	1080	ax = 0;
1686	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1081	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1687	{	1082	{
		1083	int emask, mask;
1688	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1084	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1689		1085
1690	/* If this space is out of the normal viewable area, we only check
1691	* the heads value ax or ay will only be greater than what
1692	* the client wants if using the map1a command - this is because
1693	* if the map1a command is not used, max_x and max_y will be
1694	* set to lower values.
1695	*/
1696	if (ax >= socket.mapx || ay >= socket.mapy)
1697	{
1698	int i, got_one;
1699
1700	oldlen = sl.length ();
1701
1702	sl << uint16 (mask);
1703
1704	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1705	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1706	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1707
1708	/* If all we are doing is sending 0 (blank) faces, we don't
1709	* actually need to send that - just the coordinates
1710	* with no faces tells the client to blank out the
1711	* space.
1712	*/
1713	got_one = 0;
1714	for (i = oldlen + 2; i < sl.length (); i++)
1715	if (sl[i])
1716	got_one = 1;
1717
1718	if (got_one && (mask & 0xf))
1719	sl[oldlen + 1] = mask & 0xff;
1720	else
1721	{ /*either all faces blank, either no face at all */
1722	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1723	sl.reset (oldlen + 2);
1724	else
1725	sl.reset (oldlen);
1726	}
1727
1728	/*What concerns extendinfos, nothing to be done for now
1729	* (perhaps effects layer later)
1730	*/
1731	continue; /* don't do processing below */
1732	}
1733
1734	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1086	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1735
1736	d = pl->contr->blocked_los[ax][ay];
1737		1087
1738	/* If the coordinates are not valid, or it is too dark to see,	1088	/* If the coordinates are not valid, or it is too dark to see,
1739	* we tell the client as such	1089	* we tell the client as such
1740	*/	1090	*/
1741	nx = x;	1091	nx = x;
1742	ny = y;	1092	ny = y;
1743	m = get_map_from_coord (pl->map, &nx, &ny);	1093	m = get_map_from_coord (plmap, &nx, &ny);
1744		1094
1745	if (!m)	1095	if (!m)
1746	{	1096	{
1747	/* space is out of map. Update space and clear values	1097	/* space is out of map. Update space and clear values
1748	* if this hasn't already been done. If the space is out	1098	* if this hasn't already been done. If the space is out
1749	* of the map, it shouldn't have a head	1099	* of the map, it shouldn't have a head
1750	*/	1100	*/
1751	if (lastcell.count != -1)	1101	if (lastcell.count != -1)
1752	{	1102	{
1753	sl << uint16 (mask);	1103	sl << uint16 (mask);
1754	map_clearcell (&lastcell, 0, 0, 0, -1);	1104	map_clearcell (&lastcell, -1);
1755	}	1105	}
		1106
		1107	continue;
1756	}	1108	}
		1109
		1110	m->touch ();
		1111
		1112	int d = pl->contr->blocked_los[ax][ay];
		1113
1757	else if (d > 3)	1114	if (d > 3)
1758	{	1115	{
		1116
1759	int need_send = 0, count;	1117	int need_send = 0, count;
1760		1118
1761	/* This block deals with spaces that are not visible for whatever	1119	/* This block deals with spaces that are not visible for whatever
1762	* reason. Still may need to send the head for this space.	1120	* reason. Still may need to send the head for this space.
1763	*/	1121	*/
1764		1122
1765	oldlen = sl.length ();	1123	oldlen = sl.length ();
1766		1124
1767	sl << uint16 (mask);	1125	sl << uint16 (mask);
…		…
1769	if (lastcell.count != -1)	1127	if (lastcell.count != -1)
1770	need_send = 1;	1128	need_send = 1;
1771		1129
1772	count = -1;	1130	count = -1;
1773		1131
1774	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1775	{
1776	/* Now check to see if any heads need to be sent */
1777
1778	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1779	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1780	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1781
1782	lastcell.count = count;
1783	}
1784	else
1785	{
1786	/* properly clear a previously sent big face */	1132	/* properly clear a previously sent big face */
1787	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1133	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1788	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1134	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1789	need_send = 1;	1135	need_send = 1;
1790		1136
1791	map_clearcell (&lastcell, 0, 0, 0, count);	1137	map_clearcell (&lastcell, count);
1792	}
1793		1138
1794	if ((mask & 0xf) || need_send)	1139	if ((mask & 0xf) || need_send)
1795	sl[oldlen + 1] = mask & 0xff;	1140	sl[oldlen + 1] = mask & 0xff;
1796	else	1141	else
1797	sl.reset (oldlen);	1142	sl.reset (oldlen);
1798	}	1143	}
1799	else	1144	else
1800	{	1145	{
1801	/* In this block, the space is visible or there are head objects	1146	/* In this block, the space is visible.
1802	* we need to send.
1803	*/	1147	*/
1804		1148
1805	/* Rather than try to figure out what everything that we might	1149	/* Rather than try to figure out what everything that we might
1806	* need to send is, then form the packet after that,	1150	* need to send is, then form the packet after that,
1807	* we presume that we will in fact form a packet, and update	1151	* we presume that we will in fact form a packet, and update
…		…
1810	* is done.	1154	* is done.
1811	* I think this is simpler than doing a bunch of checks to see	1155	* I think this is simpler than doing a bunch of checks to see
1812	* what if anything we need to send, setting the bits, then	1156	* what if anything we need to send, setting the bits, then
1813	* doing those checks again to add the real data.	1157	* doing those checks again to add the real data.
1814	*/	1158	*/
1815	oldlen = sl.length ();	1159	oldlen = sl.length ();
1816	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1817	eoldlen = esl.length ();	1160	eoldlen = esl.length ();
1818	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1161
1819	sl << uint16 (mask);	1162	sl << uint16 (mask);
1820
1821	if (socket.ext_mapinfos)
1822	esl << uint16 (emask);
1823		1163
1824	unsigned char dummy;	1164	unsigned char dummy;
1825	unsigned char *last_ext = &dummy;	1165	unsigned char *last_ext = &dummy;
1826		1166
1827	/* Darkness changed */	1167	/* Darkness changed */
…		…
1839	sl << uint8 (255 - 64 * d);	1179	sl << uint8 (255 - 64 * d);
1840	}	1180	}
1841		1181
1842	lastcell.count = d;	1182	lastcell.count = d;
1843		1183
		1184	mapspace &ms = m->at (nx, ny);
		1185
1844	if (socket.extmap)	1186	if (socket.extmap)
1845	{	1187	{
1846	uint8 stat_hp = 0;	1188	uint8 stat_hp = 0;
1847	uint8 stat_width = 0;	1189	uint8 stat_width = 0;
1848	uint8 flags = 0;	1190	uint8 flags = 0;
1849	UUID player = 0;	1191	tag_t player = 0;
1850		1192
1851	// send hp information, if applicable	1193	// send hp information, if applicable
1852	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1194	if (object *op = ms.faces_obj [0])
1853	{	1195	{
1854	if (op->head || op->invisible)	1196	if (op->head || op->invisible)
1855	; // do not show	1197	; // do not show
1856	else if (op->type == PLAYER	1198	else if (op->type == PLAYER
1857	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1199	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
…		…
1895		1237
1896	mask |= 0x8;	1238	mask |= 0x8;
1897	*last_ext |= 0x80;	1239	*last_ext |= 0x80;
1898	last_ext = &sl[sl.length ()];	1240	last_ext = &sl[sl.length ()];
1899		1241
1900	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1242	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1901	}	1243	}
1902		1244
1903	if (lastcell.flags != flags)	1245	if (lastcell.flags != flags)
1904	{	1246	{
1905	lastcell.flags = flags;	1247	lastcell.flags = flags;
…		…
1911	sl << uint8 (8) << uint8 (flags);	1253	sl << uint8 (8) << uint8 (flags);
1912	}	1254	}
1913	}	1255	}
1914		1256
1915	/* Floor face */	1257	/* Floor face */
1916	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1258	if (update_space (sl, socket, ms, lastcell, 2))
1917	mask |= 0x4;	1259	mask |= 0x4;
1918		1260
1919	if (socket.EMI_smooth)
1920	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1921	emask |= 0x4;
1922
1923	/* Middle face */	1261	/* Middle face */
1924	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1262	if (update_space (sl, socket, ms, lastcell, 1))
1925	mask |= 0x2;	1263	mask |= 0x2;
1926		1264
1927	if (socket.EMI_smooth)	1265	if (ms.player () == pl
1928	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1266	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1929	emask |= 0x2;
1930
1931	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1932	{	1267	{
		1268	// force player to be visible to himself if invisible
1933	if (lastcell.faces[0] != pl->face->number)	1269	if (lastcell.faces[0] != pl->face)
1934	{	1270	{
1935	lastcell.faces[0] = pl->face->number;	1271	lastcell.faces[0] = pl->face;
		1272
1936	mask |= 0x1;	1273	mask |= 0x1;
1937
1938	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1939	esrv_send_face (&socket, pl->face->number, 0);
1940
1941	sl << uint16 (pl->face->number);	1274	sl << uint16 (pl->face);
		1275
		1276	socket.send_faces (pl);
1942	}	1277	}
1943	}	1278	}
1944	else
1945	{
1946	/* Top face */	1279	/* Top face */
1947	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1280	else if (update_space (sl, socket, ms, lastcell, 0))
1948	mask |= 0x1;	1281	mask |= 0x1;
1949
1950	if (socket.EMI_smooth)
1951	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1952	emask |= 0x1;
1953	}	1282
1954		1283
1955	/* Check to see if we are in fact sending anything for this	1284	/* Check to see if we are in fact sending anything for this
1956	* space by checking the mask. If so, update the mask.	1285	* space by checking the mask. If so, update the mask.
1957	* if not, reset the len to that from before adding the mask	1286	* if not, reset the len to that from before adding the mask
1958	* value, so we don't send those bits.	1287	* value, so we don't send those bits.
…		…
1960	if (mask & 0xf)	1289	if (mask & 0xf)
1961	sl[oldlen + 1] = mask & 0xff;	1290	sl[oldlen + 1] = mask & 0xff;
1962	else	1291	else
1963	sl.reset (oldlen);	1292	sl.reset (oldlen);
1964		1293
		1294	if (socket.ext_mapinfos)
		1295	esl << uint16 (emask);
		1296
		1297	if (socket.EMI_smooth)
		1298	{
		1299	for (int layer = 2+1; layer--; )
		1300	{
		1301	object *ob = ms.faces_obj [layer];
		1302
		1303	// If there is no object for this space, or if the face for the object
		1304	// is the blank face, set the smoothlevel to zero.
		1305	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1306
		1307	// We've gotten what face we want to use for the object. Now see if
		1308	// if it has changed since we last sent it to the client.
		1309	if (lastcell.smooth[layer] != smoothlevel)
		1310	{
		1311	lastcell.smooth[layer] = smoothlevel;
		1312	esl << uint8 (smoothlevel);
		1313	emask |= 1 << layer;
		1314	}
		1315	}
		1316
1965	if (emask & 0xf)	1317	if (emask & 0xf)
1966	esl[eoldlen + 1] = emask & 0xff;	1318	esl[eoldlen + 1] = emask & 0xff;
1967	else	1319	else
1968	esl.reset (eoldlen);	1320	esl.reset (eoldlen);
		1321	}
1969	} /* else this is a viewable space */	1322	} /* else this is a viewable space */
1970	} /* for x loop */	1323	} /* for x loop */
1971	} /* for y loop */	1324	} /* for y loop */
		1325
		1326	socket.flush_fx ();
1972		1327
1973	/* Verify that we in fact do need to send this */	1328	/* Verify that we in fact do need to send this */
1974	if (socket.ext_mapinfos)	1329	if (socket.ext_mapinfos)
1975	{	1330	{
1976	if (!(sl.length () > startlen || socket.sent_scroll))	1331	if (!(sl.length () > startlen || socket.sent_scroll))
1977	{	1332	{
1978	/* No map data will follow, so don't say the client	1333	/* No map data will follow, so don't say the client
1979	* it doesn't need draw!	1334	* it doesn't need draw!
1980	*/	1335	*/
1981	ewhatflag &= (~EMI_NOREDRAW);	1336	ewhatflag &= ~EMI_NOREDRAW;
1982	esl[ewhatstart + 1] = ewhatflag & 0xff;	1337	esl[ewhatstart + 1] = ewhatflag & 0xff;
1983	}	1338	}
1984		1339
1985	if (esl.length () > estartlen)	1340	if (esl.length () > estartlen)
1986	socket.send_packet (esl);	1341	socket.send_packet (esl);
…		…
1998	*/	1353	*/
1999	void	1354	void
2000	draw_client_map (object *pl)	1355	draw_client_map (object *pl)
2001	{	1356	{
2002	int i, j;	1357	int i, j;
2003	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1358	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2004	New_Face *face, *floor;
2005	New_Face *floor2;
2006	int d, mflags;	1359	int mflags;
2007	struct Map newmap;	1360	struct Map newmap;
2008	maptile *m, *pm;	1361	maptile *m, *pm;
2009		1362
2010	if (pl->type != PLAYER)	1363	if (pl->type != PLAYER)
2011	{	1364	{
…		…
2120	* it then sends an updspell packet for each spell that has changed in this way	1473	* it then sends an updspell packet for each spell that has changed in this way
2121	*/	1474	*/
2122	void	1475	void
2123	esrv_update_spells (player *pl)	1476	esrv_update_spells (player *pl)
2124	{	1477	{
		1478	if (!pl->ns)
		1479	return;
		1480
2125	if (!pl->ns->monitor_spells)	1481	if (!pl->ns->monitor_spells)
2126	return;	1482	return;
2127		1483
2128	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1484	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2129	{	1485	{
…		…
2189		1545
2190	/* appends the spell *spell to the Socklist we will send the data to. */	1546	/* appends the spell *spell to the Socklist we will send the data to. */
2191	static void	1547	static void
2192	append_spell (player *pl, packet &sl, object *spell)	1548	append_spell (player *pl, packet &sl, object *spell)
2193	{	1549	{
2194	int len, i, skill = 0;	1550	int i, skill = 0;
2195		1551
2196	if (!(spell->name))	1552	if (!(spell->name))
2197	{	1553	{
2198	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1554	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2199	return;	1555	return;
…		…
2211	if (!strcmp (spell->skill, skill_names[i]))	1567	if (!strcmp (spell->skill, skill_names[i]))
2212	{	1568	{
2213	skill = i + CS_STAT_SKILLINFO;	1569	skill = i + CS_STAT_SKILLINFO;
2214	break;	1570	break;
2215	}	1571	}
		1572	}
		1573
		1574	// spells better have a face
		1575	if (!spell->face)
		1576	{
		1577	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1578	spell->face = face_find ("burnout.x11", blank_face);
2216	}	1579	}
2217		1580
2218	/* send the current values */	1581	/* send the current values */
2219	sl << uint32 (spell->count)	1582	sl << uint32 (spell->count)
2220	<< uint16 (spell->level)	1583	<< uint16 (spell->level)
…		…
2222	<< uint16 (spell->last_sp)	1585	<< uint16 (spell->last_sp)
2223	<< uint16 (spell->last_grace)	1586	<< uint16 (spell->last_grace)
2224	<< uint16 (spell->last_eat)	1587	<< uint16 (spell->last_eat)
2225	<< uint8 (skill)	1588	<< uint8 (skill)
2226	<< uint32 (spell->path_attuned)	1589	<< uint32 (spell->path_attuned)
2227	<< uint32 (spell->face ? spell->face->number : 0)	1590	<< uint32 (spell->face)
2228	<< data8 (spell->name)	1591	<< data8 (spell->name)
2229	<< data16 (spell->msg);	1592	<< data16 (spell->msg);
2230	}	1593	}
2231		1594
2232	/**	1595	/**
…		…
2247		1610
2248	packet sl ("addspell");	1611	packet sl ("addspell");
2249		1612
2250	if (!spell)	1613	if (!spell)
2251	{	1614	{
2252	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1615	for (spell = pl->ob->inv; spell; spell = spell->below)
2253	{	1616	{
2254	/* were we to simply keep appending data here, we could exceed	1617	/* were we to simply keep appending data here, we could exceed
2255	* MAXSOCKBUF if the player has enough spells to add, we know that	1618	* MAXSOCKBUF if the player has enough spells to add, we know that
2256	* append_spells will always append 19 data bytes, plus 4 length	1619	* append_spells will always append 19 data bytes, plus 4 length
2257	* bytes and 3 strings (because that is the spec) so we need to	1620	* bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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