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