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.66 by root, Thu Feb 15 04:04:23 2007 UTC vs.
Revision 1.105 by root, Wed Jun 6 17:22:55 2007 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software; you can redistribute it and/or modify it
9	* it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
10	* the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
11	* (at your option) any later version.	11	* any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful, but
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16	* GNU General Public License for more details.	16	* for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License along
19	* along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	21	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	/**	25	/**
26	* \file	26	* \file
27	* Client handling.	27	* Client handling.
…		…
36	* have the prototype of (char *data, int datalen, int client_num). This	36	* have the prototype of (char *data, int datalen, int client_num). This
37	* way, we can use one dispatch table.	37	* way, we can use one dispatch table.
38	*	38	*
39	* esrv_map_new starts updating the map	39	* esrv_map_new starts updating the map
40	*	40	*
41	* esrv_map_setbelow allows filling in all of the faces for the map.
42	* if a face has not already been sent to the client, it is sent now.
43	*
44	*/	41	*/
45		42
46	#include <global.h>	43	#include <global.h>
47	#include <sproto.h>	44	#include <sproto.h>
48		45
…		…
101	* that much difference in bandwidth.	98	* that much difference in bandwidth.
102	*/	99	*/
103	mx = ns->mapx;	100	mx = ns->mapx;
104	my = ns->mapy;	101	my = ns->mapy;
105		102
106	if (ns->mapmode == Map1aCmd)
107	{
108	mx += MAX_HEAD_OFFSET;
109	my += MAX_HEAD_OFFSET;
110	}
111
112	/* the x and y here are coordinates for the new map, i.e. if we moved	103	/* the x and y here are coordinates for the new map, i.e. if we moved
113	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	104	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
114	* if the destination x or y coordinate is outside the viewable	105	* if the destination x or y coordinate is outside the viewable
115	* area, we clear the values - otherwise, the old values	106	* area, we clear the values - otherwise, the old values
116	* are preserved, and the check_head thinks it needs to clear them.	107	* are preserved, and the check_head thinks it needs to clear them.
…		…
141	static void	132	static void
142	clear_map (player *pl)	133	clear_map (player *pl)
143	{	134	{
144	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
145		136
		137	pl->ns->force_newmap = false;
		138
146	if (pl->ns->newmapcmd == 1)	139	if (pl->ns->newmapcmd == 1)
147	pl->ns->send_packet ("newmap");	140	pl->ns->send_packet ("newmap");
148		141
149	pl->ns->floorbox_reset ();	142	pl->ns->floorbox_reset ();
150	}	143	}
…		…
152	/** check for map/region change and send new map data */	145	/** check for map/region change and send new map data */
153	static void	146	static void
154	check_map_change (player *pl)	147	check_map_change (player *pl)
155	{	148	{
156	client &socket = *pl->ns;	149	client &socket = *pl->ns;
157	object *ob = pl->ob;	150	object *ob = pl->observe;
158	char buf[MAX_BUF]; /* eauugggh */
159		151
160	if (socket.current_map != ob->map)	152	if (socket.current_map != ob->map || socket.force_newmap)
161	{	153	{
		154	clear_map (pl);
162	socket.current_map = ob->map;	155	socket.current_map = ob->map;
163
164	clear_map (pl);
165		156
166	if (socket.mapinfocmd)	157	if (socket.mapinfocmd)
167	{	158	{
168	if (ob->map && ob->map->path[0])	159	if (ob->map && ob->map->path[0])
169	{	160	{
170	int flags = 0;	161	int flags = 0;
171		162
172	if (ob->map->tile_path[0])	163	if (ob->map->tile_path[0]) flags |= 1;
173	flags |= 1;
174	if (ob->map->tile_path[1])	164	if (ob->map->tile_path[1]) flags |= 2;
175	flags |= 2;
176	if (ob->map->tile_path[2])	165	if (ob->map->tile_path[2]) flags |= 4;
177	flags |= 4;
178	if (ob->map->tile_path[3])	166	if (ob->map->tile_path[3]) flags |= 8;
179	flags |= 8;
180		167
181	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	168	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
182	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);	169	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		170	ob->map->width, ob->map->height, &ob->map->path);
183	}	171	}
184	else	172	else
185	snprintf (buf, MAX_BUF, "mapinfo current");
186
187	socket.send_packet (buf);	173	socket.send_packet ("mapinfo current");
188	}	174	}
189	}	175	}
190	else if (socket.current_x != ob->x || socket.current_y != ob->y)	176	else if (socket.current_x != ob->x || socket.current_y != ob->y)
191	{	177	{
192	int dx = ob->x - socket.current_x;	178	int dx = ob->x - socket.current_x;
…		…
333	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);	319	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
334	else if (map && map->path[0])	320	else if (map && map->path[0])
335	{	321	{
336	int flags = 0;	322	int flags = 0;
337		323
338	if (map->tile_path[0])	324	if (map->tile_path[0]) flags |= 1;
339	flags |= 1;
340	if (map->tile_path[1])	325	if (map->tile_path[1]) flags |= 2;
341	flags |= 2;
342	if (map->tile_path[2])	326	if (map->tile_path[2]) flags |= 4;
343	flags |= 4;
344	if (map->tile_path[3])	327	if (map->tile_path[3]) flags |= 8;
345	flags |= 8;
346		328
347	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);	329	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
348	}	330	}
349	else	331	else
350	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	332	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
…		…
353	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	335	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
354		336
355	pl->ns->send_packet (bigbuf);	337	pl->ns->send_packet (bigbuf);
356	}	338	}
357		339
358	/** This is the Setup cmd - easy first implementation */	340	/** This is the Setup cmd */
359	void	341	void
360	SetUp (char *buf, int len, client * ns)	342	SetUp (char *buf, int len, client * ns)
361	{	343	{
362	int s, slen;	344	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
363	char *cmd, *param, cmdback[HUGE_BUF];
364
365	/* run through the cmds of setup
366	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
367	*
368	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
369	* The client then must sort this out
370	*/
371
372	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
373
374	strcpy (cmdback, "setup");
375	for (s = 0; s < len; )
376	{
377	cmd = &buf[s];
378
379	/* find the next space, and put a null there */
380	for (; buf[s] && buf[s] != ' '; s++)
381	;
382
383	buf[s++] = 0;
384
385	while (buf[s] == ' ')
386	s++;
387
388	if (s >= len)
389	break;
390
391	param = &buf[s];
392
393	for (; buf[s] && buf[s] != ' '; s++)
394	;
395
396	buf[s++] = 0;
397
398	while (buf[s] == ' ')
399	s++;
400
401	slen = strlen (cmdback);
402	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
403	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
404	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
405
406	if (!strcmp (cmd, "sound"))
407	{
408	ns->sound = atoi (param);
409	safe_strcat (cmdback, param, &slen, HUGE_BUF);
410	}
411	else if (!strcmp (cmd, "exp64"))
412	safe_strcat (cmdback, param, &slen, HUGE_BUF);
413	else if (!strcmp (cmd, "spellmon"))
414	{
415	ns->monitor_spells = atoi (param);
416	safe_strcat (cmdback, param, &slen, HUGE_BUF);
417	}
418	else if (!strcmp (cmd, "darkness"))
419	{
420	ns->darkness = atoi (param);
421	safe_strcat (cmdback, param, &slen, HUGE_BUF);
422	}
423	else if (!strcmp (cmd, "map1cmd"))
424	{
425	if (atoi (param))
426	ns->mapmode = Map1Cmd;
427	/* if beyond this size, need to use map1cmd no matter what */
428	if (ns->mapx > 11 || ns->mapy > 11)
429	ns->mapmode = Map1Cmd;
430	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
431	}
432	else if (!strcmp (cmd, "map1acmd"))
433	{
434	if (atoi (param))
435	ns->mapmode = Map1aCmd;
436	/* if beyond this size, need to use map1acmd no matter what */
437	if (ns->mapx > 11 || ns->mapy > 11)
438	ns->mapmode = Map1aCmd;
439	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
440	}
441	else if (!strcmp (cmd, "newmapcmd"))
442	{
443	ns->newmapcmd = atoi (param);
444	safe_strcat (cmdback, param, &slen, HUGE_BUF);
445	// } else if (!strcmp(cmd,"plugincmd")) {
446	// ns->plugincmd = atoi(param);
447	// safe_strcat(cmdback, param, &slen, HUGE_BUF);
448	}
449	else if (!strcmp (cmd, "mapinfocmd"))
450	{
451	ns->mapinfocmd = atoi (param);
452	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
453	}
454	else if (!strcmp (cmd, "extcmd"))
455	{
456	ns->extcmd = atoi (param);
457	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
458	}
459	else if (!strcmp (cmd, "extmap"))
460	{
461	ns->extmap = atoi (param);
462	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
463	}
464	else if (!strcmp (cmd, "facecache"))
465	{
466	ns->facecache = atoi (param);
467	safe_strcat (cmdback, param, &slen, HUGE_BUF);
468	}
469	else if (!strcmp (cmd, "faceset"))
470	{
471	char tmpbuf[20];
472	int q = atoi (param);
473
474	if (is_valid_faceset (q))
475	ns->faceset = q;
476	sprintf (tmpbuf, "%d", ns->faceset);
477	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
478	/* if the client is using faceset, it knows about image2 command */
479	ns->image2 = 1;
480	}
481	else if (!strcmp (cmd, "itemcmd"))
482	{
483	/* Version of the item protocol command to use. Currently,
484	* only supported versions are 1 and 2. Using a numeric
485	* value will make it very easy to extend this in the future.
486	*/
487	char tmpbuf[20];
488	int q = atoi (param);
489
490	if (q < 1 || q > 2)
491	{
492	strcpy (tmpbuf, "FALSE");
493	}
494	else
495	{
496	ns->itemcmd = q;
497	sprintf (tmpbuf, "%d", ns->itemcmd);
498	}
499	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
500	}
501	else if (!strcmp (cmd, "mapsize"))
502	{
503	int x, y = 0;
504	char tmpbuf[MAX_BUF], *cp;
505
506	x = atoi (param);
507	for (cp = param; *cp != 0; cp++)
508	if (*cp == 'x' || *cp == 'X')
509	{
510	y = atoi (cp + 1);
511	break;
512	}
513	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
514	{
515	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
516	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
517	}
518	else
519	{
520	ns->mapx = x;
521	ns->mapy = y;
522	/* better to send back what we are really using and not the
523	* param as given to us in case it gets parsed differently.
524	*/
525	sprintf (tmpbuf, "%dx%d", x, y);
526	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
527	/* If beyond this size and still using orig map command, need to
528	* go to map1cmd.
529	*/
530	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
531	ns->mapmode = Map1Cmd;
532	}
533	}
534	else if (!strcmp (cmd, "extendedMapInfos"))
535	{
536	/* Added by tchize
537	* prepare to use the mapextended command
538	*/
539	char tmpbuf[20];
540
541	ns->ext_mapinfos = (atoi (param));
542	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
543	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
544	}
545	else if (!strcmp (cmd, "extendedTextInfos"))
546	{
547	/* Added by tchize
548	* prepare to use the extended text commands
549	* Client toggle this to non zero to get exttext
550	*/
551	char tmpbuf[20];
552
553	ns->has_readable_type = (atoi (param));
554	sprintf (tmpbuf, "%d", ns->has_readable_type);
555	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
556	}
557	else
558	{
559	/* Didn't get a setup command we understood -
560	* report a failure to the client.
561	*/
562	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
563	}
564	} /* for processing all the setup commands */
565
566	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
567	ns->send_packet (cmdback);
568	}	345	}
569		346
570	/**	347	/**
571	* The client has requested to be added to the game.	348	* The client has requested to be added to the game.
572	* This is what takes care of it. We tell the client how things worked out.	349	* This is what takes care of it. We tell the client how things worked out.
573	* I am not sure if this file is the best place for this function. however,	350	* I am not sure if this file is the best place for this function. however,
574	* it either has to be here or init_sockets needs to be exported.	351	* it either has to be here or init_sockets needs to be exported.
575	*/	352	*/
576	void	353	void
577	AddMeCmd (char *buf, int len, client * ns)	354	AddMeCmd (char *buf, int len, client *ns)
578	{	355	{
579	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	356	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
580	}	357	}
581		358
582	/** Reply to ExtendedInfos command */	359	/** Reply to ExtendedInfos command */
…		…
694		471
695	ns->send_packet (cmdback);	472	ns->send_packet (cmdback);
696	}	473	}
697		474
698	/**	475	/**
699	* A lot like the old AskSmooth (in fact, now called by AskSmooth).	476	* client requested an image. send it rate-limited
700	* Basically, it makes no sense to wait for the client to request a	477	* before flushing.
701	* a piece of data from us that we know the client wants. So
702	* if we know the client wants it, might as well push it to the
703	* client.
704	*/
705	static void
706	SendSmooth (client *ns, uint16 face)
707	{
708	uint16 smoothface;
709
710	/* If we can't find a face, return and set it so we won't try to send this
711	* again.
712	*/	478	*/
713	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	479	void
714	{	480	AskFaceCmd (char *buf, int len, client *ns)
715		481	{
716	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);	482	ns->askface.push_back (atoi (buf));
717	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
718	return;
719	}
720
721	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
722	esrv_send_face (ns, smoothface, 0);
723
724	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
725
726	packet sl ("smooth");
727
728	sl << uint16 (face)
729	<< uint16 (smoothface);
730
731	ns->send_packet (sl);
732	}	483	}
733		484
734	/**	485	/**
735	* Tells client the picture it has to use	486	* Tells client the picture it has to use
736	* to smooth a picture number given as argument.	487	* to smooth a picture number given as argument.
737	*/	488	*/
738	void	489	void
739	AskSmooth (char *buf, int len, client *ns)	490	AskSmooth (char *buf, int len, client *ns)
740	{	491	{
741	SendSmooth (ns, atoi (buf));	492	ns->send_face (atoi (buf));
		493	ns->flush_fx ();
742	}	494	}
743		495
744	/**	496	/**
745	* This handles the general commands from the client (ie, north, fire, cast,	497	* This handles the general commands from the client (ie, north, fire, cast,
746	* etc.)	498	* etc.)
…		…
769	* for the command that issued the count should be done before any other	521	* for the command that issued the count should be done before any other
770	* commands.	522	* commands.
771	*/	523	*/
772	pl->count = 0;	524	pl->count = 0;
773	}	525	}
774
775		526
776	/**	527	/**
777	* This handles the general commands from the client (ie, north, fire, cast,	528	* This handles the general commands from the client (ie, north, fire, cast,
778	* etc.). It is a lot like PlayerCmd above, but is called with the	529	* etc.). It is a lot like PlayerCmd above, but is called with the
779	* 'ncom' method which gives more information back to the client so it	530	* 'ncom' method which gives more information back to the client so it
…		…
849	{	600	{
850	case ST_PLAYING:	601	case ST_PLAYING:
851	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	602	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
852	break;	603	break;
853		604
854	case ST_CHANGE_CLASS:
855	key_change_class (pl->ob, buf[0]);
856	break;
857
858	case ST_GET_PARTY_PASSWORD: /* Get password for party */	605	case ST_GET_PARTY_PASSWORD: /* Get password for party */
859	receive_party_password (pl->ob, 13);	606	receive_party_password (pl->ob, 13);
860	break;	607	break;
861		608
862	default:	609	default:
…		…
883	ns->cs_version = atoi (buf);	630	ns->cs_version = atoi (buf);
884	ns->sc_version = ns->cs_version;	631	ns->sc_version = ns->cs_version;
885		632
886	LOG (llevDebug, "connection from client <%s>\n", buf);	633	LOG (llevDebug, "connection from client <%s>\n", buf);
887		634
888
889	//TODO: should log here just for statistics	635	//TODO: should log here just for statistics
890		636
891	//if (VERSION_CS != ns->cs_version)	637	//if (VERSION_CS != ns->cs_version)
892	// unchecked;	638	// unchecked;
893		639
…		…
902		648
903	cp = strchr (cp + 1, ' ');	649	cp = strchr (cp + 1, ' ');
904		650
905	if (cp)	651	if (cp)
906	{	652	{
907	assign (ns->version, cp + 1);	653	ns->version = cp + 1;
908		654
909	if (ns->sc_version < 1026)	655	if (ns->sc_version < 1026)
910	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	656	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
911	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	657	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
912	}	658	}
…		…
972	/**	718	/**
973	* Asks the client to query the user. This way, the client knows	719	* Asks the client to query the user. This way, the client knows
974	* it needs to send something back (vs just printing out a message)	720	* it needs to send something back (vs just printing out a message)
975	*/	721	*/
976	void	722	void
977	send_query (client *ns, uint8 flags, char *text)	723	send_query (client *ns, uint8 flags, const char *text)
978	{	724	{
979	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	725	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
		726	}
		727
		728	/**
		729	* Get player's current range attack in obuf.
		730	*/
		731	static void
		732	rangetostring (player *pl, char *obuf)
		733	{
		734	dynbuf_text buf;
		735
		736	if (pl->observe->contr)
		737	pl = pl->observe->contr;
		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	#if 0
		746	//TODO: remove this when slot system is working, this is only for debugging
		747	if (pl->ob->chosen_skill)
		748	buf << " Skill*: " << pl->ob->chosen_skill->name;
		749	#endif
		750
		751	//TODO: maybe golem should become the current_weapon, quite simply?
		752	if (pl->golem)
		753	buf << " Golem*: " << pl->golem->name;
		754
		755	buf.linearise (obuf);
		756	obuf [buf.size ()] = 0;
980	}	757	}
981		758
982	#define AddIfInt64(Old,New,Type) if (Old != New) {\	759	#define AddIfInt64(Old,New,Type) if (Old != New) {\
983	Old = New; \	760	Old = New; \
984	sl << uint8 (Type) << uint64 (New); \	761	sl << uint8 (Type) << uint64 (New); \
…		…
992	#define AddIfShort(Old,New,Type) if (Old != New) {\	769	#define AddIfShort(Old,New,Type) if (Old != New) {\
993	Old = New; \	770	Old = New; \
994	sl << uint8 (Type) << uint16 (New); \	771	sl << uint8 (Type) << uint16 (New); \
995	}	772	}
996		773
997	#define AddIfFloat(Old,New,Type) if (Old != New) {\	774	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
998	Old = New; \	775	Old = New; \
999	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	776	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1000	}	777	}
1001		778
1002	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	779	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1003	free(Old); Old = strdup (New);\	780	free(Old); Old = strdup (New);\
1004	sl << uint8 (Type) << data8 (New); \	781	sl << uint8 (Type) << data8 (New); \
…		…
1018		795
1019	client *ns = pl->ns;	796	client *ns = pl->ns;
1020	if (!ns)	797	if (!ns)
1021	return;	798	return;
1022		799
1023	object *ob = pl->ob;	800	object *ob = pl->observe;
1024	if (!ob)	801	if (!ob)
1025	return;	802	return;
1026		803
1027	packet sl ("stats");	804	packet sl ("stats");
1028		805
…		…
1057	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	834	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1058	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	835	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1059	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	836	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1060	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	837	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1061	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	838	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1062	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	839	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1063	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	840	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1064	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	841	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1065	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	842	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1066		843
1067	flags = 0;	844	flags = 0;
1068		845
1069	if (pl->fire_on)	846	if (pl->fire_on)
…		…
1091	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	868	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1092	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	869	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1093	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	870	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1094	}	871	}
1095		872
1096	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	873	rangetostring (pl, buf); /* we want use the new fire & run system in new client */
1097	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	874	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1098	set_title (ob, buf);	875	set_title (ob, buf);
1099	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	876	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1100		877
1101	/* Only send it away if we have some actual data */	878	/* Only send it away if we have some actual data */
…		…
1111	{	888	{
1112	packet sl ("player");	889	packet sl ("player");
1113		890
1114	sl << uint32 (pl->ob->count)	891	sl << uint32 (pl->ob->count)
1115	<< uint32 (weight)	892	<< uint32 (weight)
1116	<< uint32 (pl->ob->face->number)	893	<< uint32 (pl->ob->face)
1117	<< data8 (pl->ob->name);	894	<< data8 (pl->ob->name);
1118		895
1119	pl->ns->last_weight = weight;	896	pl->ns->last_weight = weight;
1120	pl->ns->send_packet (sl);	897	pl->ns->send_packet (sl);
1121	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	898	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1122	}	899	}
1123
1124	/**
1125	* Need to send an animation sequence to the client.
1126	* We will send appropriate face commands to the client if we haven't
1127	* sent them the face yet (this can become quite costly in terms of
1128	* how much we are sending - on the other hand, this should only happen
1129	* when the player logs in and picks stuff up.
1130	*/
1131	void
1132	esrv_send_animation (client * ns, short anim_num)
1133	{
1134	/* Do some checking on the anim_num we got. Note that the animations
1135	* are added in contigous order, so if the number is in the valid
1136	* range, it must be a valid animation.
1137	*/
1138	if (anim_num < 0 || anim_num > num_animations)
1139	{
1140	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1141	return;
1142	}
1143
1144	packet sl ("anim");
1145
1146	sl << uint16 (anim_num)
1147	<< uint16 (0); /* flags - not used right now */
1148
1149	/* Build up the list of faces. Also, send any information (ie, the
1150	* the face itself) down to the client.
1151	*/
1152	for (int i = 0; i < animations[anim_num].num_animations; i++)
1153	{
1154	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1155	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1156
1157	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1158	}
1159
1160	ns->send_packet (sl);
1161
1162	ns->anims_sent[anim_num] = 1;
1163	}
1164
1165		900
1166	/******************************************************************************	901	/******************************************************************************
1167	*	902	*
1168	* Start of map related commands.	903	* Start of map related commands.
1169	*	904	*
1170	******************************************************************************/	905	******************************************************************************/
1171		906
1172	/**
1173	* This adds face_num to a map cell at x,y. If the client doesn't have
1174	* the face yet, we will also send it.
1175	*/
1176	static void
1177	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1178	{
1179	if (newmap->cells[x][y].count >= MAP_LAYERS)
1180	{
1181	//TODO: one or the other, can't both have abort and return, verify and act
1182	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1183	return;
1184	abort ();
1185	}
1186
1187	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1188	newmap->cells[x][y].count++;
1189
1190	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1191	esrv_send_face (ns, face_num, 0);
1192	}
1193
1194	/** Clears a map cell */	907	/** Clears a map cell */
1195	static void	908	static void
1196	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	909	map_clearcell (struct MapCell *cell, int count)
1197	{	910	{
1198	cell->faces[0] = face0;	911	cell->faces[0] = 0;
1199	cell->faces[1] = face1;	912	cell->faces[1] = 0;
1200	cell->faces[2] = face2;	913	cell->faces[2] = 0;
		914	cell->smooth[0] = 0;
		915	cell->smooth[1] = 0;
		916	cell->smooth[2] = 0;
1201	cell->count = count;	917	cell->count = count;
1202	cell->stat_hp = 0;	918	cell->stat_hp = 0;
1203	cell->flags = 0;	919	cell->flags = 0;
1204	cell->player = 0;	920	cell->player = 0;
1205	}	921	}
1206		922
1207	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1208	#define MAX_LAYERS 3	923	#define MAX_LAYERS 3
1209
1210	/* Using a global really isn't a good approach, but saves the over head of
1211	* allocating and deallocating such a block of data each time run through,
1212	* and saves the space of allocating this in the socket object when we only
1213	* need it for this cycle. If the server is ever threaded, this needs to be
1214	* re-examined.
1215	*/
1216	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1217
1218	/**
1219	* Returns true if any of the heads for this
1220	* space is set. Returns false if all are blank - this is used
1221	* for empty space checking.
1222	*/
1223	static inline int
1224	have_head (int ax, int ay)
1225	{
1226	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1227	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1228	return 1;
1229
1230	return 0;
1231	}
1232
1233	/**
1234	* check_head is a bit simplistic version of update_space below.
1235	* basically, it only checks the that the head on space ax,ay at layer
1236	* needs to get sent - if so, it adds the data, sending the head
1237	* if needed, and returning 1. If this no data needs to get
1238	* sent, it returns zero.
1239	*/
1240	static int
1241	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1242	{
1243	short face_num;
1244
1245	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1246	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1247	else
1248	face_num = 0;
1249
1250	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1251	{
1252	sl << uint16 (face_num);
1253	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1254	esrv_send_face (&ns, face_num, 0);
1255
1256	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1257	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1258	return 1;
1259	}
1260
1261	return 0; /* No change */
1262	}
1263		924
1264	/**	925	/**
1265	* Removes the need to replicate the same code for each layer.	926	* Removes the need to replicate the same code for each layer.
1266	* this returns true if this space is now in fact different than	927	* this returns true if this space is now in fact different than
1267	* it was.	928	* it was.
1268	* sl is the socklist this data is going into.	929	* sl is the socklist this data is going into.
1269	* ns is the socket we are working on - all the info we care	930	* ns is the socket we are working on - all the info we care
1270	* about is in this socket structure, so now need not pass the	931	* about is in this socket structure, so now need not pass the
1271	* entire player object.	932	* entire player object.
1272	* mx and my are map coordinate offsets for map mp
1273	* sx and sy are the offsets into the socket structure that
1274	* holds the old values.
1275	* layer is the layer to update, with 2 being the floor and 0 the	933	* layer is the layer to update, with 2 being the floor and 0 the
1276	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	934	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1277	* take. Interesting to note that before this function, the map1 function	935	* take. Interesting to note that before this function, the map1 function
1278	* numbers the spaces differently - I think this was a leftover from	936	* numbers the spaces differently - I think this was a leftover from
1279	* the map command, where the faces stack up. Sinces that is no longer	937	* the map command, where the faces stack up. Sinces that is no longer
1280	* the case, it seems to make more sense to have these layer values	938	* the case, it seems to make more sense to have these layer values
1281	* actually match.	939	* actually match.
1282	*/	940	*/
1283	static int	941	static int
1284	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	942	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1285	{	943	{
1286	object *ob, *head;	944	object *ob = ms.faces_obj [layer];
1287	uint16 face_num;
1288	int bx, by, i;
1289
1290	/* If there is a multipart object stored away, treat that as more important.
1291	* If not, then do the normal processing.
1292	*/
1293	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1294
1295	/* Check to see if this head is part of the set of objects
1296	* we would normally send for this space. If so, then
1297	* don't use the head value. We need to do the check
1298	* here and not when setting up the heads[] value for two reasons -
1299	* 1) the heads[] values will get used even if the space is not visible.
1300	* 2) its possible the head is not on the same map as a part, and I'd
1301	* rather not need to do the map translation overhead.
1302	* 3) We need to do some extra checking to make sure that we will
1303	* otherwise send the image as this layer, eg, either it matches
1304	* the head value, or is not multipart.
1305	*/
1306	if (head && !head->more)
1307	{
1308	for (i = 0; i < MAP_LAYERS; i++)
1309	{
1310	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1311	if (!ob)
1312	continue;
1313
1314	if (ob->head)
1315	ob = ob->head;
1316
1317	if (ob == head)
1318	{
1319	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1320	head = NULL;
1321	break;
1322	}
1323	}
1324	}
1325
1326	ob = head;
1327	if (!ob)
1328	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1329		945
1330	/* If there is no object for this space, or if the face for the object	946	/* If there is no object for this space, or if the face for the object
1331	* is the blank face, set the face number to zero.	947	* is the blank face, set the face number to zero.
1332	* else if we have the stored head object for this space, that takes	948	* else if we have the stored head object for this space, that takes
1333	* precedence over the other object for this space.	949	* precedence over the other object for this space.
1334	* otherwise, we do special head processing	950	* otherwise, we do special head processing
1335	*/	951	*/
1336	if (!ob || ob->face == blank_face)	952	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1337	face_num = 0;
1338	else if (head)
1339	{
1340	/* if this is a head that had previously been stored */
1341	face_num = ob->face->number;
1342	}
1343	else
1344	{
1345	/* if the faces for the different parts of a multipart object
1346	* are the same, we only want to send the bottom right most
1347	* portion of the object. That info is in the tail_.. values
1348	* of the head. Note that for the head itself, ob->head will
1349	* be null, so we only do this block if we are working on
1350	* a tail piece.
1351	*/
1352
1353	/* tail_x and tail_y will only be set in the head object. If
1354	* this is the head object and these are set, we proceed
1355	* with logic to only send bottom right. Similarly, if
1356	* this is one of the more parts but the head has those values
1357	* set, we want to do the processing. There can be cases where
1358	* the head is not visible but one of its parts is, so we just
1359	* can always expect that ob->arch->tail_x will be true for all
1360	* object we may want to display.
1361	*/
1362	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1363	{
1364
1365	if (ob->head)
1366	head = ob->head;
1367	else
1368	head = ob;
1369
1370	/* Basically figure out where the offset is from where we are right
1371	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1372	* piece is from the head, and the tail is where the tail is from the
1373	* head. Note that bx and by will equal sx and sy if we are already working
1374	* on the bottom right corner. If ob is the head, the clone values
1375	* will be zero, so the right thing will still happen.
1376	*/
1377	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1378	by = sy + head->arch->tail_y - ob->arch->clone.y;
1379
1380	/* I don't think this can ever happen, but better to check for it just
1381	* in case.
1382	*/
1383	if (bx < sx || by < sy)
1384	{
1385	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1386	face_num = 0;
1387	}
1388	/* single part object, multipart object with non merged faces,
1389	* of multipart object already at lower right.
1390	*/
1391	else if (bx == sx && by == sy)
1392	{
1393	face_num = ob->face->number;
1394
1395	/* if this face matches one stored away, clear that one away.
1396	* this code relies on the fact that the map1 commands
1397	* goes from 2 down to 0.
1398	*/
1399	for (i = 0; i < MAP_LAYERS; i++)
1400	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1401	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1402	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1403	}
1404	else
1405	{
1406	/* If this head is stored away, clear it - otherwise,
1407	* there can be cases where a object is on multiple layers -
1408	* we only want to send it once.
1409	*/
1410	face_num = head->face->number;
1411	for (i = 0; i < MAP_LAYERS; i++)
1412	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1413	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1414	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1415
1416	/* First, try to put the new head on the same layer. If that is used up,
1417	* then find another layer.
1418	*/
1419	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1420	{
1421	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1422	}
1423	else
1424	for (i = 0; i < MAX_LAYERS; i++)
1425	{
1426	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1427	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1428	{
1429	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1430	}
1431	}
1432	face_num = 0; /* Don't send this object - we'll send the head later */
1433	}
1434	}
1435	else
1436	{
1437	/* In this case, we are already at the lower right or single part object,
1438	* so nothing special
1439	*/
1440	face_num = ob->face->number;
1441
1442	/* clear out any head entries that have the same face as this one */
1443	for (bx = 0; bx < layer; bx++)
1444	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1445	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1446	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1447	}
1448	} /* else not already head object or blank face */
1449
1450	/* This is a real hack. Basically, if we have nothing to send for this layer,
1451	* but there is a head on the next layer, send that instead.
1452	* Without this, what happens is you can get the case where the player stands
1453	* on the same space as the head. However, if you have overlapping big objects
1454	* of the same type, what happens then is it doesn't think it needs to send
1455	* This tends to make stacking also work/look better.
1456	*/
1457	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1458	{
1459	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1460	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1461	}
1462
1463	/* Another hack - because of heads and whatnot, this face may match one
1464	* we already sent for a lower layer. In that case, don't send
1465	* this one.
1466	*/
1467	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1468	face_num = 0;
1469		953
1470	/* We've gotten what face we want to use for the object. Now see if	954	/* We've gotten what face we want to use for the object. Now see if
1471	* if it has changed since we last sent it to the client.	955	* if it has changed since we last sent it to the client.
1472	*/	956	*/
1473	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	957	if (lastcell.faces[layer] != face_num)
1474	{	958	{
1475	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	959	lastcell.faces[layer] = face_num;
		960
1476	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	961	if (!ns.faces_sent[face_num])
		962	if (ob)
		963	ns.send_faces (ob);
		964	else
1477	esrv_send_face (&ns, face_num, 0);	965	ns.send_face (face_num);
1478		966
1479	sl << uint16 (face_num);	967	sl << uint16 (face_num);
1480	return 1;
1481	}
1482
1483	/* Nothing changed */
1484	return 0;
1485	}
1486
1487	/**
1488	* This function is mainly a copy of update_space,
1489	* except it handles update of the smoothing updates,
1490	* not the face updates.
1491	* Removes the need to replicate the same code for each layer.
1492	* this returns true if this smooth is now in fact different
1493	* than it was.
1494	* sl is the socklist this data is going into.
1495	* ns is the socket we are working on - all the info we care
1496	* about is in this socket structure, so know need to pass the
1497	* entire player object.
1498	* mx and my are map coordinate offsets for map mp
1499	* sx and sy are the offsets into the socket structure that
1500	* holds the old values.
1501	* layer is the layer to update, with 2 being the floor and 0 the
1502	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1503	* take.
1504	*/
1505
1506	static inline int
1507	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1508	{
1509	object *ob;
1510	int smoothlevel; /* old face_num; */
1511
1512	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1513
1514	/* If there is no object for this space, or if the face for the object
1515	* is the blank face, set the smoothlevel to zero.
1516	*/
1517	if (!ob || ob->face == blank_face)
1518	smoothlevel = 0;
1519	else
1520	{
1521	smoothlevel = ob->smoothlevel;
1522	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1523	SendSmooth (&ns, ob->face->number);
1524	} /* else not already head object or blank face */
1525
1526	/* We've gotten what face we want to use for the object. Now see if
1527	* if it has changed since we last sent it to the client.
1528	*/
1529	if (smoothlevel > 255)
1530	smoothlevel = 255;
1531	else if (smoothlevel < 0)
1532	smoothlevel = 0;
1533
1534	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1535	{
1536	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1537	sl << uint8 (smoothlevel);
1538	return 1;	968	return 1;
1539	}	969	}
1540		970
1541	/* Nothing changed */	971	/* Nothing changed */
1542	return 0;	972	return 0;
…		…
1582	{	1012	{
1583	prefetch_surrounding_maps (op->map, 3);	1013	prefetch_surrounding_maps (op->map, 3);
1584	}	1014	}
1585		1015
1586	/**	1016	/**
1587	* This function uses the new map1 protocol command to send the map	1017	* Draws client map.
1588	* to the client. It is necessary because the old map command supports
1589	* a maximum map size of 15x15.
1590	* This function is much simpler than the old one. This is because
1591	* the old function optimized to send as few face identifiers as possible,
1592	* at the expense of sending more coordinate location (coordinates were
1593	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1594	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1595	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1596	* and use the other 4 bits for other informatiion. For full documentation
1597	* of what we send, see the doc/Protocol file.
1598	* I will describe internally what we do:
1599	* the ns->lastmap shows how the map last looked when sent to the client.
1600	* in the lastmap structure, there is a cells array, which is set to the
1601	* maximum viewable size (As set in config.h).
1602	* in the cells, there are faces and a count value.
1603	* we use the count value to hold the darkness value. If -1, then this space
1604	* is not viewable.
1605	* we use faces[0] faces[1] faces[2] to hold what the three layers
1606	* look like.
1607	*/	1018	*/
1608	void	1019	void
1609	draw_client_map1 (object *pl)	1020	draw_client_map (player *pl)
1610	{	1021	{
		1022	object *ob = pl->observe;
		1023	if (!ob->active)
		1024	return;
		1025
		1026	maptile *plmap = ob->map;
		1027
		1028	/* If player is just joining the game, he isn't here yet, so the map
		1029	* can get swapped out. If so, don't try to send them a map. All will
		1030	* be OK once they really log in.
		1031	*/
		1032	if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
		1033	return;
		1034
1611	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1035	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1612	sint16 nx, ny;	1036	sint16 nx, ny;
1613	int estartlen, eoldlen;	1037	int estartlen, eoldlen;
1614	uint16 mask, emask;
1615	uint8 eentrysize;	1038	uint8 eentrysize;
1616	uint16 ewhatstart, ewhatflag;	1039	uint16 ewhatstart, ewhatflag;
1617	uint8 extendedinfos;	1040	uint8 extendedinfos;
1618	maptile *m;	1041	maptile *m;
1619		1042
1620	client &socket = *pl->contr->ns;
1621
1622	if (!pl->active)
1623	return;
1624
1625	check_map_change (pl->contr);	1043	check_map_change (pl);
1626	prefetch_surrounding_maps (pl);	1044	prefetch_surrounding_maps (pl->ob);
		1045
		1046	/* do LOS after calls to update_position */
		1047	if (ob != pl->ob)
		1048	clear_los (pl);
		1049	else if (pl->do_los)
		1050	{
		1051	update_los (ob);
		1052	pl->do_los = 0;
		1053	}
		1054
		1055	/**
		1056	* This function uses the new map1 protocol command to send the map
		1057	* to the client. It is necessary because the old map command supports
		1058	* a maximum map size of 15x15.
		1059	* This function is much simpler than the old one. This is because
		1060	* the old function optimized to send as few face identifiers as possible,
		1061	* at the expense of sending more coordinate location (coordinates were
		1062	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		1063	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		1064	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		1065	* and use the other 4 bits for other informatiion. For full documentation
		1066	* of what we send, see the doc/Protocol file.
		1067	* I will describe internally what we do:
		1068	* the ns->lastmap shows how the map last looked when sent to the client.
		1069	* in the lastmap structure, there is a cells array, which is set to the
		1070	* maximum viewable size (As set in config.h).
		1071	* in the cells, there are faces and a count value.
		1072	* we use the count value to hold the darkness value. If -1, then this space
		1073	* is not viewable.
		1074	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1075	* look like.
		1076	*/
		1077
		1078	client &socket = *pl->ns;
1627		1079
1628	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1080	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1629	packet esl;	1081	packet esl;
1630		1082
1631	startlen = sl.length ();	1083	startlen = sl.length ();
…		…
1646	<< uint8 (extendedinfos)	1098	<< uint8 (extendedinfos)
1647	<< uint8 (eentrysize);	1099	<< uint8 (eentrysize);
1648		1100
1649	estartlen = esl.length ();	1101	estartlen = esl.length ();
1650	}	1102	}
1651	else
1652	{
1653	/* suppress compiler warnings */
1654	ewhatstart = 0;
1655	ewhatflag = 0;
1656	estartlen = 0;
1657	}
1658
1659	/* Init data to zero */
1660	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1661		1103
1662	/* x,y are the real map locations. ax, ay are viewport relative	1104	/* x,y are the real map locations. ax, ay are viewport relative
1663	* locations.	1105	* locations.
1664	*/	1106	*/
1665	ay = 0;	1107	ay = 0;
1666		1108
1667	/* We could do this logic as conditionals in the if statement,	1109	/* We could do this logic as conditionals in the if statement,
1668	* but that started to get a bit messy to look at.	1110	* but that started to get a bit messy to look at.
1669	*/	1111	*/
1670	max_x = pl->x + (socket.mapx + 1) / 2;	1112	max_x = ob->x + (socket.mapx + 1) / 2;
1671	max_y = pl->y + (socket.mapy + 1) / 2;	1113	max_y = ob->y + (socket.mapy + 1) / 2;
1672		1114
1673	if (socket.mapmode == Map1aCmd)
1674	{
1675	max_x += MAX_HEAD_OFFSET;
1676	max_y += MAX_HEAD_OFFSET;
1677	}
1678
1679	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1115	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1680	{	1116	{
1681	ax = 0;	1117	ax = 0;
1682	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1118	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1683	{	1119	{
		1120	int emask, mask;
1684	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1121	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1685		1122
1686	/* If this space is out of the normal viewable area, we only check
1687	* the heads value ax or ay will only be greater than what
1688	* the client wants if using the map1a command - this is because
1689	* if the map1a command is not used, max_x and max_y will be
1690	* set to lower values.
1691	*/
1692	if (ax >= socket.mapx || ay >= socket.mapy)
1693	{
1694	int i, got_one;
1695
1696	oldlen = sl.length ();
1697
1698	sl << uint16 (mask);
1699
1700	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1701	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1702	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1703
1704	/* If all we are doing is sending 0 (blank) faces, we don't
1705	* actually need to send that - just the coordinates
1706	* with no faces tells the client to blank out the
1707	* space.
1708	*/
1709	got_one = 0;
1710	for (i = oldlen + 2; i < sl.length (); i++)
1711	if (sl[i])
1712	got_one = 1;
1713
1714	if (got_one && (mask & 0xf))
1715	sl[oldlen + 1] = mask & 0xff;
1716	else
1717	{ /*either all faces blank, either no face at all */
1718	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1719	sl.reset (oldlen + 2);
1720	else
1721	sl.reset (oldlen);
1722	}
1723
1724	/*What concerns extendinfos, nothing to be done for now
1725	* (perhaps effects layer later)
1726	*/
1727	continue; /* don't do processing below */
1728	}
1729
1730	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1123	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1731
1732	d = pl->contr->blocked_los[ax][ay];
1733		1124
1734	/* If the coordinates are not valid, or it is too dark to see,	1125	/* If the coordinates are not valid, or it is too dark to see,
1735	* we tell the client as such	1126	* we tell the client as such
1736	*/	1127	*/
1737	nx = x;	1128	nx = x;
1738	ny = y;	1129	ny = y;
1739	m = get_map_from_coord (pl->map, &nx, &ny);	1130	m = get_map_from_coord (plmap, &nx, &ny);
1740		1131
1741	if (!m)	1132	if (!m)
1742	{	1133	{
1743	/* space is out of map. Update space and clear values	1134	/* space is out of map. Update space and clear values
1744	* if this hasn't already been done. If the space is out	1135	* if this hasn't already been done. If the space is out
1745	* of the map, it shouldn't have a head	1136	* of the map, it shouldn't have a head
1746	*/	1137	*/
1747	if (lastcell.count != -1)	1138	if (lastcell.count != -1)
1748	{	1139	{
1749	sl << uint16 (mask);	1140	sl << uint16 (mask);
1750	map_clearcell (&lastcell, 0, 0, 0, -1);	1141	map_clearcell (&lastcell, -1);
1751	}	1142	}
		1143
		1144	continue;
1752	}	1145	}
		1146
		1147	m->touch ();
		1148
		1149	int d = pl->blocked_los[ax][ay];
		1150
1753	else if (d > 3)	1151	if (d > 3)
1754	{	1152	{
1755	m->touch ();
1756		1153
1757	int need_send = 0, count;	1154	int need_send = 0, count;
1758		1155
1759	/* This block deals with spaces that are not visible for whatever	1156	/* This block deals with spaces that are not visible for whatever
1760	* reason. Still may need to send the head for this space.	1157	* reason. Still may need to send the head for this space.
1761	*/	1158	*/
1762		1159
1763	oldlen = sl.length ();	1160	oldlen = sl.length ();
1764		1161
1765	sl << uint16 (mask);	1162	sl << uint16 (mask);
…		…
1767	if (lastcell.count != -1)	1164	if (lastcell.count != -1)
1768	need_send = 1;	1165	need_send = 1;
1769		1166
1770	count = -1;	1167	count = -1;
1771		1168
1772	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1773	{
1774	/* Now check to see if any heads need to be sent */
1775
1776	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1777	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1778	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1779
1780	lastcell.count = count;
1781	}
1782	else
1783	{
1784	/* properly clear a previously sent big face */	1169	/* properly clear a previously sent big face */
1785	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1170	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1786	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1171	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1787	need_send = 1;	1172	need_send = 1;
1788		1173
1789	map_clearcell (&lastcell, 0, 0, 0, count);	1174	map_clearcell (&lastcell, count);
1790	}
1791		1175
1792	if ((mask & 0xf) || need_send)	1176	if ((mask & 0xf) || need_send)
1793	sl[oldlen + 1] = mask & 0xff;	1177	sl[oldlen + 1] = mask & 0xff;
1794	else	1178	else
1795	sl.reset (oldlen);	1179	sl.reset (oldlen);
1796	}	1180	}
1797	else	1181	else
1798	{	1182	{
1799	m->touch ();
1800
1801	/* In this block, the space is visible or there are head objects	1183	/* In this block, the space is visible.
1802	* we need to send.
1803	*/	1184	*/
1804		1185
1805	/* Rather than try to figure out what everything that we might	1186	/* Rather than try to figure out what everything that we might
1806	* need to send is, then form the packet after that,	1187	* need to send is, then form the packet after that,
1807	* we presume that we will in fact form a packet, and update	1188	* we presume that we will in fact form a packet, and update
…		…
1810	* is done.	1191	* is done.
1811	* I think this is simpler than doing a bunch of checks to see	1192	* 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	1193	* what if anything we need to send, setting the bits, then
1813	* doing those checks again to add the real data.	1194	* doing those checks again to add the real data.
1814	*/	1195	*/
1815	oldlen = sl.length ();	1196	oldlen = sl.length ();
1816	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1817	eoldlen = esl.length ();	1197	eoldlen = esl.length ();
1818	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1198
1819	sl << uint16 (mask);	1199	sl << uint16 (mask);
1820
1821	if (socket.ext_mapinfos)
1822	esl << uint16 (emask);
1823		1200
1824	unsigned char dummy;	1201	unsigned char dummy;
1825	unsigned char *last_ext = &dummy;	1202	unsigned char *last_ext = &dummy;
1826		1203
1827	/* Darkness changed */	1204	/* Darkness changed */
…		…
1839	sl << uint8 (255 - 64 * d);	1216	sl << uint8 (255 - 64 * d);
1840	}	1217	}
1841		1218
1842	lastcell.count = d;	1219	lastcell.count = d;
1843		1220
		1221	mapspace &ms = m->at (nx, ny);
		1222
1844	if (socket.extmap)	1223	if (socket.extmap)
1845	{	1224	{
1846	uint8 stat_hp = 0;	1225	uint8 stat_hp = 0;
1847	uint8 stat_width = 0;	1226	uint8 stat_width = 0;
1848	uint8 flags = 0;	1227	uint8 flags = 0;
1849	UUID player = 0;	1228	tag_t player = 0;
1850		1229
1851	// send hp information, if applicable	1230	// send hp information, if applicable
1852	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1231	if (object *op = ms.faces_obj [0])
1853	{	1232	{
1854	if (op->head || op->invisible)	1233	if (op->head || op->invisible)
1855	; // do not show	1234	; // do not show
1856	else if (op->type == PLAYER	1235	else if (op->type == PLAYER
1857	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1236	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1858	{	1237	{
1859	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)	1238	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1860	{	1239	{
1861	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1240	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1862	stat_width = op->arch->tail_x;	1241	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1863	}	1242	}
1864	}	1243	}
1865		1244
1866	if (op->msg && op->msg[0] == '@')	1245	if (op->msg && op->msg[0] == '@')
1867	flags |= 1;	1246	flags |= 1;
1868		1247
1869	if (op->type == PLAYER && op != pl)	1248	if (op->type == PLAYER && op != ob)
1870	player = op->count;	1249	player = op->count;
1871	}	1250	}
1872		1251
1873	if (lastcell.stat_hp != stat_hp)	1252	if (lastcell.stat_hp != stat_hp)
1874	{	1253	{
…		…
1895		1274
1896	mask |= 0x8;	1275	mask |= 0x8;
1897	*last_ext |= 0x80;	1276	*last_ext |= 0x80;
1898	last_ext = &sl[sl.length ()];	1277	last_ext = &sl[sl.length ()];
1899		1278
1900	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1279	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1901	}	1280	}
1902		1281
1903	if (lastcell.flags != flags)	1282	if (lastcell.flags != flags)
1904	{	1283	{
1905	lastcell.flags = flags;	1284	lastcell.flags = flags;
…		…
1911	sl << uint8 (8) << uint8 (flags);	1290	sl << uint8 (8) << uint8 (flags);
1912	}	1291	}
1913	}	1292	}
1914		1293
1915	/* Floor face */	1294	/* Floor face */
1916	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1295	if (update_space (sl, socket, ms, lastcell, 2))
1917	mask |= 0x4;	1296	mask |= 0x4;
1918		1297
1919	if (socket.EMI_smooth)
1920	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1921	emask |= 0x4;
1922
1923	/* Middle face */	1298	/* Middle face */
1924	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1299	if (update_space (sl, socket, ms, lastcell, 1))
1925	mask |= 0x2;	1300	mask |= 0x2;
1926		1301
1927	if (socket.EMI_smooth)	1302	if (ms.player () == ob
1928	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1303	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1929	emask |= 0x2;
1930
1931	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1932	{	1304	{
		1305	// force player to be visible to himself if invisible
1933	if (lastcell.faces[0] != pl->face->number)	1306	if (lastcell.faces[0] != ob->face)
1934	{	1307	{
1935	lastcell.faces[0] = pl->face->number;	1308	lastcell.faces[0] = ob->face;
		1309
1936	mask |= 0x1;	1310	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);	1311	sl << uint16 (ob->face);
		1312
		1313	socket.send_faces (ob);
1942	}	1314	}
1943	}	1315	}
1944	else
1945	{
1946	/* Top face */	1316	/* Top face */
1947	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1317	else if (update_space (sl, socket, ms, lastcell, 0))
1948	mask |= 0x1;	1318	mask |= 0x1;
1949
1950	if (socket.EMI_smooth)
1951	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1952	emask |= 0x1;
1953	}
1954		1319
1955	/* Check to see if we are in fact sending anything for this	1320	/* Check to see if we are in fact sending anything for this
1956	* space by checking the mask. If so, update the mask.	1321	* space by checking the mask. If so, update the mask.
1957	* if not, reset the len to that from before adding the mask	1322	* if not, reset the len to that from before adding the mask
1958	* value, so we don't send those bits.	1323	* value, so we don't send those bits.
…		…
1960	if (mask & 0xf)	1325	if (mask & 0xf)
1961	sl[oldlen + 1] = mask & 0xff;	1326	sl[oldlen + 1] = mask & 0xff;
1962	else	1327	else
1963	sl.reset (oldlen);	1328	sl.reset (oldlen);
1964		1329
		1330	if (socket.ext_mapinfos)
		1331	esl << uint16 (emask);
		1332
		1333	if (socket.EMI_smooth)
		1334	{
		1335	for (int layer = 2+1; layer--; )
		1336	{
		1337	object *ob = ms.faces_obj [layer];
		1338
		1339	// If there is no object for this space, or if the face for the object
		1340	// is the blank face, set the smoothlevel to zero.
		1341	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1342
		1343	// We've gotten what face we want to use for the object. Now see if
		1344	// if it has changed since we last sent it to the client.
		1345	if (lastcell.smooth[layer] != smoothlevel)
		1346	{
		1347	lastcell.smooth[layer] = smoothlevel;
		1348	esl << uint8 (smoothlevel);
		1349	emask |= 1 << layer;
		1350	}
		1351	}
		1352
1965	if (emask & 0xf)	1353	if (emask & 0xf)
1966	esl[eoldlen + 1] = emask & 0xff;	1354	esl[eoldlen + 1] = emask & 0xff;
1967	else	1355	else
1968	esl.reset (eoldlen);	1356	esl.reset (eoldlen);
		1357	}
1969	} /* else this is a viewable space */	1358	} /* else this is a viewable space */
1970	} /* for x loop */	1359	} /* for x loop */
1971	} /* for y loop */	1360	} /* for y loop */
		1361
		1362	socket.flush_fx ();
1972		1363
1973	/* Verify that we in fact do need to send this */	1364	/* Verify that we in fact do need to send this */
1974	if (socket.ext_mapinfos)	1365	if (socket.ext_mapinfos)
1975	{	1366	{
1976	if (!(sl.length () > startlen || socket.sent_scroll))	1367	if (!(sl.length () > startlen || socket.sent_scroll))
1977	{	1368	{
1978	/* No map data will follow, so don't say the client	1369	/* No map data will follow, so don't say the client
1979	* it doesn't need draw!	1370	* it doesn't need draw!
1980	*/	1371	*/
1981	ewhatflag &= (~EMI_NOREDRAW);	1372	ewhatflag &= ~EMI_NOREDRAW;
1982	esl[ewhatstart + 1] = ewhatflag & 0xff;	1373	esl[ewhatstart + 1] = ewhatflag & 0xff;
1983	}	1374	}
1984		1375
1985	if (esl.length () > estartlen)	1376	if (esl.length () > estartlen)
1986	socket.send_packet (esl);	1377	socket.send_packet (esl);
…		…
1991	socket.send_packet (sl);	1382	socket.send_packet (sl);
1992	socket.sent_scroll = 0;	1383	socket.sent_scroll = 0;
1993	}	1384	}
1994	}	1385	}
1995		1386
1996	/**
1997	* Draws client map.
1998	*/
1999	void
2000	draw_client_map (object *pl)
2001	{
2002	int i, j;
2003	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
2004	facetile *face, *floor;
2005	facetile *floor2;
2006	int d, mflags;
2007	struct Map newmap;
2008	maptile *m, *pm;
2009
2010	if (pl->type != PLAYER)
2011	{
2012	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
2013	return;
2014	}
2015
2016	pm = pl->map;
2017
2018	/* If player is just joining the game, he isn't here yet, so the map
2019	* can get swapped out. If so, don't try to send them a map. All will
2020	* be OK once they really log in.
2021	*/
2022	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2023	return;
2024
2025	memset (&newmap, 0, sizeof (struct Map));
2026
2027	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2028	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2029	{
2030	ax = i;
2031	ay = j;
2032	m = pm;
2033	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2034
2035	if (mflags & P_OUT_OF_MAP)
2036	continue;
2037
2038	/* If a map is visible to the player, we don't want to swap it out
2039	* just to reload it. This should really call something like
2040	* swap_map, but this is much more efficient and 'good enough'
2041	*/
2042	if (mflags & P_NEW_MAP)
2043	m->timeout = 50;
2044	}
2045
2046	/* do LOS after calls to update_position */
2047	if (pl->contr->do_los)
2048	{
2049	update_los (pl);
2050	pl->contr->do_los = 0;
2051	}
2052
2053	/* Big maps need a different drawing mechanism to work */
2054	draw_client_map1 (pl);
2055	}
2056
2057
2058	/*****************************************************************************/	1387	/*****************************************************************************/
2059
2060	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1388	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2061
2062	/* a player. Of course, the client need to know the command to be able to */	1389	/* a player. Of course, the client need to know the command to be able to */
2063
2064	/* manage it ! */	1390	/* manage it ! */
2065
2066	/*****************************************************************************/	1391	/*****************************************************************************/
2067	void	1392	void
2068	send_plugin_custom_message (object *pl, char *buf)	1393	send_plugin_custom_message (object *pl, char *buf)
2069	{	1394	{
2070	pl->contr->ns->send_packet (buf);	1395	pl->contr->ns->send_packet (buf);
…		…
2192		1517
2193	/* appends the spell *spell to the Socklist we will send the data to. */	1518	/* appends the spell *spell to the Socklist we will send the data to. */
2194	static void	1519	static void
2195	append_spell (player *pl, packet &sl, object *spell)	1520	append_spell (player *pl, packet &sl, object *spell)
2196	{	1521	{
2197	int len, i, skill = 0;	1522	int i, skill = 0;
2198		1523
2199	if (!(spell->name))	1524	if (!(spell->name))
2200	{	1525	{
2201	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1526	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2202	return;	1527	return;
…		…
2214	if (!strcmp (spell->skill, skill_names[i]))	1539	if (!strcmp (spell->skill, skill_names[i]))
2215	{	1540	{
2216	skill = i + CS_STAT_SKILLINFO;	1541	skill = i + CS_STAT_SKILLINFO;
2217	break;	1542	break;
2218	}	1543	}
		1544	}
		1545
		1546	// spells better have a face
		1547	if (!spell->face)
		1548	{
		1549	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1550	spell->face = face_find ("burnout.x11", blank_face);
2219	}	1551	}
2220		1552
2221	/* send the current values */	1553	/* send the current values */
2222	sl << uint32 (spell->count)	1554	sl << uint32 (spell->count)
2223	<< uint16 (spell->level)	1555	<< uint16 (spell->level)
…		…
2225	<< uint16 (spell->last_sp)	1557	<< uint16 (spell->last_sp)
2226	<< uint16 (spell->last_grace)	1558	<< uint16 (spell->last_grace)
2227	<< uint16 (spell->last_eat)	1559	<< uint16 (spell->last_eat)
2228	<< uint8 (skill)	1560	<< uint8 (skill)
2229	<< uint32 (spell->path_attuned)	1561	<< uint32 (spell->path_attuned)
2230	<< uint32 (spell->face ? spell->face->number : 0)	1562	<< uint32 (spell->face)
2231	<< data8 (spell->name)	1563	<< data8 (spell->name)
2232	<< data16 (spell->msg);	1564	<< data16 (spell->msg);
2233	}	1565	}
2234		1566
2235	/**	1567	/**
…		…
2250		1582
2251	packet sl ("addspell");	1583	packet sl ("addspell");
2252		1584
2253	if (!spell)	1585	if (!spell)
2254	{	1586	{
2255	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1587	for (spell = pl->ob->inv; spell; spell = spell->below)
2256	{	1588	{
2257	/* were we to simply keep appending data here, we could exceed	1589	/* were we to simply keep appending data here, we could exceed
2258	* MAXSOCKBUF if the player has enough spells to add, we know that	1590	* MAXSOCKBUF if the player has enough spells to add, we know that
2259	* append_spells will always append 19 data bytes, plus 4 length	1591	* append_spells will always append 19 data bytes, plus 4 length
2260	* bytes and 3 strings (because that is the spec) so we need to	1592	* bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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