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.46 by root, Tue Dec 19 05:12:52 2006 UTC vs.
Revision 1.83 by root, Mon Apr 2 18:04:47 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel	5	* Copyright (C) 2001 Mark Wedel
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program 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 2 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, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The author 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.
…		…
138	}	130	}
139		131
140	static void	132	static void
141	clear_map (player *pl)	133	clear_map (player *pl)
142	{	134	{
143	memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));	135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144		136
		137	pl->ns->force_newmap = false;
		138
145	if (pl->socket->newmapcmd == 1)	139	if (pl->ns->newmapcmd == 1)
146	pl->socket->send_packet ("newmap");	140	pl->ns->send_packet ("newmap");
147		141
148	pl->socket->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->socket;	149	client &socket = *pl->ns;
156	object *ob = pl->ob;	150	object *ob = pl->ob;
157	char buf[MAX_BUF]; /* eauugggh */	151	char buf[MAX_BUF]; /* eauugggh */
158		152
159	if (socket.current_map != ob->map)	153	if (socket.force_newmap)
160	{	154	{
		155	// force newmap is used for clients that do not redraw their map
		156	// after image uploads.
161	socket.current_map = ob->map;	157	socket.current_map = ob->map;
162
163	clear_map (pl);	158	clear_map (pl);
		159	}
		160	else if (socket.current_map != ob->map)
		161	{
		162	clear_map (pl);
		163	socket.current_map = ob->map;
164		164
165	if (socket.mapinfocmd)	165	if (socket.mapinfocmd)
166	{	166	{
167	if (ob->map && ob->map->path[0])	167	if (ob->map && ob->map->path[0])
168	{	168	{
…		…
176	flags |= 4;	176	flags |= 4;
177	if (ob->map->tile_path[3])	177	if (ob->map->tile_path[3])
178	flags |= 8;	178	flags |= 8;
179		179
180	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	180	snprintf (buf, MAX_BUF, "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);	181	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182	}	182	}
183	else	183	else
184	snprintf (buf, MAX_BUF, "mapinfo current");	184	snprintf (buf, MAX_BUF, "mapinfo current");
185		185
186	socket.send_packet (buf);	186	socket.send_packet (buf);
…		…
200	}	200	}
201	}	201	}
202		202
203	socket.current_x = ob->x;	203	socket.current_x = ob->x;
204	socket.current_y = ob->y;	204	socket.current_y = ob->y;
		205
		206	region *reg = ob->region ();
		207	if (socket.current_region != reg)
		208	{
		209	socket.current_region = reg;
		210	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		211	}
205	}	212	}
206		213
207	/**	214	/**
208	* RequestInfo is sort of a meta command. There is some specific	215	* RequestInfo is sort of a meta command. There is some specific
209	* request of information, but we call other functions to provide	216	* request of information, but we call other functions to provide
…		…
280	buf += 8;	287	buf += 8;
281		288
282	// initial map and its origin	289	// initial map and its origin
283	maptile *map = pl->ob->map;	290	maptile *map = pl->ob->map;
284	sint16 dx, dy;	291	sint16 dx, dy;
285	int mapx = pl->socket->mapx / 2 - pl->ob->x;	292	int mapx = pl->ns->mapx / 2 - pl->ob->x;
286	int mapy = pl->socket->mapy / 2 - pl->ob->y;	293	int mapy = pl->ns->mapy / 2 - pl->ob->y;
287	int max_distance = 8; // limit maximum path length to something generous	294	int max_distance = 8; // limit maximum path length to something generous
288		295
289	while (*buf && map && max_distance)	296	while (*buf && map && max_distance)
290	{	297	{
291	int dir = *buf++;	298	int dir = *buf++;
292		299
293	switch (dir)	300	switch (dir)
294	{	301	{
295	case '1':	302	case '1':
296	dx = 0;	303	dx = 0;
297	dy = -1;	304	dy = -1;
298	map = get_map_from_coord (map, &dx, &dy);	305	map = map->xy_find (dx, dy);
299	map && (mapy -= map->height);	306	map && (mapy -= map->height);
300	break;	307	break;
301	case '2':	308	case '2':
302	mapx += map->width;	309	mapx += map->width;
303	dx = map->width;	310	dx = map->width;
304	dy = 0;	311	dy = 0;
305	map = get_map_from_coord (map, &dx, &dy);	312	map = map->xy_find (dx, dy);
306	break;	313	break;
307	case '3':	314	case '3':
308	mapy += map->height;	315	mapy += map->height;
309	dx = 0;	316	dx = 0;
310	dy = map->height;	317	dy = map->height;
311	map = get_map_from_coord (map, &dx, &dy);	318	map = map->xy_find (dx, dy);
312	break;	319	break;
313	case '4':	320	case '4':
314	dx = -1;	321	dx = -1;
315	dy = 0;	322	dy = 0;
316	map = get_map_from_coord (map, &dx, &dy);	323	map = map->xy_find (dx, dy);
317	map && (mapx -= map->width);	324	map && (mapx -= map->width);
318	break;	325	break;
319	}	326	}
320		327
321	--max_distance;	328	--max_distance;
322	}	329	}
323		330
…		…
334	if (map->tile_path[2])	341	if (map->tile_path[2])
335	flags |= 4;	342	flags |= 4;
336	if (map->tile_path[3])	343	if (map->tile_path[3])
337	flags |= 8;	344	flags |= 8;
338		345
339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);	346	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340	}	347	}
341	else	348	else
342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	349	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343	}	350	}
344	else	351	else
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	352	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346		353
347	pl->socket->send_packet (bigbuf);	354	pl->ns->send_packet (bigbuf);
348	}	355	}
349		356
350	/** This is the Setup cmd - easy first implementation */	357	/** This is the Setup cmd */
351	void	358	void
352	SetUp (char *buf, int len, client * ns)	359	SetUp (char *buf, int len, client * ns)
353	{	360	{
354	int s, slen;	361	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	}	362	}
564		363
565	/**	364	/**
566	* The client has requested to be added to the game.	365	* 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.	366	* 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,	367	* 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.	368	* it either has to be here or init_sockets needs to be exported.
570	*/	369	*/
571	void	370	void
572	AddMeCmd (char *buf, int len, client * ns)	371	AddMeCmd (char *buf, int len, client *ns)
573	{	372	{
574	if (ns->status != Ns_Add || add_player (ns))	373	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575	ns->send_packet ("addme_failed");
576	else
577	ns->send_packet ("addme_success");
578	}	374	}
579		375
580	/** Reply to ExtendedInfos command */	376	/** Reply to ExtendedInfos command */
581	void	377	void
582	ToggleExtendedInfos (char *buf, int len, client * ns)	378	ToggleExtendedInfos (char *buf, int len, client * ns)
…		…
692		488
693	ns->send_packet (cmdback);	489	ns->send_packet (cmdback);
694	}	490	}
695		491
696	/**	492	/**
697	* A lot like the old AskSmooth (in fact, now called by AskSmooth).	493	* client requested an image. send it rate-limited
698	* Basically, it makes no sense to wait for the client to request a	494	* before flushing.
699	* a piece of data from us that we know the client wants. So
700	* if we know the client wants it, might as well push it to the
701	* client.
702	*/
703	static void
704	SendSmooth (client *ns, uint16 face)
705	{
706	uint16 smoothface;
707
708	/* If we can't find a face, return and set it so we won't try to send this
709	* again.
710	*/	495	*/
711	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	496	void
712	{	497	AskFaceCmd (char *buf, int len, client *ns)
713		498	{
714	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);	499	ns->askface.push_back (atoi (buf));
715	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
716	return;
717	}
718
719	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
720	esrv_send_face (ns, smoothface, 0);
721
722	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
723
724	packet sl;
725
726	sl << "smooth "
727	<< uint16 (face)
728	<< uint16 (smoothface);
729
730	ns->send_packet (sl);
731	}	500	}
732		501
733	/**	502	/**
734	* Tells client the picture it has to use	503	* Tells client the picture it has to use
735	* to smooth a picture number given as argument.	504	* to smooth a picture number given as argument.
736	*/	505	*/
737	void	506	void
738	AskSmooth (char *buf, int len, client *ns)	507	AskSmooth (char *buf, int len, client *ns)
739	{	508	{
740	SendSmooth (ns, atoi (buf));	509	ns->send_face (atoi (buf));
741	}	510	}
742		511
743	/**	512	/**
744	* This handles the general commands from the client (ie, north, fire, cast,	513	* This handles the general commands from the client (ie, north, fire, cast,
745	* etc.)	514	* etc.)
…		…
804	* commands.	573	* commands.
805	*/	574	*/
806	pl->count = 0;	575	pl->count = 0;
807		576
808	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	577	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
809	int time = FABS (pl->ob->speed) < 0.001	578	int time = fabs (pl->ob->speed) < 0.001
810	? time = MAX_TIME * 100	579	? time = MAX_TIME * 100
811	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	580	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
812		581
813	/* Send confirmation of command execution now */	582	/* Send confirmation of command execution now */
814	packet sl;	583	packet sl ("comc");
815	sl << "comc " << uint16 (cmdid) << uint32 (time);	584	sl << uint16 (cmdid) << uint32 (time);
816	pl->socket->send_packet (sl);	585	pl->ns->send_packet (sl);
817	}	586	}
818
819		587
820	/** This is a reply to a previous query. */	588	/** This is a reply to a previous query. */
821	void	589	void
822	ReplyCmd (char *buf, int len, player *pl)	590	ReplyCmd (char *buf, int len, client *ns)
823	{	591	{
		592	if (ns->state == ST_CUSTOM)
		593	{
		594	INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
		595	return;
		596	}
		597
		598	if (!ns->pl)
		599	return; //TODO: depends on the exact reply we are after
		600	//TODO: but right now, we always have a ns->pl
		601
		602	player *pl = ns->pl;
		603
824	/* This is to synthesize how the data would be stored if it	604	/* This is to synthesize how the data would be stored if it
825	* was normally entered. A bit of a hack, and should be cleaned up	605	* was normally entered. A bit of a hack, and should be cleaned up
826	* once all the X11 code is removed from the server.	606	* once all the X11 code is removed from the server.
827	*	607	*
828	* We pass 13 to many of the functions because this way they	608	* We pass 13 to many of the functions because this way they
…		…
831	*/	611	*/
832	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	612	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
833		613
834	/* this avoids any hacking here */	614	/* this avoids any hacking here */
835		615
836	switch (pl->state)	616	switch (ns->state)
837	{	617	{
838	case ST_PLAYING:	618	case ST_PLAYING:
839	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	619	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
840	break;	620	break;
841		621
842	case ST_PLAY_AGAIN:
843	/* We can check this for return value (2==quit). Maybe we
844	* should, and do something appropriate?
845	*/
846	receive_play_again (pl->ob, buf[0]);
847	break;
848
849	case ST_ROLL_STAT:
850	key_roll_stat (pl->ob, buf[0]);
851	break;
852
853	case ST_CHANGE_CLASS:	622	case ST_CHANGE_CLASS:
854
855	key_change_class (pl->ob, buf[0]);	623	key_change_class (pl->ob, buf[0]);
856	break;
857
858	case ST_CONFIRM_QUIT:
859	key_confirm_quit (pl->ob, buf[0]);
860	break;
861
862	case ST_CONFIGURE:
863	LOG (llevError, "In client input handling, but into configure state\n");
864	pl->state = ST_PLAYING;
865	break;
866
867	case ST_GET_NAME:
868	receive_player_name (pl->ob, 13);
869	break;
870
871	case ST_GET_PASSWORD:
872	case ST_CONFIRM_PASSWORD:
873	receive_player_password (pl->ob, 13);
874	break;	624	break;
875		625
876	case ST_GET_PARTY_PASSWORD: /* Get password for party */	626	case ST_GET_PARTY_PASSWORD: /* Get password for party */
877	receive_party_password (pl->ob, 13);	627	receive_party_password (pl->ob, 13);
878	break;	628	break;
879		629
880	default:	630	default:
881	LOG (llevError, "Unknown input state: %d\n", pl->state);	631	LOG (llevError, "Unknown input state: %d\n", ns->state);
882	}	632	}
883	}	633	}
884		634
885	/**	635	/**
886	* Client tells its version. If there is a mismatch, we close the	636	* Client tells its version. If there is a mismatch, we close the
…		…
901	ns->cs_version = atoi (buf);	651	ns->cs_version = atoi (buf);
902	ns->sc_version = ns->cs_version;	652	ns->sc_version = ns->cs_version;
903		653
904	LOG (llevDebug, "connection from client <%s>\n", buf);	654	LOG (llevDebug, "connection from client <%s>\n", buf);
905		655
906
907	//TODO: should log here just for statistics	656	//TODO: should log here just for statistics
908		657
909	//if (VERSION_CS != ns->cs_version)	658	//if (VERSION_CS != ns->cs_version)
910	// unchecked;	659	// unchecked;
911		660
…		…
936	{	685	{
937	ns->sound = atoi (buf);	686	ns->sound = atoi (buf);
938	}	687	}
939		688
940	/** client wants the map resent */	689	/** client wants the map resent */
941
942	void	690	void
943	MapRedrawCmd (char *buf, int len, player *pl)	691	MapRedrawCmd (char *buf, int len, player *pl)
944	{	692	{
945	/* This function is currently disabled; just clearing the map state results in	693	/* This function is currently disabled; just clearing the map state results in
946	* display errors. It should clear the cache and send a newmap command.	694	* display errors. It should clear the cache and send a newmap command.
…		…
991	/**	739	/**
992	* Asks the client to query the user. This way, the client knows	740	* Asks the client to query the user. This way, the client knows
993	* it needs to send something back (vs just printing out a message)	741	* it needs to send something back (vs just printing out a message)
994	*/	742	*/
995	void	743	void
996	send_query (client *ns, uint8 flags, char *text)	744	send_query (client *ns, uint8 flags, const char *text)
997	{	745	{
998	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	746	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
999	}	747	}
1000		748
1001	#define AddIfInt64(Old,New,Type) if (Old != New) {\	749	#define AddIfInt64(Old,New,Type) if (Old != New) {\
…		…
1033	esrv_update_stats (player *pl)	781	esrv_update_stats (player *pl)
1034	{	782	{
1035	char buf[MAX_BUF];	783	char buf[MAX_BUF];
1036	uint16 flags;	784	uint16 flags;
1037		785
1038	packet sl;	786	client *ns = pl->ns;
1039	sl << "stats ";	787	if (!ns)
		788	return;
1040		789
		790	object *ob = pl->ob;
1041	if (pl->ob)	791	if (!ob)
1042	{	792	return;
		793
		794	packet sl ("stats");
		795
1043	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	796	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1044	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	797	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1045	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	798	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1046	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	799	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1047	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	800	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1048	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	801	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1049	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	802	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1050	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1051	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1052	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1053	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	803	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1054	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	804	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		805	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		806	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		807	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1055	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	808	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1056	}
1057		809
1058	if (pl->socket->exp64)
1059	for (int s = 0; s < NUM_SKILLS; s++)	810	for (int s = 0; s < NUM_SKILLS; s++)
1060	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	811	if (object *skill = pl->last_skill_ob[s])
		812	if (skill->stats.exp != ns->last_skill_exp [s])
1061	{	813	{
		814	ns->last_skill_exp [s] = skill->stats.exp;
		815
1062	/* Always send along the level if exp changes. This is only	816	/* Always send along the level if exp changes. This is only
1063	* 1 extra byte, but keeps processing simpler.	817	* 1 extra byte, but keeps processing simpler.
1064	*/	818	*/
1065	sl << uint8 (s + CS_STAT_SKILLINFO)	819	sl << uint8 (s + CS_STAT_SKILLINFO)
1066	<< uint8 (pl->last_skill_ob[s]->level)	820	<< uint8 (skill->level)
1067	<< uint64 (pl->last_skill_ob[s]->stats.exp);	821	<< uint64 (skill->stats.exp);
1068
1069	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1070	}	822	}
1071		823
1072	if (pl->socket->exp64)
1073	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	824	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1074	else
1075	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1076
1077	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	825	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1078	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	826	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1079	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	827	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1080	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	828	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1081	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	829	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1082	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	830	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1083	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	831	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1084	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	832	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		833
1085	flags = 0;	834	flags = 0;
1086		835
1087	if (pl->fire_on)	836	if (pl->fire_on)
1088	flags |= SF_FIREON;	837	flags |= SF_FIREON;
1089		838
1090	if (pl->run_on)	839	if (pl->run_on)
1091	flags |= SF_RUNON;	840	flags |= SF_RUNON;
1092		841
1093	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	842	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1094		843
1095	if (pl->socket->sc_version < 1025)	844	if (ns->sc_version < 1025)
1096	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	845	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1097	else	846	else
1098	for (int i = 0; i < NROFATTACKS; i++)	847	for (int i = 0; i < NROFATTACKS; i++)
1099	{	848	{
1100	/* Skip ones we won't send */	849	/* Skip ones we won't send */
1101	if (atnr_cs_stat[i] == -1)	850	if (atnr_cs_stat[i] == -1)
1102	continue;	851	continue;
1103		852
1104	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	853	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1105	}	854	}
1106		855
1107	if (pl->socket->monitor_spells)	856	if (pl->ns->monitor_spells)
1108	{	857	{
1109	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	858	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1110	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	859	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1111	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	860	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1112	}	861	}
1113		862
1114	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	863	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1115	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	864	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1116	set_title (pl->ob, buf);	865	set_title (ob, buf);
1117	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	866	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1118		867
1119	/* Only send it away if we have some actual data */	868	/* Only send it away if we have some actual data */
1120	if (sl.length () > 6)	869	if (sl.length () > 6)
1121	pl->socket->send_packet (sl);	870	ns->send_packet (sl);
1122	}	871	}
1123		872
1124	/**	873	/**
1125	* Tells the client that here is a player it should start using.	874	* Tells the client that here is a player it should start using.
1126	*/	875	*/
1127	void	876	void
1128	esrv_new_player (player *pl, uint32 weight)	877	esrv_new_player (player *pl, uint32 weight)
1129	{	878	{
1130	pl->last_weight = weight;	879	packet sl ("player");
1131
1132	packet sl;
1133	sl << "player ";
1134		880
1135	sl << uint32 (pl->ob->count)	881	sl << uint32 (pl->ob->count)
1136	<< uint32 (weight)	882	<< uint32 (weight)
1137	<< uint32 (pl->ob->face->number)	883	<< uint32 (pl->ob->face)
1138	<< data8 (pl->ob->name);	884	<< data8 (pl->ob->name);
1139		885
		886	pl->ns->last_weight = weight;
1140	pl->socket->send_packet (sl);	887	pl->ns->send_packet (sl);
1141	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	888	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1142	}	889	}
1143
1144	/**
1145	* Need to send an animation sequence to the client.
1146	* We will send appropriate face commands to the client if we haven't
1147	* sent them the face yet (this can become quite costly in terms of
1148	* how much we are sending - on the other hand, this should only happen
1149	* when the player logs in and picks stuff up.
1150	*/
1151	void
1152	esrv_send_animation (client * ns, short anim_num)
1153	{
1154	/* Do some checking on the anim_num we got. Note that the animations
1155	* are added in contigous order, so if the number is in the valid
1156	* range, it must be a valid animation.
1157	*/
1158	if (anim_num < 0 || anim_num > num_animations)
1159	{
1160	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1161	return;
1162	}
1163
1164	packet sl;
1165
1166	sl << "anim "
1167	<< uint16 (anim_num)
1168	<< uint16 (0); /* flags - not used right now */
1169
1170	/* Build up the list of faces. Also, send any information (ie, the
1171	* the face itself) down to the client.
1172	*/
1173	for (int i = 0; i < animations[anim_num].num_animations; i++)
1174	{
1175	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1176	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1177
1178	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1179	}
1180
1181	ns->send_packet (sl);
1182
1183	ns->anims_sent[anim_num] = 1;
1184	}
1185
1186		890
1187	/******************************************************************************	891	/******************************************************************************
1188	*	892	*
1189	* Start of map related commands.	893	* Start of map related commands.
1190	*	894	*
1191	******************************************************************************/	895	******************************************************************************/
1192		896
1193	/**
1194	* This adds face_num to a map cell at x,y. If the client doesn't have
1195	* the face yet, we will also send it.
1196	*/
1197	static void
1198	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1199	{
1200	if (newmap->cells[x][y].count >= MAP_LAYERS)
1201	{
1202	//TODO: one or the other, can't both have abort and return, verify and act
1203	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1204	return;
1205	abort ();
1206	}
1207
1208	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1209	newmap->cells[x][y].count++;
1210
1211	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1212	esrv_send_face (ns, face_num, 0);
1213	}
1214
1215	/** Clears a map cell */	897	/** Clears a map cell */
1216	static void	898	static void
1217	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	899	map_clearcell (struct MapCell *cell, int count)
1218	{	900	{
1219	cell->faces[0] = face0;	901	cell->faces[0] = 0;
1220	cell->faces[1] = face1;	902	cell->faces[1] = 0;
1221	cell->faces[2] = face2;	903	cell->faces[2] = 0;
		904	cell->smooth[0] = 0;
		905	cell->smooth[1] = 0;
		906	cell->smooth[2] = 0;
1222	cell->count = count;	907	cell->count = count;
1223	cell->stat_hp = 0;	908	cell->stat_hp = 0;
1224	cell->flags = 0;	909	cell->flags = 0;
1225	cell->player = 0;	910	cell->player = 0;
1226	}	911	}
1227		912
1228	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1229	#define MAX_LAYERS 3	913	#define MAX_LAYERS 3
1230
1231	/* Using a global really isn't a good approach, but saves the over head of
1232	* allocating and deallocating such a block of data each time run through,
1233	* and saves the space of allocating this in the socket object when we only
1234	* need it for this cycle. If the server is ever threaded, this needs to be
1235	* re-examined.
1236	*/
1237	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1238
1239	/**
1240	* Returns true if any of the heads for this
1241	* space is set. Returns false if all are blank - this is used
1242	* for empty space checking.
1243	*/
1244	static inline int
1245	have_head (int ax, int ay)
1246	{
1247	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1248	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1249	return 1;
1250
1251	return 0;
1252	}
1253
1254	/**
1255	* check_head is a bit simplistic version of update_space below.
1256	* basically, it only checks the that the head on space ax,ay at layer
1257	* needs to get sent - if so, it adds the data, sending the head
1258	* if needed, and returning 1. If this no data needs to get
1259	* sent, it returns zero.
1260	*/
1261	static int
1262	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1263	{
1264	short face_num;
1265
1266	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1267	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1268	else
1269	face_num = 0;
1270
1271	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1272	{
1273	sl << uint16 (face_num);
1274	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1275	esrv_send_face (&ns, face_num, 0);
1276
1277	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1278	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1279	return 1;
1280	}
1281
1282	return 0; /* No change */
1283	}
1284		914
1285	/**	915	/**
1286	* Removes the need to replicate the same code for each layer.	916	* Removes the need to replicate the same code for each layer.
1287	* this returns true if this space is now in fact different than	917	* this returns true if this space is now in fact different than
1288	* it was.	918	* it was.
1289	* sl is the socklist this data is going into.	919	* sl is the socklist this data is going into.
1290	* ns is the socket we are working on - all the info we care	920	* ns is the socket we are working on - all the info we care
1291	* about is in this socket structure, so now need not pass the	921	* about is in this socket structure, so now need not pass the
1292	* entire player object.	922	* entire player object.
1293	* mx and my are map coordinate offsets for map mp
1294	* sx and sy are the offsets into the socket structure that
1295	* holds the old values.
1296	* layer is the layer to update, with 2 being the floor and 0 the	923	* layer is the layer to update, with 2 being the floor and 0 the
1297	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	924	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1298	* take. Interesting to note that before this function, the map1 function	925	* take. Interesting to note that before this function, the map1 function
1299	* numbers the spaces differently - I think this was a leftover from	926	* numbers the spaces differently - I think this was a leftover from
1300	* the map command, where the faces stack up. Sinces that is no longer	927	* the map command, where the faces stack up. Sinces that is no longer
1301	* the case, it seems to make more sense to have these layer values	928	* the case, it seems to make more sense to have these layer values
1302	* actually match.	929	* actually match.
1303	*/	930	*/
1304	static int	931	static int
1305	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	932	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1306	{	933	{
1307	object *ob, *head;	934	object *ob = ms.faces_obj [layer];
1308	uint16 face_num;
1309	int bx, by, i;
1310
1311	/* If there is a multipart object stored away, treat that as more important.
1312	* If not, then do the normal processing.
1313	*/
1314	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1315
1316	/* Check to see if this head is part of the set of objects
1317	* we would normally send for this space. If so, then
1318	* don't use the head value. We need to do the check
1319	* here and not when setting up the heads[] value for two reasons -
1320	* 1) the heads[] values will get used even if the space is not visible.
1321	* 2) its possible the head is not on the same map as a part, and I'd
1322	* rather not need to do the map translation overhead.
1323	* 3) We need to do some extra checking to make sure that we will
1324	* otherwise send the image as this layer, eg, either it matches
1325	* the head value, or is not multipart.
1326	*/
1327	if (head && !head->more)
1328	{
1329	for (i = 0; i < MAP_LAYERS; i++)
1330	{
1331	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1332	if (!ob)
1333	continue;
1334
1335	if (ob->head)
1336	ob = ob->head;
1337
1338	if (ob == head)
1339	{
1340	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1341	head = NULL;
1342	break;
1343	}
1344	}
1345	}
1346
1347	ob = head;
1348	if (!ob)
1349	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1350		935
1351	/* If there is no object for this space, or if the face for the object	936	/* If there is no object for this space, or if the face for the object
1352	* is the blank face, set the face number to zero.	937	* is the blank face, set the face number to zero.
1353	* else if we have the stored head object for this space, that takes	938	* else if we have the stored head object for this space, that takes
1354	* precedence over the other object for this space.	939	* precedence over the other object for this space.
1355	* otherwise, we do special head processing	940	* otherwise, we do special head processing
1356	*/	941	*/
1357	if (!ob || ob->face == blank_face)	942	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1358	face_num = 0;
1359	else if (head)
1360	{
1361	/* if this is a head that had previously been stored */
1362	face_num = ob->face->number;
1363	}
1364	else
1365	{
1366	/* if the faces for the different parts of a multipart object
1367	* are the same, we only want to send the bottom right most
1368	* portion of the object. That info is in the tail_.. values
1369	* of the head. Note that for the head itself, ob->head will
1370	* be null, so we only do this block if we are working on
1371	* a tail piece.
1372	*/
1373
1374	/* tail_x and tail_y will only be set in the head object. If
1375	* this is the head object and these are set, we proceed
1376	* with logic to only send bottom right. Similarly, if
1377	* this is one of the more parts but the head has those values
1378	* set, we want to do the processing. There can be cases where
1379	* the head is not visible but one of its parts is, so we just
1380	* can always expect that ob->arch->tail_x will be true for all
1381	* object we may want to display.
1382	*/
1383	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1384	{
1385
1386	if (ob->head)
1387	head = ob->head;
1388	else
1389	head = ob;
1390
1391	/* Basically figure out where the offset is from where we are right
1392	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1393	* piece is from the head, and the tail is where the tail is from the
1394	* head. Note that bx and by will equal sx and sy if we are already working
1395	* on the bottom right corner. If ob is the head, the clone values
1396	* will be zero, so the right thing will still happen.
1397	*/
1398	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1399	by = sy + head->arch->tail_y - ob->arch->clone.y;
1400
1401	/* I don't think this can ever happen, but better to check for it just
1402	* in case.
1403	*/
1404	if (bx < sx || by < sy)
1405	{
1406	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1407	face_num = 0;
1408	}
1409	/* single part object, multipart object with non merged faces,
1410	* of multipart object already at lower right.
1411	*/
1412	else if (bx == sx && by == sy)
1413	{
1414	face_num = ob->face->number;
1415
1416	/* if this face matches one stored away, clear that one away.
1417	* this code relies on the fact that the map1 commands
1418	* goes from 2 down to 0.
1419	*/
1420	for (i = 0; i < MAP_LAYERS; i++)
1421	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1422	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1423	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1424	}
1425	else
1426	{
1427	/* If this head is stored away, clear it - otherwise,
1428	* there can be cases where a object is on multiple layers -
1429	* we only want to send it once.
1430	*/
1431	face_num = head->face->number;
1432	for (i = 0; i < MAP_LAYERS; i++)
1433	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1434	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1435	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1436
1437	/* First, try to put the new head on the same layer. If that is used up,
1438	* then find another layer.
1439	*/
1440	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1441	{
1442	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1443	}
1444	else
1445	for (i = 0; i < MAX_LAYERS; i++)
1446	{
1447	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1448	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1449	{
1450	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1451	}
1452	}
1453	face_num = 0; /* Don't send this object - we'll send the head later */
1454	}
1455	}
1456	else
1457	{
1458	/* In this case, we are already at the lower right or single part object,
1459	* so nothing special
1460	*/
1461	face_num = ob->face->number;
1462
1463	/* clear out any head entries that have the same face as this one */
1464	for (bx = 0; bx < layer; bx++)
1465	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1466	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1467	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1468	}
1469	} /* else not already head object or blank face */
1470
1471	/* This is a real hack. Basically, if we have nothing to send for this layer,
1472	* but there is a head on the next layer, send that instead.
1473	* Without this, what happens is you can get the case where the player stands
1474	* on the same space as the head. However, if you have overlapping big objects
1475	* of the same type, what happens then is it doesn't think it needs to send
1476	* This tends to make stacking also work/look better.
1477	*/
1478	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1479	{
1480	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1481	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1482	}
1483
1484	/* Another hack - because of heads and whatnot, this face may match one
1485	* we already sent for a lower layer. In that case, don't send
1486	* this one.
1487	*/
1488	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1489	face_num = 0;
1490		943
1491	/* We've gotten what face we want to use for the object. Now see if	944	/* We've gotten what face we want to use for the object. Now see if
1492	* if it has changed since we last sent it to the client.	945	* if it has changed since we last sent it to the client.
1493	*/	946	*/
1494	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	947	if (lastcell.faces[layer] != face_num)
1495	{	948	{
1496	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	949	lastcell.faces[layer] = face_num;
		950
1497	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	951	if (!ns.faces_sent[face_num])
		952	if (ob)
		953	ns.send_faces (ob);
		954	else
1498	esrv_send_face (&ns, face_num, 0);	955	ns.send_face (face_num);
1499		956
1500	sl << uint16 (face_num);	957	sl << uint16 (face_num);
1501	return 1;
1502	}
1503
1504	/* Nothing changed */
1505	return 0;
1506	}
1507
1508	/**
1509	* This function is mainly a copy of update_space,
1510	* except it handles update of the smoothing updates,
1511	* not the face updates.
1512	* Removes the need to replicate the same code for each layer.
1513	* this returns true if this smooth is now in fact different
1514	* than it was.
1515	* sl is the socklist this data is going into.
1516	* ns is the socket we are working on - all the info we care
1517	* about is in this socket structure, so know need to pass the
1518	* entire player object.
1519	* mx and my are map coordinate offsets for map mp
1520	* sx and sy are the offsets into the socket structure that
1521	* holds the old values.
1522	* layer is the layer to update, with 2 being the floor and 0 the
1523	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1524	* take.
1525	*/
1526
1527	static inline int
1528	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1529	{
1530	object *ob;
1531	int smoothlevel; /* old face_num; */
1532
1533	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1534
1535	/* If there is no object for this space, or if the face for the object
1536	* is the blank face, set the smoothlevel to zero.
1537	*/
1538	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1539	smoothlevel = 0;
1540	else
1541	{
1542	smoothlevel = ob->smoothlevel;
1543	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1544	SendSmooth (&ns, ob->face->number);
1545	} /* else not already head object or blank face */
1546
1547	/* We've gotten what face we want to use for the object. Now see if
1548	* if it has changed since we last sent it to the client.
1549	*/
1550	if (smoothlevel > 255)
1551	smoothlevel = 255;
1552	else if (smoothlevel < 0)
1553	smoothlevel = 0;
1554
1555	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1556	{
1557	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1558	sl << uint8 (smoothlevel);
1559	return 1;	958	return 1;
1560	}	959	}
1561		960
1562	/* Nothing changed */	961	/* Nothing changed */
1563	return 0;	962	return 0;
…		…
1578	if (ns->EMI_smooth)	977	if (ns->EMI_smooth)
1579	result += 1; /*One byte for smoothlevel */	978	result += 1; /*One byte for smoothlevel */
1580	}	979	}
1581		980
1582	return result;	981	return result;
		982	}
		983
		984	// prefetch (and touch) all maps within a specific distancd
		985	static void
		986	prefetch_surrounding_maps (maptile *map, int distance)
		987	{
		988	map->last_access = runtime;
		989
		990	if (--distance)
		991	for (int dir = 4; --dir; )
		992	if (const shstr &path = map->tile_path [dir])
		993	if (maptile *&neigh = map->tile_map [dir])
		994	prefetch_surrounding_maps (neigh, distance);
		995	else
		996	neigh = maptile::find_async (path, map);
		997	}
		998
		999	// prefetch a generous area around the player
		1000	static void
		1001	prefetch_surrounding_maps (object *op)
		1002	{
		1003	prefetch_surrounding_maps (op->map, 3);
1583	}	1004	}
1584		1005
1585	/**	1006	/**
1586	* This function uses the new map1 protocol command to send the map	1007	* This function uses the new map1 protocol command to send the map
1587	* to the client. It is necessary because the old map command supports	1008	* to the client. It is necessary because the old map command supports
…		…
1593	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1014	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1594	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1015	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1595	* and use the other 4 bits for other informatiion. For full documentation	1016	* and use the other 4 bits for other informatiion. For full documentation
1596	* of what we send, see the doc/Protocol file.	1017	* of what we send, see the doc/Protocol file.
1597	* I will describe internally what we do:	1018	* I will describe internally what we do:
1598	* the socket->lastmap shows how the map last looked when sent to the client.	1019	* the ns->lastmap shows how the map last looked when sent to the client.
1599	* in the lastmap structure, there is a cells array, which is set to the	1020	* in the lastmap structure, there is a cells array, which is set to the
1600	* maximum viewable size (As set in config.h).	1021	* maximum viewable size (As set in config.h).
1601	* in the cells, there are faces and a count value.	1022	* in the cells, there are faces and a count value.
1602	* we use the count value to hold the darkness value. If -1, then this space	1023	* we use the count value to hold the darkness value. If -1, then this space
1603	* is not viewable.	1024	* is not viewable.
…		…
1605	* look like.	1026	* look like.
1606	*/	1027	*/
1607	void	1028	void
1608	draw_client_map1 (object *pl)	1029	draw_client_map1 (object *pl)
1609	{	1030	{
1610	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1031	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1611	sint16 nx, ny;	1032	sint16 nx, ny;
1612	int estartlen, eoldlen;	1033	int estartlen, eoldlen;
1613	uint16 mask, emask;
1614	uint8 eentrysize;	1034	uint8 eentrysize;
1615	uint16 ewhatstart, ewhatflag;	1035	uint16 ewhatstart, ewhatflag;
1616	uint8 extendedinfos;	1036	uint8 extendedinfos;
1617	maptile *m;	1037	maptile *m;
1618		1038
1619	client &socket = *pl->contr->socket;	1039	client &socket = *pl->contr->ns;
		1040
		1041	if (!pl->active)
		1042	return;
1620		1043
1621	check_map_change (pl->contr);	1044	check_map_change (pl->contr);
		1045	prefetch_surrounding_maps (pl);
1622		1046
1623	packet sl;	1047	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1624	packet esl;	1048	packet esl;
1625		1049
1626	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1627	startlen = sl.length ();	1050	startlen = sl.length ();
1628		1051
1629	/*Extendedmapinfo structure initialisation */	1052	/*Extendedmapinfo structure initialisation */
1630	if (socket.ext_mapinfos)	1053	if (socket.ext_mapinfos)
1631	{	1054	{
…		…
1642	<< uint8 (extendedinfos)	1065	<< uint8 (extendedinfos)
1643	<< uint8 (eentrysize);	1066	<< uint8 (eentrysize);
1644		1067
1645	estartlen = esl.length ();	1068	estartlen = esl.length ();
1646	}	1069	}
1647	else
1648	{
1649	/* suppress compiler warnings */
1650	ewhatstart = 0;
1651	ewhatflag = 0;
1652	estartlen = 0;
1653	}
1654
1655	/* Init data to zero */
1656	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1657		1070
1658	/* x,y are the real map locations. ax, ay are viewport relative	1071	/* x,y are the real map locations. ax, ay are viewport relative
1659	* locations.	1072	* locations.
1660	*/	1073	*/
1661	ay = 0;	1074	ay = 0;
…		…
1664	* but that started to get a bit messy to look at.	1077	* but that started to get a bit messy to look at.
1665	*/	1078	*/
1666	max_x = pl->x + (socket.mapx + 1) / 2;	1079	max_x = pl->x + (socket.mapx + 1) / 2;
1667	max_y = pl->y + (socket.mapy + 1) / 2;	1080	max_y = pl->y + (socket.mapy + 1) / 2;
1668		1081
1669	if (socket.mapmode == Map1aCmd)	1082	maptile *plmap = pl->map;
1670	{
1671	max_x += MAX_HEAD_OFFSET;
1672	max_y += MAX_HEAD_OFFSET;
1673	}
1674		1083
1675	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1084	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1676	{	1085	{
1677	ax = 0;	1086	ax = 0;
1678	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1087	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1679	{	1088	{
1680		1089	int emask, mask;
1681	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1090	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1682		1091
1683	/* If this space is out of the normal viewable area, we only check
1684	* the heads value ax or ay will only be greater than what
1685	* the client wants if using the map1a command - this is because
1686	* if the map1a command is not used, max_x and max_y will be
1687	* set to lower values.
1688	*/
1689	if (ax >= socket.mapx || ay >= socket.mapy)
1690	{
1691	int i, got_one;
1692
1693	oldlen = sl.length ();
1694
1695	sl << uint16 (mask);
1696
1697	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1698	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1699	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1700
1701	/* If all we are doing is sending 0 (blank) faces, we don't
1702	* actually need to send that - just the coordinates
1703	* with no faces tells the client to blank out the
1704	* space.
1705	*/
1706	got_one = 0;
1707	for (i = oldlen + 2; i < sl.length (); i++)
1708	if (sl[i])
1709	got_one = 1;
1710
1711	if (got_one && (mask & 0xf))
1712	sl[oldlen + 1] = mask & 0xff;
1713	else
1714	{ /*either all faces blank, either no face at all */
1715	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1716	sl.reset (oldlen + 2);
1717	else
1718	sl.reset (oldlen);
1719	}
1720
1721	/*What concerns extendinfos, nothing to be done for now
1722	* (perhaps effects layer later)
1723	*/
1724	continue; /* don't do processing below */
1725	}
1726
1727	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1092	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1728
1729	d = pl->contr->blocked_los[ax][ay];
1730		1093
1731	/* If the coordinates are not valid, or it is too dark to see,	1094	/* If the coordinates are not valid, or it is too dark to see,
1732	* we tell the client as such	1095	* we tell the client as such
1733	*/	1096	*/
1734	nx = x;	1097	nx = x;
1735	ny = y;	1098	ny = y;
1736	m = get_map_from_coord (pl->map, &nx, &ny);	1099	m = get_map_from_coord (plmap, &nx, &ny);
1737		1100
1738	if (!m)	1101	if (!m)
1739	{	1102	{
1740	/* space is out of map. Update space and clear values	1103	/* space is out of map. Update space and clear values
1741	* if this hasn't already been done. If the space is out	1104	* if this hasn't already been done. If the space is out
1742	* of the map, it shouldn't have a head	1105	* of the map, it shouldn't have a head
1743	*/	1106	*/
1744	if (lastcell.count != -1)	1107	if (lastcell.count != -1)
1745	{	1108	{
1746	sl << uint16 (mask);	1109	sl << uint16 (mask);
1747	map_clearcell (&lastcell, 0, 0, 0, -1);	1110	map_clearcell (&lastcell, -1);
1748	}	1111	}
		1112
		1113	continue;
1749	}	1114	}
		1115
		1116	m->touch ();
		1117
		1118	int d = pl->contr->blocked_los[ax][ay];
		1119
1750	else if (d > 3)	1120	if (d > 3)
1751	{	1121	{
		1122
1752	int need_send = 0, count;	1123	int need_send = 0, count;
1753		1124
1754	/* This block deals with spaces that are not visible for whatever	1125	/* This block deals with spaces that are not visible for whatever
1755	* reason. Still may need to send the head for this space.	1126	* reason. Still may need to send the head for this space.
1756	*/	1127	*/
1757		1128
1758	oldlen = sl.length ();	1129	oldlen = sl.length ();
1759		1130
1760	sl << uint16 (mask);	1131	sl << uint16 (mask);
…		…
1762	if (lastcell.count != -1)	1133	if (lastcell.count != -1)
1763	need_send = 1;	1134	need_send = 1;
1764		1135
1765	count = -1;	1136	count = -1;
1766		1137
1767	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1768	{
1769	/* Now check to see if any heads need to be sent */
1770
1771	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1772	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1773	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1774
1775	lastcell.count = count;
1776	}
1777	else
1778	{
1779	/* properly clear a previously sent big face */	1138	/* properly clear a previously sent big face */
1780	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1139	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1781	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1140	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1782	need_send = 1;	1141	need_send = 1;
1783		1142
1784	map_clearcell (&lastcell, 0, 0, 0, count);	1143	map_clearcell (&lastcell, count);
1785	}
1786		1144
1787	if ((mask & 0xf) || need_send)	1145	if ((mask & 0xf) || need_send)
1788	sl[oldlen + 1] = mask & 0xff;	1146	sl[oldlen + 1] = mask & 0xff;
1789	else	1147	else
1790	sl.reset (oldlen);	1148	sl.reset (oldlen);
1791	}	1149	}
1792	else	1150	else
1793	{	1151	{
1794	/* In this block, the space is visible or there are head objects	1152	/* In this block, the space is visible.
1795	* we need to send.
1796	*/	1153	*/
1797		1154
1798	/* Rather than try to figure out what everything that we might	1155	/* Rather than try to figure out what everything that we might
1799	* need to send is, then form the packet after that,	1156	* need to send is, then form the packet after that,
1800	* we presume that we will in fact form a packet, and update	1157	* we presume that we will in fact form a packet, and update
…		…
1803	* is done.	1160	* is done.
1804	* I think this is simpler than doing a bunch of checks to see	1161	* I think this is simpler than doing a bunch of checks to see
1805	* what if anything we need to send, setting the bits, then	1162	* what if anything we need to send, setting the bits, then
1806	* doing those checks again to add the real data.	1163	* doing those checks again to add the real data.
1807	*/	1164	*/
1808	oldlen = sl.length ();	1165	oldlen = sl.length ();
1809	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1810	eoldlen = esl.length ();	1166	eoldlen = esl.length ();
1811	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1167
1812	sl << uint16 (mask);	1168	sl << uint16 (mask);
1813
1814	if (socket.ext_mapinfos)
1815	esl << uint16 (emask);
1816		1169
1817	unsigned char dummy;	1170	unsigned char dummy;
1818	unsigned char *last_ext = &dummy;	1171	unsigned char *last_ext = &dummy;
1819		1172
1820	/* Darkness changed */	1173	/* Darkness changed */
…		…
1832	sl << uint8 (255 - 64 * d);	1185	sl << uint8 (255 - 64 * d);
1833	}	1186	}
1834		1187
1835	lastcell.count = d;	1188	lastcell.count = d;
1836		1189
		1190	mapspace &ms = m->at (nx, ny);
		1191
1837	if (socket.extmap)	1192	if (socket.extmap)
1838	{	1193	{
1839	uint8 stat_hp = 0;	1194	uint8 stat_hp = 0;
1840	uint8 stat_width = 0;	1195	uint8 stat_width = 0;
1841	uint8 flags = 0;	1196	uint8 flags = 0;
1842	UUID player = 0;	1197	UUID player = 0;
1843		1198
1844	// send hp information, if applicable	1199	// send hp information, if applicable
1845	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1200	if (object *op = ms.faces_obj [0])
1846	{	1201	{
1847	if (op->head || op->invisible)	1202	if (op->head || op->invisible)
1848	; // do not show	1203	; // do not show
1849	else if (op->type == PLAYER	1204	else if (op->type == PLAYER
1850	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1205	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
…		…
1904	sl << uint8 (8) << uint8 (flags);	1259	sl << uint8 (8) << uint8 (flags);
1905	}	1260	}
1906	}	1261	}
1907		1262
1908	/* Floor face */	1263	/* Floor face */
1909	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1264	if (update_space (sl, socket, ms, lastcell, 2))
1910	mask |= 0x4;	1265	mask |= 0x4;
1911		1266
1912	if (socket.EMI_smooth)
1913	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1914	emask |= 0x4;
1915
1916	/* Middle face */	1267	/* Middle face */
1917	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1268	if (update_space (sl, socket, ms, lastcell, 1))
1918	mask |= 0x2;	1269	mask |= 0x2;
1919		1270
1920	if (socket.EMI_smooth)	1271	if (ms.player () == pl
1921	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1272	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1922	emask |= 0x2;
1923
1924	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1925	{	1273	{
		1274	// force player to be visible to himself if invisible
1926	if (lastcell.faces[0] != pl->face->number)	1275	if (lastcell.faces[0] != pl->face)
1927	{	1276	{
1928	lastcell.faces[0] = pl->face->number;	1277	lastcell.faces[0] = pl->face;
		1278
1929	mask |= 0x1;	1279	mask |= 0x1;
1930
1931	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1932	esrv_send_face (&socket, pl->face->number, 0);
1933
1934	sl << uint16 (pl->face->number);	1280	sl << uint16 (pl->face);
		1281
		1282	socket.send_faces (pl);
1935	}	1283	}
1936	}	1284	}
1937	else
1938	{
1939	/* Top face */	1285	/* Top face */
1940	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1286	else if (update_space (sl, socket, ms, lastcell, 0))
1941	mask |= 0x1;	1287	mask |= 0x1;
1942
1943	if (socket.EMI_smooth)
1944	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1945	emask |= 0x1;
1946	}	1288
1947		1289
1948	/* Check to see if we are in fact sending anything for this	1290	/* Check to see if we are in fact sending anything for this
1949	* space by checking the mask. If so, update the mask.	1291	* space by checking the mask. If so, update the mask.
1950	* if not, reset the len to that from before adding the mask	1292	* if not, reset the len to that from before adding the mask
1951	* value, so we don't send those bits.	1293	* value, so we don't send those bits.
…		…
1953	if (mask & 0xf)	1295	if (mask & 0xf)
1954	sl[oldlen + 1] = mask & 0xff;	1296	sl[oldlen + 1] = mask & 0xff;
1955	else	1297	else
1956	sl.reset (oldlen);	1298	sl.reset (oldlen);
1957		1299
		1300	if (socket.ext_mapinfos)
		1301	esl << uint16 (emask);
		1302
		1303	if (socket.EMI_smooth)
		1304	{
		1305	for (int layer = 2+1; layer--; )
		1306	{
		1307	object *ob = ms.faces_obj [layer];
		1308
		1309	// If there is no object for this space, or if the face for the object
		1310	// is the blank face, set the smoothlevel to zero.
		1311	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1312
		1313	// We've gotten what face we want to use for the object. Now see if
		1314	// if it has changed since we last sent it to the client.
		1315	if (lastcell.smooth[layer] != smoothlevel)
		1316	{
		1317	lastcell.smooth[layer] = smoothlevel;
		1318	esl << uint8 (smoothlevel);
		1319	emask |= 1 << layer;
		1320	}
		1321	}
		1322
1958	if (emask & 0xf)	1323	if (emask & 0xf)
1959	esl[eoldlen + 1] = emask & 0xff;	1324	esl[eoldlen + 1] = emask & 0xff;
1960	else	1325	else
1961	esl.reset (eoldlen);	1326	esl.reset (eoldlen);
		1327	}
1962	} /* else this is a viewable space */	1328	} /* else this is a viewable space */
1963	} /* for x loop */	1329	} /* for x loop */
1964	} /* for y loop */	1330	} /* for y loop */
1965		1331
1966	/* Verify that we in fact do need to send this */	1332	/* Verify that we in fact do need to send this */
…		…
1969	if (!(sl.length () > startlen || socket.sent_scroll))	1335	if (!(sl.length () > startlen || socket.sent_scroll))
1970	{	1336	{
1971	/* No map data will follow, so don't say the client	1337	/* No map data will follow, so don't say the client
1972	* it doesn't need draw!	1338	* it doesn't need draw!
1973	*/	1339	*/
1974	ewhatflag &= (~EMI_NOREDRAW);	1340	ewhatflag &= ~EMI_NOREDRAW;
1975	esl[ewhatstart + 1] = ewhatflag & 0xff;	1341	esl[ewhatstart + 1] = ewhatflag & 0xff;
1976	}	1342	}
1977		1343
1978	if (esl.length () > estartlen)	1344	if (esl.length () > estartlen)
1979	socket.send_packet (esl);	1345	socket.send_packet (esl);
…		…
1991	*/	1357	*/
1992	void	1358	void
1993	draw_client_map (object *pl)	1359	draw_client_map (object *pl)
1994	{	1360	{
1995	int i, j;	1361	int i, j;
1996	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1362	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1997	New_Face *face, *floor;
1998	New_Face *floor2;
1999	int d, mflags;	1363	int mflags;
2000	struct Map newmap;	1364	struct Map newmap;
2001	maptile *m, *pm;	1365	maptile *m, *pm;
2002		1366
2003	if (pl->type != PLAYER)	1367	if (pl->type != PLAYER)
2004	{	1368	{
…		…
2015	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	1379	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2016	return;	1380	return;
2017		1381
2018	memset (&newmap, 0, sizeof (struct Map));	1382	memset (&newmap, 0, sizeof (struct Map));
2019		1383
2020	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	1384	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2021	{
2022	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)	1385	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2023	{	1386	{
2024	ax = i;	1387	ax = i;
2025	ay = j;	1388	ay = j;
2026	m = pm;	1389	m = pm;
2027	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	1390	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2028		1391
2029	if (mflags & P_OUT_OF_MAP)	1392	if (mflags & P_OUT_OF_MAP)
2030	continue;	1393	continue;
2031		1394
2032	if (mflags & P_NEED_UPDATE)
2033	update_position (m, ax, ay);
2034
2035	/* If a map is visible to the player, we don't want to swap it out	1395	/* If a map is visible to the player, we don't want to swap it out
2036	* just to reload it. This should really call something like	1396	* just to reload it. This should really call something like
2037	* swap_map, but this is much more efficient and 'good enough'	1397	* swap_map, but this is much more efficient and 'good enough'
2038	*/	1398	*/
2039	if (mflags & P_NEW_MAP)	1399	if (mflags & P_NEW_MAP)
2040	m->timeout = 50;	1400	m->timeout = 50;
2041	}	1401	}
2042	}	1402
2043	/* do LOS after calls to update_position */	1403	/* do LOS after calls to update_position */
2044	if (pl->contr->do_los)	1404	if (pl->contr->do_los)
2045	{	1405	{
2046	update_los (pl);	1406	update_los (pl);
2047	pl->contr->do_los = 0;	1407	pl->contr->do_los = 0;
…		…
2062		1422
2063	/*****************************************************************************/	1423	/*****************************************************************************/
2064	void	1424	void
2065	send_plugin_custom_message (object *pl, char *buf)	1425	send_plugin_custom_message (object *pl, char *buf)
2066	{	1426	{
2067	pl->contr->socket->send_packet (buf);	1427	pl->contr->ns->send_packet (buf);
2068	}	1428	}
2069		1429
2070	/**	1430	/**
2071	* This sends the skill number to name mapping. We ignore	1431	* This sends the skill number to name mapping. We ignore
2072	* the params - we always send the same info no matter what.	1432	* the params - we always send the same info no matter what.
…		…
2117	* it then sends an updspell packet for each spell that has changed in this way	1477	* it then sends an updspell packet for each spell that has changed in this way
2118	*/	1478	*/
2119	void	1479	void
2120	esrv_update_spells (player *pl)	1480	esrv_update_spells (player *pl)
2121	{	1481	{
		1482	if (!pl->ns)
		1483	return;
		1484
2122	if (!pl->socket->monitor_spells)	1485	if (!pl->ns->monitor_spells)
2123	return;	1486	return;
2124		1487
2125	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1488	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2126	{	1489	{
2127	if (spell->type == SPELL)	1490	if (spell->type == SPELL)
…		…
2157		1520
2158	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1521	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2159	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1522	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2160	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1523	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2161		1524
2162	pl->socket->send_packet (sl);	1525	pl->ns->send_packet (sl);
2163	}	1526	}
2164	}	1527	}
2165	}	1528	}
2166	}	1529	}
2167		1530
2168	void	1531	void
2169	esrv_remove_spell (player *pl, object *spell)	1532	esrv_remove_spell (player *pl, object *spell)
2170	{	1533	{
2171	if (!pl->socket->monitor_spells)	1534	if (!pl->ns->monitor_spells)
2172	return;	1535	return;
2173		1536
2174	if (!pl || !spell || spell->env != pl->ob)	1537	if (!pl || !spell || spell->env != pl->ob)
2175	{	1538	{
2176	LOG (llevError, "Invalid call to esrv_remove_spell");	1539	LOG (llevError, "Invalid call to esrv_remove_spell");
2177	return;	1540	return;
2178	}	1541	}
2179		1542
2180	packet sl;	1543	packet sl ("delspell");
2181		1544
2182	sl << "delspell "
2183	<< uint32 (spell->count);	1545	sl << uint32 (spell->count);
2184		1546
2185	pl->socket->send_packet (sl);	1547	pl->ns->send_packet (sl);
2186	}	1548	}
2187		1549
2188	/* appends the spell *spell to the Socklist we will send the data to. */	1550	/* appends the spell *spell to the Socklist we will send the data to. */
2189	static void	1551	static void
2190	append_spell (player *pl, packet &sl, object *spell)	1552	append_spell (player *pl, packet &sl, object *spell)
2191	{	1553	{
2192	int len, i, skill = 0;	1554	int i, skill = 0;
2193		1555
2194	if (!(spell->name))	1556	if (!(spell->name))
2195	{	1557	{
2196	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1558	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2197	return;	1559	return;
…		…
2209	if (!strcmp (spell->skill, skill_names[i]))	1571	if (!strcmp (spell->skill, skill_names[i]))
2210	{	1572	{
2211	skill = i + CS_STAT_SKILLINFO;	1573	skill = i + CS_STAT_SKILLINFO;
2212	break;	1574	break;
2213	}	1575	}
		1576	}
		1577
		1578	// spells better have a face
		1579	if (!spell->face)
		1580	{
		1581	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1582	spell->face = face_find ("burnout.x11", blank_face);
2214	}	1583	}
2215		1584
2216	/* send the current values */	1585	/* send the current values */
2217	sl << uint32 (spell->count)	1586	sl << uint32 (spell->count)
2218	<< uint16 (spell->level)	1587	<< uint16 (spell->level)
…		…
2220	<< uint16 (spell->last_sp)	1589	<< uint16 (spell->last_sp)
2221	<< uint16 (spell->last_grace)	1590	<< uint16 (spell->last_grace)
2222	<< uint16 (spell->last_eat)	1591	<< uint16 (spell->last_eat)
2223	<< uint8 (skill)	1592	<< uint8 (skill)
2224	<< uint32 (spell->path_attuned)	1593	<< uint32 (spell->path_attuned)
2225	<< uint32 (spell->face ? spell->face->number : 0)	1594	<< uint32 (spell->face)
2226	<< data8 (spell->name)	1595	<< data8 (spell->name)
2227	<< data16 (spell->msg);	1596	<< data16 (spell->msg);
2228	}	1597	}
2229		1598
2230	/**	1599	/**
…		…
2238	{	1607	{
2239	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	1608	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2240	return;	1609	return;
2241	}	1610	}
2242		1611
2243	if (!pl->socket->monitor_spells)	1612	if (!pl->ns->monitor_spells)
2244	return;	1613	return;
2245		1614
2246	packet sl;	1615	packet sl ("addspell");
2247	sl << "addspell ";
2248		1616
2249	if (!spell)	1617	if (!spell)
2250	{	1618	{
2251	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1619	for (spell = pl->ob->inv; spell; spell = spell->below)
2252	{	1620	{
2253	/* were we to simply keep appending data here, we could exceed	1621	/* were we to simply keep appending data here, we could exceed
2254	* MAXSOCKBUF if the player has enough spells to add, we know that	1622	* MAXSOCKBUF if the player has enough spells to add, we know that
2255	* append_spells will always append 19 data bytes, plus 4 length	1623	* append_spells will always append 19 data bytes, plus 4 length
2256	* bytes and 3 strings (because that is the spec) so we need to	1624	* bytes and 3 strings (because that is the spec) so we need to
…		…
2266	if (spell->type != SPELL)	1634	if (spell->type != SPELL)
2267	continue;	1635	continue;
2268		1636
2269	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1637	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2270	{	1638	{
2271	pl->socket->send_packet (sl);	1639	pl->ns->send_packet (sl);
2272		1640
2273	sl.reset ();	1641	sl.reset ();
2274	sl << "addspell ";	1642	sl << "addspell ";
2275	}	1643	}
2276		1644
…		…
2290	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1658	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2291	fatal (0);	1659	fatal (0);
2292	}	1660	}
2293		1661
2294	/* finally, we can send the packet */	1662	/* finally, we can send the packet */
2295	pl->socket->send_packet (sl);	1663	pl->ns->send_packet (sl);
2296	}	1664	}
2297		1665

Diff Legend

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