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.56 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.112 by root, Sun Jul 1 05:00:20 2007 UTC

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

Diff Legend

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