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.61 by root, Mon Jan 8 18:18:36 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.
28	*	28	*
…		…
36	* have the prototype of (char *data, int datalen, int client_num). This	36	* have the prototype of (char *data, int datalen, int client_num). This
37	* way, we can use one dispatch table.	37	* way, we can use one dispatch table.
38	*	38	*
39	* esrv_map_new starts updating the map	39	* esrv_map_new starts updating the map
40	*	40	*
41	* esrv_map_setbelow allows filling in all of the faces for the map.
42	* if a face has not already been sent to the client, it is sent now.
43	*
44	*/	41	*/
45		42
46	#include <global.h>	43	#include <global.h>
47	#include <sproto.h>	44	#include <sproto.h>
48		45
…		…
101	* that much difference in bandwidth.	98	* that much difference in bandwidth.
102	*/	99	*/
103	mx = ns->mapx;	100	mx = ns->mapx;
104	my = ns->mapy;	101	my = ns->mapy;
105		102
106	if (ns->mapmode == Map1aCmd)
107	{
108	mx += MAX_HEAD_OFFSET;
109	my += MAX_HEAD_OFFSET;
110	}
111
112	/* the x and y here are coordinates for the new map, i.e. if we moved	103	/* the x and y here are coordinates for the new map, i.e. if we moved
113	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	104	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
114	* if the destination x or y coordinate is outside the viewable	105	* if the destination x or y coordinate is outside the viewable
115	* area, we clear the values - otherwise, the old values	106	* area, we clear the values - otherwise, the old values
116	* are preserved, and the check_head thinks it needs to clear them.	107	* are preserved, and the check_head thinks it needs to clear them.
…		…
141	static void	132	static void
142	clear_map (player *pl)	133	clear_map (player *pl)
143	{	134	{
144	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
145		136
		137	pl->ns->force_newmap = false;
		138
146	if (pl->ns->newmapcmd == 1)	139	if (pl->ns->newmapcmd == 1)
147	pl->ns->send_packet ("newmap");	140	pl->ns->send_packet ("newmap");
148		141
149	pl->ns->floorbox_reset ();	142	pl->ns->floorbox_reset ();
150	}	143	}
151		144
152	/** check for map change and send new map data */	145	/** check for map/region change and send new map data */
153	static void	146	static void
154	check_map_change (player *pl)	147	check_map_change (player *pl)
155	{	148	{
156	client &socket = *pl->ns;	149	client &socket = *pl->ns;
157	object *ob = pl->ob;	150	object *ob = pl->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;
…		…
201	}	187	}
202	}	188	}
203		189
204	socket.current_x = ob->x;	190	socket.current_x = ob->x;
205	socket.current_y = ob->y;	191	socket.current_y = ob->y;
		192
		193	region *reg = ob->region ();
		194	if (socket.current_region != reg)
		195	{
		196	socket.current_region = reg;
		197	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		198	}
206	}	199	}
207		200
208	/**	201	/**
209	* RequestInfo is sort of a meta command. There is some specific	202	* RequestInfo is sort of a meta command. There is some specific
210	* request of information, but we call other functions to provide	203	* request of information, but we call other functions to provide
…		…
326	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);	319	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
327	else if (map && map->path[0])	320	else if (map && map->path[0])
328	{	321	{
329	int flags = 0;	322	int flags = 0;
330		323
331	if (map->tile_path[0])	324	if (map->tile_path[0]) flags |= 1;
332	flags |= 1;
333	if (map->tile_path[1])	325	if (map->tile_path[1]) flags |= 2;
334	flags |= 2;
335	if (map->tile_path[2])	326	if (map->tile_path[2]) flags |= 4;
336	flags |= 4;
337	if (map->tile_path[3])	327	if (map->tile_path[3]) flags |= 8;
338	flags |= 8;
339		328
340	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);
341	}	330	}
342	else	331	else
343	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	332	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
…		…
346	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	335	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
347		336
348	pl->ns->send_packet (bigbuf);	337	pl->ns->send_packet (bigbuf);
349	}	338	}
350		339
351	/** This is the Setup cmd - easy first implementation */	340	/** This is the Setup cmd */
352	void	341	void
353	SetUp (char *buf, int len, client * ns)	342	SetUp (char *buf, int len, client * ns)
354	{	343	{
355	int s, slen;	344	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
356	char *cmd, *param, cmdback[HUGE_BUF];
357
358	/* run through the cmds of setup
359	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
360	*
361	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
362	* The client then must sort this out
363	*/
364
365	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
366
367	strcpy (cmdback, "setup");
368	for (s = 0; s < len; )
369	{
370	cmd = &buf[s];
371
372	/* find the next space, and put a null there */
373	for (; buf[s] && buf[s] != ' '; s++)
374	;
375
376	buf[s++] = 0;
377
378	while (buf[s] == ' ')
379	s++;
380
381	if (s >= len)
382	break;
383
384	param = &buf[s];
385
386	for (; buf[s] && buf[s] != ' '; s++)
387	;
388
389	buf[s++] = 0;
390
391	while (buf[s] == ' ')
392	s++;
393
394	slen = strlen (cmdback);
395	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
397	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
398
399	if (!strcmp (cmd, "sound"))
400	{
401	ns->sound = atoi (param);
402	safe_strcat (cmdback, param, &slen, HUGE_BUF);
403	}
404	else if (!strcmp (cmd, "exp64"))
405	safe_strcat (cmdback, param, &slen, HUGE_BUF);
406	else if (!strcmp (cmd, "spellmon"))
407	{
408	ns->monitor_spells = atoi (param);
409	safe_strcat (cmdback, param, &slen, HUGE_BUF);
410	}
411	else if (!strcmp (cmd, "darkness"))
412	{
413	ns->darkness = atoi (param);
414	safe_strcat (cmdback, param, &slen, HUGE_BUF);
415	}
416	else if (!strcmp (cmd, "map1cmd"))
417	{
418	if (atoi (param))
419	ns->mapmode = Map1Cmd;
420	/* if beyond this size, need to use map1cmd no matter what */
421	if (ns->mapx > 11 || ns->mapy > 11)
422	ns->mapmode = Map1Cmd;
423	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
424	}
425	else if (!strcmp (cmd, "map1acmd"))
426	{
427	if (atoi (param))
428	ns->mapmode = Map1aCmd;
429	/* if beyond this size, need to use map1acmd no matter what */
430	if (ns->mapx > 11 || ns->mapy > 11)
431	ns->mapmode = Map1aCmd;
432	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
433	}
434	else if (!strcmp (cmd, "newmapcmd"))
435	{
436	ns->newmapcmd = atoi (param);
437	safe_strcat (cmdback, param, &slen, HUGE_BUF);
438	// } else if (!strcmp(cmd,"plugincmd")) {
439	// ns->plugincmd = atoi(param);
440	// safe_strcat(cmdback, param, &slen, HUGE_BUF);
441	}
442	else if (!strcmp (cmd, "mapinfocmd"))
443	{
444	ns->mapinfocmd = atoi (param);
445	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446	}
447	else if (!strcmp (cmd, "extcmd"))
448	{
449	ns->extcmd = atoi (param);
450	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451	}
452	else if (!strcmp (cmd, "extmap"))
453	{
454	ns->extmap = atoi (param);
455	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
456	}
457	else if (!strcmp (cmd, "facecache"))
458	{
459	ns->facecache = atoi (param);
460	safe_strcat (cmdback, param, &slen, HUGE_BUF);
461	}
462	else if (!strcmp (cmd, "faceset"))
463	{
464	char tmpbuf[20];
465	int q = atoi (param);
466
467	if (is_valid_faceset (q))
468	ns->faceset = q;
469	sprintf (tmpbuf, "%d", ns->faceset);
470	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
471	/* if the client is using faceset, it knows about image2 command */
472	ns->image2 = 1;
473	}
474	else if (!strcmp (cmd, "itemcmd"))
475	{
476	/* Version of the item protocol command to use. Currently,
477	* only supported versions are 1 and 2. Using a numeric
478	* value will make it very easy to extend this in the future.
479	*/
480	char tmpbuf[20];
481	int q = atoi (param);
482
483	if (q < 1 || q > 2)
484	{
485	strcpy (tmpbuf, "FALSE");
486	}
487	else
488	{
489	ns->itemcmd = q;
490	sprintf (tmpbuf, "%d", ns->itemcmd);
491	}
492	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
493	}
494	else if (!strcmp (cmd, "mapsize"))
495	{
496	int x, y = 0;
497	char tmpbuf[MAX_BUF], *cp;
498
499	x = atoi (param);
500	for (cp = param; *cp != 0; cp++)
501	if (*cp == 'x' || *cp == 'X')
502	{
503	y = atoi (cp + 1);
504	break;
505	}
506	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
507	{
508	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
509	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
510	}
511	else
512	{
513	ns->mapx = x;
514	ns->mapy = y;
515	/* better to send back what we are really using and not the
516	* param as given to us in case it gets parsed differently.
517	*/
518	sprintf (tmpbuf, "%dx%d", x, y);
519	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
520	/* If beyond this size and still using orig map command, need to
521	* go to map1cmd.
522	*/
523	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
524	ns->mapmode = Map1Cmd;
525	}
526	}
527	else if (!strcmp (cmd, "extendedMapInfos"))
528	{
529	/* Added by tchize
530	* prepare to use the mapextended command
531	*/
532	char tmpbuf[20];
533
534	ns->ext_mapinfos = (atoi (param));
535	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
536	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
537	}
538	else if (!strcmp (cmd, "extendedTextInfos"))
539	{
540	/* Added by tchize
541	* prepare to use the extended text commands
542	* Client toggle this to non zero to get exttext
543	*/
544	char tmpbuf[20];
545
546	ns->has_readable_type = (atoi (param));
547	sprintf (tmpbuf, "%d", ns->has_readable_type);
548	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
549	}
550	else
551	{
552	/* Didn't get a setup command we understood -
553	* report a failure to the client.
554	*/
555	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
556	}
557	} /* for processing all the setup commands */
558
559	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
560	ns->send_packet (cmdback);
561	}	345	}
562		346
563	/**	347	/**
564	* The client has requested to be added to the game.	348	* The client has requested to be added to the game.
565	* This is what takes care of it. We tell the client how things worked out.	349	* This is what takes care of it. We tell the client how things worked out.
566	* I am not sure if this file is the best place for this function. however,	350	* I am not sure if this file is the best place for this function. however,
567	* it either has to be here or init_sockets needs to be exported.	351	* it either has to be here or init_sockets needs to be exported.
568	*/	352	*/
569	void	353	void
570	AddMeCmd (char *buf, int len, client * ns)	354	AddMeCmd (char *buf, int len, client *ns)
571	{	355	{
572	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	356	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
573	}	357	}
574		358
575	/** Reply to ExtendedInfos command */	359	/** Reply to ExtendedInfos command */
…		…
687		471
688	ns->send_packet (cmdback);	472	ns->send_packet (cmdback);
689	}	473	}
690		474
691	/**	475	/**
692	* A lot like the old AskSmooth (in fact, now called by AskSmooth).	476	* client requested an image. send it rate-limited
693	* Basically, it makes no sense to wait for the client to request a	477	* before flushing.
694	* a piece of data from us that we know the client wants. So
695	* if we know the client wants it, might as well push it to the
696	* client.
697	*/
698	static void
699	SendSmooth (client *ns, uint16 face)
700	{
701	uint16 smoothface;
702
703	/* If we can't find a face, return and set it so we won't try to send this
704	* again.
705	*/	478	*/
706	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	479	void
707	{	480	AskFaceCmd (char *buf, int len, client *ns)
708		481	{
709	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);	482	ns->askface.push_back (atoi (buf));
710	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
711	return;
712	}
713
714	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
715	esrv_send_face (ns, smoothface, 0);
716
717	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
718
719	packet sl ("smooth");
720
721	sl << uint16 (face)
722	<< uint16 (smoothface);
723
724	ns->send_packet (sl);
725	}	483	}
726		484
727	/**	485	/**
728	* Tells client the picture it has to use	486	* Tells client the picture it has to use
729	* to smooth a picture number given as argument.	487	* to smooth a picture number given as argument.
730	*/	488	*/
731	void	489	void
732	AskSmooth (char *buf, int len, client *ns)	490	AskSmooth (char *buf, int len, client *ns)
733	{	491	{
734	SendSmooth (ns, atoi (buf));	492	ns->send_face (atoi (buf));
		493	ns->flush_fx ();
735	}	494	}
736		495
737	/**	496	/**
738	* 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,
739	* etc.)	498	* etc.)
…		…
763	* commands.	522	* commands.
764	*/	523	*/
765	pl->count = 0;	524	pl->count = 0;
766	}	525	}
767		526
768
769	/**	527	/**
770	* 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,
771	* 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
772	* '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
773	* can throttle.	531	* can throttle.
…		…
798	* commands.	556	* commands.
799	*/	557	*/
800	pl->count = 0;	558	pl->count = 0;
801		559
802	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	560	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
803	int time = FABS (pl->ob->speed) < 0.001	561	int time = fabs (pl->ob->speed) < 0.001
804	? time = MAX_TIME * 100	562	? time = MAX_TIME * 100
805	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	563	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
806		564
807	/* Send confirmation of command execution now */	565	/* Send confirmation of command execution now */
808	packet sl ("comc");	566	packet sl ("comc");
809	sl << uint16 (cmdid) << uint32 (time);	567	sl << uint16 (cmdid) << uint32 (time);
810	pl->ns->send_packet (sl);	568	pl->ns->send_packet (sl);
…		…
842	{	600	{
843	case ST_PLAYING:	601	case ST_PLAYING:
844	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	602	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
845	break;	603	break;
846		604
847	case ST_CHANGE_CLASS:
848	key_change_class (pl->ob, buf[0]);
849	break;
850
851	case ST_GET_PARTY_PASSWORD: /* Get password for party */	605	case ST_GET_PARTY_PASSWORD: /* Get password for party */
852	receive_party_password (pl->ob, 13);	606	receive_party_password (pl->ob, 13);
853	break;	607	break;
854		608
855	default:	609	default:
…		…
876	ns->cs_version = atoi (buf);	630	ns->cs_version = atoi (buf);
877	ns->sc_version = ns->cs_version;	631	ns->sc_version = ns->cs_version;
878		632
879	LOG (llevDebug, "connection from client <%s>\n", buf);	633	LOG (llevDebug, "connection from client <%s>\n", buf);
880		634
881
882	//TODO: should log here just for statistics	635	//TODO: should log here just for statistics
883		636
884	//if (VERSION_CS != ns->cs_version)	637	//if (VERSION_CS != ns->cs_version)
885	// unchecked;	638	// unchecked;
886		639
…		…
895		648
896	cp = strchr (cp + 1, ' ');	649	cp = strchr (cp + 1, ' ');
897		650
898	if (cp)	651	if (cp)
899	{	652	{
900	assign (ns->version, cp + 1);	653	ns->version = cp + 1;
901		654
902	if (ns->sc_version < 1026)	655	if (ns->sc_version < 1026)
903	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	656	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
904	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	657	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
905	}	658	}
…		…
965	/**	718	/**
966	* 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
967	* 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)
968	*/	721	*/
969	void	722	void
970	send_query (client *ns, uint8 flags, char *text)	723	send_query (client *ns, uint8 flags, const char *text)
971	{	724	{
972	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;
973	}	757	}
974		758
975	#define AddIfInt64(Old,New,Type) if (Old != New) {\	759	#define AddIfInt64(Old,New,Type) if (Old != New) {\
976	Old = New; \	760	Old = New; \
977	sl << uint8 (Type) << uint64 (New); \	761	sl << uint8 (Type) << uint64 (New); \
…		…
985	#define AddIfShort(Old,New,Type) if (Old != New) {\	769	#define AddIfShort(Old,New,Type) if (Old != New) {\
986	Old = New; \	770	Old = New; \
987	sl << uint8 (Type) << uint16 (New); \	771	sl << uint8 (Type) << uint16 (New); \
988	}	772	}
989		773
990	#define AddIfFloat(Old,New,Type) if (Old != New) {\	774	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
991	Old = New; \	775	Old = New; \
992	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	776	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
993	}	777	}
994		778
995	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	779	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
996	free(Old); Old = strdup (New);\	780	free(Old); Old = strdup (New);\
997	sl << uint8 (Type) << data8 (New); \	781	sl << uint8 (Type) << data8 (New); \
…		…
1011		795
1012	client *ns = pl->ns;	796	client *ns = pl->ns;
1013	if (!ns)	797	if (!ns)
1014	return;	798	return;
1015		799
1016	object *ob = pl->ob;	800	object *ob = pl->observe;
1017	if (!ob)	801	if (!ob)
1018	return;	802	return;
1019		803
1020	packet sl ("stats");	804	packet sl ("stats");
1021		805
…		…
1050	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	834	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1051	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	835	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1052	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	836	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1053	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	837	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1054	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	838	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1055	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	839	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1056	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	840	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1057	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);
1058	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);
1059		843
1060	flags = 0;	844	flags = 0;
1061		845
1062	if (pl->fire_on)	846	if (pl->fire_on)
…		…
1084	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);
1085	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);
1086	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);
1087	}	871	}
1088		872
1089	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 */
1090	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	874	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1091	set_title (ob, buf);	875	set_title (ob, buf);
1092	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	876	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1093		877
1094	/* Only send it away if we have some actual data */	878	/* Only send it away if we have some actual data */
…		…
1104	{	888	{
1105	packet sl ("player");	889	packet sl ("player");
1106		890
1107	sl << uint32 (pl->ob->count)	891	sl << uint32 (pl->ob->count)
1108	<< uint32 (weight)	892	<< uint32 (weight)
1109	<< uint32 (pl->ob->face->number)	893	<< uint32 (pl->ob->face)
1110	<< data8 (pl->ob->name);	894	<< data8 (pl->ob->name);
1111		895
1112	pl->ns->last_weight = weight;	896	pl->ns->last_weight = weight;
1113	pl->ns->send_packet (sl);	897	pl->ns->send_packet (sl);
1114	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	898	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1115	}	899	}
1116
1117	/**
1118	* Need to send an animation sequence to the client.
1119	* We will send appropriate face commands to the client if we haven't
1120	* sent them the face yet (this can become quite costly in terms of
1121	* how much we are sending - on the other hand, this should only happen
1122	* when the player logs in and picks stuff up.
1123	*/
1124	void
1125	esrv_send_animation (client * ns, short anim_num)
1126	{
1127	/* Do some checking on the anim_num we got. Note that the animations
1128	* are added in contigous order, so if the number is in the valid
1129	* range, it must be a valid animation.
1130	*/
1131	if (anim_num < 0 || anim_num > num_animations)
1132	{
1133	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1134	return;
1135	}
1136
1137	packet sl ("anim");
1138
1139	sl << uint16 (anim_num)
1140	<< uint16 (0); /* flags - not used right now */
1141
1142	/* Build up the list of faces. Also, send any information (ie, the
1143	* the face itself) down to the client.
1144	*/
1145	for (int i = 0; i < animations[anim_num].num_animations; i++)
1146	{
1147	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1148	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1149
1150	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1151	}
1152
1153	ns->send_packet (sl);
1154
1155	ns->anims_sent[anim_num] = 1;
1156	}
1157
1158		900
1159	/******************************************************************************	901	/******************************************************************************
1160	*	902	*
1161	* Start of map related commands.	903	* Start of map related commands.
1162	*	904	*
1163	******************************************************************************/	905	******************************************************************************/
1164		906
1165	/**
1166	* This adds face_num to a map cell at x,y. If the client doesn't have
1167	* the face yet, we will also send it.
1168	*/
1169	static void
1170	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1171	{
1172	if (newmap->cells[x][y].count >= MAP_LAYERS)
1173	{
1174	//TODO: one or the other, can't both have abort and return, verify and act
1175	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1176	return;
1177	abort ();
1178	}
1179
1180	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1181	newmap->cells[x][y].count++;
1182
1183	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1184	esrv_send_face (ns, face_num, 0);
1185	}
1186
1187	/** Clears a map cell */	907	/** Clears a map cell */
1188	static void	908	static void
1189	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	909	map_clearcell (struct MapCell *cell, int count)
1190	{	910	{
1191	cell->faces[0] = face0;	911	cell->faces[0] = 0;
1192	cell->faces[1] = face1;	912	cell->faces[1] = 0;
1193	cell->faces[2] = face2;	913	cell->faces[2] = 0;
		914	cell->smooth[0] = 0;
		915	cell->smooth[1] = 0;
		916	cell->smooth[2] = 0;
1194	cell->count = count;	917	cell->count = count;
1195	cell->stat_hp = 0;	918	cell->stat_hp = 0;
1196	cell->flags = 0;	919	cell->flags = 0;
1197	cell->player = 0;	920	cell->player = 0;
1198	}	921	}
1199		922
1200	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1201	#define MAX_LAYERS 3	923	#define MAX_LAYERS 3
1202
1203	/* Using a global really isn't a good approach, but saves the over head of
1204	* allocating and deallocating such a block of data each time run through,
1205	* and saves the space of allocating this in the socket object when we only
1206	* need it for this cycle. If the server is ever threaded, this needs to be
1207	* re-examined.
1208	*/
1209	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1210
1211	/**
1212	* Returns true if any of the heads for this
1213	* space is set. Returns false if all are blank - this is used
1214	* for empty space checking.
1215	*/
1216	static inline int
1217	have_head (int ax, int ay)
1218	{
1219	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1220	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1221	return 1;
1222
1223	return 0;
1224	}
1225
1226	/**
1227	* check_head is a bit simplistic version of update_space below.
1228	* basically, it only checks the that the head on space ax,ay at layer
1229	* needs to get sent - if so, it adds the data, sending the head
1230	* if needed, and returning 1. If this no data needs to get
1231	* sent, it returns zero.
1232	*/
1233	static int
1234	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1235	{
1236	short face_num;
1237
1238	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1239	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1240	else
1241	face_num = 0;
1242
1243	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1244	{
1245	sl << uint16 (face_num);
1246	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1247	esrv_send_face (&ns, face_num, 0);
1248
1249	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1250	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1251	return 1;
1252	}
1253
1254	return 0; /* No change */
1255	}
1256		924
1257	/**	925	/**
1258	* Removes the need to replicate the same code for each layer.	926	* Removes the need to replicate the same code for each layer.
1259	* 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
1260	* it was.	928	* it was.
1261	* sl is the socklist this data is going into.	929	* sl is the socklist this data is going into.
1262	* 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
1263	* 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
1264	* entire player object.	932	* entire player object.
1265	* mx and my are map coordinate offsets for map mp
1266	* sx and sy are the offsets into the socket structure that
1267	* holds the old values.
1268	* layer is the layer to update, with 2 being the floor and 0 the	933	* layer is the layer to update, with 2 being the floor and 0 the
1269	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	934	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1270	* take. Interesting to note that before this function, the map1 function	935	* take. Interesting to note that before this function, the map1 function
1271	* numbers the spaces differently - I think this was a leftover from	936	* numbers the spaces differently - I think this was a leftover from
1272	* the map command, where the faces stack up. Sinces that is no longer	937	* the map command, where the faces stack up. Sinces that is no longer
1273	* the case, it seems to make more sense to have these layer values	938	* the case, it seems to make more sense to have these layer values
1274	* actually match.	939	* actually match.
1275	*/	940	*/
1276	static int	941	static int
1277	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)
1278	{	943	{
1279	object *ob, *head;	944	object *ob = ms.faces_obj [layer];
1280	uint16 face_num;
1281	int bx, by, i;
1282
1283	/* If there is a multipart object stored away, treat that as more important.
1284	* If not, then do the normal processing.
1285	*/
1286	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1287
1288	/* Check to see if this head is part of the set of objects
1289	* we would normally send for this space. If so, then
1290	* don't use the head value. We need to do the check
1291	* here and not when setting up the heads[] value for two reasons -
1292	* 1) the heads[] values will get used even if the space is not visible.
1293	* 2) its possible the head is not on the same map as a part, and I'd
1294	* rather not need to do the map translation overhead.
1295	* 3) We need to do some extra checking to make sure that we will
1296	* otherwise send the image as this layer, eg, either it matches
1297	* the head value, or is not multipart.
1298	*/
1299	if (head && !head->more)
1300	{
1301	for (i = 0; i < MAP_LAYERS; i++)
1302	{
1303	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1304	if (!ob)
1305	continue;
1306
1307	if (ob->head)
1308	ob = ob->head;
1309
1310	if (ob == head)
1311	{
1312	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1313	head = NULL;
1314	break;
1315	}
1316	}
1317	}
1318
1319	ob = head;
1320	if (!ob)
1321	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1322		945
1323	/* 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
1324	* is the blank face, set the face number to zero.	947	* is the blank face, set the face number to zero.
1325	* 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
1326	* precedence over the other object for this space.	949	* precedence over the other object for this space.
1327	* otherwise, we do special head processing	950	* otherwise, we do special head processing
1328	*/	951	*/
1329	if (!ob || ob->face == blank_face)	952	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1330	face_num = 0;
1331	else if (head)
1332	{
1333	/* if this is a head that had previously been stored */
1334	face_num = ob->face->number;
1335	}
1336	else
1337	{
1338	/* if the faces for the different parts of a multipart object
1339	* are the same, we only want to send the bottom right most
1340	* portion of the object. That info is in the tail_.. values
1341	* of the head. Note that for the head itself, ob->head will
1342	* be null, so we only do this block if we are working on
1343	* a tail piece.
1344	*/
1345
1346	/* tail_x and tail_y will only be set in the head object. If
1347	* this is the head object and these are set, we proceed
1348	* with logic to only send bottom right. Similarly, if
1349	* this is one of the more parts but the head has those values
1350	* set, we want to do the processing. There can be cases where
1351	* the head is not visible but one of its parts is, so we just
1352	* can always expect that ob->arch->tail_x will be true for all
1353	* object we may want to display.
1354	*/
1355	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1356	{
1357
1358	if (ob->head)
1359	head = ob->head;
1360	else
1361	head = ob;
1362
1363	/* Basically figure out where the offset is from where we are right
1364	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1365	* piece is from the head, and the tail is where the tail is from the
1366	* head. Note that bx and by will equal sx and sy if we are already working
1367	* on the bottom right corner. If ob is the head, the clone values
1368	* will be zero, so the right thing will still happen.
1369	*/
1370	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1371	by = sy + head->arch->tail_y - ob->arch->clone.y;
1372
1373	/* I don't think this can ever happen, but better to check for it just
1374	* in case.
1375	*/
1376	if (bx < sx || by < sy)
1377	{
1378	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1379	face_num = 0;
1380	}
1381	/* single part object, multipart object with non merged faces,
1382	* of multipart object already at lower right.
1383	*/
1384	else if (bx == sx && by == sy)
1385	{
1386	face_num = ob->face->number;
1387
1388	/* if this face matches one stored away, clear that one away.
1389	* this code relies on the fact that the map1 commands
1390	* goes from 2 down to 0.
1391	*/
1392	for (i = 0; i < MAP_LAYERS; i++)
1393	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1394	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1395	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1396	}
1397	else
1398	{
1399	/* If this head is stored away, clear it - otherwise,
1400	* there can be cases where a object is on multiple layers -
1401	* we only want to send it once.
1402	*/
1403	face_num = head->face->number;
1404	for (i = 0; i < MAP_LAYERS; i++)
1405	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1406	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1407	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1408
1409	/* First, try to put the new head on the same layer. If that is used up,
1410	* then find another layer.
1411	*/
1412	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1413	{
1414	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1415	}
1416	else
1417	for (i = 0; i < MAX_LAYERS; i++)
1418	{
1419	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1420	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1421	{
1422	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1423	}
1424	}
1425	face_num = 0; /* Don't send this object - we'll send the head later */
1426	}
1427	}
1428	else
1429	{
1430	/* In this case, we are already at the lower right or single part object,
1431	* so nothing special
1432	*/
1433	face_num = ob->face->number;
1434
1435	/* clear out any head entries that have the same face as this one */
1436	for (bx = 0; bx < layer; bx++)
1437	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1438	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1439	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1440	}
1441	} /* else not already head object or blank face */
1442
1443	/* This is a real hack. Basically, if we have nothing to send for this layer,
1444	* but there is a head on the next layer, send that instead.
1445	* Without this, what happens is you can get the case where the player stands
1446	* on the same space as the head. However, if you have overlapping big objects
1447	* of the same type, what happens then is it doesn't think it needs to send
1448	* This tends to make stacking also work/look better.
1449	*/
1450	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1451	{
1452	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1453	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1454	}
1455
1456	/* Another hack - because of heads and whatnot, this face may match one
1457	* we already sent for a lower layer. In that case, don't send
1458	* this one.
1459	*/
1460	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1461	face_num = 0;
1462		953
1463	/* 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
1464	* 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.
1465	*/	956	*/
1466	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	957	if (lastcell.faces[layer] != face_num)
1467	{	958	{
1468	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	959	lastcell.faces[layer] = face_num;
		960
1469	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
1470	esrv_send_face (&ns, face_num, 0);	965	ns.send_face (face_num);
1471		966
1472	sl << uint16 (face_num);	967	sl << uint16 (face_num);
1473	return 1;
1474	}
1475
1476	/* Nothing changed */
1477	return 0;
1478	}
1479
1480	/**
1481	* This function is mainly a copy of update_space,
1482	* except it handles update of the smoothing updates,
1483	* not the face updates.
1484	* Removes the need to replicate the same code for each layer.
1485	* this returns true if this smooth is now in fact different
1486	* than it was.
1487	* sl is the socklist this data is going into.
1488	* ns is the socket we are working on - all the info we care
1489	* about is in this socket structure, so know need to pass the
1490	* entire player object.
1491	* mx and my are map coordinate offsets for map mp
1492	* sx and sy are the offsets into the socket structure that
1493	* holds the old values.
1494	* layer is the layer to update, with 2 being the floor and 0 the
1495	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1496	* take.
1497	*/
1498
1499	static inline int
1500	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1501	{
1502	object *ob;
1503	int smoothlevel; /* old face_num; */
1504
1505	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1506
1507	/* If there is no object for this space, or if the face for the object
1508	* is the blank face, set the smoothlevel to zero.
1509	*/
1510	if (!ob || ob->face == blank_face)
1511	smoothlevel = 0;
1512	else
1513	{
1514	smoothlevel = ob->smoothlevel;
1515	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1516	SendSmooth (&ns, ob->face->number);
1517	} /* else not already head object or blank face */
1518
1519	/* We've gotten what face we want to use for the object. Now see if
1520	* if it has changed since we last sent it to the client.
1521	*/
1522	if (smoothlevel > 255)
1523	smoothlevel = 255;
1524	else if (smoothlevel < 0)
1525	smoothlevel = 0;
1526
1527	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1528	{
1529	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1530	sl << uint8 (smoothlevel);
1531	return 1;	968	return 1;
1532	}	969	}
1533		970
1534	/* Nothing changed */	971	/* Nothing changed */
1535	return 0;	972	return 0;
…		…
1552	}	989	}
1553		990
1554	return result;	991	return result;
1555	}	992	}
1556		993
		994	// prefetch (and touch) all maps within a specific distancd
		995	static void
		996	prefetch_surrounding_maps (maptile *map, int distance)
		997	{
		998	map->last_access = runtime;
		999
		1000	if (--distance)
		1001	for (int dir = 4; --dir; )
		1002	if (const shstr &path = map->tile_path [dir])
		1003	if (maptile *&neigh = map->tile_map [dir])
		1004	prefetch_surrounding_maps (neigh, distance);
		1005	else
		1006	neigh = maptile::find_async (path, map);
		1007	}
		1008
		1009	// prefetch a generous area around the player
		1010	static void
		1011	prefetch_surrounding_maps (object *op)
		1012	{
		1013	prefetch_surrounding_maps (op->map, 3);
		1014	}
		1015
1557	/**	1016	/**
1558	* This function uses the new map1 protocol command to send the map	1017	* Draws client map.
1559	* to the client. It is necessary because the old map command supports
1560	* a maximum map size of 15x15.
1561	* This function is much simpler than the old one. This is because
1562	* the old function optimized to send as few face identifiers as possible,
1563	* at the expense of sending more coordinate location (coordinates were
1564	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1565	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1566	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1567	* and use the other 4 bits for other informatiion. For full documentation
1568	* of what we send, see the doc/Protocol file.
1569	* I will describe internally what we do:
1570	* the ns->lastmap shows how the map last looked when sent to the client.
1571	* in the lastmap structure, there is a cells array, which is set to the
1572	* maximum viewable size (As set in config.h).
1573	* in the cells, there are faces and a count value.
1574	* we use the count value to hold the darkness value. If -1, then this space
1575	* is not viewable.
1576	* we use faces[0] faces[1] faces[2] to hold what the three layers
1577	* look like.
1578	*/	1018	*/
1579	void	1019	void
1580	draw_client_map1 (object *pl)	1020	draw_client_map (player *pl)
1581	{	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
1582	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1035	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1583	sint16 nx, ny;	1036	sint16 nx, ny;
1584	int estartlen, eoldlen;	1037	int estartlen, eoldlen;
1585	uint16 mask, emask;
1586	uint8 eentrysize;	1038	uint8 eentrysize;
1587	uint16 ewhatstart, ewhatflag;	1039	uint16 ewhatstart, ewhatflag;
1588	uint8 extendedinfos;	1040	uint8 extendedinfos;
1589	maptile *m;	1041	maptile *m;
1590		1042
		1043	check_map_change (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
1591	client &socket = *pl->contr->ns;	1078	client &socket = *pl->ns;
1592
1593	if (!pl->active)
1594	return;
1595
1596	check_map_change (pl->contr);
1597		1079
1598	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1080	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1599	packet esl;	1081	packet esl;
1600		1082
1601	startlen = sl.length ();	1083	startlen = sl.length ();
…		…
1616	<< uint8 (extendedinfos)	1098	<< uint8 (extendedinfos)
1617	<< uint8 (eentrysize);	1099	<< uint8 (eentrysize);
1618		1100
1619	estartlen = esl.length ();	1101	estartlen = esl.length ();
1620	}	1102	}
1621	else
1622	{
1623	/* suppress compiler warnings */
1624	ewhatstart = 0;
1625	ewhatflag = 0;
1626	estartlen = 0;
1627	}
1628
1629	/* Init data to zero */
1630	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1631		1103
1632	/* 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
1633	* locations.	1105	* locations.
1634	*/	1106	*/
1635	ay = 0;	1107	ay = 0;
1636		1108
1637	/* We could do this logic as conditionals in the if statement,	1109	/* We could do this logic as conditionals in the if statement,
1638	* but that started to get a bit messy to look at.	1110	* but that started to get a bit messy to look at.
1639	*/	1111	*/
1640	max_x = pl->x + (socket.mapx + 1) / 2;	1112	max_x = ob->x + (socket.mapx + 1) / 2;
1641	max_y = pl->y + (socket.mapy + 1) / 2;	1113	max_y = ob->y + (socket.mapy + 1) / 2;
1642		1114
1643	if (socket.mapmode == Map1aCmd)
1644	{
1645	max_x += MAX_HEAD_OFFSET;
1646	max_y += MAX_HEAD_OFFSET;
1647	}
1648
1649	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++)
1650	{	1116	{
1651	ax = 0;	1117	ax = 0;
1652	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++)
1653	{	1119	{
		1120	int emask, mask;
1654	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1121	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1655		1122
1656	/* If this space is out of the normal viewable area, we only check
1657	* the heads value ax or ay will only be greater than what
1658	* the client wants if using the map1a command - this is because
1659	* if the map1a command is not used, max_x and max_y will be
1660	* set to lower values.
1661	*/
1662	if (ax >= socket.mapx || ay >= socket.mapy)
1663	{
1664	int i, got_one;
1665
1666	oldlen = sl.length ();
1667
1668	sl << uint16 (mask);
1669
1670	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1671	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1672	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1673
1674	/* If all we are doing is sending 0 (blank) faces, we don't
1675	* actually need to send that - just the coordinates
1676	* with no faces tells the client to blank out the
1677	* space.
1678	*/
1679	got_one = 0;
1680	for (i = oldlen + 2; i < sl.length (); i++)
1681	if (sl[i])
1682	got_one = 1;
1683
1684	if (got_one && (mask & 0xf))
1685	sl[oldlen + 1] = mask & 0xff;
1686	else
1687	{ /*either all faces blank, either no face at all */
1688	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1689	sl.reset (oldlen + 2);
1690	else
1691	sl.reset (oldlen);
1692	}
1693
1694	/*What concerns extendinfos, nothing to be done for now
1695	* (perhaps effects layer later)
1696	*/
1697	continue; /* don't do processing below */
1698	}
1699
1700	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1123	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1701
1702	d = pl->contr->blocked_los[ax][ay];
1703		1124
1704	/* 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,
1705	* we tell the client as such	1126	* we tell the client as such
1706	*/	1127	*/
1707	nx = x;	1128	nx = x;
1708	ny = y;	1129	ny = y;
1709	m = get_map_from_coord (pl->map, &nx, &ny);	1130	m = get_map_from_coord (plmap, &nx, &ny);
1710		1131
1711	if (!m)	1132	if (!m)
1712	{	1133	{
1713	/* space is out of map. Update space and clear values	1134	/* space is out of map. Update space and clear values
1714	* 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
1715	* of the map, it shouldn't have a head	1136	* of the map, it shouldn't have a head
1716	*/	1137	*/
1717	if (lastcell.count != -1)	1138	if (lastcell.count != -1)
1718	{	1139	{
1719	sl << uint16 (mask);	1140	sl << uint16 (mask);
1720	map_clearcell (&lastcell, 0, 0, 0, -1);	1141	map_clearcell (&lastcell, -1);
1721	}	1142	}
		1143
		1144	continue;
1722	}	1145	}
		1146
		1147	m->touch ();
		1148
		1149	int d = pl->blocked_los[ax][ay];
		1150
1723	else if (d > 3)	1151	if (d > 3)
1724	{	1152	{
1725	m->touch ();
1726		1153
1727	int need_send = 0, count;	1154	int need_send = 0, count;
1728		1155
1729	/* This block deals with spaces that are not visible for whatever	1156	/* This block deals with spaces that are not visible for whatever
1730	* reason. Still may need to send the head for this space.	1157	* reason. Still may need to send the head for this space.
1731	*/	1158	*/
1732		1159
1733	oldlen = sl.length ();	1160	oldlen = sl.length ();
1734		1161
1735	sl << uint16 (mask);	1162	sl << uint16 (mask);
…		…
1737	if (lastcell.count != -1)	1164	if (lastcell.count != -1)
1738	need_send = 1;	1165	need_send = 1;
1739		1166
1740	count = -1;	1167	count = -1;
1741		1168
1742	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1743	{
1744	/* Now check to see if any heads need to be sent */
1745
1746	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1747	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1748	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1749
1750	lastcell.count = count;
1751	}
1752	else
1753	{
1754	/* properly clear a previously sent big face */	1169	/* properly clear a previously sent big face */
1755	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1170	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1756	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1171	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1757	need_send = 1;	1172	need_send = 1;
1758		1173
1759	map_clearcell (&lastcell, 0, 0, 0, count);	1174	map_clearcell (&lastcell, count);
1760	}
1761		1175
1762	if ((mask & 0xf) || need_send)	1176	if ((mask & 0xf) || need_send)
1763	sl[oldlen + 1] = mask & 0xff;	1177	sl[oldlen + 1] = mask & 0xff;
1764	else	1178	else
1765	sl.reset (oldlen);	1179	sl.reset (oldlen);
1766	}	1180	}
1767	else	1181	else
1768	{	1182	{
1769	m->touch ();
1770
1771	/* In this block, the space is visible or there are head objects	1183	/* In this block, the space is visible.
1772	* we need to send.
1773	*/	1184	*/
1774		1185
1775	/* Rather than try to figure out what everything that we might	1186	/* Rather than try to figure out what everything that we might
1776	* need to send is, then form the packet after that,	1187	* need to send is, then form the packet after that,
1777	* 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
…		…
1780	* is done.	1191	* is done.
1781	* 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
1782	* what if anything we need to send, setting the bits, then	1193	* what if anything we need to send, setting the bits, then
1783	* doing those checks again to add the real data.	1194	* doing those checks again to add the real data.
1784	*/	1195	*/
1785	oldlen = sl.length ();	1196	oldlen = sl.length ();
1786	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1787	eoldlen = esl.length ();	1197	eoldlen = esl.length ();
1788	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1198
1789	sl << uint16 (mask);	1199	sl << uint16 (mask);
1790
1791	if (socket.ext_mapinfos)
1792	esl << uint16 (emask);
1793		1200
1794	unsigned char dummy;	1201	unsigned char dummy;
1795	unsigned char *last_ext = &dummy;	1202	unsigned char *last_ext = &dummy;
1796		1203
1797	/* Darkness changed */	1204	/* Darkness changed */
…		…
1809	sl << uint8 (255 - 64 * d);	1216	sl << uint8 (255 - 64 * d);
1810	}	1217	}
1811		1218
1812	lastcell.count = d;	1219	lastcell.count = d;
1813		1220
		1221	mapspace &ms = m->at (nx, ny);
		1222
1814	if (socket.extmap)	1223	if (socket.extmap)
1815	{	1224	{
1816	uint8 stat_hp = 0;	1225	uint8 stat_hp = 0;
1817	uint8 stat_width = 0;	1226	uint8 stat_width = 0;
1818	uint8 flags = 0;	1227	uint8 flags = 0;
1819	UUID player = 0;	1228	tag_t player = 0;
1820		1229
1821	// send hp information, if applicable	1230	// send hp information, if applicable
1822	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1231	if (object *op = ms.faces_obj [0])
1823	{	1232	{
1824	if (op->head || op->invisible)	1233	if (op->head || op->invisible)
1825	; // do not show	1234	; // do not show
1826	else if (op->type == PLAYER	1235	else if (op->type == PLAYER
1827	|| 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))
1828	{	1237	{
1829	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)
1830	{	1239	{
1831	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1240	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1832	stat_width = op->arch->tail_x;	1241	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1833	}	1242	}
1834	}	1243	}
1835		1244
1836	if (op->msg && op->msg[0] == '@')	1245	if (op->msg && op->msg[0] == '@')
1837	flags |= 1;	1246	flags |= 1;
1838		1247
1839	if (op->type == PLAYER && op != pl)	1248	if (op->type == PLAYER && op != ob)
1840	player = op->count;	1249	player = op->count;
1841	}	1250	}
1842		1251
1843	if (lastcell.stat_hp != stat_hp)	1252	if (lastcell.stat_hp != stat_hp)
1844	{	1253	{
…		…
1865		1274
1866	mask |= 0x8;	1275	mask |= 0x8;
1867	*last_ext |= 0x80;	1276	*last_ext |= 0x80;
1868	last_ext = &sl[sl.length ()];	1277	last_ext = &sl[sl.length ()];
1869		1278
1870	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1279	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1871	}	1280	}
1872		1281
1873	if (lastcell.flags != flags)	1282	if (lastcell.flags != flags)
1874	{	1283	{
1875	lastcell.flags = flags;	1284	lastcell.flags = flags;
…		…
1881	sl << uint8 (8) << uint8 (flags);	1290	sl << uint8 (8) << uint8 (flags);
1882	}	1291	}
1883	}	1292	}
1884		1293
1885	/* Floor face */	1294	/* Floor face */
1886	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1295	if (update_space (sl, socket, ms, lastcell, 2))
1887	mask |= 0x4;	1296	mask |= 0x4;
1888		1297
1889	if (socket.EMI_smooth)
1890	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1891	emask |= 0x4;
1892
1893	/* Middle face */	1298	/* Middle face */
1894	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1299	if (update_space (sl, socket, ms, lastcell, 1))
1895	mask |= 0x2;	1300	mask |= 0x2;
1896		1301
1897	if (socket.EMI_smooth)	1302	if (ms.player () == ob
1898	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1303	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1899	emask |= 0x2;
1900
1901	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1902	{	1304	{
		1305	// force player to be visible to himself if invisible
1903	if (lastcell.faces[0] != pl->face->number)	1306	if (lastcell.faces[0] != ob->face)
1904	{	1307	{
1905	lastcell.faces[0] = pl->face->number;	1308	lastcell.faces[0] = ob->face;
		1309
1906	mask |= 0x1;	1310	mask |= 0x1;
1907
1908	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1909	esrv_send_face (&socket, pl->face->number, 0);
1910
1911	sl << uint16 (pl->face->number);	1311	sl << uint16 (ob->face);
		1312
		1313	socket.send_faces (ob);
1912	}	1314	}
1913	}	1315	}
1914	else
1915	{
1916	/* Top face */	1316	/* Top face */
1917	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1317	else if (update_space (sl, socket, ms, lastcell, 0))
1918	mask |= 0x1;	1318	mask |= 0x1;
1919
1920	if (socket.EMI_smooth)
1921	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1922	emask |= 0x1;
1923	}
1924		1319
1925	/* 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
1926	* space by checking the mask. If so, update the mask.	1321	* space by checking the mask. If so, update the mask.
1927	* 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
1928	* value, so we don't send those bits.	1323	* value, so we don't send those bits.
…		…
1930	if (mask & 0xf)	1325	if (mask & 0xf)
1931	sl[oldlen + 1] = mask & 0xff;	1326	sl[oldlen + 1] = mask & 0xff;
1932	else	1327	else
1933	sl.reset (oldlen);	1328	sl.reset (oldlen);
1934		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
1935	if (emask & 0xf)	1353	if (emask & 0xf)
1936	esl[eoldlen + 1] = emask & 0xff;	1354	esl[eoldlen + 1] = emask & 0xff;
1937	else	1355	else
1938	esl.reset (eoldlen);	1356	esl.reset (eoldlen);
		1357	}
1939	} /* else this is a viewable space */	1358	} /* else this is a viewable space */
1940	} /* for x loop */	1359	} /* for x loop */
1941	} /* for y loop */	1360	} /* for y loop */
		1361
		1362	socket.flush_fx ();
1942		1363
1943	/* Verify that we in fact do need to send this */	1364	/* Verify that we in fact do need to send this */
1944	if (socket.ext_mapinfos)	1365	if (socket.ext_mapinfos)
1945	{	1366	{
1946	if (!(sl.length () > startlen || socket.sent_scroll))	1367	if (!(sl.length () > startlen || socket.sent_scroll))
1947	{	1368	{
1948	/* No map data will follow, so don't say the client	1369	/* No map data will follow, so don't say the client
1949	* it doesn't need draw!	1370	* it doesn't need draw!
1950	*/	1371	*/
1951	ewhatflag &= (~EMI_NOREDRAW);	1372	ewhatflag &= ~EMI_NOREDRAW;
1952	esl[ewhatstart + 1] = ewhatflag & 0xff;	1373	esl[ewhatstart + 1] = ewhatflag & 0xff;
1953	}	1374	}
1954		1375
1955	if (esl.length () > estartlen)	1376	if (esl.length () > estartlen)
1956	socket.send_packet (esl);	1377	socket.send_packet (esl);
…		…
1961	socket.send_packet (sl);	1382	socket.send_packet (sl);
1962	socket.sent_scroll = 0;	1383	socket.sent_scroll = 0;
1963	}	1384	}
1964	}	1385	}
1965		1386
1966	/**
1967	* Draws client map.
1968	*/
1969	void
1970	draw_client_map (object *pl)
1971	{
1972	int i, j;
1973	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1974	New_Face *face, *floor;
1975	New_Face *floor2;
1976	int d, mflags;
1977	struct Map newmap;
1978	maptile *m, *pm;
1979
1980	if (pl->type != PLAYER)
1981	{
1982	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1983	return;
1984	}
1985
1986	pm = pl->map;
1987
1988	/* If player is just joining the game, he isn't here yet, so the map
1989	* can get swapped out. If so, don't try to send them a map. All will
1990	* be OK once they really log in.
1991	*/
1992	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1993	return;
1994
1995	memset (&newmap, 0, sizeof (struct Map));
1996
1997	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1998	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1999	{
2000	ax = i;
2001	ay = j;
2002	m = pm;
2003	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2004
2005	if (mflags & P_OUT_OF_MAP)
2006	continue;
2007
2008	/* If a map is visible to the player, we don't want to swap it out
2009	* just to reload it. This should really call something like
2010	* swap_map, but this is much more efficient and 'good enough'
2011	*/
2012	if (mflags & P_NEW_MAP)
2013	m->timeout = 50;
2014	}
2015
2016	/* do LOS after calls to update_position */
2017	if (pl->contr->do_los)
2018	{
2019	update_los (pl);
2020	pl->contr->do_los = 0;
2021	}
2022
2023	/* Big maps need a different drawing mechanism to work */
2024	draw_client_map1 (pl);
2025	}
2026
2027
2028	/*****************************************************************************/	1387	/*****************************************************************************/
2029
2030	/* 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*/
2031
2032	/* 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 */
2033
2034	/* manage it ! */	1390	/* manage it ! */
2035
2036	/*****************************************************************************/	1391	/*****************************************************************************/
2037	void	1392	void
2038	send_plugin_custom_message (object *pl, char *buf)	1393	send_plugin_custom_message (object *pl, char *buf)
2039	{	1394	{
2040	pl->contr->ns->send_packet (buf);	1395	pl->contr->ns->send_packet (buf);
…		…
2162		1517
2163	/* 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. */
2164	static void	1519	static void
2165	append_spell (player *pl, packet &sl, object *spell)	1520	append_spell (player *pl, packet &sl, object *spell)
2166	{	1521	{
2167	int len, i, skill = 0;	1522	int i, skill = 0;
2168		1523
2169	if (!(spell->name))	1524	if (!(spell->name))
2170	{	1525	{
2171	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);
2172	return;	1527	return;
…		…
2184	if (!strcmp (spell->skill, skill_names[i]))	1539	if (!strcmp (spell->skill, skill_names[i]))
2185	{	1540	{
2186	skill = i + CS_STAT_SKILLINFO;	1541	skill = i + CS_STAT_SKILLINFO;
2187	break;	1542	break;
2188	}	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);
2189	}	1551	}
2190		1552
2191	/* send the current values */	1553	/* send the current values */
2192	sl << uint32 (spell->count)	1554	sl << uint32 (spell->count)
2193	<< uint16 (spell->level)	1555	<< uint16 (spell->level)
…		…
2195	<< uint16 (spell->last_sp)	1557	<< uint16 (spell->last_sp)
2196	<< uint16 (spell->last_grace)	1558	<< uint16 (spell->last_grace)
2197	<< uint16 (spell->last_eat)	1559	<< uint16 (spell->last_eat)
2198	<< uint8 (skill)	1560	<< uint8 (skill)
2199	<< uint32 (spell->path_attuned)	1561	<< uint32 (spell->path_attuned)
2200	<< uint32 (spell->face ? spell->face->number : 0)	1562	<< uint32 (spell->face)
2201	<< data8 (spell->name)	1563	<< data8 (spell->name)
2202	<< data16 (spell->msg);	1564	<< data16 (spell->msg);
2203	}	1565	}
2204		1566
2205	/**	1567	/**
…		…
2220		1582
2221	packet sl ("addspell");	1583	packet sl ("addspell");
2222		1584
2223	if (!spell)	1585	if (!spell)
2224	{	1586	{
2225	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1587	for (spell = pl->ob->inv; spell; spell = spell->below)
2226	{	1588	{
2227	/* were we to simply keep appending data here, we could exceed	1589	/* were we to simply keep appending data here, we could exceed
2228	* 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
2229	* append_spells will always append 19 data bytes, plus 4 length	1591	* append_spells will always append 19 data bytes, plus 4 length
2230	* 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