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.60 by root, Sun Jan 7 02:39:15 2007 UTC vs.
Revision 1.103 by root, Mon Jun 4 13:04:01 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.)
…		…
798	* commands.	557	* commands.
799	*/	558	*/
800	pl->count = 0;	559	pl->count = 0;
801		560
802	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	561	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
803	int time = FABS (pl->ob->speed) < 0.001	562	int time = fabs (pl->ob->speed) < 0.001
804	? time = MAX_TIME * 100	563	? time = MAX_TIME * 100
805	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	564	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
806		565
807	/* Send confirmation of command execution now */	566	/* Send confirmation of command execution now */
808	packet sl ("comc");	567	packet sl ("comc");
809	sl << uint16 (cmdid) << uint32 (time);	568	sl << uint16 (cmdid) << uint32 (time);
810	pl->ns->send_packet (sl);	569	pl->ns->send_packet (sl);
…		…
842	{	601	{
843	case ST_PLAYING:	602	case ST_PLAYING:
844	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	603	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
845	break;	604	break;
846		605
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 */	606	case ST_GET_PARTY_PASSWORD: /* Get password for party */
852	receive_party_password (pl->ob, 13);	607	receive_party_password (pl->ob, 13);
853	break;	608	break;
854		609
855	default:	610	default:
…		…
876	ns->cs_version = atoi (buf);	631	ns->cs_version = atoi (buf);
877	ns->sc_version = ns->cs_version;	632	ns->sc_version = ns->cs_version;
878		633
879	LOG (llevDebug, "connection from client <%s>\n", buf);	634	LOG (llevDebug, "connection from client <%s>\n", buf);
880		635
881
882	//TODO: should log here just for statistics	636	//TODO: should log here just for statistics
883		637
884	//if (VERSION_CS != ns->cs_version)	638	//if (VERSION_CS != ns->cs_version)
885	// unchecked;	639	// unchecked;
886		640
…		…
895		649
896	cp = strchr (cp + 1, ' ');	650	cp = strchr (cp + 1, ' ');
897		651
898	if (cp)	652	if (cp)
899	{	653	{
900	assign (ns->version, cp + 1);	654	ns->version = cp + 1;
901		655
902	if (ns->sc_version < 1026)	656	if (ns->sc_version < 1026)
903	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	657	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
904	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	658	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
905	}	659	}
…		…
965	/**	719	/**
966	* Asks the client to query the user. This way, the client knows	720	* 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)	721	* it needs to send something back (vs just printing out a message)
968	*/	722	*/
969	void	723	void
970	send_query (client *ns, uint8 flags, char *text)	724	send_query (client *ns, uint8 flags, const char *text)
971	{	725	{
972	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	726	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
		727	}
		728
		729	/**
		730	* Get player's current range attack in obuf.
		731	*/
		732	static void
		733	rangetostring (player *pl, char *obuf)
		734	{
		735	dynbuf_text buf;
		736
		737	if (pl->ranged_ob)
		738	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		739
		740	if (pl->combat_ob)
		741	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		742
		743	//TODO: remove this when slot system is working, this is only for debugging
		744	if (pl->ob->chosen_skill)
		745	buf << " Skill*: " << pl->ob->chosen_skill->name;
		746
		747	//TODO: maybe golem should become the current_weapon, quite simply?
		748	if (pl->golem)
		749	buf << " Golem*: " << pl->golem->name;
		750
		751	buf.linearise (obuf);
		752	obuf [buf.size ()] = 0;
973	}	753	}
974		754
975	#define AddIfInt64(Old,New,Type) if (Old != New) {\	755	#define AddIfInt64(Old,New,Type) if (Old != New) {\
976	Old = New; \	756	Old = New; \
977	sl << uint8 (Type) << uint64 (New); \	757	sl << uint8 (Type) << uint64 (New); \
…		…
985	#define AddIfShort(Old,New,Type) if (Old != New) {\	765	#define AddIfShort(Old,New,Type) if (Old != New) {\
986	Old = New; \	766	Old = New; \
987	sl << uint8 (Type) << uint16 (New); \	767	sl << uint8 (Type) << uint16 (New); \
988	}	768	}
989		769
990	#define AddIfFloat(Old,New,Type) if (Old != New) {\	770	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
991	Old = New; \	771	Old = New; \
992	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	772	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
993	}	773	}
994		774
995	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	775	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
996	free(Old); Old = strdup (New);\	776	free(Old); Old = strdup (New);\
997	sl << uint8 (Type) << data8 (New); \	777	sl << uint8 (Type) << data8 (New); \
…		…
1007	esrv_update_stats (player *pl)	787	esrv_update_stats (player *pl)
1008	{	788	{
1009	char buf[MAX_BUF];	789	char buf[MAX_BUF];
1010	uint16 flags;	790	uint16 flags;
1011		791
		792	client *ns = pl->ns;
1012	if (!pl->ns)	793	if (!ns)
1013	return;	794	return;
1014		795
		796	object *ob = pl->observe;
		797	if (!ob)
		798	return;
		799
1015	packet sl ("stats");	800	packet sl ("stats");
1016		801
1017	if (pl->ob)
1018	{
1019	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	802	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1020	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	803	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1021	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	804	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1022	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	805	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1023	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	806	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1024	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	807	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1025	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	808	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1026	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	809	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1027	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	810	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1028	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);	811	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1029	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);	812	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1030	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);	813	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1031	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	814	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1032	}
1033		815
1034	for (int s = 0; s < NUM_SKILLS; s++)	816	for (int s = 0; s < NUM_SKILLS; s++)
1035	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	817	if (object *skill = pl->last_skill_ob[s])
		818	if (skill->stats.exp != ns->last_skill_exp [s])
1036	{	819	{
		820	ns->last_skill_exp [s] = skill->stats.exp;
		821
1037	/* Always send along the level if exp changes. This is only	822	/* Always send along the level if exp changes. This is only
1038	* 1 extra byte, but keeps processing simpler.	823	* 1 extra byte, but keeps processing simpler.
1039	*/	824	*/
1040	sl << uint8 (s + CS_STAT_SKILLINFO)	825	sl << uint8 (s + CS_STAT_SKILLINFO)
1041	<< uint8 (pl->last_skill_ob[s]->level)	826	<< uint8 (skill->level)
1042	<< uint64 (pl->last_skill_ob[s]->stats.exp);	827	<< uint64 (skill->stats.exp);
1043
1044	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1045	}	828	}
1046		829
1047	AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);	830	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1048	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	831	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1049	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	832	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1050	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	833	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1051	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	834	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1052	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	835	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1053	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	836	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1054	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	837	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1055	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	838	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		839
1056	flags = 0;	840	flags = 0;
1057		841
1058	if (pl->fire_on)	842	if (pl->fire_on)
1059	flags |= SF_FIREON;	843	flags |= SF_FIREON;
1060		844
1061	if (pl->run_on)	845	if (pl->run_on)
1062	flags |= SF_RUNON;	846	flags |= SF_RUNON;
1063		847
1064	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	848	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1065		849
1066	if (pl->ns->sc_version < 1025)	850	if (ns->sc_version < 1025)
1067	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	851	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1068	else	852	else
1069	for (int i = 0; i < NROFATTACKS; i++)	853	for (int i = 0; i < NROFATTACKS; i++)
1070	{	854	{
1071	/* Skip ones we won't send */	855	/* Skip ones we won't send */
1072	if (atnr_cs_stat[i] == -1)	856	if (atnr_cs_stat[i] == -1)
1073	continue;	857	continue;
1074		858
1075	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	859	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1076	}	860	}
1077		861
1078	if (pl->ns->monitor_spells)	862	if (pl->ns->monitor_spells)
1079	{	863	{
1080	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	864	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1081	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	865	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1082	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	866	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1083	}	867	}
1084		868
1085	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	869	rangetostring (pl, buf); /* we want use the new fire & run system in new client */
1086	AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);	870	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1087	set_title (pl->ob, buf);	871	set_title (ob, buf);
1088	AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);	872	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1089		873
1090	/* Only send it away if we have some actual data */	874	/* Only send it away if we have some actual data */
1091	if (sl.length () > 6)	875	if (sl.length () > 6)
1092	pl->ns->send_packet (sl);	876	ns->send_packet (sl);
1093	}	877	}
1094		878
1095	/**	879	/**
1096	* Tells the client that here is a player it should start using.	880	* Tells the client that here is a player it should start using.
1097	*/	881	*/
1098	void	882	void
1099	esrv_new_player (player *pl, uint32 weight)	883	esrv_new_player (player *pl, uint32 weight)
1100	{	884	{
1101	pl->last_weight = weight;
1102
1103	packet sl ("player");	885	packet sl ("player");
1104		886
1105	sl << uint32 (pl->ob->count)	887	sl << uint32 (pl->ob->count)
1106	<< uint32 (weight)	888	<< uint32 (weight)
1107	<< uint32 (pl->ob->face->number)	889	<< uint32 (pl->ob->face)
1108	<< data8 (pl->ob->name);	890	<< data8 (pl->ob->name);
1109		891
		892	pl->ns->last_weight = weight;
1110	pl->ns->send_packet (sl);	893	pl->ns->send_packet (sl);
1111	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	894	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1112	}	895	}
1113
1114	/**
1115	* Need to send an animation sequence to the client.
1116	* We will send appropriate face commands to the client if we haven't
1117	* sent them the face yet (this can become quite costly in terms of
1118	* how much we are sending - on the other hand, this should only happen
1119	* when the player logs in and picks stuff up.
1120	*/
1121	void
1122	esrv_send_animation (client * ns, short anim_num)
1123	{
1124	/* Do some checking on the anim_num we got. Note that the animations
1125	* are added in contigous order, so if the number is in the valid
1126	* range, it must be a valid animation.
1127	*/
1128	if (anim_num < 0 || anim_num > num_animations)
1129	{
1130	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1131	return;
1132	}
1133
1134	packet sl ("anim");
1135
1136	sl << uint16 (anim_num)
1137	<< uint16 (0); /* flags - not used right now */
1138
1139	/* Build up the list of faces. Also, send any information (ie, the
1140	* the face itself) down to the client.
1141	*/
1142	for (int i = 0; i < animations[anim_num].num_animations; i++)
1143	{
1144	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1145	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1146
1147	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1148	}
1149
1150	ns->send_packet (sl);
1151
1152	ns->anims_sent[anim_num] = 1;
1153	}
1154
1155		896
1156	/******************************************************************************	897	/******************************************************************************
1157	*	898	*
1158	* Start of map related commands.	899	* Start of map related commands.
1159	*	900	*
1160	******************************************************************************/	901	******************************************************************************/
1161		902
1162	/**
1163	* This adds face_num to a map cell at x,y. If the client doesn't have
1164	* the face yet, we will also send it.
1165	*/
1166	static void
1167	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1168	{
1169	if (newmap->cells[x][y].count >= MAP_LAYERS)
1170	{
1171	//TODO: one or the other, can't both have abort and return, verify and act
1172	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1173	return;
1174	abort ();
1175	}
1176
1177	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1178	newmap->cells[x][y].count++;
1179
1180	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1181	esrv_send_face (ns, face_num, 0);
1182	}
1183
1184	/** Clears a map cell */	903	/** Clears a map cell */
1185	static void	904	static void
1186	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	905	map_clearcell (struct MapCell *cell, int count)
1187	{	906	{
1188	cell->faces[0] = face0;	907	cell->faces[0] = 0;
1189	cell->faces[1] = face1;	908	cell->faces[1] = 0;
1190	cell->faces[2] = face2;	909	cell->faces[2] = 0;
		910	cell->smooth[0] = 0;
		911	cell->smooth[1] = 0;
		912	cell->smooth[2] = 0;
1191	cell->count = count;	913	cell->count = count;
1192	cell->stat_hp = 0;	914	cell->stat_hp = 0;
1193	cell->flags = 0;	915	cell->flags = 0;
1194	cell->player = 0;	916	cell->player = 0;
1195	}	917	}
1196		918
1197	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1198	#define MAX_LAYERS 3	919	#define MAX_LAYERS 3
1199
1200	/* Using a global really isn't a good approach, but saves the over head of
1201	* allocating and deallocating such a block of data each time run through,
1202	* and saves the space of allocating this in the socket object when we only
1203	* need it for this cycle. If the server is ever threaded, this needs to be
1204	* re-examined.
1205	*/
1206	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1207
1208	/**
1209	* Returns true if any of the heads for this
1210	* space is set. Returns false if all are blank - this is used
1211	* for empty space checking.
1212	*/
1213	static inline int
1214	have_head (int ax, int ay)
1215	{
1216	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1217	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1218	return 1;
1219
1220	return 0;
1221	}
1222
1223	/**
1224	* check_head is a bit simplistic version of update_space below.
1225	* basically, it only checks the that the head on space ax,ay at layer
1226	* needs to get sent - if so, it adds the data, sending the head
1227	* if needed, and returning 1. If this no data needs to get
1228	* sent, it returns zero.
1229	*/
1230	static int
1231	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1232	{
1233	short face_num;
1234
1235	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1236	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1237	else
1238	face_num = 0;
1239
1240	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1241	{
1242	sl << uint16 (face_num);
1243	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1244	esrv_send_face (&ns, face_num, 0);
1245
1246	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1247	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1248	return 1;
1249	}
1250
1251	return 0; /* No change */
1252	}
1253		920
1254	/**	921	/**
1255	* Removes the need to replicate the same code for each layer.	922	* Removes the need to replicate the same code for each layer.
1256	* this returns true if this space is now in fact different than	923	* this returns true if this space is now in fact different than
1257	* it was.	924	* it was.
1258	* sl is the socklist this data is going into.	925	* sl is the socklist this data is going into.
1259	* ns is the socket we are working on - all the info we care	926	* ns is the socket we are working on - all the info we care
1260	* about is in this socket structure, so now need not pass the	927	* about is in this socket structure, so now need not pass the
1261	* entire player object.	928	* entire player object.
1262	* mx and my are map coordinate offsets for map mp
1263	* sx and sy are the offsets into the socket structure that
1264	* holds the old values.
1265	* layer is the layer to update, with 2 being the floor and 0 the	929	* layer is the layer to update, with 2 being the floor and 0 the
1266	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	930	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1267	* take. Interesting to note that before this function, the map1 function	931	* take. Interesting to note that before this function, the map1 function
1268	* numbers the spaces differently - I think this was a leftover from	932	* numbers the spaces differently - I think this was a leftover from
1269	* the map command, where the faces stack up. Sinces that is no longer	933	* the map command, where the faces stack up. Sinces that is no longer
1270	* the case, it seems to make more sense to have these layer values	934	* the case, it seems to make more sense to have these layer values
1271	* actually match.	935	* actually match.
1272	*/	936	*/
1273	static int	937	static int
1274	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	938	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1275	{	939	{
1276	object *ob, *head;	940	object *ob = ms.faces_obj [layer];
1277	uint16 face_num;
1278	int bx, by, i;
1279
1280	/* If there is a multipart object stored away, treat that as more important.
1281	* If not, then do the normal processing.
1282	*/
1283	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1284
1285	/* Check to see if this head is part of the set of objects
1286	* we would normally send for this space. If so, then
1287	* don't use the head value. We need to do the check
1288	* here and not when setting up the heads[] value for two reasons -
1289	* 1) the heads[] values will get used even if the space is not visible.
1290	* 2) its possible the head is not on the same map as a part, and I'd
1291	* rather not need to do the map translation overhead.
1292	* 3) We need to do some extra checking to make sure that we will
1293	* otherwise send the image as this layer, eg, either it matches
1294	* the head value, or is not multipart.
1295	*/
1296	if (head && !head->more)
1297	{
1298	for (i = 0; i < MAP_LAYERS; i++)
1299	{
1300	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1301	if (!ob)
1302	continue;
1303
1304	if (ob->head)
1305	ob = ob->head;
1306
1307	if (ob == head)
1308	{
1309	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1310	head = NULL;
1311	break;
1312	}
1313	}
1314	}
1315
1316	ob = head;
1317	if (!ob)
1318	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1319		941
1320	/* If there is no object for this space, or if the face for the object	942	/* If there is no object for this space, or if the face for the object
1321	* is the blank face, set the face number to zero.	943	* is the blank face, set the face number to zero.
1322	* else if we have the stored head object for this space, that takes	944	* else if we have the stored head object for this space, that takes
1323	* precedence over the other object for this space.	945	* precedence over the other object for this space.
1324	* otherwise, we do special head processing	946	* otherwise, we do special head processing
1325	*/	947	*/
1326	if (!ob || ob->face == blank_face)	948	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1327	face_num = 0;
1328	else if (head)
1329	{
1330	/* if this is a head that had previously been stored */
1331	face_num = ob->face->number;
1332	}
1333	else
1334	{
1335	/* if the faces for the different parts of a multipart object
1336	* are the same, we only want to send the bottom right most
1337	* portion of the object. That info is in the tail_.. values
1338	* of the head. Note that for the head itself, ob->head will
1339	* be null, so we only do this block if we are working on
1340	* a tail piece.
1341	*/
1342
1343	/* tail_x and tail_y will only be set in the head object. If
1344	* this is the head object and these are set, we proceed
1345	* with logic to only send bottom right. Similarly, if
1346	* this is one of the more parts but the head has those values
1347	* set, we want to do the processing. There can be cases where
1348	* the head is not visible but one of its parts is, so we just
1349	* can always expect that ob->arch->tail_x will be true for all
1350	* object we may want to display.
1351	*/
1352	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1353	{
1354
1355	if (ob->head)
1356	head = ob->head;
1357	else
1358	head = ob;
1359
1360	/* Basically figure out where the offset is from where we are right
1361	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1362	* piece is from the head, and the tail is where the tail is from the
1363	* head. Note that bx and by will equal sx and sy if we are already working
1364	* on the bottom right corner. If ob is the head, the clone values
1365	* will be zero, so the right thing will still happen.
1366	*/
1367	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1368	by = sy + head->arch->tail_y - ob->arch->clone.y;
1369
1370	/* I don't think this can ever happen, but better to check for it just
1371	* in case.
1372	*/
1373	if (bx < sx || by < sy)
1374	{
1375	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1376	face_num = 0;
1377	}
1378	/* single part object, multipart object with non merged faces,
1379	* of multipart object already at lower right.
1380	*/
1381	else if (bx == sx && by == sy)
1382	{
1383	face_num = ob->face->number;
1384
1385	/* if this face matches one stored away, clear that one away.
1386	* this code relies on the fact that the map1 commands
1387	* goes from 2 down to 0.
1388	*/
1389	for (i = 0; i < MAP_LAYERS; i++)
1390	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1391	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1392	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1393	}
1394	else
1395	{
1396	/* If this head is stored away, clear it - otherwise,
1397	* there can be cases where a object is on multiple layers -
1398	* we only want to send it once.
1399	*/
1400	face_num = head->face->number;
1401	for (i = 0; i < MAP_LAYERS; i++)
1402	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1403	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1404	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1405
1406	/* First, try to put the new head on the same layer. If that is used up,
1407	* then find another layer.
1408	*/
1409	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1410	{
1411	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1412	}
1413	else
1414	for (i = 0; i < MAX_LAYERS; i++)
1415	{
1416	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1417	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1418	{
1419	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1420	}
1421	}
1422	face_num = 0; /* Don't send this object - we'll send the head later */
1423	}
1424	}
1425	else
1426	{
1427	/* In this case, we are already at the lower right or single part object,
1428	* so nothing special
1429	*/
1430	face_num = ob->face->number;
1431
1432	/* clear out any head entries that have the same face as this one */
1433	for (bx = 0; bx < layer; bx++)
1434	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1435	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1436	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1437	}
1438	} /* else not already head object or blank face */
1439
1440	/* This is a real hack. Basically, if we have nothing to send for this layer,
1441	* but there is a head on the next layer, send that instead.
1442	* Without this, what happens is you can get the case where the player stands
1443	* on the same space as the head. However, if you have overlapping big objects
1444	* of the same type, what happens then is it doesn't think it needs to send
1445	* This tends to make stacking also work/look better.
1446	*/
1447	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1448	{
1449	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1450	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1451	}
1452
1453	/* Another hack - because of heads and whatnot, this face may match one
1454	* we already sent for a lower layer. In that case, don't send
1455	* this one.
1456	*/
1457	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1458	face_num = 0;
1459		949
1460	/* We've gotten what face we want to use for the object. Now see if	950	/* We've gotten what face we want to use for the object. Now see if
1461	* if it has changed since we last sent it to the client.	951	* if it has changed since we last sent it to the client.
1462	*/	952	*/
1463	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	953	if (lastcell.faces[layer] != face_num)
1464	{	954	{
1465	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	955	lastcell.faces[layer] = face_num;
		956
1466	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	957	if (!ns.faces_sent[face_num])
		958	if (ob)
		959	ns.send_faces (ob);
		960	else
1467	esrv_send_face (&ns, face_num, 0);	961	ns.send_face (face_num);
1468		962
1469	sl << uint16 (face_num);	963	sl << uint16 (face_num);
1470	return 1;
1471	}
1472
1473	/* Nothing changed */
1474	return 0;
1475	}
1476
1477	/**
1478	* This function is mainly a copy of update_space,
1479	* except it handles update of the smoothing updates,
1480	* not the face updates.
1481	* Removes the need to replicate the same code for each layer.
1482	* this returns true if this smooth is now in fact different
1483	* than it was.
1484	* sl is the socklist this data is going into.
1485	* ns is the socket we are working on - all the info we care
1486	* about is in this socket structure, so know need to pass the
1487	* entire player object.
1488	* mx and my are map coordinate offsets for map mp
1489	* sx and sy are the offsets into the socket structure that
1490	* holds the old values.
1491	* layer is the layer to update, with 2 being the floor and 0 the
1492	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1493	* take.
1494	*/
1495
1496	static inline int
1497	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1498	{
1499	object *ob;
1500	int smoothlevel; /* old face_num; */
1501
1502	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1503
1504	/* If there is no object for this space, or if the face for the object
1505	* is the blank face, set the smoothlevel to zero.
1506	*/
1507	if (!ob || ob->face == blank_face)
1508	smoothlevel = 0;
1509	else
1510	{
1511	smoothlevel = ob->smoothlevel;
1512	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1513	SendSmooth (&ns, ob->face->number);
1514	} /* else not already head object or blank face */
1515
1516	/* We've gotten what face we want to use for the object. Now see if
1517	* if it has changed since we last sent it to the client.
1518	*/
1519	if (smoothlevel > 255)
1520	smoothlevel = 255;
1521	else if (smoothlevel < 0)
1522	smoothlevel = 0;
1523
1524	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1525	{
1526	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1527	sl << uint8 (smoothlevel);
1528	return 1;	964	return 1;
1529	}	965	}
1530		966
1531	/* Nothing changed */	967	/* Nothing changed */
1532	return 0;	968	return 0;
…		…
1549	}	985	}
1550		986
1551	return result;	987	return result;
1552	}	988	}
1553		989
		990	// prefetch (and touch) all maps within a specific distancd
		991	static void
		992	prefetch_surrounding_maps (maptile *map, int distance)
		993	{
		994	map->last_access = runtime;
		995
		996	if (--distance)
		997	for (int dir = 4; --dir; )
		998	if (const shstr &path = map->tile_path [dir])
		999	if (maptile *&neigh = map->tile_map [dir])
		1000	prefetch_surrounding_maps (neigh, distance);
		1001	else
		1002	neigh = maptile::find_async (path, map);
		1003	}
		1004
		1005	// prefetch a generous area around the player
		1006	static void
		1007	prefetch_surrounding_maps (object *op)
		1008	{
		1009	prefetch_surrounding_maps (op->map, 3);
		1010	}
		1011
1554	/**	1012	/**
1555	* This function uses the new map1 protocol command to send the map	1013	* Draws client map.
1556	* to the client. It is necessary because the old map command supports
1557	* a maximum map size of 15x15.
1558	* This function is much simpler than the old one. This is because
1559	* the old function optimized to send as few face identifiers as possible,
1560	* at the expense of sending more coordinate location (coordinates were
1561	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1562	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1563	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1564	* and use the other 4 bits for other informatiion. For full documentation
1565	* of what we send, see the doc/Protocol file.
1566	* I will describe internally what we do:
1567	* the ns->lastmap shows how the map last looked when sent to the client.
1568	* in the lastmap structure, there is a cells array, which is set to the
1569	* maximum viewable size (As set in config.h).
1570	* in the cells, there are faces and a count value.
1571	* we use the count value to hold the darkness value. If -1, then this space
1572	* is not viewable.
1573	* we use faces[0] faces[1] faces[2] to hold what the three layers
1574	* look like.
1575	*/	1014	*/
1576	void	1015	void
1577	draw_client_map1 (object *pl)	1016	draw_client_map (player *pl)
1578	{	1017	{
		1018	object *ob = pl->observe;
		1019	if (!ob->active)
		1020	return;
		1021
		1022	maptile *plmap = ob->map;
		1023
		1024	/* If player is just joining the game, he isn't here yet, so the map
		1025	* can get swapped out. If so, don't try to send them a map. All will
		1026	* be OK once they really log in.
		1027	*/
		1028	if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
		1029	return;
		1030
1579	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1031	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1580	sint16 nx, ny;	1032	sint16 nx, ny;
1581	int estartlen, eoldlen;	1033	int estartlen, eoldlen;
1582	uint16 mask, emask;
1583	uint8 eentrysize;	1034	uint8 eentrysize;
1584	uint16 ewhatstart, ewhatflag;	1035	uint16 ewhatstart, ewhatflag;
1585	uint8 extendedinfos;	1036	uint8 extendedinfos;
1586	maptile *m;	1037	maptile *m;
1587		1038
		1039	check_map_change (pl);
		1040	prefetch_surrounding_maps (pl->ob);
		1041
		1042	/* do LOS after calls to update_position */
		1043	if (ob != pl->ob)
		1044	clear_los (pl);
		1045	else if (pl->do_los)
		1046	{
		1047	update_los (ob);
		1048	pl->do_los = 0;
		1049	}
		1050
		1051	/**
		1052	* This function uses the new map1 protocol command to send the map
		1053	* to the client. It is necessary because the old map command supports
		1054	* a maximum map size of 15x15.
		1055	* This function is much simpler than the old one. This is because
		1056	* the old function optimized to send as few face identifiers as possible,
		1057	* at the expense of sending more coordinate location (coordinates were
		1058	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		1059	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		1060	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		1061	* and use the other 4 bits for other informatiion. For full documentation
		1062	* of what we send, see the doc/Protocol file.
		1063	* I will describe internally what we do:
		1064	* the ns->lastmap shows how the map last looked when sent to the client.
		1065	* in the lastmap structure, there is a cells array, which is set to the
		1066	* maximum viewable size (As set in config.h).
		1067	* in the cells, there are faces and a count value.
		1068	* we use the count value to hold the darkness value. If -1, then this space
		1069	* is not viewable.
		1070	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1071	* look like.
		1072	*/
		1073
1588	client &socket = *pl->contr->ns;	1074	client &socket = *pl->ns;
1589
1590	if (!pl->active)
1591	return;
1592
1593	check_map_change (pl->contr);
1594		1075
1595	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1076	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1596	packet esl;	1077	packet esl;
1597		1078
1598	startlen = sl.length ();	1079	startlen = sl.length ();
…		…
1613	<< uint8 (extendedinfos)	1094	<< uint8 (extendedinfos)
1614	<< uint8 (eentrysize);	1095	<< uint8 (eentrysize);
1615		1096
1616	estartlen = esl.length ();	1097	estartlen = esl.length ();
1617	}	1098	}
1618	else
1619	{
1620	/* suppress compiler warnings */
1621	ewhatstart = 0;
1622	ewhatflag = 0;
1623	estartlen = 0;
1624	}
1625
1626	/* Init data to zero */
1627	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1628		1099
1629	/* x,y are the real map locations. ax, ay are viewport relative	1100	/* x,y are the real map locations. ax, ay are viewport relative
1630	* locations.	1101	* locations.
1631	*/	1102	*/
1632	ay = 0;	1103	ay = 0;
1633		1104
1634	/* We could do this logic as conditionals in the if statement,	1105	/* We could do this logic as conditionals in the if statement,
1635	* but that started to get a bit messy to look at.	1106	* but that started to get a bit messy to look at.
1636	*/	1107	*/
1637	max_x = pl->x + (socket.mapx + 1) / 2;	1108	max_x = ob->x + (socket.mapx + 1) / 2;
1638	max_y = pl->y + (socket.mapy + 1) / 2;	1109	max_y = ob->y + (socket.mapy + 1) / 2;
1639		1110
1640	if (socket.mapmode == Map1aCmd)
1641	{
1642	max_x += MAX_HEAD_OFFSET;
1643	max_y += MAX_HEAD_OFFSET;
1644	}
1645
1646	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1111	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1647	{	1112	{
1648	ax = 0;	1113	ax = 0;
1649	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1114	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1650	{	1115	{
		1116	int emask, mask;
1651	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1117	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1652		1118
1653	/* If this space is out of the normal viewable area, we only check
1654	* the heads value ax or ay will only be greater than what
1655	* the client wants if using the map1a command - this is because
1656	* if the map1a command is not used, max_x and max_y will be
1657	* set to lower values.
1658	*/
1659	if (ax >= socket.mapx || ay >= socket.mapy)
1660	{
1661	int i, got_one;
1662
1663	oldlen = sl.length ();
1664
1665	sl << uint16 (mask);
1666
1667	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1668	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1669	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1670
1671	/* If all we are doing is sending 0 (blank) faces, we don't
1672	* actually need to send that - just the coordinates
1673	* with no faces tells the client to blank out the
1674	* space.
1675	*/
1676	got_one = 0;
1677	for (i = oldlen + 2; i < sl.length (); i++)
1678	if (sl[i])
1679	got_one = 1;
1680
1681	if (got_one && (mask & 0xf))
1682	sl[oldlen + 1] = mask & 0xff;
1683	else
1684	{ /*either all faces blank, either no face at all */
1685	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1686	sl.reset (oldlen + 2);
1687	else
1688	sl.reset (oldlen);
1689	}
1690
1691	/*What concerns extendinfos, nothing to be done for now
1692	* (perhaps effects layer later)
1693	*/
1694	continue; /* don't do processing below */
1695	}
1696
1697	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1119	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1698
1699	d = pl->contr->blocked_los[ax][ay];
1700		1120
1701	/* If the coordinates are not valid, or it is too dark to see,	1121	/* If the coordinates are not valid, or it is too dark to see,
1702	* we tell the client as such	1122	* we tell the client as such
1703	*/	1123	*/
1704	nx = x;	1124	nx = x;
1705	ny = y;	1125	ny = y;
1706	m = get_map_from_coord (pl->map, &nx, &ny);	1126	m = get_map_from_coord (plmap, &nx, &ny);
1707		1127
1708	if (!m)	1128	if (!m)
1709	{	1129	{
1710	/* space is out of map. Update space and clear values	1130	/* space is out of map. Update space and clear values
1711	* if this hasn't already been done. If the space is out	1131	* if this hasn't already been done. If the space is out
1712	* of the map, it shouldn't have a head	1132	* of the map, it shouldn't have a head
1713	*/	1133	*/
1714	if (lastcell.count != -1)	1134	if (lastcell.count != -1)
1715	{	1135	{
1716	sl << uint16 (mask);	1136	sl << uint16 (mask);
1717	map_clearcell (&lastcell, 0, 0, 0, -1);	1137	map_clearcell (&lastcell, -1);
1718	}	1138	}
		1139
		1140	continue;
1719	}	1141	}
		1142
		1143	m->touch ();
		1144
		1145	int d = pl->blocked_los[ax][ay];
		1146
1720	else if (d > 3)	1147	if (d > 3)
1721	{	1148	{
1722	m->touch ();
1723		1149
1724	int need_send = 0, count;	1150	int need_send = 0, count;
1725		1151
1726	/* This block deals with spaces that are not visible for whatever	1152	/* This block deals with spaces that are not visible for whatever
1727	* reason. Still may need to send the head for this space.	1153	* reason. Still may need to send the head for this space.
1728	*/	1154	*/
1729		1155
1730	oldlen = sl.length ();	1156	oldlen = sl.length ();
1731		1157
1732	sl << uint16 (mask);	1158	sl << uint16 (mask);
…		…
1734	if (lastcell.count != -1)	1160	if (lastcell.count != -1)
1735	need_send = 1;	1161	need_send = 1;
1736		1162
1737	count = -1;	1163	count = -1;
1738		1164
1739	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1740	{
1741	/* Now check to see if any heads need to be sent */
1742
1743	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1744	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1745	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1746
1747	lastcell.count = count;
1748	}
1749	else
1750	{
1751	/* properly clear a previously sent big face */	1165	/* properly clear a previously sent big face */
1752	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1166	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1753	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1167	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1754	need_send = 1;	1168	need_send = 1;
1755		1169
1756	map_clearcell (&lastcell, 0, 0, 0, count);	1170	map_clearcell (&lastcell, count);
1757	}
1758		1171
1759	if ((mask & 0xf) || need_send)	1172	if ((mask & 0xf) || need_send)
1760	sl[oldlen + 1] = mask & 0xff;	1173	sl[oldlen + 1] = mask & 0xff;
1761	else	1174	else
1762	sl.reset (oldlen);	1175	sl.reset (oldlen);
1763	}	1176	}
1764	else	1177	else
1765	{	1178	{
1766	m->touch ();
1767
1768	/* In this block, the space is visible or there are head objects	1179	/* In this block, the space is visible.
1769	* we need to send.
1770	*/	1180	*/
1771		1181
1772	/* Rather than try to figure out what everything that we might	1182	/* Rather than try to figure out what everything that we might
1773	* need to send is, then form the packet after that,	1183	* need to send is, then form the packet after that,
1774	* we presume that we will in fact form a packet, and update	1184	* we presume that we will in fact form a packet, and update
…		…
1777	* is done.	1187	* is done.
1778	* I think this is simpler than doing a bunch of checks to see	1188	* I think this is simpler than doing a bunch of checks to see
1779	* what if anything we need to send, setting the bits, then	1189	* what if anything we need to send, setting the bits, then
1780	* doing those checks again to add the real data.	1190	* doing those checks again to add the real data.
1781	*/	1191	*/
1782	oldlen = sl.length ();	1192	oldlen = sl.length ();
1783	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1784	eoldlen = esl.length ();	1193	eoldlen = esl.length ();
1785	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1194
1786	sl << uint16 (mask);	1195	sl << uint16 (mask);
1787
1788	if (socket.ext_mapinfos)
1789	esl << uint16 (emask);
1790		1196
1791	unsigned char dummy;	1197	unsigned char dummy;
1792	unsigned char *last_ext = &dummy;	1198	unsigned char *last_ext = &dummy;
1793		1199
1794	/* Darkness changed */	1200	/* Darkness changed */
…		…
1806	sl << uint8 (255 - 64 * d);	1212	sl << uint8 (255 - 64 * d);
1807	}	1213	}
1808		1214
1809	lastcell.count = d;	1215	lastcell.count = d;
1810		1216
		1217	mapspace &ms = m->at (nx, ny);
		1218
1811	if (socket.extmap)	1219	if (socket.extmap)
1812	{	1220	{
1813	uint8 stat_hp = 0;	1221	uint8 stat_hp = 0;
1814	uint8 stat_width = 0;	1222	uint8 stat_width = 0;
1815	uint8 flags = 0;	1223	uint8 flags = 0;
1816	UUID player = 0;	1224	tag_t player = 0;
1817		1225
1818	// send hp information, if applicable	1226	// send hp information, if applicable
1819	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1227	if (object *op = ms.faces_obj [0])
1820	{	1228	{
1821	if (op->head || op->invisible)	1229	if (op->head || op->invisible)
1822	; // do not show	1230	; // do not show
1823	else if (op->type == PLAYER	1231	else if (op->type == PLAYER
1824	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1232	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1825	{	1233	{
1826	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)	1234	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1827	{	1235	{
1828	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1236	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1829	stat_width = op->arch->tail_x;	1237	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1830	}	1238	}
1831	}	1239	}
1832		1240
1833	if (op->msg && op->msg[0] == '@')	1241	if (op->msg && op->msg[0] == '@')
1834	flags |= 1;	1242	flags |= 1;
1835		1243
1836	if (op->type == PLAYER && op != pl)	1244	if (op->type == PLAYER && op != ob)
1837	player = op->count;	1245	player = op->count;
1838	}	1246	}
1839		1247
1840	if (lastcell.stat_hp != stat_hp)	1248	if (lastcell.stat_hp != stat_hp)
1841	{	1249	{
…		…
1862		1270
1863	mask |= 0x8;	1271	mask |= 0x8;
1864	*last_ext |= 0x80;	1272	*last_ext |= 0x80;
1865	last_ext = &sl[sl.length ()];	1273	last_ext = &sl[sl.length ()];
1866		1274
1867	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1275	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1868	}	1276	}
1869		1277
1870	if (lastcell.flags != flags)	1278	if (lastcell.flags != flags)
1871	{	1279	{
1872	lastcell.flags = flags;	1280	lastcell.flags = flags;
…		…
1878	sl << uint8 (8) << uint8 (flags);	1286	sl << uint8 (8) << uint8 (flags);
1879	}	1287	}
1880	}	1288	}
1881		1289
1882	/* Floor face */	1290	/* Floor face */
1883	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1291	if (update_space (sl, socket, ms, lastcell, 2))
1884	mask |= 0x4;	1292	mask |= 0x4;
1885		1293
1886	if (socket.EMI_smooth)
1887	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1888	emask |= 0x4;
1889
1890	/* Middle face */	1294	/* Middle face */
1891	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1295	if (update_space (sl, socket, ms, lastcell, 1))
1892	mask |= 0x2;	1296	mask |= 0x2;
1893		1297
1894	if (socket.EMI_smooth)	1298	if (ms.player () == ob
1895	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1299	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1896	emask |= 0x2;
1897
1898	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1899	{	1300	{
		1301	// force player to be visible to himself if invisible
1900	if (lastcell.faces[0] != pl->face->number)	1302	if (lastcell.faces[0] != ob->face)
1901	{	1303	{
1902	lastcell.faces[0] = pl->face->number;	1304	lastcell.faces[0] = ob->face;
		1305
1903	mask |= 0x1;	1306	mask |= 0x1;
1904
1905	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1906	esrv_send_face (&socket, pl->face->number, 0);
1907
1908	sl << uint16 (pl->face->number);	1307	sl << uint16 (ob->face);
		1308
		1309	socket.send_faces (ob);
1909	}	1310	}
1910	}	1311	}
1911	else
1912	{
1913	/* Top face */	1312	/* Top face */
1914	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1313	else if (update_space (sl, socket, ms, lastcell, 0))
1915	mask |= 0x1;	1314	mask |= 0x1;
1916
1917	if (socket.EMI_smooth)
1918	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1919	emask |= 0x1;
1920	}
1921		1315
1922	/* Check to see if we are in fact sending anything for this	1316	/* Check to see if we are in fact sending anything for this
1923	* space by checking the mask. If so, update the mask.	1317	* space by checking the mask. If so, update the mask.
1924	* if not, reset the len to that from before adding the mask	1318	* if not, reset the len to that from before adding the mask
1925	* value, so we don't send those bits.	1319	* value, so we don't send those bits.
…		…
1927	if (mask & 0xf)	1321	if (mask & 0xf)
1928	sl[oldlen + 1] = mask & 0xff;	1322	sl[oldlen + 1] = mask & 0xff;
1929	else	1323	else
1930	sl.reset (oldlen);	1324	sl.reset (oldlen);
1931		1325
		1326	if (socket.ext_mapinfos)
		1327	esl << uint16 (emask);
		1328
		1329	if (socket.EMI_smooth)
		1330	{
		1331	for (int layer = 2+1; layer--; )
		1332	{
		1333	object *ob = ms.faces_obj [layer];
		1334
		1335	// If there is no object for this space, or if the face for the object
		1336	// is the blank face, set the smoothlevel to zero.
		1337	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1338
		1339	// We've gotten what face we want to use for the object. Now see if
		1340	// if it has changed since we last sent it to the client.
		1341	if (lastcell.smooth[layer] != smoothlevel)
		1342	{
		1343	lastcell.smooth[layer] = smoothlevel;
		1344	esl << uint8 (smoothlevel);
		1345	emask |= 1 << layer;
		1346	}
		1347	}
		1348
1932	if (emask & 0xf)	1349	if (emask & 0xf)
1933	esl[eoldlen + 1] = emask & 0xff;	1350	esl[eoldlen + 1] = emask & 0xff;
1934	else	1351	else
1935	esl.reset (eoldlen);	1352	esl.reset (eoldlen);
		1353	}
1936	} /* else this is a viewable space */	1354	} /* else this is a viewable space */
1937	} /* for x loop */	1355	} /* for x loop */
1938	} /* for y loop */	1356	} /* for y loop */
		1357
		1358	socket.flush_fx ();
1939		1359
1940	/* Verify that we in fact do need to send this */	1360	/* Verify that we in fact do need to send this */
1941	if (socket.ext_mapinfos)	1361	if (socket.ext_mapinfos)
1942	{	1362	{
1943	if (!(sl.length () > startlen || socket.sent_scroll))	1363	if (!(sl.length () > startlen || socket.sent_scroll))
1944	{	1364	{
1945	/* No map data will follow, so don't say the client	1365	/* No map data will follow, so don't say the client
1946	* it doesn't need draw!	1366	* it doesn't need draw!
1947	*/	1367	*/
1948	ewhatflag &= (~EMI_NOREDRAW);	1368	ewhatflag &= ~EMI_NOREDRAW;
1949	esl[ewhatstart + 1] = ewhatflag & 0xff;	1369	esl[ewhatstart + 1] = ewhatflag & 0xff;
1950	}	1370	}
1951		1371
1952	if (esl.length () > estartlen)	1372	if (esl.length () > estartlen)
1953	socket.send_packet (esl);	1373	socket.send_packet (esl);
…		…
1958	socket.send_packet (sl);	1378	socket.send_packet (sl);
1959	socket.sent_scroll = 0;	1379	socket.sent_scroll = 0;
1960	}	1380	}
1961	}	1381	}
1962		1382
1963	/**
1964	* Draws client map.
1965	*/
1966	void
1967	draw_client_map (object *pl)
1968	{
1969	int i, j;
1970	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1971	New_Face *face, *floor;
1972	New_Face *floor2;
1973	int d, mflags;
1974	struct Map newmap;
1975	maptile *m, *pm;
1976
1977	if (pl->type != PLAYER)
1978	{
1979	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1980	return;
1981	}
1982
1983	pm = pl->map;
1984
1985	/* If player is just joining the game, he isn't here yet, so the map
1986	* can get swapped out. If so, don't try to send them a map. All will
1987	* be OK once they really log in.
1988	*/
1989	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1990	return;
1991
1992	memset (&newmap, 0, sizeof (struct Map));
1993
1994	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1995	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1996	{
1997	ax = i;
1998	ay = j;
1999	m = pm;
2000	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2001
2002	if (mflags & P_OUT_OF_MAP)
2003	continue;
2004
2005	/* If a map is visible to the player, we don't want to swap it out
2006	* just to reload it. This should really call something like
2007	* swap_map, but this is much more efficient and 'good enough'
2008	*/
2009	if (mflags & P_NEW_MAP)
2010	m->timeout = 50;
2011	}
2012
2013	/* do LOS after calls to update_position */
2014	if (pl->contr->do_los)
2015	{
2016	update_los (pl);
2017	pl->contr->do_los = 0;
2018	}
2019
2020	/* Big maps need a different drawing mechanism to work */
2021	draw_client_map1 (pl);
2022	}
2023
2024
2025	/*****************************************************************************/	1383	/*****************************************************************************/
2026
2027	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1384	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2028
2029	/* a player. Of course, the client need to know the command to be able to */	1385	/* a player. Of course, the client need to know the command to be able to */
2030
2031	/* manage it ! */	1386	/* manage it ! */
2032
2033	/*****************************************************************************/	1387	/*****************************************************************************/
2034	void	1388	void
2035	send_plugin_custom_message (object *pl, char *buf)	1389	send_plugin_custom_message (object *pl, char *buf)
2036	{	1390	{
2037	pl->contr->ns->send_packet (buf);	1391	pl->contr->ns->send_packet (buf);
…		…
2159		1513
2160	/* appends the spell *spell to the Socklist we will send the data to. */	1514	/* appends the spell *spell to the Socklist we will send the data to. */
2161	static void	1515	static void
2162	append_spell (player *pl, packet &sl, object *spell)	1516	append_spell (player *pl, packet &sl, object *spell)
2163	{	1517	{
2164	int len, i, skill = 0;	1518	int i, skill = 0;
2165		1519
2166	if (!(spell->name))	1520	if (!(spell->name))
2167	{	1521	{
2168	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1522	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2169	return;	1523	return;
…		…
2181	if (!strcmp (spell->skill, skill_names[i]))	1535	if (!strcmp (spell->skill, skill_names[i]))
2182	{	1536	{
2183	skill = i + CS_STAT_SKILLINFO;	1537	skill = i + CS_STAT_SKILLINFO;
2184	break;	1538	break;
2185	}	1539	}
		1540	}
		1541
		1542	// spells better have a face
		1543	if (!spell->face)
		1544	{
		1545	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1546	spell->face = face_find ("burnout.x11", blank_face);
2186	}	1547	}
2187		1548
2188	/* send the current values */	1549	/* send the current values */
2189	sl << uint32 (spell->count)	1550	sl << uint32 (spell->count)
2190	<< uint16 (spell->level)	1551	<< uint16 (spell->level)
…		…
2192	<< uint16 (spell->last_sp)	1553	<< uint16 (spell->last_sp)
2193	<< uint16 (spell->last_grace)	1554	<< uint16 (spell->last_grace)
2194	<< uint16 (spell->last_eat)	1555	<< uint16 (spell->last_eat)
2195	<< uint8 (skill)	1556	<< uint8 (skill)
2196	<< uint32 (spell->path_attuned)	1557	<< uint32 (spell->path_attuned)
2197	<< uint32 (spell->face ? spell->face->number : 0)	1558	<< uint32 (spell->face)
2198	<< data8 (spell->name)	1559	<< data8 (spell->name)
2199	<< data16 (spell->msg);	1560	<< data16 (spell->msg);
2200	}	1561	}
2201		1562
2202	/**	1563	/**
…		…
2217		1578
2218	packet sl ("addspell");	1579	packet sl ("addspell");
2219		1580
2220	if (!spell)	1581	if (!spell)
2221	{	1582	{
2222	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1583	for (spell = pl->ob->inv; spell; spell = spell->below)
2223	{	1584	{
2224	/* were we to simply keep appending data here, we could exceed	1585	/* were we to simply keep appending data here, we could exceed
2225	* MAXSOCKBUF if the player has enough spells to add, we know that	1586	* MAXSOCKBUF if the player has enough spells to add, we know that
2226	* append_spells will always append 19 data bytes, plus 4 length	1587	* append_spells will always append 19 data bytes, plus 4 length
2227	* bytes and 3 strings (because that is the spec) so we need to	1588	* bytes and 3 strings (because that is the spec) so we need to

Diff Legend

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