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.47 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.97 by root, Thu May 17 14:14:56 2007 UTC

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

Diff Legend

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