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.136 by root, Sun Aug 10 16:31:18 2008 UTC vs.
Revision 1.194 by root, Sun Jan 29 02:47:06 2017 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel	5	* Copyright (©) 2001 Mark Wedel
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* 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,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
		24
		25	//+GPL
23		26
24	/**	27	/**
25	* \file	28	* \file
26	* Client handling.	29	* Client handling.
27	*	30	*
28	* \date 2003-12-02	31	* \date 2003-12-02
29	*	32	*
30	* This file implements all of the goo on the server side for handling	33	* This file implements all of the goo on the server side for handling
31	* clients. It's got a bunch of global variables for keeping track of	34	* clients. It's got a bunch of global variables for keeping track of
32	* each of the clients.	35	* each of the clients.
33	*	36	*
34	* Note: All functions that are used to process data from the client	37	* Note: All functions that are used to process data from the client
35	* have the prototype of (char *data, int datalen, int client_num). This	38	* have the prototype of (char *data, int datalen, int client_num). This
36	* way, we can use one dispatch table.	39	* way, we can use one dispatch table.
37	*	40	*
…		…
41		44
42	#include <global.h>	45	#include <global.h>
43	#include <sproto.h>	46	#include <sproto.h>
44		47
45	#include <living.h>	48	#include <living.h>
46	#include <commands.h>
47		49
48	/* This block is basically taken from socket.c - I assume if it works there,	50	/* This block is basically taken from socket.c - I assume if it works there,
49	* it should work here.	51	* it should work here.
50	*/	52	*/
51	#include <sys/types.h>	53	#include <sys/types.h>
…		…
63	* This table translates the attack numbers as used within the	65	* This table translates the attack numbers as used within the
64	* program to the value we use when sending STATS command to the	66	* program to the value we use when sending STATS command to the
65	* client. If a value is -1, then we don't send that to the	67	* client. If a value is -1, then we don't send that to the
66	* client.	68	* client.
67	*/	69	*/
68	short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,	70	static short atnr_cs_stat[NROFATTACKS] =
69	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,	71	{
70	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,	72	CS_STAT_RES_PHYS,
71	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	73	CS_STAT_RES_MAG,
72	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	74	CS_STAT_RES_FIRE,
73	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,	75	CS_STAT_RES_ELEC,
74	CS_STAT_RES_FEAR, -1 /* Cancellation */ ,	76	CS_STAT_RES_COLD,
75	CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,	77	CS_STAT_RES_CONF,
76	-1 /* Chaos */ , -1 /* Counterspell */ ,	78	CS_STAT_RES_ACID,
77	-1 /* Godpower */ , CS_STAT_RES_HOLYWORD,	79	CS_STAT_RES_DRAIN,
		80	-1 /* weaponmagic */,
		81	CS_STAT_RES_GHOSTHIT,
		82	CS_STAT_RES_POISON,
		83	CS_STAT_RES_SLOW,
		84	CS_STAT_RES_PARA,
		85	CS_STAT_TURN_UNDEAD,
		86	CS_STAT_RES_FEAR,
		87	-1 /* Cancellation */,
		88	CS_STAT_RES_DEPLETE,
		89	CS_STAT_RES_DEATH,
		90	-1 /* Chaos */,
		91	-1 /* Counterspell */,
		92	-1 /* Godpower */,
		93	CS_STAT_RES_HOLYWORD,
78	CS_STAT_RES_BLIND,	94	CS_STAT_RES_BLIND,
79	-1, /* Internal */	95	-1, /* Internal */
80	-1, /* life stealing */	96	-1, /* life stealing */
81	-1 /* Disease - not fully done yet */	97	-1 /* Disease - not fully done yet */
82	};	98	};
…		…
98	*/	114	*/
99	mx = ns->mapx;	115	mx = ns->mapx;
100	my = ns->mapy;	116	my = ns->mapy;
101		117
102	/* the x and y here are coordinates for the new map, i.e. if we moved	118	/* the x and y here are coordinates for the new map, i.e. if we moved
103	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	119	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
104	* if the destination x or y coordinate is outside the viewable	120	* if the destination x or y coordinate is outside the viewable
105	* area, we clear the values - otherwise, the old values	121	* area, we clear the values - otherwise, the old values
106	* are preserved, and the check_head thinks it needs to clear them.	122	* are preserved, and the check_head thinks it needs to clear them.
107	*/	123	*/
108	for (x = 0; x < mx; x++)	124	for (x = 0; x < mx; x++)
109	{
110	for (y = 0; y < my; y++)	125	for (y = 0; y < my; y++)
111	{
112	if (x >= ns->mapx || y >= ns->mapy)	126	if (x >= ns->mapx || y >= ns->mapy)
113	/* clear cells outside the viewable area */	127	/* clear cells outside the viewable area */
114	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	128	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115	else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)	129	else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
116	/* clear newly visible tiles within the viewable area */	130	/* clear newly visible tiles within the viewable area */
117	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	131	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118	else	132	else
119	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	133	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120	}
121	}
122		134
123	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	135	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124		136
125	/* Make sure that the next "map1" command will be sent (even if it is	137	/* Make sure that the next "map1" command will be sent (even if it is
126	* empty).	138	* empty).
…		…
134	pl->ns->mapinfo_queue_clear ();	146	pl->ns->mapinfo_queue_clear ();
135		147
136	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	148	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
137		149
138	pl->ns->force_newmap = false;	150	pl->ns->force_newmap = false;
139
140	if (pl->ns->newmapcmd == 1)
141	pl->ns->send_packet ("newmap");	151	pl->ns->send_packet ("newmap");
142
143	pl->ns->floorbox_reset ();	152	pl->ns->floorbox_reset ();
144	}	153	}
145		154
146	static void	155	static void
147	send_map_info (player *pl)	156	send_map_info (player *pl)
148	{	157	{
149	client &socket = *pl->ns;	158	client &socket = *pl->ns;
150	object *ob = pl->observe;	159	object *ob = pl->viewpoint;
151		160
152	if (socket.mapinfocmd)	161	if (socket.mapinfocmd)
153	{	162	{
154	if (ob->map && ob->map->path[0])	163	if (ob->map && ob->map->path)
155	{	164	{
156	int flags = 0;	165	int flags = 0;
157		166
		167	// due to historical glitches, the bit ordering and map index ordering differs
158	if (ob->map->tile_path[0]) flags |= 1;	168	if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
159	if (ob->map->tile_path[1]) flags |= 2;	169	if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
160	if (ob->map->tile_path[2]) flags |= 4;	170	if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
161	if (ob->map->tile_path[3]) flags |= 8;	171	if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
		172	// these two are debatable
		173	if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
		174	if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
162		175
163	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",	176	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
164	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,	177	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
165	ob->map->width, ob->map->height, &ob->map->path);	178	ob->map->width, ob->map->height, &ob->map->path);
166	}	179	}
…		…
172	/** check for map/region change and send new map data */	185	/** check for map/region change and send new map data */
173	static void	186	static void
174	check_map_change (player *pl)	187	check_map_change (player *pl)
175	{	188	{
176	client &socket = *pl->ns;	189	client &socket = *pl->ns;
177	object *ob = pl->observe;	190	object *ob = pl->viewpoint;
178		191
179	region *reg = ob->region ();	192	region *reg = ob->region ();
180	if (socket.current_region != reg)	193	if (socket.current_region != reg)
181	{	194	{
182	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	195	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
183	socket.current_region = reg;	196	socket.current_region = reg;
184	}	197	}
185		198
186	// first try to aovid a full newmap on tiled map scrolls	199	// first try to avoid a full newmap on tiled map scrolls
187	if (socket.current_map != ob->map && !socket.force_newmap)	200	if (socket.current_map != ob->map && !socket.force_newmap)
188	{	201	{
189	rv_vector rv;	202	rv_vector rv;
190		203
191	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);	204	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
…		…
212	else if (socket.current_x != ob->x || socket.current_y != ob->y)	225	else if (socket.current_x != ob->x || socket.current_y != ob->y)
213	{	226	{
214	int dx = ob->x - socket.current_x;	227	int dx = ob->x - socket.current_x;
215	int dy = ob->y - socket.current_y;	228	int dy = ob->y - socket.current_y;
216		229
217	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
218	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
219	else
220	{
221	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	230	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
222	socket.floorbox_reset ();	231	socket.floorbox_reset ();
223	}
224	}	232	}
225		233
226	socket.current_x = ob->x;	234	socket.current_x = ob->x;
227	socket.current_y = ob->y;	235	socket.current_y = ob->y;
		236	}
		237
		238	/**
		239	* This sends the skill number to name mapping. We ignore
		240	* the params - we always send the same info no matter what.
		241	*/
		242	static void
		243	send_skill_info (client *ns, char *params)
		244	{
		245	packet sl;
		246	sl << "replyinfo skill_info\n";
		247
		248	for (int i = 0; i < skillvec.size (); ++i)
		249	sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
		250
		251	if (sl.length () > MAXSOCKBUF)
		252	cleanup ("buffer overflow in send_skill_info!");
		253
		254	ns->send_packet (sl);
		255	}
		256
		257	/**
		258	* This sends the spell path to name mapping. We ignore
		259	* the params - we always send the same info no matter what.
		260	*/
		261	static void
		262	send_spell_paths (client * ns, char *params)
		263	{
		264	packet sl;
		265
		266	sl << "replyinfo spell_paths\n";
		267
		268	for (int i = 0; i < NRSPELLPATHS; i++)
		269	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		270
		271	if (sl.length () > MAXSOCKBUF)
		272	cleanup ("buffer overflow in send_spell_paths!");
		273
		274	ns->send_packet (sl);
228	}	275	}
229		276
230	/**	277	/**
231	* RequestInfo is sort of a meta command. There is some specific	278	* RequestInfo is sort of a meta command. There is some specific
232	* request of information, but we call other functions to provide	279	* request of information, but we call other functions to provide
233	* that information.	280	* that information.
		281	* requestinfo is completely deprecated, use resource exti request
		282	* and the fxix or http protocols.
234	*/	283	*/
235	void	284	void
236	RequestInfo (char *buf, int len, client *ns)	285	RequestInfo (char *buf, int len, client *ns)
237	{	286	{
238	char *params;	287	char *params;
…		…
245	{	294	{
246	*params++ = 0;	295	*params++ = 0;
247	break;	296	break;
248	}	297	}
249		298
250	if (!strcmp (buf, "image_info"))
251	send_image_info (ns, params);
252	else if (!strcmp (buf, "image_sums"))
253	send_image_sums (ns, params);
254	else if (!strcmp (buf, "skill_info"))	299	if (!strcmp (buf, "skill_info"))
255	send_skill_info (ns, params);	300	send_skill_info (ns, params);
256	else if (!strcmp (buf, "spell_paths"))	301	else if (!strcmp (buf, "spell_paths"))
257	send_spell_paths (ns, params);	302	send_spell_paths (ns, params);
258	else	303	else
259	{	304	{
…		…
275	ExtiCmd (char *buf, int len, client *ns)	320	ExtiCmd (char *buf, int len, client *ns)
276	{	321	{
277	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	322	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278	}	323	}
279		324
		325	//-GPL
		326
280	void	327	void
281	client::mapinfo_queue_clear ()	328	client::mapinfo_queue_clear ()
282	{	329	{
283	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	330	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284	free (*i);	331	free (*i);
…		…
291	{	338	{
292	char *token = buf;	339	char *token = buf;
293	buf += strlen (buf) + 9;	340	buf += strlen (buf) + 9;
294		341
295	// initial map and its origin	342	// initial map and its origin
296	maptile *map = pl->observe->map;	343	maptile *map = pl->viewpoint->map;
297	int mapx = pl->ns->mapx / 2 - pl->observe->x;	344	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
298	int mapy = pl->ns->mapy / 2 - pl->observe->y;	345	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
299	int max_distance = 8; // limit maximum path length to something generous	346	int max_distance = 8; // limit maximum path length to something generous
300		347
301	while (*buf && map && max_distance)	348	while (*buf && map && max_distance)
302	{	349	{
303	int dir = *buf++ - '1';	350	int dir = *buf++ - '1';
304		351
305	if (dir >= 0 && dir <= 3)	352	// due to historical glitches, the mapinfo index and tile index differs
		353	static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
		354
		355	// maybe we should only allow the four flat directions
		356	if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
306	{	357	{
		358	dir = dirmap [dir];
		359
307	if (!map->tile_path [dir])	360	if (!map->tile_path [dir])
308	map = 0;	361	map = 0;
309	else if (map->tile_available (dir, false))	362	else if (map->tile_available (dir, false))
310	{	363	{
311	maptile *neigh = map->tile_map [dir];	364	maptile *neigh = map->tile_map [dir];
…		…
334	send_packet_printf ("mapinfo %s nomap", token);	387	send_packet_printf ("mapinfo %s nomap", token);
335	else	388	else
336	{	389	{
337	int flags = 0;	390	int flags = 0;
338		391
		392	// due to historical glitches, the bit ordering and map index ordering differs
339	if (map->tile_path[0]) flags |= 1;	393	if (map->tile_path [TILE_NORTH]) flags |= 0x01;
340	if (map->tile_path[1]) flags |= 2;	394	if (map->tile_path [TILE_EAST ]) flags |= 0x02;
341	if (map->tile_path[2]) flags |= 4;	395	if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
342	if (map->tile_path[3]) flags |= 8;	396	if (map->tile_path [TILE_WEST ]) flags |= 0x08;
		397	// these two are debatable
		398	if (map->tile_path [TILE_UP ]) flags |= 0x10;
		399	if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
343		400
344	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);	401	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
345	}	402	}
346		403
347	return 1;	404	return 1;
…		…
408	AddMeCmd (char *buf, int len, client *ns)	465	AddMeCmd (char *buf, int len, client *ns)
409	{	466	{
410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	467	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
411	}	468	}
412		469
413	/** Reply to ExtendedInfos command */	470	//+GPL
414	void
415	ToggleExtendedInfos (char *buf, int len, client * ns)
416	{
417	char cmdback[MAX_BUF];
418	char command[50];
419	int info, nextinfo;
420
421	cmdback[0] = '\0';
422	nextinfo = 0;
423
424	while (1)
425	{
426	/* 1. Extract an info */
427	info = nextinfo;
428
429	while ((info < len) && (buf[info] == ' '))
430	info++;
431
432	if (info >= len)
433	break;
434
435	nextinfo = info + 1;
436
437	while ((nextinfo < len) && (buf[nextinfo] != ' '))
438	nextinfo++;
439
440	if (nextinfo - info >= 49) /*Erroneous info asked */
441	continue;
442
443	strncpy (command, &(buf[info]), nextinfo - info);
444
445	/* 2. Interpret info */
446	if (!strcmp ("smooth", command))
447	/* Toggle smoothing */
448	ns->EMI_smooth = !ns->EMI_smooth;
449	else
450	/*bad value */;
451
452	/*3. Next info */
453	}
454
455	strcpy (cmdback, "ExtendedInfoSet");
456
457	if (ns->EMI_smooth)
458	{
459	strcat (cmdback, " ");
460	strcat (cmdback, "smoothing");
461	}
462
463	ns->send_packet (cmdback);
464	}
465
466	/*
467	#define MSG_TYPE_BOOK 1
468	#define MSG_TYPE_CARD 2
469	#define MSG_TYPE_PAPER 3
470	#define MSG_TYPE_SIGN 4
471	#define MSG_TYPE_MONUMENT 5
472	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
473
474	/** Reply to ExtendedInfos command */
475	void
476	ToggleExtendedText (char *buf, int len, client * ns)
477	{
478	char cmdback[MAX_BUF];
479	char temp[10];
480	char command[50];
481	int info, nextinfo, i, flag;
482
483	cmdback[0] = '\0';
484
485	nextinfo = 0;
486	while (1)
487	{
488	/* 1. Extract an info */
489	info = nextinfo;
490
491	while ((info < len) && (buf[info] == ' '))
492	info++;
493
494	if (info >= len)
495	break;
496
497	nextinfo = info + 1;
498
499	while ((nextinfo < len) && (buf[nextinfo] != ' '))
500	nextinfo++;
501
502	if (nextinfo - info >= 49) /*Erroneous info asked */
503	continue;
504
505	strncpy (command, &(buf[info]), nextinfo - info);
506	command[nextinfo - info] = '\0';
507	/* 2. Interpret info */
508	i = sscanf (command, "%d", &flag);
509
510	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
511	ns->supported_readables |= (1 << flag);
512	/*3. Next info */
513	}
514
515	/* Send resulting state */
516	strcpy (cmdback, "ExtendedTextSet");
517
518	for (i = 0; i <= MSG_TYPE_LAST; i++)
519	if (ns->supported_readables & (1 << i))
520	{
521	strcat (cmdback, " ");
522	snprintf (temp, sizeof (temp), "%d", i);
523	strcat (cmdback, temp);
524	}
525
526	ns->send_packet (cmdback);
527	}
528		471
529	/**	472	/**
530	* This handles the general commands from the client (ie, north, fire, cast,	473	* This handles the general commands from the client (ie, north, fire, cast,
531	* etc.)	474	* etc.)
532	*/	475	*/
…		…
545	return;	488	return;
546		489
547	buf++;	490	buf++;
548	}	491	}
549		492
550	execute_newserver_command (pl->ob, (char *) buf);	493	execute_newserver_command (pl->ob, (char *)buf);
551		494
552	/* Perhaps something better should be done with a left over count.	495	/* Perhaps something better should be done with a left over count.
553	* Cleaning up the input should probably be done first - all actions	496	* Cleaning up the input should probably be done first - all actions
554	* for the command that issued the count should be done before any other	497	* for the command that issued the count should be done before any other
555	* commands.	498	* commands.
556	*/	499	*/
557	pl->count = 0;	500	pl->count = 0;
558	}
559
560	/**
561	* This handles the general commands from the client (ie, north, fire, cast,
562	* etc.). It is a lot like PlayerCmd above, but is called with the
563	* 'ncom' method which gives more information back to the client so it
564	* can throttle.
565	*/
566	void
567	NewPlayerCmd (char *buf, int len, player *pl)
568	{
569	if (len <= 6)
570	{
571	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
572	return;
573	}
574
575	uint16 cmdid = net_uint16 ((uint8 *)buf);
576	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
577
578	/* -1 is special - no repeat, but don't update */
579	if (repeat != -1)
580	pl->count = repeat;
581
582	buf += 6; //len -= 6;
583
584	execute_newserver_command (pl->ob, buf);
585
586	/* Perhaps something better should be done with a left over count.
587	* Cleaning up the input should probably be done first - all actions
588	* for the command that issued the count should be done before any other
589	* commands.
590	*/
591	pl->count = 0;
592
593	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
594	int time = fabs (pl->ob->speed) < 0.001
595	? time = MAX_TIME * 100
596	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
597
598	/* Send confirmation of command execution now */
599	packet sl ("comc");
600	sl << uint16 (cmdid) << uint32 (time);
601	pl->ns->send_packet (sl);
602	}	501	}
603		502
604	/** This is a reply to a previous query. */	503	/** This is a reply to a previous query. */
605	void	504	void
606	ReplyCmd (char *buf, int len, client *ns)	505	ReplyCmd (char *buf, int len, client *ns)
…		…
643	LOG (llevError, "Unknown input state: %d\n", ns->state);	542	LOG (llevError, "Unknown input state: %d\n", ns->state);
644	}	543	}
645	}	544	}
646		545
647	/**	546	/**
648	* Client tells its version. If there is a mismatch, we close the	547	* Client tells its version info.
649	* socket. In real life, all we should care about is the client having
650	* something older than the server. If we assume the client will be
651	* backwards compatible, having it be a later version should not be a
652	* problem.
653	*/	548	*/
654	void	549	void
655	VersionCmd (char *buf, int len, client * ns)	550	VersionCmd (char *buf, int len, client *ns)
656	{	551	{
657	if (!buf)	552	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
658	{
659	LOG (llevError, "CS: received corrupted version command\n");
660	return;
661	}
662
663	ns->cs_version = atoi (buf);
664	ns->sc_version = ns->cs_version;
665
666	LOG (llevDebug, "connection from client <%s>\n", buf);
667
668	//TODO: should log here just for statistics
669
670	//if (VERSION_CS != ns->cs_version)
671	// unchecked;
672
673	char *cp = strchr (buf + 1, ' ');
674	if (!cp)
675	return;
676
677	ns->sc_version = atoi (cp);
678
679	//if (VERSION_SC != ns->sc_version)
680	// unchecked;
681
682	cp = strchr (cp + 1, ' ');
683
684	if (cp)
685	{
686	ns->version = cp + 1;
687
688	if (ns->sc_version < 1026)
689	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
690	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
691	}
692	}	553	}
693		554
694	/** sound related functions. */	555	/** sound related functions. */
695	void	556	void
696	SetSound (char *buf, int len, client * ns)	557	SetSound (char *buf, int len, client * ns)
…		…
747	* Get player's current range attack in obuf.	608	* Get player's current range attack in obuf.
748	*/	609	*/
749	static void	610	static void
750	rangetostring (player *pl, char *obuf)	611	rangetostring (player *pl, char *obuf)
751	{	612	{
752	dynbuf_text buf;	613	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		614
		615	#if 0
		616	// print ranged/chosen_skill etc. objects every call
		617	printf ("%s %s => %s (%s)\n",
		618	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		619	pl->combat_ob ? &pl->combat_ob->name : "-",
		620	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		621	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		622	);
		623	#endif
753		624
754	if (pl->ranged_ob)	625	if (pl->ranged_ob)
755	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	626	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
756		627
757	if (pl->combat_ob)	628	if (pl->combat_ob)
…		…
803	* commands for now.	674	* commands for now.
804	*/	675	*/
805	void	676	void
806	esrv_update_stats (player *pl)	677	esrv_update_stats (player *pl)
807	{	678	{
808	char buf[MAX_BUF];
809	uint16 flags;
810
811	client *ns = pl->ns;	679	client *ns = pl->ns;
812	if (!ns)	680	if (!ns)
813	return;	681	return;
814		682
815	object *ob = pl->observe;	683	object *ob = pl->observe;
…		…
832	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	700	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
833	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	701	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
834	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	702	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
835	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	703	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
836		704
837	for (int s = 0; s < NUM_SKILLS; s++)	705	for (int s = 0; s < CS_NUM_SKILLS; s++)
838	if (object *skill = opl->last_skill_ob[s])	706	if (object *skill = opl->last_skill_ob [s])
839	if (skill->stats.exp != ns->last_skill_exp [s])	707	if (skill->stats.exp != ns->last_skill_exp [s])
840	{	708	{
841	ns->last_skill_exp [s] = skill->stats.exp;	709	ns->last_skill_exp [s] = skill->stats.exp;
842		710
843	/* Always send along the level if exp changes. This is only	711	/* Always send along the level if exp changes. This is only
844	* 1 extra byte, but keeps processing simpler.	712	* 1 extra byte, but keeps processing simpler.
845	*/	713	*/
846	sl << uint8 (s + CS_STAT_SKILLINFO)	714	sl << uint8 (CS_STAT_SKILLINFO + s)
847	<< uint8 (skill->level)	715	<< uint8 (skill->level)
848	<< uint64 (skill->stats.exp);	716	<< uint64 (skill->stats.exp);
849	}	717	}
850		718
851	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	719	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
852	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	720	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
853	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	721	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
854	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	722	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
855	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	723	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
856	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	724	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
857	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	725	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
858	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	726	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
859	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	727	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
860		728
861	flags = 0;	729	int flags = (opl->fire_on ? SF_FIREON : 0)
862		730	| (opl->run_on ? SF_RUNON : 0);
863	if (opl->fire_on)
864	flags |= SF_FIREON;
865
866	if (opl->run_on)
867	flags |= SF_RUNON;
868		731
869	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	732	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
870		733
871	if (ns->sc_version < 1025)
872	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
873	else
874	for (int i = 0; i < NROFATTACKS; i++)	734	for (int i = 0; i < NROFATTACKS; i++)
875	{
876	/* Skip ones we won't send */	735	/* Skip ones we won't send */
877	if (atnr_cs_stat[i] == -1)	736	if (atnr_cs_stat[i] >= 0)
878	continue;
879
880	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	737	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
881	}
882		738
883	if (pl->ns->monitor_spells)	739	if (pl->ns->monitor_spells)
884	{	740	{
885	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	741	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
886	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	742	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
887	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	743	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
888	}	744	}
889		745
		746	char buf[MAX_BUF];
890	rangetostring (opl, buf); /* we want use the new fire & run system in new client */	747	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
891	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	748	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
892	set_title (ob, buf);	749	set_title (ob, buf);
893	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	750	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
894		751
…		…
912	<< uint32 (pl->ob->face)	769	<< uint32 (pl->ob->face)
913	<< data8 (pl->ob->name);	770	<< data8 (pl->ob->name);
914		771
915	pl->ns->last_weight = weight;	772	pl->ns->last_weight = weight;
916	pl->ns->send_packet (sl);	773	pl->ns->send_packet (sl);
917	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
918	}	774	}
919		775
920	/******************************************************************************	776	/******************************************************************************
921	*	777	*
922	* Start of map related commands.	778	* Start of map related commands.
…		…
990	/* Nothing changed */	846	/* Nothing changed */
991	return 0;	847	return 0;
992	}	848	}
993		849
994	/**	850	/**
995	* Returns the size of a data for a map square as returned by
996	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
997	* available.
998	*/
999	int
1000	getExtendedMapInfoSize (client * ns)
1001	{
1002	int result = 0;
1003
1004	if (ns->ext_mapinfos)
1005	{
1006	if (ns->EMI_smooth)
1007	result += 1; /*One byte for smoothlevel */
1008	}
1009
1010	return result;
1011	}
1012
1013	// prefetch (and touch) all maps within a specific distancd
1014	static void
1015	prefetch_surrounding_maps (maptile *map, int distance)
1016	{
1017	map->last_access = runtime;
1018
1019	if (--distance)
1020	for (int dir = 4; --dir; )
1021	if (const shstr &path = map->tile_path [dir])
1022	if (maptile *&neigh = map->tile_map [dir])
1023	prefetch_surrounding_maps (neigh, distance);
1024	else
1025	neigh = maptile::find_async (path, map);
1026	}
1027
1028	// prefetch a generous area around the player
1029	static void
1030	prefetch_surrounding_maps (object *op)
1031	{
1032	prefetch_surrounding_maps (op->map, 3);
1033	}
1034
1035	/**
1036	* Draws client map.	851	* Draws client map.
1037	*/	852	*/
1038	void	853	void
1039	draw_client_map (player *pl)	854	draw_client_map (player *pl)
1040	{	855	{
1041	object *ob = pl->observe;	856	object *ob = pl->viewpoint;
1042	if (!ob->active)	857	if (!pl->observe->active)
1043	return;	858	return;
1044
1045	maptile *plmap = ob->map;
1046		859
1047	/* If player is just joining the game, he isn't here yet, so the map	860	/* If player is just joining the game, he isn't here yet, so the map
1048	* can get swapped out. If so, don't try to send them a map. All will	861	* can get swapped out. If so, don't try to send them a map. All will
1049	* be OK once they really log in.	862	* be OK once they really log in.
1050	*/	863	*/
1051	if (!plmap || plmap->in_memory != MAP_ACTIVE)	864	if (!ob->map || ob->map->state != MAP_ACTIVE)
1052	return;	865	return;
1053		866
1054	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1055	int estartlen, eoldlen;	867	int startlen, oldlen;
1056	uint8 eentrysize;
1057	uint16 ewhatstart, ewhatflag;
1058	uint8 extendedinfos;
1059		868
1060	check_map_change (pl);	869	check_map_change (pl);
1061	prefetch_surrounding_maps (pl->ob);	870	pl->ob->prefetch_surrounding_maps ();
1062		871
1063	/* do LOS after calls to update_position */	872	/* do LOS after calls to update_position */
1064	if (ob != pl->ob)	873	/* unfortunately, we need to udpate los when observing, currently */
1065	clear_los (pl);	874	if (pl->do_los || pl->viewpoint != pl->ob)
1066	else if (pl->do_los)
1067	{	875	{
1068	update_los (ob);
1069	pl->do_los = 0;	876	pl->do_los = 0;
		877	pl->update_los ();
1070	}	878	}
1071		879
1072	/**	880	/**
1073	* This function uses the new map1 protocol command to send the map	881	* This function uses the new map1 protocol command to send the map
1074	* to the client. It is necessary because the old map command supports	882	* to the client. It is necessary because the old map command supports
…		…
1092	* look like.	900	* look like.
1093	*/	901	*/
1094		902
1095	client &socket = *pl->ns;	903	client &socket = *pl->ns;
1096		904
1097	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	905	packet sl ("map1a");
1098	packet esl;
1099		906
1100	startlen = sl.length ();	907	startlen = sl.length ();
1101		908
1102	/*Extendedmapinfo structure initialisation */	909	int hx = socket.mapx / 2;
1103	if (socket.ext_mapinfos)	910	int hy = socket.mapy / 2;
1104	{
1105	extendedinfos = EMI_NOREDRAW;
1106		911
1107	if (socket.EMI_smooth)	912	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1108	extendedinfos |= EMI_SMOOTH;	913	int ax = dx + hx;
		914	int ay = dy + hy;
1109		915
1110	ewhatstart = esl.length ();	916	int mask = (ax << 10) | (ay << 4);
1111	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	917	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1112	could need to be taken away */
1113	eentrysize = getExtendedMapInfoSize (&socket);
1114	esl << "mapextended "
1115	<< uint8 (extendedinfos)
1116	<< uint8 (eentrysize);
1117		918
1118	estartlen = esl.length ();	919	/* If the coordinates are not valid, or it is too dark to see,
1119	}	920	* we tell the client as such
1120
1121	/* x,y are the real map locations. ax, ay are viewport relative
1122	* locations.
1123	*/	921	*/
1124	ay = 0;	922	if (!m)
1125
1126	/* We could do this logic as conditionals in the if statement,
1127	* but that started to get a bit messy to look at.
1128	*/
1129	max_x = ob->x + (socket.mapx + 1) / 2;
1130	max_y = ob->y + (socket.mapy + 1) / 2;
1131
1132	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1133	{	923	{
1134	sint16 nx, ny;	924	/* space is out of map. Update space and clear values
1135	maptile *m = 0;	925	* if this hasn't already been done. If the space is out
1136		926	* of the map, it shouldn't have a head.
1137	ax = 0;	927	*/
1138	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	928	if (lastcell.count != -1)
1139	{	929	{
1140	// check to see if we can simply go one right quickly	930	sl << uint16 (mask);
		931	map_clearcell (&lastcell, -1);
1141	++nx;	932	}
1142	if (m && nx >= m->width)	933
		934	continue;
		935	}
		936
		937	int d = pl->blocked_los_uc (dx, dy);
		938
		939	if (d > 3)
		940	{
		941	/* This block deals with spaces that are not visible for whatever
		942	* reason. Still may need to send the head for this space.
		943	*/
		944	if (lastcell.count != -1
		945	|| lastcell.faces[0]
		946	|| lastcell.faces[1]
		947	|| lastcell.faces[2]
		948	|| lastcell.stat_hp
		949	|| lastcell.flags
		950	|| lastcell.player)
		951	sl << uint16 (mask);
		952
		953	/* properly clear a previously sent big face */
		954	map_clearcell (&lastcell, -1);
		955	}
		956	else
		957	{
		958	/* In this block, the space is visible.
		959	*/
		960
		961	/* Rather than try to figure out what everything that we might
		962	* need to send is, then form the packet after that,
		963	* we presume that we will in fact form a packet, and update
		964	* the bits by what we do actually send. If we send nothing,
		965	* we just back out sl.length () to the old value, and no harm
		966	* is done.
		967	* I think this is simpler than doing a bunch of checks to see
		968	* what if anything we need to send, setting the bits, then
		969	* doing those checks again to add the real data.
		970	*/
		971	oldlen = sl.length ();
		972
		973	sl << uint16 (mask);
		974
		975	unsigned char dummy;
		976	unsigned char *last_ext = &dummy;
		977
		978	/* Darkness changed */
		979	if (lastcell.count != d)
		980	{
1143	m = 0;	981	mask |= 0x8;
1144		982
1145	if (!m)	983	*last_ext |= 0x80;
		984	last_ext = &sl[sl.length ()];
		985	sl << uint8 (d);
		986	}
		987
		988	lastcell.count = d;
		989
		990	mapspace &ms = m->at (nx, ny);
		991	ms.update ();
		992
		993	// extmap handling
		994	uint8 stat_hp = 0;
		995	uint8 stat_width = 0;
		996	uint8 flags = 0;
		997	tag_t player = 0;
		998
		999	// send hp information, if applicable
		1000	if (object *op = ms.faces_obj [0])
		1001	if (op->is_head () && !op->invisible)
1146	{	1002	{
1147	nx = x; ny = y; m = plmap;	1003	if (op->stats.maxhp > op->stats.hp
1148		1004	&& op->stats.maxhp > 0
1149	if (xy_normalise (m, nx, ny))	1005	&& (op->type == PLAYER
1150	m->touch ();	1006	|| op->type == DOOR // does not work, have maxhp 0
1151	else	1007	|| op->flag [FLAG_MONSTER]
		1008	|| op->flag [FLAG_ALIVE]
		1009	|| op->flag [FLAG_GENERATOR]))
1152	m = 0;	1010	{
		1011	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1012	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1013	}
		1014
		1015	if (expect_false (op->has_dialogue ()))
		1016	flags |= 1;
		1017
		1018	if (expect_false (op->type == PLAYER))
		1019	player = op == ob ? pl->ob->count
		1020	: op == pl->ob ? ob->count
		1021	: op->count;
1153	}	1022	}
1154		1023
1155	int emask, mask;	1024	if (expect_false (lastcell.stat_hp != stat_hp))
1156	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1157
1158	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1159
1160	/* If the coordinates are not valid, or it is too dark to see,
1161	* we tell the client as such
1162	*/
1163	if (!m)
1164	{	1025	{
1165	/* space is out of map. Update space and clear values	1026	lastcell.stat_hp = stat_hp;
1166	* if this hasn't already been done. If the space is out	1027
1167	* of the map, it shouldn't have a head	1028	mask |= 0x8;
1168	*/	1029	*last_ext |= 0x80;
1169	if (lastcell.count != -1)	1030	last_ext = &sl[sl.length ()];
		1031
		1032	sl << uint8 (5) << uint8 (stat_hp);
		1033
		1034	if (stat_width > 1)
1170	{	1035	{
1171	sl << uint16 (mask);
1172	map_clearcell (&lastcell, -1);
1173	}
1174
1175	continue;
1176	}
1177
1178	int d = pl->blocked_los[ax][ay];
1179
1180	if (d > 3)
1181	{
1182	int need_send = 0, count;
1183
1184	/* This block deals with spaces that are not visible for whatever
1185	* reason. Still may need to send the head for this space.
1186	*/
1187
1188	oldlen = sl.length ();
1189
1190	sl << uint16 (mask);
1191
1192	if (lastcell.count != -1)
1193	need_send = 1;
1194
1195	count = -1;
1196
1197	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1198	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1199	need_send = 1;
1200
1201	/* properly clear a previously sent big face */
1202	map_clearcell (&lastcell, count);
1203
1204	if ((mask & 0xf) || need_send)
1205	sl[oldlen + 1] = mask & 0xff;
1206	else
1207	sl.reset (oldlen);
1208	}
1209	else
1210	{
1211	/* In this block, the space is visible.
1212	*/
1213
1214	/* Rather than try to figure out what everything that we might
1215	* need to send is, then form the packet after that,
1216	* we presume that we will in fact form a packet, and update
1217	* the bits by what we do actually send. If we send nothing,
1218	* we just back out sl.length () to the old value, and no harm
1219	* is done.
1220	* I think this is simpler than doing a bunch of checks to see
1221	* what if anything we need to send, setting the bits, then
1222	* doing those checks again to add the real data.
1223	*/
1224	oldlen = sl.length ();
1225	eoldlen = esl.length ();
1226
1227	sl << uint16 (mask);
1228
1229	unsigned char dummy;
1230	unsigned char *last_ext = &dummy;
1231
1232	/* Darkness changed */
1233	if (lastcell.count != d && socket.darkness)
1234	{
1235	mask |= 0x8;
1236
1237	if (socket.extmap)
1238	{
1239	*last_ext |= 0x80;	1036	*last_ext |= 0x80;
1240	last_ext = &sl[sl.length ()];	1037	last_ext = &sl[sl.length ()];
1241	sl << uint8 (d);	1038
1242	}	1039	sl << uint8 (6) << uint8 (stat_width);
1243	else
1244	sl << uint8 (255 - 64 * d);
1245	}	1040	}
		1041	}
1246		1042
1247	lastcell.count = d;	1043	if (expect_false (lastcell.player != player))
1248
1249	mapspace &ms = m->at (nx, ny);
1250	ms.update ();
1251
1252	if (socket.extmap)
1253	{	1044	{
1254	uint8 stat_hp = 0;	1045	lastcell.player = player;
1255	uint8 stat_width = 0;
1256	uint8 flags = 0;
1257	tag_t player = 0;
1258		1046
1259	// send hp information, if applicable
1260	if (object *op = ms.faces_obj [0])
1261	if (op->is_head () && !op->invisible)
1262	{
1263	if (op->stats.maxhp > op->stats.hp
1264	&& op->stats.maxhp > 0
1265	&& (op->type == PLAYER
1266	|| op->type == DOOR // does not work, have maxhp 0
1267	|| QUERY_FLAG (op, FLAG_MONSTER)
1268	|| QUERY_FLAG (op, FLAG_ALIVE)
1269	|| QUERY_FLAG (op, FLAG_GENERATOR)))
1270	{
1271	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1272	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1273	}
1274
1275	if (op->has_dialogue ())
1276	flags |= 1;
1277
1278	if (op->type == PLAYER)
1279	player = op == ob ? pl->ob->count
1280	: op == pl->ob ? ob->count
1281	: op->count;
1282	}
1283
1284	if (lastcell.stat_hp != stat_hp)
1285	{
1286	lastcell.stat_hp = stat_hp;
1287
1288	mask |= 0x8;	1047	mask |= 0x8;
1289	*last_ext |= 0x80;	1048	*last_ext |= 0x80;
1290	last_ext = &sl[sl.length ()];	1049	last_ext = &sl[sl.length ()];
1291		1050
1292	sl << uint8 (5) << uint8 (stat_hp);
1293
1294	if (stat_width > 1)
1295	{
1296	*last_ext |= 0x80;
1297	last_ext = &sl[sl.length ()];
1298
1299	sl << uint8 (6) << uint8 (stat_width);
1300	}
1301	}
1302
1303	if (lastcell.player != player)
1304	{
1305	lastcell.player = player;
1306
1307	mask |= 0x8;
1308	*last_ext |= 0x80;
1309	last_ext = &sl[sl.length ()];
1310
1311	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1051	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1312	}	1052	}
1313		1053
1314	if (lastcell.flags != flags)	1054	if (expect_false (lastcell.flags != flags))
1315	{	1055	{
1316	lastcell.flags = flags;	1056	lastcell.flags = flags;
1317		1057
1318	mask |= 0x8;	1058	mask |= 0x8;
1319	*last_ext |= 0x80;	1059	*last_ext |= 0x80;
1320	last_ext = &sl[sl.length ()];	1060	last_ext = &sl[sl.length ()];
1321		1061
1322	sl << uint8 (8) << uint8 (flags);	1062	sl << uint8 (8) << uint8 (flags);
1323	}
1324	}	1063	}
1325		1064
		1065	// faces
		1066
1326	/* Floor face */	1067	/* Floor face */
1327	if (update_space (sl, socket, ms, lastcell, 2))	1068	if (update_space (sl, socket, ms, lastcell, 2))
1328	mask |= 0x4;	1069	mask |= 0x4;
1329		1070
1330	/* Middle face */	1071	/* Middle face */
1331	if (update_space (sl, socket, ms, lastcell, 1))	1072	if (update_space (sl, socket, ms, lastcell, 1))
1332	mask |= 0x2;	1073	mask |= 0x2;
1333		1074
		1075	if (expect_false (ob->invisible)
		1076	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1334	if (ms.player () == ob	1077	&& ms.player () == ob)
1335	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1336	{	1078	{
1337	// force player to be visible to himself if invisible	1079	// force player to be visible to himself if invisible
1338	if (lastcell.faces[0] != ob->face)	1080	if (lastcell.faces[0] != ob->face)
1339	{	1081	{
1340	lastcell.faces[0] = ob->face;	1082	lastcell.faces[0] = ob->face;
1341		1083
1342	mask |= 0x1;
1343	sl << uint16 (ob->face);
1344
1345	socket.send_faces (ob);
1346	}
1347	}
1348	/* Top face */
1349	else if (update_space (sl, socket, ms, lastcell, 0))
1350	mask |= 0x1;	1084	mask |= 0x1;
		1085	sl << uint16 (ob->face);
1351		1086
		1087	socket.send_faces (ob);
		1088	}
		1089	}
		1090	/* Top face */
		1091	else if (update_space (sl, socket, ms, lastcell, 0))
		1092	mask |= 0x1;
		1093
1352	/* Check to see if we are in fact sending anything for this	1094	/* Check to see if we are in fact sending anything for this
1353	* space by checking the mask. If so, update the mask.	1095	* space by checking the mask. If so, update the mask.
1354	* if not, reset the len to that from before adding the mask	1096	* if not, reset the len to that from before adding the mask
1355	* value, so we don't send those bits.	1097	* value, so we don't send those bits.
1356	*/	1098	*/
1357	if (mask & 0xf)	1099	if (mask & 0xf)
1358	sl[oldlen + 1] = mask & 0xff;	1100	sl[oldlen + 1] = mask & 0xff;
1359	else	1101	else
1360	sl.reset (oldlen);	1102	sl.reset (oldlen);
1361
1362	if (socket.ext_mapinfos)
1363	esl << uint16 (emask);
1364
1365	if (socket.EMI_smooth)
1366	{
1367	for (int layer = 2+1; layer--; )
1368	{
1369	object *ob = ms.faces_obj [layer];
1370
1371	// If there is no object for this space, or if the face for the object
1372	// is the blank face, set the smoothlevel to zero.
1373	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1374
1375	// We've gotten what face we want to use for the object. Now see if
1376	// if it has changed since we last sent it to the client.
1377	if (lastcell.smooth[layer] != smoothlevel)
1378	{
1379	lastcell.smooth[layer] = smoothlevel;
1380	esl << uint8 (smoothlevel);
1381	emask |= 1 << layer;
1382	}
1383	}
1384
1385	if (emask & 0xf)
1386	esl[eoldlen + 1] = emask & 0xff;
1387	else
1388	esl.reset (eoldlen);
1389	}
1390	} /* else this is a viewable space */	1103	} /* else this is a viewable space */
1391	} /* for x loop */	1104	ordered_mapwalk_end
1392	} /* for y loop */
1393		1105
1394	socket.flush_fx ();	1106	socket.flush_fx ();
1395
1396	/* Verify that we in fact do need to send this */
1397	if (socket.ext_mapinfos)
1398	{
1399	if (!(sl.length () > startlen || socket.sent_scroll))
1400	{
1401	/* No map data will follow, so don't say the client
1402	* it doesn't need draw!
1403	*/
1404	ewhatflag &= ~EMI_NOREDRAW;
1405	esl[ewhatstart + 1] = ewhatflag & 0xff;
1406	}
1407
1408	if (esl.length () > estartlen)
1409	socket.send_packet (esl);
1410	}
1411		1107
1412	if (sl.length () > startlen || socket.sent_scroll)	1108	if (sl.length () > startlen || socket.sent_scroll)
1413	{	1109	{
1414	socket.send_packet (sl);	1110	socket.send_packet (sl);
1415	socket.sent_scroll = 0;	1111	socket.sent_scroll = 0;
1416	}	1112	}
1417	}	1113	}
1418		1114
1419	/*****************************************************************************/
1420	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1421	/* a player. Of course, the client need to know the command to be able to */
1422	/* manage it ! */
1423	/*****************************************************************************/
1424	void
1425	send_plugin_custom_message (object *pl, char *buf)
1426	{
1427	pl->contr->ns->send_packet (buf);
1428	}
1429
1430	/**
1431	* This sends the skill number to name mapping. We ignore
1432	* the params - we always send the same info no matter what.
1433	*/
1434	void
1435	send_skill_info (client *ns, char *params)
1436	{
1437	packet sl;
1438	sl << "replyinfo skill_info\n";
1439
1440	for (int i = 1; i < NUM_SKILLS; i++)
1441	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1442
1443	if (sl.length () > MAXSOCKBUF)
1444	{
1445	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1446	fatal (0);
1447	}
1448
1449	ns->send_packet (sl);
1450	}
1451
1452	/**
1453	* This sends the spell path to name mapping. We ignore
1454	* the params - we always send the same info no matter what.
1455	*/
1456	void
1457	send_spell_paths (client * ns, char *params)
1458	{
1459	packet sl;
1460
1461	sl << "replyinfo spell_paths\n";
1462
1463	for (int i = 0; i < NRSPELLPATHS; i++)
1464	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1465
1466	if (sl.length () > MAXSOCKBUF)
1467	{
1468	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1469	fatal (0);
1470	}
1471
1472	ns->send_packet (sl);
1473	}
1474
1475	/**	1115	/**
1476	* This looks for any spells the player may have that have changed their stats.	1116	* This looks for any spells the player may have that have changed their stats.
1477	* it then sends an updspell packet for each spell that has changed in this way	1117	* it then sends an updspell packet for each spell that has changed in this way
1478	*/	1118	*/
1479	void	1119	void
1480	esrv_update_spells (player *pl)	1120	esrv_update_spells (player *pl)
1481	{	1121	{
1482	if (!pl->ns)	1122	if (!pl->ns)
1483	return;	1123	return;
1484		1124
		1125	pl->ns->update_spells = false;
		1126
1485	if (!pl->ns->monitor_spells)	1127	if (!pl->ns->monitor_spells)
1486	return;	1128	return;
1487		1129
1488	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1130	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1489	{
1490	if (spell->type == SPELL)	1131	if (spell->type == SPELL)
1491	{	1132	{
1492	int flags = 0;	1133	int flags = 0;
		1134	int val;
1493		1135
1494	/* check if we need to update it */	1136	/* check if we need to update it */
1495	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1137	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1138	if (spell->cached_sp != val)
1496	{	1139	{
1497	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1140	spell->cached_sp = val;
1498	flags |= UPD_SP_MANA;	1141	flags |= UPD_SP_MANA;
1499	}	1142	}
1500		1143
1501	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1144	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1145	if (spell->cached_grace != val)
1502	{	1146	{
1503	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1147	spell->cached_grace = val;
1504	flags |= UPD_SP_GRACE;	1148	flags |= UPD_SP_GRACE;
1505	}	1149	}
1506		1150
1507	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1151	val = casting_level (pl->ob, spell);
		1152	if (spell->cached_eat != val)
1508	{	1153	{
1509	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1154	spell->cached_eat = val;
1510	flags |= UPD_SP_DAMAGE;	1155	flags |= UPD_SP_LEVEL;
1511	}	1156	}
1512		1157
1513	if (flags)	1158	if (flags)
1514	{	1159	{
1515	packet sl;	1160	packet sl;
1516		1161
1517	sl << "updspell "	1162	sl << "updspell "
1518	<< uint8 (flags)	1163	<< uint8 (flags)
1519	<< uint32 (spell->count);	1164	<< uint32 (spell->count);
1520		1165
1521	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1166	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1522	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1167	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1523	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1168	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1524		1169
1525	pl->ns->send_packet (sl);	1170	pl->ns->send_packet (sl);
1526	}	1171	}
1527	}	1172	}
1528	}
1529	}	1173	}
1530		1174
1531	void	1175	void
1532	esrv_remove_spell (player *pl, object *spell)	1176	esrv_remove_spell (player *pl, object *spell)
1533	{	1177	{
…		…
1549		1193
1550	/* appends the spell *spell to the Socklist we will send the data to. */	1194	/* appends the spell *spell to the Socklist we will send the data to. */
1551	static void	1195	static void
1552	append_spell (player *pl, packet &sl, object *spell)	1196	append_spell (player *pl, packet &sl, object *spell)
1553	{	1197	{
1554	int i, skill = 0;	1198	int skill = 0;
1555		1199
1556	if (!(spell->name))	1200	if (!(spell->name))
1557	{	1201	{
1558	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1202	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1559	return;	1203	return;
1560	}	1204	}
1561		1205
1562	/* store costs and damage in the object struct, to compare to later */	1206	/* store costs and damage in the object struct, to compare to later */
1563	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1207	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1564	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1208	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1565	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1209	spell->cached_eat = casting_level (pl->ob, spell);
1566		1210
1567	/* figure out which skill it uses, if it uses one */	1211	/* figure out which skill it uses, if it uses one */
1568	if (spell->skill)	1212	if (spell->skill)
1569	{	1213	if (object *tmp = pl->find_skill (spell->skill))
1570	for (i = 1; i < NUM_SKILLS; i++)	1214	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1571	if (!strcmp (spell->skill, skill_names[i]))
1572	{
1573	skill = i + CS_STAT_SKILLINFO;
1574	break;
1575	}
1576	}
1577		1215
1578	// spells better have a face	1216	// spells better have a face
1579	if (!spell->face)	1217	if (!spell->face)
1580	{	1218	{
1581	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1219	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1592	<< uint16 (spell->cached_grace)	1230	<< uint16 (spell->cached_grace)
1593	<< uint16 (spell->cached_eat)	1231	<< uint16 (spell->cached_eat)
1594	<< uint8 (skill)	1232	<< uint8 (skill)
1595	<< uint32 (spell->path_attuned)	1233	<< uint32 (spell->path_attuned)
1596	<< uint32 (spell->face)	1234	<< uint32 (spell->face)
1597	<< data8 (spell->name)	1235	<< data8 (spell->name);
		1236
		1237	if (pl->ns->monitor_spells < 2)
1598	<< data16 (spell->msg);	1238	sl << data16 (spell->msg);
1599	}	1239	}
1600		1240
1601	/**	1241	/**
1602	* This tells the client to add the spell *ob, if *ob is NULL, then add	1242	* This tells the client to add the spell *ob, if *ob is NULL, then add
1603	* all spells in the player's inventory.	1243	* all spells in the player's inventory.
1604	*/	1244	*/
1605	void	1245	void
1606	esrv_add_spells (player *pl, object *spell)	1246	esrv_add_spells (player *pl, object *spell)
1607	{	1247	{
…		…
1618		1258
1619	if (!spell)	1259	if (!spell)
1620	{	1260	{
1621	for (spell = pl->ob->inv; spell; spell = spell->below)	1261	for (spell = pl->ob->inv; spell; spell = spell->below)
1622	{	1262	{
1623	/* were we to simply keep appending data here, we could exceed	1263	/* were we to simply keep appending data here, we could exceed
1624	* MAXSOCKBUF if the player has enough spells to add, we know that	1264	* MAXSOCKBUF if the player has enough spells to add, we know that
1625	* append_spells will always append 19 data bytes, plus 4 length	1265	* append_spells will always append 19 data bytes, plus 4 length
1626	* bytes and 3 strings (because that is the spec) so we need to	1266	* bytes and 3 strings (because that is the spec) so we need to
1627	* check that the length of those 3 strings, plus the 23 bytes,	1267	* check that the length of those 3 strings, plus the 23 bytes,
1628	* won't take us over the length limit for the socket, if it does,	1268	* won't take us over the length limit for the socket, if it does,
1629	* we need to send what we already have, and restart packet formation	1269	* we need to send what we already have, and restart packet formation
1630	*/	1270	*/
1631	if (spell->type != SPELL)	1271	if (spell->type != SPELL)
1632	continue;	1272	continue;
1633		1273
1634	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1274	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
…		…
1655	}	1295	}
1656	else	1296	else
1657	append_spell (pl, sl, spell);	1297	append_spell (pl, sl, spell);
1658		1298
1659	if (sl.length () > MAXSOCKBUF)	1299	if (sl.length () > MAXSOCKBUF)
1660	{
1661	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1300	cleanup ("buffer overflow in esrv_add_spells!");
1662	fatal (0);
1663	}
1664		1301
1665	/* finally, we can send the packet */	1302	/* finally, we can send the packet */
1666	pl->ns->flush_fx ();	1303	pl->ns->flush_fx ();
1667	pl->ns->send_packet (sl);	1304	pl->ns->send_packet (sl);
1668	}	1305	}
1669		1306
		1307	//-GPL
		1308

Diff Legend

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