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.52 by root, Sat Dec 23 09:41:55 2006 UTC vs.
Revision 1.96 by root, Sat May 12 19:30:18 2007 UTC

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