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.43 by root, Sat Dec 16 20:16:37 2006 UTC vs.
Revision 1.93 by root, Tue May 1 05:48:21 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	* mapcellchanged, compactlayer, compactstack, perform the map compressing
44	* operations
45	*
46	*/	41	*/
47		42
48	#include <global.h>	43	#include <global.h>
49	#include <sproto.h>	44	#include <sproto.h>
50		45
…		…
103	* that much difference in bandwidth.	98	* that much difference in bandwidth.
104	*/	99	*/
105	mx = ns->mapx;	100	mx = ns->mapx;
106	my = ns->mapy;	101	my = ns->mapy;
107		102
108	if (ns->mapmode == Map1aCmd)
109	{
110	mx += MAX_HEAD_OFFSET;
111	my += MAX_HEAD_OFFSET;
112	}
113
114	/* 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
115	* (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,
116	* if the destination x or y coordinate is outside the viewable	105	* if the destination x or y coordinate is outside the viewable
117	* area, we clear the values - otherwise, the old values	106	* area, we clear the values - otherwise, the old values
118	* are preserved, and the check_head thinks it needs to clear them.	107	* are preserved, and the check_head thinks it needs to clear them.
…		…
141	}	130	}
142		131
143	static void	132	static void
144	clear_map (player *pl)	133	clear_map (player *pl)
145	{	134	{
146	client &socket = *pl->socket;
147
148	memset (&socket.lastmap, 0, sizeof (socket.lastmap));	135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
149		136
		137	pl->ns->force_newmap = false;
		138
150	if (socket.newmapcmd == 1)	139	if (pl->ns->newmapcmd == 1)
151	socket.send_packet ("newmap");	140	pl->ns->send_packet ("newmap");
152		141
153	socket.update_look = 1;	142	pl->ns->floorbox_reset ();
154	socket.look_position = 0;
155	}	143	}
156		144
157	/** check for map change and send new map data */	145	/** check for map/region change and send new map data */
158	static void	146	static void
159	check_map_change (player *pl)	147	check_map_change (player *pl)
160	{	148	{
161	client &socket = *pl->socket;	149	client &socket = *pl->ns;
162	object *ob = pl->ob;	150	object *ob = pl->ob;
163	char buf[MAX_BUF]; /* eauugggh */	151	char buf[MAX_BUF]; /* eauugggh */
164		152
165	if (socket.current_map != ob->map)	153	if (socket.current_map != ob->map || socket.force_newmap)
166	{	154	{
		155	clear_map (pl);
167	socket.current_map = ob->map;	156	socket.current_map = ob->map;
168
169	clear_map (pl);
170		157
171	if (socket.mapinfocmd)	158	if (socket.mapinfocmd)
172	{	159	{
173	if (ob->map && ob->map->path[0])	160	if (ob->map && ob->map->path[0])
174	{	161	{
175	int flags = 0;	162	int flags = 0;
176		163
177	if (ob->map->tile_path[0])	164	if (ob->map->tile_path[0]) flags |= 1;
178	flags |= 1;
179	if (ob->map->tile_path[1])	165	if (ob->map->tile_path[1]) flags |= 2;
180	flags |= 2;
181	if (ob->map->tile_path[2])	166	if (ob->map->tile_path[2]) flags |= 4;
182	flags |= 4;
183	if (ob->map->tile_path[3])	167	if (ob->map->tile_path[3]) flags |= 8;
184	flags |= 8;
185		168
186	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",
187	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);
188	}	171	}
189	else	172	else
190	snprintf (buf, MAX_BUF, "mapinfo current");	173	snprintf (buf, MAX_BUF, "mapinfo current");
191		174
192	socket.send_packet (buf);	175	socket.send_packet (buf);
…		…
200	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))	183	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
201	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows	184	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
202	else	185	else
203	{	186	{
204	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	187	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
205	socket.update_look = 1;	188	socket.floorbox_reset ();
206	socket.look_position = 0;
207	}	189	}
208	}	190	}
209		191
210	socket.current_x = ob->x;	192	socket.current_x = ob->x;
211	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	}
212	}	201	}
213		202
214	/**	203	/**
215	* RequestInfo is sort of a meta command. There is some specific	204	* RequestInfo is sort of a meta command. There is some specific
216	* request of information, but we call other functions to provide	205	* request of information, but we call other functions to provide
…		…
260	{	249	{
261	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));	250	INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
262	}	251	}
263		252
264	void	253	void
		254	ExtiCmd (char *buf, int len, client *ns)
		255	{
		256	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		257	}
		258
		259	void
265	MapInfoCmd (char *buf, int len, player *pl)	260	MapInfoCmd (char *buf, int len, player *pl)
266	{	261	{
267	// <mapinfo tag spatial tile-path	262	// <mapinfo tag spatial tile-path
268	// >mapinfo tag spatial flags x y w h hash	263	// >mapinfo tag spatial flags x y w h hash
269		264
…		…
281	buf += 8;	276	buf += 8;
282		277
283	// initial map and its origin	278	// initial map and its origin
284	maptile *map = pl->ob->map;	279	maptile *map = pl->ob->map;
285	sint16 dx, dy;	280	sint16 dx, dy;
286	int mapx = pl->socket->mapx / 2 - pl->ob->x;	281	int mapx = pl->ns->mapx / 2 - pl->ob->x;
287	int mapy = pl->socket->mapy / 2 - pl->ob->y;	282	int mapy = pl->ns->mapy / 2 - pl->ob->y;
288	int max_distance = 8; // limit maximum path length to something generous	283	int max_distance = 8; // limit maximum path length to something generous
289		284
290	while (*buf && map && max_distance)	285	while (*buf && map && max_distance)
291	{	286	{
292	int dir = *buf++;	287	int dir = *buf++;
293		288
294	switch (dir)	289	switch (dir)
295	{	290	{
296	case '1':	291	case '1':
297	dx = 0;	292	dx = 0;
298	dy = -1;	293	dy = -1;
299	map = get_map_from_coord (map, &dx, &dy);	294	map = map->xy_find (dx, dy);
300	map && (mapy -= map->height);	295	map && (mapy -= map->height);
301	break;	296	break;
302	case '2':	297	case '2':
303	mapx += map->width;	298	mapx += map->width;
304	dx = map->width;	299	dx = map->width;
305	dy = 0;	300	dy = 0;
306	map = get_map_from_coord (map, &dx, &dy);	301	map = map->xy_find (dx, dy);
307	break;	302	break;
308	case '3':	303	case '3':
309	mapy += map->height;	304	mapy += map->height;
310	dx = 0;	305	dx = 0;
311	dy = map->height;	306	dy = map->height;
312	map = get_map_from_coord (map, &dx, &dy);	307	map = map->xy_find (dx, dy);
313	break;	308	break;
314	case '4':	309	case '4':
315	dx = -1;	310	dx = -1;
316	dy = 0;	311	dy = 0;
317	map = get_map_from_coord (map, &dx, &dy);	312	map = map->xy_find (dx, dy);
318	map && (mapx -= map->width);	313	map && (mapx -= map->width);
319	break;	314	break;
320	}	315	}
321		316
322	--max_distance;	317	--max_distance;
323	}	318	}
324		319
…		…
326	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);	321	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
327	else if (map && map->path[0])	322	else if (map && map->path[0])
328	{	323	{
329	int flags = 0;	324	int flags = 0;
330		325
331	if (map->tile_path[0])	326	if (map->tile_path[0]) flags |= 1;
332	flags |= 1;
333	if (map->tile_path[1])	327	if (map->tile_path[1]) flags |= 2;
334	flags |= 2;
335	if (map->tile_path[2])	328	if (map->tile_path[2]) flags |= 4;
336	flags |= 4;
337	if (map->tile_path[3])	329	if (map->tile_path[3]) flags |= 8;
338	flags |= 8;
339		330
340	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);
341	}	332	}
342	else	333	else
343	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	334	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
344	}	335	}
345	else	336	else
346	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	337	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
347		338
348	pl->socket->send_packet (bigbuf);	339	pl->ns->send_packet (bigbuf);
349	}	340	}
350		341
351	/** This is the Setup cmd - easy first implementation */	342	/** This is the Setup cmd */
352	void	343	void
353	SetUp (char *buf, int len, client * ns)	344	SetUp (char *buf, int len, client * ns)
354	{	345	{
355	int s, slen;	346	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
356	char *cmd, *param, cmdback[HUGE_BUF];
357
358	/* run through the cmds of setup
359	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
360	*
361	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
362	* The client then must sort this out
363	*/
364
365	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
366
367	strcpy (cmdback, "setup");
368	for (s = 0; s < len; )
369	{
370	cmd = &buf[s];
371
372	/* find the next space, and put a null there */
373	for (; buf[s] && buf[s] != ' '; s++)
374	;
375
376	buf[s++] = 0;
377
378	while (buf[s] == ' ')
379	s++;
380
381	if (s >= len)
382	break;
383
384	param = &buf[s];
385
386	for (; buf[s] && buf[s] != ' '; s++)
387	;
388
389	buf[s++] = 0;
390
391	while (buf[s] == ' ')
392	s++;
393
394	slen = strlen (cmdback);
395	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
397	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
398
399	if (!strcmp (cmd, "sound"))
400	{
401	ns->sound = atoi (param);
402	safe_strcat (cmdback, param, &slen, HUGE_BUF);
403	}
404	else if (!strcmp (cmd, "exp64"))
405	{
406	ns->exp64 = atoi (param);
407	safe_strcat (cmdback, param, &slen, HUGE_BUF);
408	}
409	else if (!strcmp (cmd, "spellmon"))
410	{
411	ns->monitor_spells = atoi (param);
412	safe_strcat (cmdback, param, &slen, HUGE_BUF);
413	}
414	else if (!strcmp (cmd, "darkness"))
415	{
416	ns->darkness = atoi (param);
417	safe_strcat (cmdback, param, &slen, HUGE_BUF);
418	}
419	else if (!strcmp (cmd, "map1cmd"))
420	{
421	if (atoi (param))
422	ns->mapmode = Map1Cmd;
423	/* if beyond this size, need to use map1cmd no matter what */
424	if (ns->mapx > 11 || ns->mapy > 11)
425	ns->mapmode = Map1Cmd;
426	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
427	}
428	else if (!strcmp (cmd, "map1acmd"))
429	{
430	if (atoi (param))
431	ns->mapmode = Map1aCmd;
432	/* if beyond this size, need to use map1acmd no matter what */
433	if (ns->mapx > 11 || ns->mapy > 11)
434	ns->mapmode = Map1aCmd;
435	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
436	}
437	else if (!strcmp (cmd, "newmapcmd"))
438	{
439	ns->newmapcmd = atoi (param);
440	safe_strcat (cmdback, param, &slen, HUGE_BUF);
441	// } else if (!strcmp(cmd,"plugincmd")) {
442	// ns->plugincmd = atoi(param);
443	// safe_strcat(cmdback, param, &slen, HUGE_BUF);
444	}
445	else if (!strcmp (cmd, "mapinfocmd"))
446	{
447	ns->mapinfocmd = atoi (param);
448	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
449	}
450	else if (!strcmp (cmd, "extcmd"))
451	{
452	ns->extcmd = atoi (param);
453	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
454	}
455	else if (!strcmp (cmd, "extmap"))
456	{
457	ns->extmap = atoi (param);
458	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
459	}
460	else if (!strcmp (cmd, "facecache"))
461	{
462	ns->facecache = atoi (param);
463	safe_strcat (cmdback, param, &slen, HUGE_BUF);
464	}
465	else if (!strcmp (cmd, "faceset"))
466	{
467	char tmpbuf[20];
468	int q = atoi (param);
469
470	if (is_valid_faceset (q))
471	ns->faceset = q;
472	sprintf (tmpbuf, "%d", ns->faceset);
473	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
474	/* if the client is using faceset, it knows about image2 command */
475	ns->image2 = 1;
476	}
477	else if (!strcmp (cmd, "itemcmd"))
478	{
479	/* Version of the item protocol command to use. Currently,
480	* only supported versions are 1 and 2. Using a numeric
481	* value will make it very easy to extend this in the future.
482	*/
483	char tmpbuf[20];
484	int q = atoi (param);
485
486	if (q < 1 || q > 2)
487	{
488	strcpy (tmpbuf, "FALSE");
489	}
490	else
491	{
492	ns->itemcmd = q;
493	sprintf (tmpbuf, "%d", ns->itemcmd);
494	}
495	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
496	}
497	else if (!strcmp (cmd, "mapsize"))
498	{
499	int x, y = 0;
500	char tmpbuf[MAX_BUF], *cp;
501
502	x = atoi (param);
503	for (cp = param; *cp != 0; cp++)
504	if (*cp == 'x' || *cp == 'X')
505	{
506	y = atoi (cp + 1);
507	break;
508	}
509	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
510	{
511	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
512	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
513	}
514	else
515	{
516	ns->mapx = x;
517	ns->mapy = y;
518	/* better to send back what we are really using and not the
519	* param as given to us in case it gets parsed differently.
520	*/
521	sprintf (tmpbuf, "%dx%d", x, y);
522	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
523	/* If beyond this size and still using orig map command, need to
524	* go to map1cmd.
525	*/
526	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
527	ns->mapmode = Map1Cmd;
528	}
529	}
530	else if (!strcmp (cmd, "extendedMapInfos"))
531	{
532	/* Added by tchize
533	* prepare to use the mapextended command
534	*/
535	char tmpbuf[20];
536
537	ns->ext_mapinfos = (atoi (param));
538	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
539	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
540	}
541	else if (!strcmp (cmd, "extendedTextInfos"))
542	{
543	/* Added by tchize
544	* prepare to use the extended text commands
545	* Client toggle this to non zero to get exttext
546	*/
547	char tmpbuf[20];
548
549	ns->has_readable_type = (atoi (param));
550	sprintf (tmpbuf, "%d", ns->has_readable_type);
551	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
552	}
553	else
554	{
555	/* Didn't get a setup command we understood -
556	* report a failure to the client.
557	*/
558	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
559	}
560	} /* for processing all the setup commands */
561
562	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
563	ns->send_packet (cmdback);
564	}	347	}
565		348
566	/**	349	/**
567	* The client has requested to be added to the game.	350	* The client has requested to be added to the game.
568	* 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.
569	* 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,
570	* 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.
571	*/	354	*/
572	void	355	void
573	AddMeCmd (char *buf, int len, client * ns)	356	AddMeCmd (char *buf, int len, client *ns)
574	{	357	{
575	if (ns->status != Ns_Add || add_player (ns))	358	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
576	ns->send_packet ("addme_failed");
577	else
578	ns->send_packet ("addme_success");
579	}	359	}
580		360
581	/** Reply to ExtendedInfos command */	361	/** Reply to ExtendedInfos command */
582	void	362	void
583	ToggleExtendedInfos (char *buf, int len, client * ns)	363	ToggleExtendedInfos (char *buf, int len, client * ns)
…		…
693		473
694	ns->send_packet (cmdback);	474	ns->send_packet (cmdback);
695	}	475	}
696		476
697	/**	477	/**
698	* A lot like the old AskSmooth (in fact, now called by AskSmooth).	478	* client requested an image. send it rate-limited
699	* Basically, it makes no sense to wait for the client to request a	479	* before flushing.
700	* a piece of data from us that we know the client wants. So
701	* if we know the client wants it, might as well push it to the
702	* client.
703	*/
704	static void
705	SendSmooth (client * ns, uint16 face)
706	{
707	uint16 smoothface;
708
709	/* If we can't find a face, return and set it so we won't try to send this
710	* again.
711	*/	480	*/
712	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))	481	void
713	{	482	AskFaceCmd (char *buf, int len, client *ns)
714		483	{
715	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);	484	ns->askface.push_back (atoi (buf));
716	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
717	return;
718	}
719
720	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
721	esrv_send_face (ns, smoothface, 0);
722
723	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
724
725	packet sl;
726
727	sl << "smooth "
728	<< uint16 (face)
729	<< uint16 (smoothface);
730
731	ns->send_packet (sl);
732	}	485	}
733		486
734	/**	487	/**
735	* Tells client the picture it has to use	488	* Tells client the picture it has to use
736	* to smooth a picture number given as argument.	489	* to smooth a picture number given as argument.
737	*/	490	*/
738	void	491	void
739	AskSmooth (char *buf, int len, client * ns)	492	AskSmooth (char *buf, int len, client *ns)
740	{	493	{
741	uint16 facenbr;	494	ns->send_face (atoi (buf));
742		495	ns->flush_fx ();
743	facenbr = atoi (buf);
744	SendSmooth (ns, facenbr);
745	}	496	}
746		497
747	/**	498	/**
748	* 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,
749	* etc.)	500	* etc.)
750	*/	501	*/
751	void	502	void
752	PlayerCmd (char *buf, int len, player *pl)	503	PlayerCmd (char *buf, int len, player *pl)
753	{	504	{
754
755	/* The following should never happen with a proper or honest client.
756	* Therefore, the error message doesn't have to be too clear - if
757	* someone is playing with a hacked/non working client, this gives them
758	* an idea of the problem, but they deserve what they get
759	*/
760	if (pl->state != ST_PLAYING)
761	{
762	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
763	return;
764	}
765	/* Check if there is a count. In theory, a zero count could also be	505	/* Check if there is a count. In theory, a zero count could also be
766	* sent, so check for that also.	506	* sent, so check for that also.
767	*/	507	*/
768	if (atoi (buf) || buf[0] == '0')	508	if (atoi (buf) || buf[0] == '0')
769	{	509	{
770	pl->count = atoi ((char *) buf);	510	pl->count = atoi ((char *) buf);
		511
771	buf = strchr (buf, ' '); /* advance beyond the numbers */	512	buf = strchr (buf, ' '); /* advance beyond the numbers */
772	if (!buf)	513	if (!buf)
773	{
774	#ifdef ESRV_DEBUG
775	LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
776	#endif
777	return;	514	return;
778	}	515
779	buf++;	516	buf++;
780	}	517	}
781	/* This should not happen anymore. */	518
782	if (pl->ob->speed_left < -1.0)
783	{
784	LOG (llevError, "Player has negative time - shouldn't do command.\n");
785	}
786	/* In c_new.c */
787	execute_newserver_command (pl->ob, (char *) buf);	519	execute_newserver_command (pl->ob, (char *) buf);
788	/* Perhaps something better should be done with a left over count.
789	* Cleaning up the input should probably be done first - all actions
790	* for the command that issued the count should be done before any other
791	* commands.
792	*/
793		520
794	pl->count = 0;
795
796	}
797
798
799	/**
800	* This handles the general commands from the client (ie, north, fire, cast,
801	* etc.). It is a lot like PlayerCmd above, but is called with the
802	* 'ncom' method which gives more information back to the client so it
803	* can throttle.
804	*/
805	void
806	NewPlayerCmd (char *buf, int len, player *pl)
807	{
808	int time, repeat;
809	char command[MAX_BUF];
810	int pktlen;
811
812	if (len < 7)
813	{
814	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
815	return;
816	}
817
818	pktlen = net_uint16 ((uint8 *)buf);
819	repeat = net_uint32 ((uint8 *)buf + 2);
820
821	/* -1 is special - no repeat, but don't update */
822	if (repeat != -1)
823	pl->count = repeat;
824
825	if ((len - 4) >= MAX_BUF)
826	len = MAX_BUF - 5;
827
828	strncpy ((char *) command, (char *) buf + 6, len - 4);
829	command[len - 4] = 0;
830
831	/* This should not happen anymore. */
832	if (pl->ob->speed_left < -1.0)
833	LOG (llevError, "Player has negative time - shouldn't do command.\n");
834
835	/* In c_new.c */
836	execute_newserver_command (pl->ob, (char *) command);
837	/* Perhaps something better should be done with a left over count.	521	/* Perhaps something better should be done with a left over count.
838	* Cleaning up the input should probably be done first - all actions	522	* Cleaning up the input should probably be done first - all actions
839	* for the command that issued the count should be done before any other	523	* for the command that issued the count should be done before any other
840	* commands.	524	* commands.
841	*/	525	*/
842	pl->count = 0;	526	pl->count = 0;
		527	}
843		528
844	if (FABS (pl->ob->speed) < 0.001)	529
		530	/**
		531	* This handles the general commands from the client (ie, north, fire, cast,
		532	* etc.). It is a lot like PlayerCmd above, but is called with the
		533	* 'ncom' method which gives more information back to the client so it
		534	* can throttle.
		535	*/
		536	void
		537	NewPlayerCmd (char *buf, int len, player *pl)
		538	{
		539	if (len <= 6)
		540	{
		541	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
		542	return;
		543	}
		544
		545	uint16 cmdid = net_uint16 ((uint8 *)buf);
		546	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
		547
		548	/* -1 is special - no repeat, but don't update */
		549	if (repeat != -1)
		550	pl->count = repeat;
		551
		552	buf += 6; //len -= 6;
		553
		554	execute_newserver_command (pl->ob, buf);
		555
		556	/* Perhaps something better should be done with a left over count.
		557	* Cleaning up the input should probably be done first - all actions
		558	* for the command that issued the count should be done before any other
		559	* commands.
		560	*/
		561	pl->count = 0;
		562
		563	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
		564	int time = fabs (pl->ob->speed) < 0.001
845	time = MAX_TIME * 100;	565	? time = MAX_TIME * 100
846	else
847	time = (int) (MAX_TIME / FABS (pl->ob->speed));	566	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
848		567
849	/* Send confirmation of command execution now */	568	/* Send confirmation of command execution now */
850		569	packet sl ("comc");
851	packet sl;
852	sl << "comc " << uint16 (pktlen) << uint32 (time);	570	sl << uint16 (cmdid) << uint32 (time);
853	pl->socket->send_packet (sl);	571	pl->ns->send_packet (sl);
854	}	572	}
855
856		573
857	/** This is a reply to a previous query. */	574	/** This is a reply to a previous query. */
858	void	575	void
859	ReplyCmd (char *buf, int len, player *pl)	576	ReplyCmd (char *buf, int len, client *ns)
860	{	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
861	/* 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
862	* 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
863	* once all the X11 code is removed from the server.	592	* once all the X11 code is removed from the server.
864	*	593	*
865	* 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
866	* think it was the carriage return that was entered, and the	595	* think it was the carriage return that was entered, and the
867	* function then does not try to do additional input.	596	* function then does not try to do additional input.
868	*/	597	*/
869	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	598	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
870		599
871	/* this avoids any hacking here */	600	/* this avoids any hacking here */
872		601
873	switch (pl->state)	602	switch (ns->state)
874	{	603	{
875	case ST_PLAYING:	604	case ST_PLAYING:
876	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	605	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
877	break;	606	break;
878		607
879	case ST_PLAY_AGAIN:
880	/* We can check this for return value (2==quit). Maybe we
881	* should, and do something appropriate?
882	*/
883	receive_play_again (pl->ob, buf[0]);
884	break;
885
886	case ST_ROLL_STAT:
887	key_roll_stat (pl->ob, buf[0]);
888	break;
889
890	case ST_CHANGE_CLASS:
891
892	key_change_class (pl->ob, buf[0]);
893	break;
894
895	case ST_CONFIRM_QUIT:
896	key_confirm_quit (pl->ob, buf[0]);
897	break;
898
899	case ST_CONFIGURE:
900	LOG (llevError, "In client input handling, but into configure state\n");
901	pl->state = ST_PLAYING;
902	break;
903
904	case ST_GET_NAME:
905	receive_player_name (pl->ob, 13);
906	break;
907
908	case ST_GET_PASSWORD:
909	case ST_CONFIRM_PASSWORD:
910	receive_player_password (pl->ob, 13);
911	break;
912
913	case ST_GET_PARTY_PASSWORD: /* Get password for party */	608	case ST_GET_PARTY_PASSWORD: /* Get password for party */
914	receive_party_password (pl->ob, 13);	609	receive_party_password (pl->ob, 13);
915	break;	610	break;
916		611
917	default:	612	default:
918	LOG (llevError, "Unknown input state: %d\n", pl->state);	613	LOG (llevError, "Unknown input state: %d\n", ns->state);
919	}	614	}
920	}	615	}
921		616
922	/**	617	/**
923	* 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
…		…
927	* problem.	622	* problem.
928	*/	623	*/
929	void	624	void
930	VersionCmd (char *buf, int len, client * ns)	625	VersionCmd (char *buf, int len, client * ns)
931	{	626	{
932	char *cp;
933	char version_warning[256];
934
935	if (!buf)	627	if (!buf)
936	{	628	{
937	LOG (llevError, "CS: received corrupted version command\n");	629	LOG (llevError, "CS: received corrupted version command\n");
938	return;	630	return;
939	}	631	}
940		632
941	ns->cs_version = atoi (buf);	633	ns->cs_version = atoi (buf);
942	ns->sc_version = ns->cs_version;	634	ns->sc_version = ns->cs_version;
		635
		636	LOG (llevDebug, "connection from client <%s>\n", buf);
		637
		638	//TODO: should log here just for statistics
		639
943	if (VERSION_CS != ns->cs_version)	640	//if (VERSION_CS != ns->cs_version)
944	{	641	// unchecked;
945	#ifdef ESRV_DEBUG	642
946	LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
947	#endif
948	}
949	cp = strchr (buf + 1, ' ');	643	char *cp = strchr (buf + 1, ' ');
950	if (!cp)	644	if (!cp)
951	return;	645	return;
		646
952	ns->sc_version = atoi (cp);	647	ns->sc_version = atoi (cp);
		648
953	if (VERSION_SC != ns->sc_version)	649	//if (VERSION_SC != ns->sc_version)
954	{	650	// unchecked;
955	#ifdef ESRV_DEBUG	651
956	LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
957	#endif
958	}
959	cp = strchr (cp + 1, ' ');	652	cp = strchr (cp + 1, ' ');
		653
960	if (cp)	654	if (cp)
961	{	655	{
962	LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
963
964	assign (ns->version, cp + 1);	656	ns->version = cp + 1;
965		657
966	if (ns->sc_version < 1026)	658	if (ns->sc_version < 1026)
967	{	659	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
968	sprintf (version_warning, "drawinfo %d %s", NDI_RED,
969	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	660	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
970	ns->send_packet (version_warning);
971	}
972
973	}	661	}
974	}	662	}
975		663
976	/** sound related functions. */	664	/** sound related functions. */
977	void	665	void
…		…
979	{	667	{
980	ns->sound = atoi (buf);	668	ns->sound = atoi (buf);
981	}	669	}
982		670
983	/** client wants the map resent */	671	/** client wants the map resent */
984
985	void	672	void
986	MapRedrawCmd (char *buf, int len, player *pl)	673	MapRedrawCmd (char *buf, int len, player *pl)
987	{	674	{
988
989	/* 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
990	* 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.
991	* Unfortunately this solution does not work because some client versions send	677	* Unfortunately this solution does not work because some client versions send
992	* a mapredraw command after receiving a newmap command.	678	* a mapredraw command after receiving a newmap command.
993	*/	679	*/
994	#if 0
995	/* Okay, this is MAJOR UGLY. but the only way I know how to
996	* clear the "cache"
997	*/
998	memset (&pl->socket->lastmap, 0, sizeof (struct Map));
999	draw_client_map (pl->ob);
1000	#endif
1001	}	680	}
1002		681
1003	/**	682	/**
1004	* Moves an object (typically, container to inventory).	683	* Moves an object (typically, container to inventory).
1005	* syntax is: move (to) (tag) (nrof)	684	* syntax is: move (to) (tag) (nrof)
…		…
1008	MoveCmd (char *buf, int len, player *pl)	687	MoveCmd (char *buf, int len, player *pl)
1009	{	688	{
1010	int vals[3], i;	689	int vals[3], i;
1011		690
1012	/* A little funky here. We only cycle for 2 records, because	691	/* A little funky here. We only cycle for 2 records, because
1013	* we obviously am not going to find a space after the third	692	* we obviously are not going to find a space after the third
1014	* record. Perhaps we should just replace this with a	693	* record. Perhaps we should just replace this with a
1015	* sscanf?	694	* sscanf?
1016	*/	695	*/
1017	for (i = 0; i < 2; i++)	696	for (i = 0; i < 2; i++)
1018	{	697	{
1019	vals[i] = atoi (buf);	698	vals[i] = atoi (buf);
		699
1020	if (!(buf = strchr (buf, ' ')))	700	if (!(buf = strchr (buf, ' ')))
1021	{	701	{
1022	LOG (llevError, "Incomplete move command: %s\n", buf);	702	LOG (llevError, "Incomplete move command: %s\n", buf);
1023	return;	703	return;
1024	}	704	}
		705
1025	buf++;	706	buf++;
1026	}	707	}
		708
1027	vals[2] = atoi (buf);	709	vals[2] = atoi (buf);
1028		710
1029	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/	711	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
1030	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);	712	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
1031	}	713	}
1032
1033
1034		714
1035	/******************************************************************************	715	/******************************************************************************
1036	*	716	*
1037	* Start of commands the server sends to the client.	717	* Start of commands the server sends to the client.
1038	*	718	*
…		…
1041	/**	721	/**
1042	* 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
1043	* 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)
1044	*/	724	*/
1045	void	725	void
1046	send_query (client * ns, uint8 flags, char *text)	726	send_query (client *ns, uint8 flags, const char *text)
1047	{	727	{
1048	char buf[MAX_BUF];
1049
1050	sprintf (buf, "query %d %s", flags, text ? text : "");	728	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
1051	ns->send_packet (buf);	729	}
		730
		731	/**
		732	* Get player's current range attack in obuf.
		733	*/
		734	static void
		735	rangetostring (object *ob, char *obuf)
		736	{
		737	dynbuf_text buf;
		738
		739	player *pl = ob->contr;
		740
		741	if (pl->ranged_ob)
		742	buf << " Range: " << pl->ranged_ob->name;
		743
		744	if (pl->combat_ob)
		745	buf << " Combat: " << pl->combat_ob->name;
		746
		747	if (pl->golem)
		748	buf << " Golem: " << pl->golem->name;
		749
		750	if (buf.empty ())
		751	*obuf = 0;
		752	else
		753	{
		754	memcpy (obuf, buf.linearise () + 1, buf.size () - 1);
		755	obuf [buf.size ()] = 0;
		756	}
1052	}	757	}
1053		758
1054	#define AddIfInt64(Old,New,Type) if (Old != New) {\	759	#define AddIfInt64(Old,New,Type) if (Old != New) {\
1055	Old = New; \	760	Old = New; \
1056	sl << uint8 (Type) << uint64 (New); \	761	sl << uint8 (Type) << uint64 (New); \
…		…
1086	esrv_update_stats (player *pl)	791	esrv_update_stats (player *pl)
1087	{	792	{
1088	char buf[MAX_BUF];	793	char buf[MAX_BUF];
1089	uint16 flags;	794	uint16 flags;
1090		795
1091	packet sl;	796	client *ns = pl->ns;
1092	sl << "stats ";	797	if (!ns)
		798	return;
1093		799
1094	if (pl->ob != NULL)	800	object *ob = pl->ob;
1095	{	801	if (!ob)
		802	return;
		803
		804	packet sl ("stats");
		805
1096	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	806	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1097	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	807	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1098	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	808	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1099	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	809	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1100	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	810	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1101	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	811	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1102	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	812	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1103	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1104	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1105	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1106	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	813	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1107	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	814	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		815	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		816	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		817	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1108	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	818	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1109	}
1110		819
1111	if (pl->socket->exp64)
1112	{
1113	uint8 s;
1114
1115	for (s = 0; s < NUM_SKILLS; s++)	820	for (int s = 0; s < NUM_SKILLS; s++)
		821	if (object *skill = pl->last_skill_ob[s])
		822	if (skill->stats.exp != ns->last_skill_exp [s])
1116	{	823	{
1117	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	824	ns->last_skill_exp [s] = skill->stats.exp;
1118	{	825
1119	/* Always send along the level if exp changes. This is only	826	/* Always send along the level if exp changes. This is only
1120	* 1 extra byte, but keeps processing simpler.	827	* 1 extra byte, but keeps processing simpler.
1121	*/	828	*/
1122	sl << uint8 (s + CS_STAT_SKILLINFO)	829	sl << uint8 (s + CS_STAT_SKILLINFO)
1123	<< uint8 (pl->last_skill_ob[s]->level)	830	<< uint8 (skill->level)
1124	<< uint64 (pl->last_skill_ob[s]->stats.exp);	831	<< uint64 (skill->stats.exp);
1125
1126	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1127	}
1128	}	832	}
1129	}
1130		833
1131	if (pl->socket->exp64)
1132	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	834	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1133	else
1134	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1135
1136	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	835	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1137	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	836	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1138	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	837	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1139	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	838	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1140	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	839	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1141	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	840	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1142	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	841	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1143	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	842	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		843
1144	flags = 0;	844	flags = 0;
1145		845
1146	if (pl->fire_on)	846	if (pl->fire_on)
1147	flags |= SF_FIREON;	847	flags |= SF_FIREON;
1148		848
1149	if (pl->run_on)	849	if (pl->run_on)
1150	flags |= SF_RUNON;	850	flags |= SF_RUNON;
1151		851
1152	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	852	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1153		853
1154	if (pl->socket->sc_version < 1025)	854	if (ns->sc_version < 1025)
1155	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	855	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1156	else	856	else
1157	{
1158	int i;
1159
1160	for (i = 0; i < NROFATTACKS; i++)	857	for (int i = 0; i < NROFATTACKS; i++)
1161	{	858	{
1162	/* Skip ones we won't send */	859	/* Skip ones we won't send */
1163	if (atnr_cs_stat[i] == -1)	860	if (atnr_cs_stat[i] == -1)
1164	continue;	861	continue;
1165		862
1166	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	863	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1167	}	864	}
1168	}
1169		865
1170	if (pl->socket->monitor_spells)	866	if (pl->ns->monitor_spells)
1171	{	867	{
1172	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	868	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1173	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	869	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1174	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	870	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1175	}	871	}
1176		872
1177	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	873	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1178	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	874	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1179	set_title (pl->ob, buf);	875	set_title (ob, buf);
1180	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	876	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1181		877
1182	/* Only send it away if we have some actual data */	878	/* Only send it away if we have some actual data */
1183	if (sl.length () > 6)	879	if (sl.length () > 6)
1184	pl->socket->send_packet (sl);	880	ns->send_packet (sl);
1185	}	881	}
1186		882
1187	/**	883	/**
1188	* Tells the client that here is a player it should start using.	884	* Tells the client that here is a player it should start using.
1189	*/	885	*/
1190	void	886	void
1191	esrv_new_player (player *pl, uint32 weight)	887	esrv_new_player (player *pl, uint32 weight)
1192	{	888	{
1193	pl->last_weight = weight;	889	packet sl ("player");
1194
1195	packet sl;
1196	sl << "player ";
1197		890
1198	sl << uint32 (pl->ob->count)	891	sl << uint32 (pl->ob->count)
1199	<< uint32 (weight)	892	<< uint32 (weight)
1200	<< uint32 (pl->ob->face->number)	893	<< uint32 (pl->ob->face)
1201	<< data8 (pl->ob->name);	894	<< data8 (pl->ob->name);
1202		895
		896	pl->ns->last_weight = weight;
1203	pl->socket->send_packet (sl);	897	pl->ns->send_packet (sl);
1204	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	898	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1205	}	899	}
1206
1207	/**
1208	* Need to send an animation sequence to the client.
1209	* We will send appropriate face commands to the client if we haven't
1210	* sent them the face yet (this can become quite costly in terms of
1211	* how much we are sending - on the other hand, this should only happen
1212	* when the player logs in and picks stuff up.
1213	*/
1214	void
1215	esrv_send_animation (client * ns, short anim_num)
1216	{
1217	int i;
1218
1219	/* Do some checking on the anim_num we got. Note that the animations
1220	* are added in contigous order, so if the number is in the valid
1221	* range, it must be a valid animation.
1222	*/
1223	if (anim_num < 0 || anim_num > num_animations)
1224	{
1225	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1226	return;
1227	}
1228
1229	packet sl;
1230
1231	sl << "anim "
1232	<< uint16 (anim_num)
1233	<< uint16 (0); /* flags - not used right now */
1234
1235	/* Build up the list of faces. Also, send any information (ie, the
1236	* the face itself) down to the client.
1237	*/
1238	for (i = 0; i < animations[anim_num].num_animations; i++)
1239	{
1240	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1241	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1242	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1243	}
1244
1245	ns->send_packet (sl);
1246
1247	ns->anims_sent[anim_num] = 1;
1248	}
1249
1250		900
1251	/******************************************************************************	901	/******************************************************************************
1252	*	902	*
1253	* Start of map related commands.	903	* Start of map related commands.
1254	*	904	*
1255	******************************************************************************/	905	******************************************************************************/
1256		906
1257	/**
1258	* This adds face_num to a map cell at x,y. If the client doesn't have
1259	* the face yet, we will also send it.
1260	*/
1261	static void
1262	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1263	{
1264	if (newmap->cells[x][y].count >= MAP_LAYERS)
1265	{
1266	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1267	return;
1268	abort ();
1269	}
1270
1271	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1272	newmap->cells[x][y].count++;
1273
1274	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1275	esrv_send_face (ns, face_num, 0);
1276	}
1277
1278	struct LayerCell
1279	{
1280	uint16 xy;
1281	short face;
1282	};
1283
1284	struct MapLayer
1285	{
1286	int count;
1287	struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
1288	};
1289
1290	/** Checkes if map cells have changed */
1291	static int
1292	mapcellchanged (client * ns, int i, int j, struct Map *newmap)
1293	{
1294	int k;
1295
1296	if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
1297	return 1;
1298	for (k = 0; k < newmap->cells[i][j].count; k++)
1299	{
1300	if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
1301	{
1302	return 1;
1303	}
1304	}
1305	return 0;
1306	}
1307
1308	/**
1309	* Basically, what this does is pack the data into layers.
1310	* cnum is the client number, cur is the the buffer we put all of
1311	* this data into. we return the end of the data. layers is
1312	* how many layers of data we should back.
1313	*/
1314	static uint8 *
1315	compactlayer (client * ns, unsigned char *cur, int numlayers, struct Map *newmap)
1316	{
1317	int x, y, k;
1318	int face;
1319	unsigned char *fcur;
1320	struct MapLayer layers[MAP_LAYERS];
1321
1322	for (k = 0; k < MAP_LAYERS; k++)
1323	layers[k].count = 0;
1324	fcur = cur;
1325	for (x = 0; x < ns->mapx; x++)
1326	{
1327	for (y = 0; y < ns->mapy; y++)
1328	{
1329	if (!mapcellchanged (ns, x, y, newmap))
1330	continue;
1331	if (newmap->cells[x][y].count == 0)
1332	{
1333	*cur = x * ns->mapy + y; /* mark empty space */
1334	cur++;
1335	continue;
1336	}
1337	for (k = 0; k < newmap->cells[x][y].count; k++)
1338	{
1339	layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
1340	layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
1341	layers[k].count++;
1342	}
1343	}
1344	}
1345	/* If no data, return now. */
1346	if (fcur == cur && layers[0].count == 0)
1347	return cur;
1348	*cur = 255; /* mark end of explicitly cleared cells */
1349	cur++;
1350	/* First pack by layers. */
1351	for (k = 0; k < numlayers; k++)
1352	{
1353	if (layers[k].count == 0)
1354	break; /* once a layer is entirely empty, no layer below it can
1355	have anything in it either */
1356	/* Pack by entries in thie layer */
1357	for (x = 0; x < layers[k].count;)
1358	{
1359	fcur = cur;
1360	*cur = layers[k].lcells[x].face >> 8;
1361	cur++;
1362	*cur = layers[k].lcells[x].face & 0xFF;
1363	cur++;
1364	face = layers[k].lcells[x].face;
1365	/* Now, we back the redundant data into 1 byte xy pairings */
1366	for (y = x; y < layers[k].count; y++)
1367	{
1368	if (layers[k].lcells[y].face == face)
1369	{
1370	*cur = (uint8) layers[k].lcells[y].xy;
1371	cur++;
1372	layers[k].lcells[y].face = -1;
1373	}
1374	}
1375	*(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
1376	/* forward over the now redundant data */
1377	while (x < layers[k].count && layers[k].lcells[x].face == -1)
1378	x++;
1379	}
1380	*fcur = *fcur | 128; /* mark for end of faces at this layer */
1381	}
1382	return cur;
1383	}
1384
1385	/** Clears a map cell */	907	/** Clears a map cell */
1386	static void	908	static void
1387	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	909	map_clearcell (struct MapCell *cell, int count)
1388	{	910	{
1389	cell->faces[0] = face0;	911	cell->faces[0] = 0;
1390	cell->faces[1] = face1;	912	cell->faces[1] = 0;
1391	cell->faces[2] = face2;	913	cell->faces[2] = 0;
		914	cell->smooth[0] = 0;
		915	cell->smooth[1] = 0;
		916	cell->smooth[2] = 0;
1392	cell->count = count;	917	cell->count = count;
1393	cell->stat_hp = 0;	918	cell->stat_hp = 0;
1394	cell->flags = 0;	919	cell->flags = 0;
1395	cell->player = 0;	920	cell->player = 0;
1396	}	921	}
1397		922
1398	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1399	#define MAX_LAYERS 3	923	#define MAX_LAYERS 3
1400
1401	/* Using a global really isn't a good approach, but saves the over head of
1402	* allocating and deallocating such a block of data each time run through,
1403	* and saves the space of allocating this in the socket object when we only
1404	* need it for this cycle. If the serve is ever threaded, this needs to be
1405	* re-examined.
1406	*/
1407
1408	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1409
1410	/**
1411	* Returns true if any of the heads for this
1412	* space is set. Returns false if all are blank - this is used
1413	* for empty space checking.
1414	*/
1415	static inline int
1416	have_head (int ax, int ay)
1417	{
1418
1419	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1420	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1421	return 1;
1422	return 0;
1423	}
1424
1425	/**
1426	* check_head is a bit simplistic version of update_space below.
1427	* basically, it only checks the that the head on space ax,ay at layer
1428	* needs to get sent - if so, it adds the data, sending the head
1429	* if needed, and returning 1. If this no data needs to get
1430	* sent, it returns zero.
1431	*/
1432	static int
1433	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1434	{
1435	short face_num;
1436
1437	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1438	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1439	else
1440	face_num = 0;
1441
1442	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1443	{
1444	sl << uint16 (face_num);
1445	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1446	esrv_send_face (&ns, face_num, 0);
1447
1448	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1449	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1450	return 1;
1451	}
1452
1453	return 0; /* No change */
1454	}
1455		924
1456	/**	925	/**
1457	* Removes the need to replicate the same code for each layer.	926	* Removes the need to replicate the same code for each layer.
1458	* this returns true if this space is now in fact different than	927	* this returns true if this space is now in fact different than
1459	* it was.	928	* it was.
1460	* sl is the socklist this data is going into.	929	* sl is the socklist this data is going into.
1461	* ns is the socket we are working on - all the info we care	930	* ns is the socket we are working on - all the info we care
1462	* about is in this socket structure, so now need not pass the	931	* about is in this socket structure, so now need not pass the
1463	* entire player object.	932	* entire player object.
1464	* mx and my are map coordinate offsets for map mp
1465	* sx and sy are the offsets into the socket structure that
1466	* holds the old values.
1467	* layer is the layer to update, with 2 being the floor and 0 the	933	* layer is the layer to update, with 2 being the floor and 0 the
1468	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	934	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1469	* take. Interesting to note that before this function, the map1 function	935	* take. Interesting to note that before this function, the map1 function
1470	* numbers the spaces differently - I think this was a leftover from	936	* numbers the spaces differently - I think this was a leftover from
1471	* the map command, where the faces stack up. Sinces that is no longer	937	* the map command, where the faces stack up. Sinces that is no longer
1472	* the case, it seems to make more sense to have these layer values	938	* the case, it seems to make more sense to have these layer values
1473	* actually match.	939	* actually match.
1474	*/	940	*/
1475
1476	static int	941	static int
1477	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	942	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1478	{	943	{
1479	object *ob, *head;	944	object *ob = ms.faces_obj [layer];
1480	uint16 face_num;
1481	int bx, by, i;
1482
1483	/* If there is a multipart object stored away, treat that as more important.
1484	* If not, then do the normal processing.
1485	*/
1486	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1487
1488	/* Check to see if this head is part of the set of objects
1489	* we would normally send for this space. If so, then
1490	* don't use the head value. We need to do the check
1491	* here and not when setting up the heads[] value for two reasons -
1492	* 1) the heads[] values will get used even if the space is not visible.
1493	* 2) its possible the head is not on the same map as a part, and I'd
1494	* rather not need to do the map translation overhead.
1495	* 3) We need to do some extra checking to make sure that we will
1496	* otherwise send the image as this layer, eg, either it matches
1497	* the head value, or is not multipart.
1498	*/
1499	if (head && !head->more)
1500	{
1501	for (i = 0; i < MAP_LAYERS; i++)
1502	{
1503	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1504	if (!ob)
1505	continue;
1506
1507	if (ob->head)
1508	ob = ob->head;
1509
1510	if (ob == head)
1511	{
1512	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1513	head = NULL;
1514	break;
1515	}
1516	}
1517	}
1518
1519	ob = head;
1520	if (!ob)
1521	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1522		945
1523	/* If there is no object for this space, or if the face for the object	946	/* If there is no object for this space, or if the face for the object
1524	* is the blank face, set the face number to zero.	947	* is the blank face, set the face number to zero.
1525	* else if we have the stored head object for this space, that takes	948	* else if we have the stored head object for this space, that takes
1526	* precedence over the other object for this space.	949	* precedence over the other object for this space.
1527	* otherwise, we do special head processing	950	* otherwise, we do special head processing
1528	*/	951	*/
1529	if (!ob || ob->face == blank_face)	952	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1530	face_num = 0;
1531	else if (head)
1532	{
1533	/* if this is a head that had previously been stored */
1534	face_num = ob->face->number;
1535	}
1536	else
1537	{
1538	/* if the faces for the different parts of a multipart object
1539	* are the same, we only want to send the bottom right most
1540	* portion of the object. That info is in the tail_.. values
1541	* of the head. Note that for the head itself, ob->head will
1542	* be null, so we only do this block if we are working on
1543	* a tail piece.
1544	*/
1545
1546	/* tail_x and tail_y will only be set in the head object. If
1547	* this is the head object and these are set, we proceed
1548	* with logic to only send bottom right. Similarly, if
1549	* this is one of the more parts but the head has those values
1550	* set, we want to do the processing. There can be cases where
1551	* the head is not visible but one of its parts is, so we just
1552	* can always expect that ob->arch->tail_x will be true for all
1553	* object we may want to display.
1554	*/
1555	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1556	{
1557
1558	if (ob->head)
1559	head = ob->head;
1560	else
1561	head = ob;
1562
1563	/* Basically figure out where the offset is from where we are right
1564	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1565	* piece is from the head, and the tail is where the tail is from the
1566	* head. Note that bx and by will equal sx and sy if we are already working
1567	* on the bottom right corner. If ob is the head, the clone values
1568	* will be zero, so the right thing will still happen.
1569	*/
1570	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1571	by = sy + head->arch->tail_y - ob->arch->clone.y;
1572
1573	/* I don't think this can ever happen, but better to check for it just
1574	* in case.
1575	*/
1576	if (bx < sx || by < sy)
1577	{
1578	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1579	face_num = 0;
1580	}
1581	/* single part object, multipart object with non merged faces,
1582	* of multipart object already at lower right.
1583	*/
1584	else if (bx == sx && by == sy)
1585	{
1586	face_num = ob->face->number;
1587
1588	/* if this face matches one stored away, clear that one away.
1589	* this code relies on the fact that the map1 commands
1590	* goes from 2 down to 0.
1591	*/
1592	for (i = 0; i < MAP_LAYERS; i++)
1593	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1594	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1595	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1596	}
1597	else
1598	{
1599	/* If this head is stored away, clear it - otherwise,
1600	* there can be cases where a object is on multiple layers -
1601	* we only want to send it once.
1602	*/
1603	face_num = head->face->number;
1604	for (i = 0; i < MAP_LAYERS; i++)
1605	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1606	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1607	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1608
1609	/* First, try to put the new head on the same layer. If that is used up,
1610	* then find another layer.
1611	*/
1612	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1613	{
1614	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1615	}
1616	else
1617	for (i = 0; i < MAX_LAYERS; i++)
1618	{
1619	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1620	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1621	{
1622	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1623	}
1624	}
1625	face_num = 0; /* Don't send this object - we'll send the head later */
1626	}
1627	}
1628	else
1629	{
1630	/* In this case, we are already at the lower right or single part object,
1631	* so nothing special
1632	*/
1633	face_num = ob->face->number;
1634
1635	/* clear out any head entries that have the same face as this one */
1636	for (bx = 0; bx < layer; bx++)
1637	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1638	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1639	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1640	}
1641	} /* else not already head object or blank face */
1642
1643	/* This is a real hack. Basically, if we have nothing to send for this layer,
1644	* but there is a head on the next layer, send that instead.
1645	* Without this, what happens is you can get the case where the player stands
1646	* on the same space as the head. However, if you have overlapping big objects
1647	* of the same type, what happens then is it doesn't think it needs to send
1648	* This tends to make stacking also work/look better.
1649	*/
1650	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1651	{
1652	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1653	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1654	}
1655
1656	/* Another hack - because of heads and whatnot, this face may match one
1657	* we already sent for a lower layer. In that case, don't send
1658	* this one.
1659	*/
1660	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1661	face_num = 0;
1662		953
1663	/* We've gotten what face we want to use for the object. Now see if	954	/* We've gotten what face we want to use for the object. Now see if
1664	* if it has changed since we last sent it to the client.	955	* if it has changed since we last sent it to the client.
1665	*/	956	*/
1666	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	957	if (lastcell.faces[layer] != face_num)
1667	{	958	{
1668	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	959	lastcell.faces[layer] = face_num;
		960
1669	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	961	if (!ns.faces_sent[face_num])
		962	if (ob)
		963	ns.send_faces (ob);
		964	else
1670	esrv_send_face (&ns, face_num, 0);	965	ns.send_face (face_num);
1671		966
1672	sl << uint16 (face_num);	967	sl << uint16 (face_num);
1673	return 1;
1674	}
1675
1676	/* Nothing changed */
1677	return 0;
1678	}
1679
1680	/**
1681	* This function is mainly a copy of update_space,
1682	* except it handles update of the smoothing updates,
1683	* not the face updates.
1684	* Removes the need to replicate the same code for each layer.
1685	* this returns true if this smooth is now in fact different
1686	* than it was.
1687	* sl is the socklist this data is going into.
1688	* ns is the socket we are working on - all the info we care
1689	* about is in this socket structure, so know need to pass the
1690	* entire player object.
1691	* mx and my are map coordinate offsets for map mp
1692	* sx and sy are the offsets into the socket structure that
1693	* holds the old values.
1694	* layer is the layer to update, with 2 being the floor and 0 the
1695	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1696	* take.
1697	*/
1698
1699	static inline int
1700	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1701	{
1702	object *ob;
1703	int smoothlevel; /* old face_num; */
1704
1705	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1706
1707	/* If there is no object for this space, or if the face for the object
1708	* is the blank face, set the smoothlevel to zero.
1709	*/
1710	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1711	smoothlevel = 0;
1712	else
1713	{
1714	smoothlevel = ob->smoothlevel;
1715	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1716	SendSmooth (&ns, ob->face->number);
1717	} /* else not already head object or blank face */
1718
1719	/* We've gotten what face we want to use for the object. Now see if
1720	* if it has changed since we last sent it to the client.
1721	*/
1722	if (smoothlevel > 255)
1723	smoothlevel = 255;
1724	else if (smoothlevel < 0)
1725	smoothlevel = 0;
1726
1727	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1728	{
1729	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1730	sl << uint8 (smoothlevel);
1731	return 1;	968	return 1;
1732	}	969	}
1733		970
1734	/* Nothing changed */	971	/* Nothing changed */
1735	return 0;	972	return 0;
…		…
1748	if (ns->ext_mapinfos)	985	if (ns->ext_mapinfos)
1749	{	986	{
1750	if (ns->EMI_smooth)	987	if (ns->EMI_smooth)
1751	result += 1; /*One byte for smoothlevel */	988	result += 1; /*One byte for smoothlevel */
1752	}	989	}
		990
1753	return result;	991	return result;
		992	}
		993
		994	// prefetch (and touch) all maps within a specific distancd
		995	static void
		996	prefetch_surrounding_maps (maptile *map, int distance)
		997	{
		998	map->last_access = runtime;
		999
		1000	if (--distance)
		1001	for (int dir = 4; --dir; )
		1002	if (const shstr &path = map->tile_path [dir])
		1003	if (maptile *&neigh = map->tile_map [dir])
		1004	prefetch_surrounding_maps (neigh, distance);
		1005	else
		1006	neigh = maptile::find_async (path, map);
		1007	}
		1008
		1009	// prefetch a generous area around the player
		1010	static void
		1011	prefetch_surrounding_maps (object *op)
		1012	{
		1013	prefetch_surrounding_maps (op->map, 3);
1754	}	1014	}
1755		1015
1756	/**	1016	/**
1757	* This function uses the new map1 protocol command to send the map	1017	* This function uses the new map1 protocol command to send the map
1758	* to the client. It is necessary because the old map command supports	1018	* to the client. It is necessary because the old map command supports
…		…
1764	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1024	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1765	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1025	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1766	* and use the other 4 bits for other informatiion. For full documentation	1026	* and use the other 4 bits for other informatiion. For full documentation
1767	* of what we send, see the doc/Protocol file.	1027	* of what we send, see the doc/Protocol file.
1768	* I will describe internally what we do:	1028	* I will describe internally what we do:
1769	* the socket->lastmap shows how the map last looked when sent to the client.	1029	* the ns->lastmap shows how the map last looked when sent to the client.
1770	* in the lastmap structure, there is a cells array, which is set to the	1030	* in the lastmap structure, there is a cells array, which is set to the
1771	* maximum viewable size (As set in config.h).	1031	* maximum viewable size (As set in config.h).
1772	* in the cells, there are faces and a count value.	1032	* in the cells, there are faces and a count value.
1773	* we use the count value to hold the darkness value. If -1, then this space	1033	* we use the count value to hold the darkness value. If -1, then this space
1774	* is not viewable.	1034	* is not viewable.
…		…
1776	* look like.	1036	* look like.
1777	*/	1037	*/
1778	void	1038	void
1779	draw_client_map1 (object *pl)	1039	draw_client_map1 (object *pl)
1780	{	1040	{
1781	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1041	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1782	sint16 nx, ny;	1042	sint16 nx, ny;
1783	int estartlen, eoldlen;	1043	int estartlen, eoldlen;
1784	uint16 mask, emask;
1785	uint8 eentrysize;	1044	uint8 eentrysize;
1786	uint16 ewhatstart, ewhatflag;	1045	uint16 ewhatstart, ewhatflag;
1787	uint8 extendedinfos;	1046	uint8 extendedinfos;
1788	maptile *m;	1047	maptile *m;
1789		1048
1790	client &socket = *pl->contr->socket;	1049	client &socket = *pl->contr->ns;
		1050
		1051	if (!pl->active)
		1052	return;
1791		1053
1792	check_map_change (pl->contr);	1054	check_map_change (pl->contr);
		1055	prefetch_surrounding_maps (pl);
1793		1056
1794	packet sl;	1057	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1795	packet esl;	1058	packet esl;
1796		1059
1797	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1798	startlen = sl.length ();	1060	startlen = sl.length ();
1799		1061
1800	/*Extendedmapinfo structure initialisation */	1062	/*Extendedmapinfo structure initialisation */
1801	if (socket.ext_mapinfos)	1063	if (socket.ext_mapinfos)
1802	{	1064	{
…		…
1813	<< uint8 (extendedinfos)	1075	<< uint8 (extendedinfos)
1814	<< uint8 (eentrysize);	1076	<< uint8 (eentrysize);
1815		1077
1816	estartlen = esl.length ();	1078	estartlen = esl.length ();
1817	}	1079	}
1818	else
1819	{
1820	/* suppress compiler warnings */
1821	ewhatstart = 0;
1822	ewhatflag = 0;
1823	estartlen = 0;
1824	}
1825
1826	/* Init data to zero */
1827	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1828		1080
1829	/* x,y are the real map locations. ax, ay are viewport relative	1081	/* x,y are the real map locations. ax, ay are viewport relative
1830	* locations.	1082	* locations.
1831	*/	1083	*/
1832	ay = 0;	1084	ay = 0;
…		…
1835	* but that started to get a bit messy to look at.	1087	* but that started to get a bit messy to look at.
1836	*/	1088	*/
1837	max_x = pl->x + (socket.mapx + 1) / 2;	1089	max_x = pl->x + (socket.mapx + 1) / 2;
1838	max_y = pl->y + (socket.mapy + 1) / 2;	1090	max_y = pl->y + (socket.mapy + 1) / 2;
1839		1091
1840	if (socket.mapmode == Map1aCmd)	1092	maptile *plmap = pl->map;
1841	{
1842	max_x += MAX_HEAD_OFFSET;
1843	max_y += MAX_HEAD_OFFSET;
1844	}
1845		1093
1846	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1094	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1847	{	1095	{
1848	ax = 0;	1096	ax = 0;
1849	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1097	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1850	{	1098	{
1851		1099	int emask, mask;
1852	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1100	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1853		1101
1854	/* If this space is out of the normal viewable area, we only check
1855	* the heads value ax or ay will only be greater than what
1856	* the client wants if using the map1a command - this is because
1857	* if the map1a command is not used, max_x and max_y will be
1858	* set to lower values.
1859	*/
1860	if (ax >= socket.mapx || ay >= socket.mapy)
1861	{
1862	int i, got_one;
1863
1864	oldlen = sl.length ();
1865
1866	sl << uint16 (mask);
1867
1868	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1869	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1870	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1871
1872	/* If all we are doing is sending 0 (blank) faces, we don't
1873	* actually need to send that - just the coordinates
1874	* with no faces tells the client to blank out the
1875	* space.
1876	*/
1877	got_one = 0;
1878	for (i = oldlen + 2; i < sl.length (); i++)
1879	if (sl[i])
1880	got_one = 1;
1881
1882	if (got_one && (mask & 0xf))
1883	sl[oldlen + 1] = mask & 0xff;
1884	else
1885	{ /*either all faces blank, either no face at all */
1886	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1887	sl.reset (oldlen + 2);
1888	else
1889	sl.reset (oldlen);
1890	}
1891
1892	/*What concerns extendinfos, nothing to be done for now
1893	* (perhaps effects layer later)
1894	*/
1895	continue; /* don't do processing below */
1896	}
1897
1898	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1102	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1899
1900	d = pl->contr->blocked_los[ax][ay];
1901		1103
1902	/* If the coordinates are not valid, or it is too dark to see,	1104	/* If the coordinates are not valid, or it is too dark to see,
1903	* we tell the client as such	1105	* we tell the client as such
1904	*/	1106	*/
1905	nx = x;	1107	nx = x;
1906	ny = y;	1108	ny = y;
1907	m = get_map_from_coord (pl->map, &nx, &ny);	1109	m = get_map_from_coord (plmap, &nx, &ny);
1908		1110
1909	if (!m)	1111	if (!m)
1910	{	1112	{
1911	/* space is out of map. Update space and clear values	1113	/* space is out of map. Update space and clear values
1912	* if this hasn't already been done. If the space is out	1114	* if this hasn't already been done. If the space is out
1913	* of the map, it shouldn't have a head	1115	* of the map, it shouldn't have a head
1914	*/	1116	*/
1915	if (lastcell.count != -1)	1117	if (lastcell.count != -1)
1916	{	1118	{
1917	sl << uint16 (mask);	1119	sl << uint16 (mask);
1918	map_clearcell (&lastcell, 0, 0, 0, -1);	1120	map_clearcell (&lastcell, -1);
1919	}	1121	}
		1122
		1123	continue;
1920	}	1124	}
		1125
		1126	m->touch ();
		1127
		1128	int d = pl->contr->blocked_los[ax][ay];
		1129
1921	else if (d > 3)	1130	if (d > 3)
1922	{	1131	{
		1132
1923	int need_send = 0, count;	1133	int need_send = 0, count;
1924		1134
1925	/* This block deals with spaces that are not visible for whatever	1135	/* This block deals with spaces that are not visible for whatever
1926	* reason. Still may need to send the head for this space.	1136	* reason. Still may need to send the head for this space.
1927	*/	1137	*/
1928		1138
1929	oldlen = sl.length ();	1139	oldlen = sl.length ();
1930		1140
1931	sl << uint16 (mask);	1141	sl << uint16 (mask);
…		…
1933	if (lastcell.count != -1)	1143	if (lastcell.count != -1)
1934	need_send = 1;	1144	need_send = 1;
1935		1145
1936	count = -1;	1146	count = -1;
1937		1147
1938	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1939	{
1940	/* Now check to see if any heads need to be sent */
1941
1942	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1943	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1944	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1945
1946	lastcell.count = count;
1947	}
1948	else
1949	{
1950	/* properly clear a previously sent big face */	1148	/* properly clear a previously sent big face */
1951	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1149	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1952	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1150	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1953	need_send = 1;	1151	need_send = 1;
1954		1152
1955	map_clearcell (&lastcell, 0, 0, 0, count);	1153	map_clearcell (&lastcell, count);
1956	}
1957		1154
1958	if ((mask & 0xf) || need_send)	1155	if ((mask & 0xf) || need_send)
1959	sl[oldlen + 1] = mask & 0xff;	1156	sl[oldlen + 1] = mask & 0xff;
1960	else	1157	else
1961	sl.reset (oldlen);	1158	sl.reset (oldlen);
1962	}	1159	}
1963	else	1160	else
1964	{	1161	{
1965	/* In this block, the space is visible or there are head objects	1162	/* In this block, the space is visible.
1966	* we need to send.
1967	*/	1163	*/
1968		1164
1969	/* Rather than try to figure out what everything that we might	1165	/* Rather than try to figure out what everything that we might
1970	* need to send is, then form the packet after that,	1166	* need to send is, then form the packet after that,
1971	* we presume that we will in fact form a packet, and update	1167	* we presume that we will in fact form a packet, and update
…		…
1974	* is done.	1170	* is done.
1975	* I think this is simpler than doing a bunch of checks to see	1171	* I think this is simpler than doing a bunch of checks to see
1976	* what if anything we need to send, setting the bits, then	1172	* what if anything we need to send, setting the bits, then
1977	* doing those checks again to add the real data.	1173	* doing those checks again to add the real data.
1978	*/	1174	*/
1979	oldlen = sl.length ();	1175	oldlen = sl.length ();
1980	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1981	eoldlen = esl.length ();	1176	eoldlen = esl.length ();
1982	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1177
1983	sl << uint16 (mask);	1178	sl << uint16 (mask);
1984
1985	if (socket.ext_mapinfos)
1986	esl << uint16 (emask);
1987		1179
1988	unsigned char dummy;	1180	unsigned char dummy;
1989	unsigned char *last_ext = &dummy;	1181	unsigned char *last_ext = &dummy;
1990		1182
1991	/* Darkness changed */	1183	/* Darkness changed */
…		…
2003	sl << uint8 (255 - 64 * d);	1195	sl << uint8 (255 - 64 * d);
2004	}	1196	}
2005		1197
2006	lastcell.count = d;	1198	lastcell.count = d;
2007		1199
		1200	mapspace &ms = m->at (nx, ny);
		1201
2008	if (socket.extmap)	1202	if (socket.extmap)
2009	{	1203	{
2010	uint8 stat_hp = 0;	1204	uint8 stat_hp = 0;
2011	uint8 stat_width = 0;	1205	uint8 stat_width = 0;
2012	uint8 flags = 0;	1206	uint8 flags = 0;
2013	UUID player = 0;	1207	tag_t player = 0;
2014		1208
2015	// send hp information, if applicable	1209	// send hp information, if applicable
2016	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1210	if (object *op = ms.faces_obj [0])
2017	{	1211	{
2018	if (op->head || op->invisible)	1212	if (op->head || op->invisible)
2019	; // do not show	1213	; // do not show
2020	else if (op->type == PLAYER	1214	else if (op->type == PLAYER
2021	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1215	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
…		…
2059		1253
2060	mask |= 0x8;	1254	mask |= 0x8;
2061	*last_ext |= 0x80;	1255	*last_ext |= 0x80;
2062	last_ext = &sl[sl.length ()];	1256	last_ext = &sl[sl.length ()];
2063		1257
2064	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1258	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
2065	}	1259	}
2066		1260
2067	if (lastcell.flags != flags)	1261	if (lastcell.flags != flags)
2068	{	1262	{
2069	lastcell.flags = flags;	1263	lastcell.flags = flags;
…		…
2075	sl << uint8 (8) << uint8 (flags);	1269	sl << uint8 (8) << uint8 (flags);
2076	}	1270	}
2077	}	1271	}
2078		1272
2079	/* Floor face */	1273	/* Floor face */
2080	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1274	if (update_space (sl, socket, ms, lastcell, 2))
2081	mask |= 0x4;	1275	mask |= 0x4;
2082		1276
2083	if (socket.EMI_smooth)
2084	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
2085	emask |= 0x4;
2086
2087	/* Middle face */	1277	/* Middle face */
2088	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1278	if (update_space (sl, socket, ms, lastcell, 1))
2089	mask |= 0x2;	1279	mask |= 0x2;
2090		1280
2091	if (socket.EMI_smooth)	1281	if (ms.player () == pl
2092	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1282	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
2093	emask |= 0x2;
2094
2095	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
2096	{	1283	{
		1284	// force player to be visible to himself if invisible
2097	if (lastcell.faces[0] != pl->face->number)	1285	if (lastcell.faces[0] != pl->face)
2098	{	1286	{
2099	lastcell.faces[0] = pl->face->number;	1287	lastcell.faces[0] = pl->face;
		1288
2100	mask |= 0x1;	1289	mask |= 0x1;
2101
2102	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
2103	esrv_send_face (&socket, pl->face->number, 0);
2104
2105	sl << uint16 (pl->face->number);	1290	sl << uint16 (pl->face);
		1291
		1292	socket.send_faces (pl);
2106	}	1293	}
2107	}	1294	}
2108	else
2109	{
2110	/* Top face */	1295	/* Top face */
2111	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1296	else if (update_space (sl, socket, ms, lastcell, 0))
2112	mask |= 0x1;	1297	mask |= 0x1;
2113
2114	if (socket.EMI_smooth)
2115	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
2116	emask |= 0x1;
2117	}	1298
2118		1299
2119	/* Check to see if we are in fact sending anything for this	1300	/* Check to see if we are in fact sending anything for this
2120	* space by checking the mask. If so, update the mask.	1301	* space by checking the mask. If so, update the mask.
2121	* if not, reset the len to that from before adding the mask	1302	* if not, reset the len to that from before adding the mask
2122	* value, so we don't send those bits.	1303	* value, so we don't send those bits.
…		…
2124	if (mask & 0xf)	1305	if (mask & 0xf)
2125	sl[oldlen + 1] = mask & 0xff;	1306	sl[oldlen + 1] = mask & 0xff;
2126	else	1307	else
2127	sl.reset (oldlen);	1308	sl.reset (oldlen);
2128		1309
		1310	if (socket.ext_mapinfos)
		1311	esl << uint16 (emask);
		1312
		1313	if (socket.EMI_smooth)
		1314	{
		1315	for (int layer = 2+1; layer--; )
		1316	{
		1317	object *ob = ms.faces_obj [layer];
		1318
		1319	// If there is no object for this space, or if the face for the object
		1320	// is the blank face, set the smoothlevel to zero.
		1321	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1322
		1323	// We've gotten what face we want to use for the object. Now see if
		1324	// if it has changed since we last sent it to the client.
		1325	if (lastcell.smooth[layer] != smoothlevel)
		1326	{
		1327	lastcell.smooth[layer] = smoothlevel;
		1328	esl << uint8 (smoothlevel);
		1329	emask |= 1 << layer;
		1330	}
		1331	}
		1332
2129	if (emask & 0xf)	1333	if (emask & 0xf)
2130	esl[eoldlen + 1] = emask & 0xff;	1334	esl[eoldlen + 1] = emask & 0xff;
2131	else	1335	else
2132	esl.reset (eoldlen);	1336	esl.reset (eoldlen);
		1337	}
2133	} /* else this is a viewable space */	1338	} /* else this is a viewable space */
2134	} /* for x loop */	1339	} /* for x loop */
2135	} /* for y loop */	1340	} /* for y loop */
		1341
		1342	socket.flush_fx ();
2136		1343
2137	/* Verify that we in fact do need to send this */	1344	/* Verify that we in fact do need to send this */
2138	if (socket.ext_mapinfos)	1345	if (socket.ext_mapinfos)
2139	{	1346	{
2140	if (!(sl.length () > startlen || socket.sent_scroll))	1347	if (!(sl.length () > startlen || socket.sent_scroll))
2141	{	1348	{
2142	/* No map data will follow, so don't say the client	1349	/* No map data will follow, so don't say the client
2143	* it doesn't need draw!	1350	* it doesn't need draw!
2144	*/	1351	*/
2145	ewhatflag &= (~EMI_NOREDRAW);	1352	ewhatflag &= ~EMI_NOREDRAW;
2146	esl[ewhatstart + 1] = ewhatflag & 0xff;	1353	esl[ewhatstart + 1] = ewhatflag & 0xff;
2147	}	1354	}
2148		1355
2149	if (esl.length () > estartlen)	1356	if (esl.length () > estartlen)
2150	socket.send_packet (esl);	1357	socket.send_packet (esl);
…		…
2162	*/	1369	*/
2163	void	1370	void
2164	draw_client_map (object *pl)	1371	draw_client_map (object *pl)
2165	{	1372	{
2166	int i, j;	1373	int i, j;
2167	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1374	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
2168	New_Face *face, *floor;
2169	New_Face *floor2;
2170	int d, mflags;	1375	int mflags;
2171	struct Map newmap;	1376	struct Map newmap;
2172	maptile *m, *pm;	1377	maptile *m, *pm;
2173		1378
2174	if (pl->type != PLAYER)	1379	if (pl->type != PLAYER)
2175	{	1380	{
…		…
2186	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	1391	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
2187	return;	1392	return;
2188		1393
2189	memset (&newmap, 0, sizeof (struct Map));	1394	memset (&newmap, 0, sizeof (struct Map));
2190		1395
2191	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	1396	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2192	{
2193	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)	1397	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2194	{	1398	{
2195	ax = i;	1399	ax = i;
2196	ay = j;	1400	ay = j;
2197	m = pm;	1401	m = pm;
2198	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	1402	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
		1403
2199	if (mflags & P_OUT_OF_MAP)	1404	if (mflags & P_OUT_OF_MAP)
2200	continue;	1405	continue;
2201	if (mflags & P_NEED_UPDATE)	1406
2202	update_position (m, ax, ay);
2203	/* If a map is visible to the player, we don't want to swap it out	1407	/* If a map is visible to the player, we don't want to swap it out
2204	* just to reload it. This should really call something like	1408	* just to reload it. This should really call something like
2205	* swap_map, but this is much more efficient and 'good enough'	1409	* swap_map, but this is much more efficient and 'good enough'
2206	*/	1410	*/
2207	if (mflags & P_NEW_MAP)	1411	if (mflags & P_NEW_MAP)
2208	m->timeout = 50;	1412	m->timeout = 50;
2209	}	1413	}
2210	}	1414
2211	/* do LOS after calls to update_position */	1415	/* do LOS after calls to update_position */
2212	if (pl->contr->do_los)	1416	if (pl->contr->do_los)
2213	{	1417	{
2214	update_los (pl);	1418	update_los (pl);
2215	pl->contr->do_los = 0;	1419	pl->contr->do_los = 0;
…		…
2230		1434
2231	/*****************************************************************************/	1435	/*****************************************************************************/
2232	void	1436	void
2233	send_plugin_custom_message (object *pl, char *buf)	1437	send_plugin_custom_message (object *pl, char *buf)
2234	{	1438	{
2235	pl->contr->socket->send_packet (buf);	1439	pl->contr->ns->send_packet (buf);
2236	}	1440	}
2237		1441
2238	/**	1442	/**
2239	* This sends the skill number to name mapping. We ignore	1443	* This sends the skill number to name mapping. We ignore
2240	* the params - we always send the same info no matter what.	1444	* the params - we always send the same info no matter what.
…		…
2285	* it then sends an updspell packet for each spell that has changed in this way	1489	* it then sends an updspell packet for each spell that has changed in this way
2286	*/	1490	*/
2287	void	1491	void
2288	esrv_update_spells (player *pl)	1492	esrv_update_spells (player *pl)
2289	{	1493	{
		1494	if (!pl->ns)
		1495	return;
		1496
2290	if (!pl->socket->monitor_spells)	1497	if (!pl->ns->monitor_spells)
2291	return;	1498	return;
2292		1499
2293	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1500	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2294	{	1501	{
2295	if (spell->type == SPELL)	1502	if (spell->type == SPELL)
…		…
2325		1532
2326	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1533	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2327	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1534	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2328	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1535	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2329		1536
2330	pl->socket->send_packet (sl);	1537	pl->ns->send_packet (sl);
2331	}	1538	}
2332	}	1539	}
2333	}	1540	}
2334	}	1541	}
2335		1542
2336	void	1543	void
2337	esrv_remove_spell (player *pl, object *spell)	1544	esrv_remove_spell (player *pl, object *spell)
2338	{	1545	{
2339	if (!pl->socket->monitor_spells)	1546	if (!pl->ns->monitor_spells)
2340	return;	1547	return;
2341		1548
2342	if (!pl || !spell || spell->env != pl->ob)	1549	if (!pl || !spell || spell->env != pl->ob)
2343	{	1550	{
2344	LOG (llevError, "Invalid call to esrv_remove_spell");	1551	LOG (llevError, "Invalid call to esrv_remove_spell");
2345	return;	1552	return;
2346	}	1553	}
2347		1554
2348	packet sl;	1555	packet sl ("delspell");
2349		1556
2350	sl << "delspell "
2351	<< uint32 (spell->count);	1557	sl << uint32 (spell->count);
2352		1558
2353	pl->socket->send_packet (sl);	1559	pl->ns->send_packet (sl);
2354	}	1560	}
2355		1561
2356	/* appends the spell *spell to the Socklist we will send the data to. */	1562	/* appends the spell *spell to the Socklist we will send the data to. */
2357	static void	1563	static void
2358	append_spell (player *pl, packet &sl, object *spell)	1564	append_spell (player *pl, packet &sl, object *spell)
2359	{	1565	{
2360	int len, i, skill = 0;	1566	int i, skill = 0;
2361		1567
2362	if (!(spell->name))	1568	if (!(spell->name))
2363	{	1569	{
2364	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1570	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2365	return;	1571	return;
…		…
2377	if (!strcmp (spell->skill, skill_names[i]))	1583	if (!strcmp (spell->skill, skill_names[i]))
2378	{	1584	{
2379	skill = i + CS_STAT_SKILLINFO;	1585	skill = i + CS_STAT_SKILLINFO;
2380	break;	1586	break;
2381	}	1587	}
		1588	}
		1589
		1590	// spells better have a face
		1591	if (!spell->face)
		1592	{
		1593	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1594	spell->face = face_find ("burnout.x11", blank_face);
2382	}	1595	}
2383		1596
2384	/* send the current values */	1597	/* send the current values */
2385	sl << uint32 (spell->count)	1598	sl << uint32 (spell->count)
2386	<< uint16 (spell->level)	1599	<< uint16 (spell->level)
…		…
2388	<< uint16 (spell->last_sp)	1601	<< uint16 (spell->last_sp)
2389	<< uint16 (spell->last_grace)	1602	<< uint16 (spell->last_grace)
2390	<< uint16 (spell->last_eat)	1603	<< uint16 (spell->last_eat)
2391	<< uint8 (skill)	1604	<< uint8 (skill)
2392	<< uint32 (spell->path_attuned)	1605	<< uint32 (spell->path_attuned)
2393	<< uint32 (spell->face ? spell->face->number : 0)	1606	<< uint32 (spell->face)
2394	<< data8 (spell->name)	1607	<< data8 (spell->name)
2395	<< data16 (spell->msg);	1608	<< data16 (spell->msg);
2396	}	1609	}
2397		1610
2398	/**	1611	/**
…		…
2406	{	1619	{
2407	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	1620	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2408	return;	1621	return;
2409	}	1622	}
2410		1623
2411	if (!pl->socket->monitor_spells)	1624	if (!pl->ns->monitor_spells)
2412	return;	1625	return;
2413		1626
2414	packet sl;	1627	packet sl ("addspell");
2415
2416	sl << "addspell ";
2417		1628
2418	if (!spell)	1629	if (!spell)
2419	{	1630	{
2420	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1631	for (spell = pl->ob->inv; spell; spell = spell->below)
2421	{	1632	{
2422	/* were we to simply keep appending data here, we could exceed	1633	/* were we to simply keep appending data here, we could exceed
2423	* MAXSOCKBUF if the player has enough spells to add, we know that	1634	* MAXSOCKBUF if the player has enough spells to add, we know that
2424	* append_spells will always append 19 data bytes, plus 4 length	1635	* append_spells will always append 19 data bytes, plus 4 length
2425	* bytes and 3 strings (because that is the spec) so we need to	1636	* bytes and 3 strings (because that is the spec) so we need to
…		…
2435	if (spell->type != SPELL)	1646	if (spell->type != SPELL)
2436	continue;	1647	continue;
2437		1648
2438	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1649	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2439	{	1650	{
2440	pl->socket->send_packet (sl);	1651	pl->ns->send_packet (sl);
2441		1652
2442	sl.reset ();	1653	sl.reset ();
2443	sl << "addspell ";	1654	sl << "addspell ";
2444	}	1655	}
2445		1656
…		…
2459	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1670	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2460	fatal (0);	1671	fatal (0);
2461	}	1672	}
2462		1673
2463	/* finally, we can send the packet */	1674	/* finally, we can send the packet */
2464	pl->socket->send_packet (sl);	1675	pl->ns->send_packet (sl);
2465	}	1676	}
2466		1677

Diff Legend

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