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.112 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.183 by root, Sat May 7 20:03:28 2011 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011 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	* Crossfire TRT 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 <crossfire@schmorp.de>	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	*
…		…
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).
…		…
129	}	141	}
130		142
131	static void	143	static void
132	clear_map (player *pl)	144	clear_map (player *pl)
133	{	145	{
		146	pl->ns->mapinfo_queue_clear ();
		147
134	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	148	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135		149
136	pl->ns->force_newmap = false;	150	pl->ns->force_newmap = false;
137
138	if (pl->ns->newmapcmd == 1)
139	pl->ns->send_packet ("newmap");	151	pl->ns->send_packet ("newmap");
140
141	pl->ns->floorbox_reset ();	152	pl->ns->floorbox_reset ();
		153	}
		154
		155	static void
		156	send_map_info (player *pl)
		157	{
		158	client &socket = *pl->ns;
		159	object *ob = pl->viewpoint;
		160
		161	if (socket.mapinfocmd)
		162	{
		163	if (ob->map && ob->map->path)
		164	{
		165	int flags = 0;
		166
		167	// due to historical glitches, the bit ordering and map index ordering differs
		168	if (ob->map->tile_path[TILE_NORTH]) flags |= 0x01;
		169	if (ob->map->tile_path[TILE_EAST ]) flags |= 0x02;
		170	if (ob->map->tile_path[TILE_SOUTH]) flags |= 0x04;
		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;
		175
		176	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		177	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		178	ob->map->width, ob->map->height, &ob->map->path);
		179	}
		180	else
		181	socket.send_packet ("mapinfo current");
		182	}
142	}	183	}
143		184
144	/** check for map/region change and send new map data */	185	/** check for map/region change and send new map data */
145	static void	186	static void
146	check_map_change (player *pl)	187	check_map_change (player *pl)
147	{	188	{
148	client &socket = *pl->ns;	189	client &socket = *pl->ns;
149	object *ob = pl->observe;	190	object *ob = pl->viewpoint;
		191
		192	region *reg = ob->region ();
		193	if (socket.current_region != reg)
		194	{
		195	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		196	socket.current_region = reg;
		197	}
		198
		199	// first try to aovid a full newmap on tiled map scrolls
		200	if (socket.current_map != ob->map && !socket.force_newmap)
		201	{
		202	rv_vector rv;
		203
		204	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		205
		206	// manhattan distance is very handy here
		207	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		208	{
		209	socket.current_map = ob->map;
		210	socket.current_x = ob->x;
		211	socket.current_y = ob->y;
		212
		213	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		214	socket.floorbox_reset ();
		215	send_map_info (pl);
		216	}
		217	}
150		218
151	if (socket.current_map != ob->map || socket.force_newmap)	219	if (socket.current_map != ob->map || socket.force_newmap)
152	{	220	{
153	clear_map (pl);	221	clear_map (pl);
154	socket.current_map = ob->map;	222	socket.current_map = ob->map;
155		223	send_map_info (pl);
156	if (socket.mapinfocmd)
157	{
158	if (ob->map && ob->map->path[0])
159	{
160	int flags = 0;
161
162	if (ob->map->tile_path[0]) flags |= 1;
163	if (ob->map->tile_path[1]) flags |= 2;
164	if (ob->map->tile_path[2]) flags |= 4;
165	if (ob->map->tile_path[3]) flags |= 8;
166
167	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
168	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
169	ob->map->width, ob->map->height, &ob->map->path);
170	}
171	else
172	socket.send_packet ("mapinfo current");
173	}
174	}	224	}
175	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)
176	{	226	{
177	int dx = ob->x - socket.current_x;	227	int dx = ob->x - socket.current_x;
178	int dy = ob->y - socket.current_y;	228	int dy = ob->y - socket.current_y;
179		229
180	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
181	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
182	else
183	{
184	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);
185	socket.floorbox_reset ();	231	socket.floorbox_reset ();
186	}
187	}	232	}
188		233
189	socket.current_x = ob->x;	234	socket.current_x = ob->x;
190	socket.current_y = ob->y;	235	socket.current_y = ob->y;
		236	}
191		237
192	region *reg = ob->region ();	238	/**
193	if (socket.current_region != reg)	239	* This sends the skill number to name mapping. We ignore
194	{	240	* the params - we always send the same info no matter what.
195	socket.current_region = reg;	241	*/
196	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);	242	static void
197	}	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);
198	}	275	}
199		276
200	/**	277	/**
201	* RequestInfo is sort of a meta command. There is some specific	278	* RequestInfo is sort of a meta command. There is some specific
202	* request of information, but we call other functions to provide	279	* request of information, but we call other functions to provide
203	* that information.	280	* that information.
204	*/	281	*/
205	void	282	void
206	RequestInfo (char *buf, int len, client * ns)	283	RequestInfo (char *buf, int len, client *ns)
207	{	284	{
208	char *params = NULL, *cp;	285	char *params;
209
210	/* No match */
211	char bigbuf[MAX_BUF];
212	int slen;
213
214	/* Set up replyinfo before we modify any of the buffers - this is used
215	* if we don't find a match.
216	*/
217	strcpy (bigbuf, "replyinfo ");
218	slen = strlen (bigbuf);
219	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
220		286
221	/* find the first space, make it null, and update the	287	/* find the first space, make it null, and update the
222	* params pointer.	288	* params pointer.
223	*/	289	*/
224	for (cp = buf; *cp != '\0'; cp++)	290	for (params = buf; *params; params++)
225	if (*cp == ' ')	291	if (*params == ' ')
226	{	292	{
227	*cp = '\0';
228	params = cp + 1;	293	*params++ = 0;
229	break;	294	break;
230	}	295	}
231		296
232	if (!strcmp (buf, "image_info"))
233	send_image_info (ns, params);
234	else if (!strcmp (buf, "image_sums"))
235	send_image_sums (ns, params);
236	else if (!strcmp (buf, "skill_info"))	297	if (!strcmp (buf, "skill_info"))
237	send_skill_info (ns, params);	298	send_skill_info (ns, params);
238	else if (!strcmp (buf, "spell_paths"))	299	else if (!strcmp (buf, "spell_paths"))
239	send_spell_paths (ns, params);	300	send_spell_paths (ns, params);
240	else	301	else
241	ns->send_packet (bigbuf, len);	302	{
		303	// undo tokenisation above and send replyinfo with the request unchanged
		304	if (*params)
		305	*--params = ' ';
		306
		307	ns->send_packet_printf ("replyinfo %s", buf);
		308	}
242	}	309	}
243		310
244	void	311	void
245	ExtCmd (char *buf, int len, player *pl)	312	ExtCmd (char *buf, int len, player *pl)
246	{	313	{
…		…
249		316
250	void	317	void
251	ExtiCmd (char *buf, int len, client *ns)	318	ExtiCmd (char *buf, int len, client *ns)
252	{	319	{
253	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	320	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		321	}
		322
		323	//-GPL
		324
		325	void
		326	client::mapinfo_queue_clear ()
		327	{
		328	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		329	free (*i);
		330
		331	mapinfo_queue.clear ();
		332	}
		333
		334	bool
		335	client::mapinfo_try (char *buf)
		336	{
		337	char *token = buf;
		338	buf += strlen (buf) + 9;
		339
		340	// initial map and its origin
		341	maptile *map = pl->viewpoint->map;
		342	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
		343	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
		344	int max_distance = 8; // limit maximum path length to something generous
		345
		346	while (*buf && map && max_distance)
		347	{
		348	int dir = *buf++ - '1';
		349
		350	// due to historical glitches, the mapinfo index and tile index differs
		351	static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
		352
		353	// maybe we should only allow the four flat directions
		354	if (dir >= 0 && dir < array_length (dirmap))
		355	{
		356	dir = dirmap [dir];
		357
		358	if (!map->tile_path [dir])
		359	map = 0;
		360	else if (map->tile_available (dir, false))
		361	{
		362	maptile *neigh = map->tile_map [dir];
		363
		364	switch (dir)
		365	{
		366	case 0: mapy -= neigh->height; break;
		367	case 2: mapy += map ->height; break;
		368	case 3: mapx -= neigh->width ; break;
		369	case 1: mapx += map ->width ; break;
		370	}
		371
		372	map = neigh;
		373	--max_distance;
		374	}
		375	else
		376	return 0;
		377	}
		378	else
		379	max_distance = 0;
		380	}
		381
		382	if (!max_distance)
		383	send_packet_printf ("mapinfo %s error", token);
		384	else if (!map || !map->path)
		385	send_packet_printf ("mapinfo %s nomap", token);
		386	else
		387	{
		388	int flags = 0;
		389
		390	// due to historical glitches, the bit ordering and map index ordering differs
		391	if (map->tile_path[TILE_NORTH]) flags |= 0x01;
		392	if (map->tile_path[TILE_EAST ]) flags |= 0x02;
		393	if (map->tile_path[TILE_SOUTH]) flags |= 0x04;
		394	if (map->tile_path[TILE_WEST ]) flags |= 0x08;
		395	// these two are debatable
		396	if (map->tile_path[TILE_UP ]) flags |= 0x10;
		397	if (map->tile_path[TILE_DOWN ]) flags |= 0x20;
		398
		399	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		400	}
		401
		402	return 1;
		403	}
		404
		405	void
		406	client::mapinfo_queue_run ()
		407	{
		408	if (mapinfo_queue.empty () || !pl)
		409	return;
		410
		411	for (int i = 0; i < mapinfo_queue.size (); ++i)
		412	if (mapinfo_try (mapinfo_queue [i]))
		413	{
		414	free (mapinfo_queue [i]);
		415	mapinfo_queue.erase (i);
		416	}
		417	else
		418	++i;
254	}	419	}
255		420
256	void	421	void
257	MapInfoCmd (char *buf, int len, player *pl)	422	MapInfoCmd (char *buf, int len, player *pl)
258	{	423	{
259	// <mapinfo tag spatial tile-path	424	// <mapinfo tag spatial tile-path
260	// >mapinfo tag spatial flags x y w h hash	425	// >mapinfo tag spatial flags x y w h hash
261		426
262	char bigbuf[MAX_BUF], *token;
263
264	token = buf;	427	char *token = buf;
265	// copy token	428
266	if (!(buf = strchr (buf, ' ')))	429	if (!(buf = strchr (buf, ' ')))
267	return;	430	return;
268		431
269	*buf++ = 0;
270
271	if (!strncmp (buf, "spatial ", 8))	432	if (!strncmp (buf, " spatial ", 9))
272	{	433	{
273	buf += 8;	434	char *copy = strdup (token);
		435	copy [buf - token] = 0;
274		436
275	// initial map and its origin	437	#if 0
276	maptile *map = pl->ob->map;	438	// this makes only sense when we flush the buffer immediately
277	sint16 dx, dy;	439	if (pl->ns->mapinfo_try (copy))
278	int mapx = pl->ns->mapx / 2 - pl->ob->x;	440	free (copy);
279	int mapy = pl->ns->mapy / 2 - pl->ob->y;
280	int max_distance = 8; // limit maximum path length to something generous
281
282	while (*buf && map && max_distance)
283	{
284	int dir = *buf++;
285
286	switch (dir)
287	{
288	case '1':
289	dx = 0;
290	dy = -1;
291	map = map->xy_find (dx, dy);
292	map && (mapy -= map->height);
293	break;
294	case '2':
295	mapx += map->width;
296	dx = map->width;
297	dy = 0;
298	map = map->xy_find (dx, dy);
299	break;
300	case '3':
301	mapy += map->height;
302	dx = 0;
303	dy = map->height;
304	map = map->xy_find (dx, dy);
305	break;
306	case '4':
307	dx = -1;
308	dy = 0;
309	map = map->xy_find (dx, dy);
310	map && (mapx -= map->width);
311	break;
312	}
313
314	--max_distance;
315	}
316
317	if (!max_distance)
318	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
319	else if (map && map->path[0])
320	{
321	int flags = 0;
322
323	if (map->tile_path[0]) flags |= 1;
324	if (map->tile_path[1]) flags |= 2;
325	if (map->tile_path[2]) flags |= 4;
326	if (map->tile_path[3]) flags |= 8;
327
328	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
329	}
330	else	441	else
331	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	442	#endif
		443	pl->ns->mapinfo_queue.push_back (copy);
332	}	444	}
333	else	445	else
334	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	446	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
335
336	pl->ns->send_packet (bigbuf);
337	}	447	}
338		448
339	/** This is the Setup cmd */	449	/** This is the Setup cmd */
340	void	450	void
341	SetUp (char *buf, int len, client * ns)	451	SetUp (char *buf, int len, client * ns)
…		…
353	AddMeCmd (char *buf, int len, client *ns)	463	AddMeCmd (char *buf, int len, client *ns)
354	{	464	{
355	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	465	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
356	}	466	}
357		467
358	/** Reply to ExtendedInfos command */	468	//+GPL
359	void
360	ToggleExtendedInfos (char *buf, int len, client * ns)
361	{
362	char cmdback[MAX_BUF];
363	char command[50];
364	int info, nextinfo;
365
366	cmdback[0] = '\0';
367	nextinfo = 0;
368
369	while (1)
370	{
371	/* 1. Extract an info */
372	info = nextinfo;
373
374	while ((info < len) && (buf[info] == ' '))
375	info++;
376
377	if (info >= len)
378	break;
379
380	nextinfo = info + 1;
381
382	while ((nextinfo < len) && (buf[nextinfo] != ' '))
383	nextinfo++;
384
385	if (nextinfo - info >= 49) /*Erroneous info asked */
386	continue;
387
388	strncpy (command, &(buf[info]), nextinfo - info);
389
390	/* 2. Interpret info */
391	if (!strcmp ("smooth", command))
392	/* Toggle smoothing */
393	ns->EMI_smooth = !ns->EMI_smooth;
394	else
395	/*bad value */;
396
397	/*3. Next info */
398	}
399
400	strcpy (cmdback, "ExtendedInfoSet");
401
402	if (ns->EMI_smooth)
403	{
404	strcat (cmdback, " ");
405	strcat (cmdback, "smoothing");
406	}
407
408	ns->send_packet (cmdback);
409	}
410
411	/*
412	#define MSG_TYPE_BOOK 1
413	#define MSG_TYPE_CARD 2
414	#define MSG_TYPE_PAPER 3
415	#define MSG_TYPE_SIGN 4
416	#define MSG_TYPE_MONUMENT 5
417	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
418
419	/** Reply to ExtendedInfos command */
420	void
421	ToggleExtendedText (char *buf, int len, client * ns)
422	{
423	char cmdback[MAX_BUF];
424	char temp[10];
425	char command[50];
426	int info, nextinfo, i, flag;
427
428	cmdback[0] = '\0';
429
430	nextinfo = 0;
431	while (1)
432	{
433	/* 1. Extract an info */
434	info = nextinfo;
435
436	while ((info < len) && (buf[info] == ' '))
437	info++;
438
439	if (info >= len)
440	break;
441
442	nextinfo = info + 1;
443
444	while ((nextinfo < len) && (buf[nextinfo] != ' '))
445	nextinfo++;
446
447	if (nextinfo - info >= 49) /*Erroneous info asked */
448	continue;
449
450	strncpy (command, &(buf[info]), nextinfo - info);
451	command[nextinfo - info] = '\0';
452	/* 2. Interpret info */
453	i = sscanf (command, "%d", &flag);
454
455	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
456	ns->supported_readables |= (1 << flag);
457	/*3. Next info */
458	}
459
460	/* Send resulting state */
461	strcpy (cmdback, "ExtendedTextSet");
462
463	for (i = 0; i <= MSG_TYPE_LAST; i++)
464	if (ns->supported_readables & (1 << i))
465	{
466	strcat (cmdback, " ");
467	snprintf (temp, sizeof (temp), "%d", i);
468	strcat (cmdback, temp);
469	}
470
471	ns->send_packet (cmdback);
472	}
473		469
474	/**	470	/**
475	* This handles the general commands from the client (ie, north, fire, cast,	471	* This handles the general commands from the client (ie, north, fire, cast,
476	* etc.)	472	* etc.)
477	*/	473	*/
…		…
490	return;	486	return;
491		487
492	buf++;	488	buf++;
493	}	489	}
494		490
495	execute_newserver_command (pl->ob, (char *) buf);	491	execute_newserver_command (pl->ob, (char *)buf);
496		492
497	/* Perhaps something better should be done with a left over count.	493	/* Perhaps something better should be done with a left over count.
498	* Cleaning up the input should probably be done first - all actions	494	* Cleaning up the input should probably be done first - all actions
499	* for the command that issued the count should be done before any other	495	* for the command that issued the count should be done before any other
500	* commands.	496	* commands.
…		…
511	void	507	void
512	NewPlayerCmd (char *buf, int len, player *pl)	508	NewPlayerCmd (char *buf, int len, player *pl)
513	{	509	{
514	if (len <= 6)	510	if (len <= 6)
515	{	511	{
516	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	512	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
517	return;	513	return;
518	}	514	}
519		515
520	uint16 cmdid = net_uint16 ((uint8 *)buf);	516	uint16 cmdid = net_uint16 ((uint8 *)buf);
521	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	517	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
534	* commands.	530	* commands.
535	*/	531	*/
536	pl->count = 0;	532	pl->count = 0;
537		533
538	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	534	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
539	int time = fabs (pl->ob->speed) < 0.001	535	int time = pl->ob->has_active_speed ()
540	? time = MAX_TIME * 100
541	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	536	? (int) (MAX_TIME / pl->ob->speed)
		537	: MAX_TIME * 100;
542		538
543	/* Send confirmation of command execution now */	539	/* Send confirmation of command execution now */
544	packet sl ("comc");	540	packet sl ("comc");
545	sl << uint16 (cmdid) << uint32 (time);	541	sl << uint16 (cmdid) << uint32 (time);
546	pl->ns->send_packet (sl);	542	pl->ns->send_packet (sl);
…		…
588	LOG (llevError, "Unknown input state: %d\n", ns->state);	584	LOG (llevError, "Unknown input state: %d\n", ns->state);
589	}	585	}
590	}	586	}
591		587
592	/**	588	/**
593	* Client tells its version. If there is a mismatch, we close the	589	* Client tells its version info.
594	* socket. In real life, all we should care about is the client having
595	* something older than the server. If we assume the client will be
596	* backwards compatible, having it be a later version should not be a
597	* problem.
598	*/	590	*/
599	void	591	void
600	VersionCmd (char *buf, int len, client * ns)	592	VersionCmd (char *buf, int len, client *ns)
601	{	593	{
602	if (!buf)	594	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
603	{
604	LOG (llevError, "CS: received corrupted version command\n");
605	return;
606	}
607
608	ns->cs_version = atoi (buf);
609	ns->sc_version = ns->cs_version;
610
611	LOG (llevDebug, "connection from client <%s>\n", buf);
612
613	//TODO: should log here just for statistics
614
615	//if (VERSION_CS != ns->cs_version)
616	// unchecked;
617
618	char *cp = strchr (buf + 1, ' ');
619	if (!cp)
620	return;
621
622	ns->sc_version = atoi (cp);
623
624	//if (VERSION_SC != ns->sc_version)
625	// unchecked;
626
627	cp = strchr (cp + 1, ' ');
628
629	if (cp)
630	{
631	ns->version = cp + 1;
632
633	if (ns->sc_version < 1026)
634	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
635	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
636	}
637	}	595	}
638		596
639	/** sound related functions. */	597	/** sound related functions. */
640	void	598	void
641	SetSound (char *buf, int len, client * ns)	599	SetSound (char *buf, int len, client * ns)
…		…
659	* syntax is: move (to) (tag) (nrof)	617	* syntax is: move (to) (tag) (nrof)
660	*/	618	*/
661	void	619	void
662	MoveCmd (char *buf, int len, player *pl)	620	MoveCmd (char *buf, int len, player *pl)
663	{	621	{
664	int vals[3], i;	622	int to, tag, nrof;
665		623
666	/* A little funky here. We only cycle for 2 records, because	624	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
667	* we obviously are not going to find a space after the third
668	* record. Perhaps we should just replace this with a
669	* sscanf?
670	*/
671	for (i = 0; i < 2; i++)
672	{	625	{
673	vals[i] = atoi (buf);
674
675	if (!(buf = strchr (buf, ' ')))
676	{
677	LOG (llevError, "Incomplete move command: %s\n", buf);	626	LOG (llevError, "Incomplete move command: %s\n", buf);
678	return;	627	return;
679	}
680
681	buf++;
682	}	628	}
683		629
684	vals[2] = atoi (buf);	630	esrv_move_object (pl->ob, to, tag, nrof);
685
686	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
687	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
688	}	631	}
689		632
690	/******************************************************************************	633	/******************************************************************************
691	*	634	*
692	* Start of commands the server sends to the client.	635	* Start of commands the server sends to the client.
…		…
707	* Get player's current range attack in obuf.	650	* Get player's current range attack in obuf.
708	*/	651	*/
709	static void	652	static void
710	rangetostring (player *pl, char *obuf)	653	rangetostring (player *pl, char *obuf)
711	{	654	{
712	dynbuf_text buf;	655	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		656
		657	#if 0
		658	// print ranged/chosen_skill etc. objects every call
		659	printf ("%s %s => %s (%s)\n",
		660	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		661	pl->combat_ob ? &pl->combat_ob->name : "-",
		662	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		663	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		664	);
		665	#endif
713		666
714	if (pl->ranged_ob)	667	if (pl->ranged_ob)
715	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	668	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
716		669
717	if (pl->combat_ob)	670	if (pl->combat_ob)
…		…
763	* commands for now.	716	* commands for now.
764	*/	717	*/
765	void	718	void
766	esrv_update_stats (player *pl)	719	esrv_update_stats (player *pl)
767	{	720	{
768	char buf[MAX_BUF];
769	uint16 flags;
770
771	client *ns = pl->ns;	721	client *ns = pl->ns;
772	if (!ns)	722	if (!ns)
773	return;	723	return;
774		724
775	object *ob = pl->observe;	725	object *ob = pl->observe;
…		…
792	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	742	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
793	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	743	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
794	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	744	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
795	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	745	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
796		746
797	for (int s = 0; s < NUM_SKILLS; s++)	747	for (int s = 0; s < CS_NUM_SKILLS; s++)
798	if (object *skill = opl->last_skill_ob[s])	748	if (object *skill = opl->last_skill_ob [s])
799	if (skill->stats.exp != ns->last_skill_exp [s])	749	if (skill->stats.exp != ns->last_skill_exp [s])
800	{	750	{
801	ns->last_skill_exp [s] = skill->stats.exp;	751	ns->last_skill_exp [s] = skill->stats.exp;
802		752
803	/* Always send along the level if exp changes. This is only	753	/* Always send along the level if exp changes. This is only
804	* 1 extra byte, but keeps processing simpler.	754	* 1 extra byte, but keeps processing simpler.
805	*/	755	*/
806	sl << uint8 (s + CS_STAT_SKILLINFO)	756	sl << uint8 (CS_STAT_SKILLINFO + s)
807	<< uint8 (skill->level)	757	<< uint8 (skill->level)
808	<< uint64 (skill->stats.exp);	758	<< uint64 (skill->stats.exp);
809	}	759	}
810		760
811	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	761	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
812	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	762	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
813	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	763	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
814	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	764	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
815	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	765	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
816	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	766	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
817	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	767	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
818	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	768	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
819	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	769	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
820		770
821	flags = 0;	771	int flags = (opl->fire_on ? SF_FIREON : 0)
822		772	| (opl->run_on ? SF_RUNON : 0);
823	if (opl->fire_on)
824	flags |= SF_FIREON;
825
826	if (opl->run_on)
827	flags |= SF_RUNON;
828		773
829	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	774	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
830		775
831	if (ns->sc_version < 1025)
832	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
833	else
834	for (int i = 0; i < NROFATTACKS; i++)	776	for (int i = 0; i < NROFATTACKS; i++)
835	{
836	/* Skip ones we won't send */	777	/* Skip ones we won't send */
837	if (atnr_cs_stat[i] == -1)	778	if (atnr_cs_stat[i] >= 0)
838	continue;
839
840	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	779	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
841	}
842		780
843	if (pl->ns->monitor_spells)	781	if (pl->ns->monitor_spells)
844	{	782	{
845	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	783	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
846	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	784	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
847	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	785	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
848	}	786	}
849		787
		788	char buf[MAX_BUF];
850	rangetostring (opl, buf); /* we want use the new fire & run system in new client */	789	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
851	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	790	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
852	set_title (ob, buf);	791	set_title (ob, buf);
853	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	792	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
854		793
…		…
859		798
860	/**	799	/**
861	* Tells the client that here is a player it should start using.	800	* Tells the client that here is a player it should start using.
862	*/	801	*/
863	void	802	void
864	esrv_new_player (player *pl, uint32 weight)	803	esrv_new_player (player *pl)
865	{	804	{
		805	sint32 weight = pl->ob->client_weight ();
		806
866	packet sl ("player");	807	packet sl ("player");
867		808
868	sl << uint32 (pl->ob->count)	809	sl << uint32 (pl->ob->count)
869	<< uint32 (weight)	810	<< uint32 (weight)
870	<< uint32 (pl->ob->face)	811	<< uint32 (pl->ob->face)
871	<< data8 (pl->ob->name);	812	<< data8 (pl->ob->name);
872		813
873	pl->ns->last_weight = weight;	814	pl->ns->last_weight = weight;
874	pl->ns->send_packet (sl);	815	pl->ns->send_packet (sl);
875	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
876	}	816	}
877		817
878	/******************************************************************************	818	/******************************************************************************
879	*	819	*
880	* Start of map related commands.	820	* Start of map related commands.
…		…
937		877
938	if (!ns.faces_sent[face_num])	878	if (!ns.faces_sent[face_num])
939	if (ob)	879	if (ob)
940	ns.send_faces (ob);	880	ns.send_faces (ob);
941	else	881	else
942	ns.send_face (face_num);	882	ns.send_face (face_num, 10);
943		883
944	sl << uint16 (face_num);	884	sl << uint16 (face_num);
945	return 1;	885	return 1;
946	}	886	}
947		887
948	/* Nothing changed */	888	/* Nothing changed */
949	return 0;	889	return 0;
950	}	890	}
951		891
952	/**	892	//-GPL
953	* Returns the size of a data for a map square as returned by
954	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
955	* available.
956	*/
957	int
958	getExtendedMapInfoSize (client * ns)
959	{
960	int result = 0;
961		893
962	if (ns->ext_mapinfos)	894	// prefetch some flat area around the player
963	{
964	if (ns->EMI_smooth)
965	result += 1; /*One byte for smoothlevel */
966	}
967
968	return result;
969	}
970
971	// prefetch (and touch) all maps within a specific distancd
972	static void	895	static void
973	prefetch_surrounding_maps (maptile *map, int distance)	896	prefetch_surrounding_area (object *op, maptile *map, int range)
974	{	897	{
975	map->last_access = runtime;	898	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
976		899	op->x - range , op->y - range ,
977	if (--distance)	900	op->x + range + 1, op->y + range + 1);
978	for (int dir = 4; --dir; )	901	rect->m;
979	if (const shstr &path = map->tile_path [dir])	902	++rect)
980	if (maptile *&neigh = map->tile_map [dir])	903	{
981	prefetch_surrounding_maps (neigh, distance);	904	rect->m->touch ();
982	else	905	rect->m->activate ();
983	neigh = maptile::find_async (path, map);	906	}
984	}	907	}
985		908
986	// prefetch a generous area around the player	909	// prefetch a generous area around the player, also up and down
987	static void	910	void
988	prefetch_surrounding_maps (object *op)	911	object::prefetch_surrounding_maps ()
989	{	912	{
990	prefetch_surrounding_maps (op->map, 3);	913	prefetch_surrounding_area (this, map, 40);
		914
		915	if (maptile *m = map->tile_available (TILE_DOWN))
		916	prefetch_surrounding_area (this, m, 20);
		917
		918	if (maptile *m = map->tile_available (TILE_UP))
		919	prefetch_surrounding_area (this, m, 20);
991	}	920	}
		921
		922	//+GPL
992		923
993	/**	924	/**
994	* Draws client map.	925	* Draws client map.
995	*/	926	*/
996	void	927	void
997	draw_client_map (player *pl)	928	draw_client_map (player *pl)
998	{	929	{
999	object *ob = pl->observe;	930	object *ob = pl->viewpoint;
1000	if (!ob->active)	931	if (!pl->observe->active)
1001	return;	932	return;
1002
1003	maptile *plmap = ob->map;
1004		933
1005	/* If player is just joining the game, he isn't here yet, so the map	934	/* If player is just joining the game, he isn't here yet, so the map
1006	* can get swapped out. If so, don't try to send them a map. All will	935	* can get swapped out. If so, don't try to send them a map. All will
1007	* be OK once they really log in.	936	* be OK once they really log in.
1008	*/	937	*/
1009	if (!plmap || plmap->in_memory != MAP_IN_MEMORY)	938	if (!ob->map || ob->map->state != MAP_ACTIVE)
1010	return;	939	return;
1011		940
1012	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1013	int estartlen, eoldlen;	941	int startlen, oldlen;
1014	uint8 eentrysize;
1015	uint16 ewhatstart, ewhatflag;
1016	uint8 extendedinfos;
1017		942
1018	check_map_change (pl);	943	check_map_change (pl);
1019	prefetch_surrounding_maps (pl->ob);	944	pl->ob->prefetch_surrounding_maps ();
1020		945
1021	/* do LOS after calls to update_position */	946	/* do LOS after calls to update_position */
1022	if (ob != pl->ob)	947	/* unfortunately, we need to udpate los when observing, currently */
1023	clear_los (pl);	948	if (pl->do_los || pl->viewpoint != pl->ob)
1024	else if (pl->do_los)
1025	{	949	{
1026	update_los (ob);
1027	pl->do_los = 0;	950	pl->do_los = 0;
		951	pl->update_los ();
1028	}	952	}
1029		953
1030	/**	954	/**
1031	* This function uses the new map1 protocol command to send the map	955	* This function uses the new map1 protocol command to send the map
1032	* to the client. It is necessary because the old map command supports	956	* to the client. It is necessary because the old map command supports
…		…
1050	* look like.	974	* look like.
1051	*/	975	*/
1052		976
1053	client &socket = *pl->ns;	977	client &socket = *pl->ns;
1054		978
1055	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	979	packet sl ("map1a");
1056	packet esl;
1057		980
1058	startlen = sl.length ();	981	startlen = sl.length ();
1059		982
1060	/*Extendedmapinfo structure initialisation */	983	int hx = socket.mapx / 2;
1061	if (socket.ext_mapinfos)	984	int hy = socket.mapy / 2;
1062	{
1063	extendedinfos = EMI_NOREDRAW;
1064		985
1065	if (socket.EMI_smooth)	986	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1066	extendedinfos |= EMI_SMOOTH;	987	int ax = dx + hx;
		988	int ay = dy + hy;
1067		989
1068	ewhatstart = esl.length ();	990	int mask = (ax << 10) | (ay << 4);
1069	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	991	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1070	could need to be taken away */
1071	eentrysize = getExtendedMapInfoSize (&socket);
1072	esl << "mapextended "
1073	<< uint8 (extendedinfos)
1074	<< uint8 (eentrysize);
1075		992
1076	estartlen = esl.length ();	993	/* If the coordinates are not valid, or it is too dark to see,
1077	}	994	* we tell the client as such
1078
1079	/* x,y are the real map locations. ax, ay are viewport relative
1080	* locations.
1081	*/	995	*/
1082	ay = 0;	996	if (!m)
1083
1084	/* We could do this logic as conditionals in the if statement,
1085	* but that started to get a bit messy to look at.
1086	*/
1087	max_x = ob->x + (socket.mapx + 1) / 2;
1088	max_y = ob->y + (socket.mapy + 1) / 2;
1089
1090	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1091	{	997	{
1092	sint16 nx, ny;	998	/* space is out of map. Update space and clear values
1093	maptile *m = 0;	999	* if this hasn't already been done. If the space is out
1094		1000	* of the map, it shouldn't have a head.
1095	ax = 0;	1001	*/
1096	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	1002	if (lastcell.count != -1)
1097	{	1003	{
1098	// check to see if we can simply go one right quickly	1004	sl << uint16 (mask);
		1005	map_clearcell (&lastcell, -1);
1099	++nx;	1006	}
1100	if (m && nx >= m->width)	1007
		1008	continue;
		1009	}
		1010
		1011	int d = pl->blocked_los_uc (dx, dy);
		1012
		1013	if (d > 3)
		1014	{
		1015	/* This block deals with spaces that are not visible for whatever
		1016	* reason. Still may need to send the head for this space.
		1017	*/
		1018	if (lastcell.count != -1
		1019	|| lastcell.faces[0]
		1020	|| lastcell.faces[1]
		1021	|| lastcell.faces[2]
		1022	|| lastcell.stat_hp
		1023	|| lastcell.flags
		1024	|| lastcell.player)
		1025	sl << uint16 (mask);
		1026
		1027	/* properly clear a previously sent big face */
		1028	map_clearcell (&lastcell, -1);
		1029	}
		1030	else
		1031	{
		1032	/* In this block, the space is visible.
		1033	*/
		1034
		1035	/* Rather than try to figure out what everything that we might
		1036	* need to send is, then form the packet after that,
		1037	* we presume that we will in fact form a packet, and update
		1038	* the bits by what we do actually send. If we send nothing,
		1039	* we just back out sl.length () to the old value, and no harm
		1040	* is done.
		1041	* I think this is simpler than doing a bunch of checks to see
		1042	* what if anything we need to send, setting the bits, then
		1043	* doing those checks again to add the real data.
		1044	*/
		1045	oldlen = sl.length ();
		1046
		1047	sl << uint16 (mask);
		1048
		1049	unsigned char dummy;
		1050	unsigned char *last_ext = &dummy;
		1051
		1052	/* Darkness changed */
		1053	if (lastcell.count != d)
		1054	{
1101	m = 0;	1055	mask |= 0x8;
1102		1056
1103	if (!m)	1057	*last_ext |= 0x80;
		1058	last_ext = &sl[sl.length ()];
		1059	sl << uint8 (d);
		1060	}
		1061
		1062	lastcell.count = d;
		1063
		1064	mapspace &ms = m->at (nx, ny);
		1065	ms.update ();
		1066
		1067	// extmap handling
		1068	uint8 stat_hp = 0;
		1069	uint8 stat_width = 0;
		1070	uint8 flags = 0;
		1071	tag_t player = 0;
		1072
		1073	// send hp information, if applicable
		1074	if (object *op = ms.faces_obj [0])
		1075	if (op->is_head () && !op->invisible)
1104	{	1076	{
1105	nx = x; ny = y; m = plmap;	1077	if (op->stats.maxhp > op->stats.hp
1106		1078	&& op->stats.maxhp > 0
1107	if (!xy_normalise (m, nx, ny))	1079	&& (op->type == PLAYER
		1080	|| op->type == DOOR // does not work, have maxhp 0
		1081	|| op->flag [FLAG_MONSTER]
		1082	|| op->flag [FLAG_ALIVE]
		1083	|| op->flag [FLAG_GENERATOR]))
1108	m = 0;	1084	{
		1085	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1086	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1087	}
		1088
		1089	if (expect_false (op->has_dialogue ()))
		1090	flags |= 1;
		1091
		1092	if (expect_false (op->type == PLAYER))
		1093	player = op == ob ? pl->ob->count
		1094	: op == pl->ob ? ob->count
		1095	: op->count;
1109	}	1096	}
1110		1097
1111	int emask, mask;	1098	if (expect_false (lastcell.stat_hp != stat_hp))
1112	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1113
1114	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1115
1116	/* If the coordinates are not valid, or it is too dark to see,
1117	* we tell the client as such
1118	*/
1119	if (!m)
1120	{	1099	{
1121	/* space is out of map. Update space and clear values	1100	lastcell.stat_hp = stat_hp;
1122	* if this hasn't already been done. If the space is out	1101
1123	* of the map, it shouldn't have a head	1102	mask |= 0x8;
1124	*/	1103	*last_ext |= 0x80;
1125	if (lastcell.count != -1)	1104	last_ext = &sl[sl.length ()];
		1105
		1106	sl << uint8 (5) << uint8 (stat_hp);
		1107
		1108	if (stat_width > 1)
1126	{	1109	{
1127	sl << uint16 (mask);
1128	map_clearcell (&lastcell, -1);
1129	}
1130
1131	continue;
1132	}
1133
1134	m->touch ();
1135
1136	int d = pl->blocked_los[ax][ay];
1137
1138	if (d > 3)
1139	{
1140
1141	int need_send = 0, count;
1142
1143	/* This block deals with spaces that are not visible for whatever
1144	* reason. Still may need to send the head for this space.
1145	*/
1146
1147	oldlen = sl.length ();
1148
1149	sl << uint16 (mask);
1150
1151	if (lastcell.count != -1)
1152	need_send = 1;
1153
1154	count = -1;
1155
1156	/* properly clear a previously sent big face */
1157	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1158	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1159	need_send = 1;
1160
1161	map_clearcell (&lastcell, count);
1162
1163	if ((mask & 0xf) || need_send)
1164	sl[oldlen + 1] = mask & 0xff;
1165	else
1166	sl.reset (oldlen);
1167	}
1168	else
1169	{
1170	/* In this block, the space is visible.
1171	*/
1172
1173	/* Rather than try to figure out what everything that we might
1174	* need to send is, then form the packet after that,
1175	* we presume that we will in fact form a packet, and update
1176	* the bits by what we do actually send. If we send nothing,
1177	* we just back out sl.length () to the old value, and no harm
1178	* is done.
1179	* I think this is simpler than doing a bunch of checks to see
1180	* what if anything we need to send, setting the bits, then
1181	* doing those checks again to add the real data.
1182	*/
1183	oldlen = sl.length ();
1184	eoldlen = esl.length ();
1185
1186	sl << uint16 (mask);
1187
1188	unsigned char dummy;
1189	unsigned char *last_ext = &dummy;
1190
1191	/* Darkness changed */
1192	if (lastcell.count != d && socket.darkness)
1193	{
1194	mask |= 0x8;
1195
1196	if (socket.extmap)
1197	{
1198	*last_ext |= 0x80;	1110	*last_ext |= 0x80;
1199	last_ext = &sl[sl.length ()];	1111	last_ext = &sl[sl.length ()];
1200	sl << uint8 (d);	1112
1201	}	1113	sl << uint8 (6) << uint8 (stat_width);
1202	else
1203	sl << uint8 (255 - 64 * d);
1204	}	1114	}
		1115	}
1205		1116
1206	lastcell.count = d;	1117	if (expect_false (lastcell.player != player))
1207
1208	mapspace &ms = m->at (nx, ny);
1209	ms.update ();
1210
1211	if (socket.extmap)
1212	{	1118	{
1213	uint8 stat_hp = 0;	1119	lastcell.player = player;
1214	uint8 stat_width = 0;
1215	uint8 flags = 0;
1216	tag_t player = 0;
1217		1120
1218	// send hp information, if applicable
1219	if (object *op = ms.faces_obj [0])
1220	{
1221	if (op->head || op->invisible)
1222	; // do not show
1223	else if (op->type == PLAYER
1224	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1225	{
1226	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1227	{
1228	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1229	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1230	}
1231	}
1232
1233	if (op->msg && op->msg[0] == '@')
1234	flags |= 1;
1235
1236	if (op->type == PLAYER && op != ob)
1237	player = op->count;
1238	}
1239
1240	if (lastcell.stat_hp != stat_hp)
1241	{
1242	lastcell.stat_hp = stat_hp;
1243
1244	mask |= 0x8;	1121	mask |= 0x8;
1245	*last_ext |= 0x80;	1122	*last_ext |= 0x80;
1246	last_ext = &sl[sl.length ()];	1123	last_ext = &sl[sl.length ()];
1247		1124
1248	sl << uint8 (5) << uint8 (stat_hp);
1249
1250	if (stat_width > 1)
1251	{
1252	*last_ext |= 0x80;
1253	last_ext = &sl[sl.length ()];
1254
1255	sl << uint8 (6) << uint8 (stat_width);
1256	}
1257	}
1258
1259	if (lastcell.player != player)
1260	{
1261	lastcell.player = player;
1262
1263	mask |= 0x8;
1264	*last_ext |= 0x80;
1265	last_ext = &sl[sl.length ()];
1266
1267	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1125	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1268	}	1126	}
1269		1127
1270	if (lastcell.flags != flags)	1128	if (expect_false (lastcell.flags != flags))
1271	{	1129	{
1272	lastcell.flags = flags;	1130	lastcell.flags = flags;
1273		1131
1274	mask |= 0x8;	1132	mask |= 0x8;
1275	*last_ext |= 0x80;	1133	*last_ext |= 0x80;
1276	last_ext = &sl[sl.length ()];	1134	last_ext = &sl[sl.length ()];
1277		1135
1278	sl << uint8 (8) << uint8 (flags);	1136	sl << uint8 (8) << uint8 (flags);
1279	}
1280	}	1137	}
1281		1138
		1139	// faces
		1140
1282	/* Floor face */	1141	/* Floor face */
1283	if (update_space (sl, socket, ms, lastcell, 2))	1142	if (update_space (sl, socket, ms, lastcell, 2))
1284	mask |= 0x4;	1143	mask |= 0x4;
1285		1144
1286	/* Middle face */	1145	/* Middle face */
1287	if (update_space (sl, socket, ms, lastcell, 1))	1146	if (update_space (sl, socket, ms, lastcell, 1))
1288	mask |= 0x2;	1147	mask |= 0x2;
1289		1148
		1149	if (expect_false (ob->invisible)
		1150	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1290	if (ms.player () == ob	1151	&& ms.player () == ob)
1291	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1292	{	1152	{
1293	// force player to be visible to himself if invisible	1153	// force player to be visible to himself if invisible
1294	if (lastcell.faces[0] != ob->face)	1154	if (lastcell.faces[0] != ob->face)
1295	{	1155	{
1296	lastcell.faces[0] = ob->face;	1156	lastcell.faces[0] = ob->face;
1297		1157
1298	mask |= 0x1;
1299	sl << uint16 (ob->face);
1300
1301	socket.send_faces (ob);
1302	}
1303	}
1304	/* Top face */
1305	else if (update_space (sl, socket, ms, lastcell, 0))
1306	mask |= 0x1;	1158	mask |= 0x1;
		1159	sl << uint16 (ob->face);
1307		1160
		1161	socket.send_faces (ob);
		1162	}
		1163	}
		1164	/* Top face */
		1165	else if (update_space (sl, socket, ms, lastcell, 0))
		1166	mask |= 0x1;
		1167
1308	/* Check to see if we are in fact sending anything for this	1168	/* Check to see if we are in fact sending anything for this
1309	* space by checking the mask. If so, update the mask.	1169	* space by checking the mask. If so, update the mask.
1310	* if not, reset the len to that from before adding the mask	1170	* if not, reset the len to that from before adding the mask
1311	* value, so we don't send those bits.	1171	* value, so we don't send those bits.
1312	*/	1172	*/
1313	if (mask & 0xf)	1173	if (mask & 0xf)
1314	sl[oldlen + 1] = mask & 0xff;	1174	sl[oldlen + 1] = mask & 0xff;
1315	else	1175	else
1316	sl.reset (oldlen);	1176	sl.reset (oldlen);
1317
1318	if (socket.ext_mapinfos)
1319	esl << uint16 (emask);
1320
1321	if (socket.EMI_smooth)
1322	{
1323	for (int layer = 2+1; layer--; )
1324	{
1325	object *ob = ms.faces_obj [layer];
1326
1327	// If there is no object for this space, or if the face for the object
1328	// is the blank face, set the smoothlevel to zero.
1329	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1330
1331	// We've gotten what face we want to use for the object. Now see if
1332	// if it has changed since we last sent it to the client.
1333	if (lastcell.smooth[layer] != smoothlevel)
1334	{
1335	lastcell.smooth[layer] = smoothlevel;
1336	esl << uint8 (smoothlevel);
1337	emask |= 1 << layer;
1338	}
1339	}
1340
1341	if (emask & 0xf)
1342	esl[eoldlen + 1] = emask & 0xff;
1343	else
1344	esl.reset (eoldlen);
1345	}
1346	} /* else this is a viewable space */	1177	} /* else this is a viewable space */
1347	} /* for x loop */	1178	ordered_mapwalk_end
1348	} /* for y loop */
1349		1179
1350	socket.flush_fx ();	1180	socket.flush_fx ();
1351
1352	/* Verify that we in fact do need to send this */
1353	if (socket.ext_mapinfos)
1354	{
1355	if (!(sl.length () > startlen || socket.sent_scroll))
1356	{
1357	/* No map data will follow, so don't say the client
1358	* it doesn't need draw!
1359	*/
1360	ewhatflag &= ~EMI_NOREDRAW;
1361	esl[ewhatstart + 1] = ewhatflag & 0xff;
1362	}
1363
1364	if (esl.length () > estartlen)
1365	socket.send_packet (esl);
1366	}
1367		1181
1368	if (sl.length () > startlen || socket.sent_scroll)	1182	if (sl.length () > startlen || socket.sent_scroll)
1369	{	1183	{
1370	socket.send_packet (sl);	1184	socket.send_packet (sl);
1371	socket.sent_scroll = 0;	1185	socket.sent_scroll = 0;
1372	}	1186	}
1373	}	1187	}
1374		1188
1375	/*****************************************************************************/
1376	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1377	/* a player. Of course, the client need to know the command to be able to */
1378	/* manage it ! */
1379	/*****************************************************************************/
1380	void
1381	send_plugin_custom_message (object *pl, char *buf)
1382	{
1383	pl->contr->ns->send_packet (buf);
1384	}
1385
1386	/**
1387	* This sends the skill number to name mapping. We ignore
1388	* the params - we always send the same info no matter what.
1389	*/
1390	void
1391	send_skill_info (client *ns, char *params)
1392	{
1393	packet sl;
1394	sl << "replyinfo skill_info\n";
1395
1396	for (int i = 1; i < NUM_SKILLS; i++)
1397	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1398
1399	if (sl.length () >= MAXSOCKBUF)
1400	{
1401	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1402	fatal (0);
1403	}
1404
1405	ns->send_packet (sl);
1406	}
1407
1408	/**
1409	* This sends the spell path to name mapping. We ignore
1410	* the params - we always send the same info no matter what.
1411	*/
1412	void
1413	send_spell_paths (client * ns, char *params)
1414	{
1415	packet sl;
1416
1417	sl << "replyinfo spell_paths\n";
1418
1419	for (int i = 0; i < NRSPELLPATHS; i++)
1420	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1421
1422	if (sl.length () >= MAXSOCKBUF)
1423	{
1424	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1425	fatal (0);
1426	}
1427
1428	ns->send_packet (sl);
1429	}
1430
1431	/**	1189	/**
1432	* This looks for any spells the player may have that have changed their stats.	1190	* This looks for any spells the player may have that have changed their stats.
1433	* it then sends an updspell packet for each spell that has changed in this way	1191	* it then sends an updspell packet for each spell that has changed in this way
1434	*/	1192	*/
1435	void	1193	void
1436	esrv_update_spells (player *pl)	1194	esrv_update_spells (player *pl)
1437	{	1195	{
1438	if (!pl->ns)	1196	if (!pl->ns)
1439	return;	1197	return;
1440		1198
		1199	pl->ns->update_spells = false;
		1200
1441	if (!pl->ns->monitor_spells)	1201	if (!pl->ns->monitor_spells)
1442	return;	1202	return;
1443		1203
1444	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1204	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1445	{
1446	if (spell->type == SPELL)	1205	if (spell->type == SPELL)
1447	{	1206	{
1448	int flags = 0;	1207	int flags = 0;
		1208	int val;
1449		1209
1450	/* check if we need to update it */	1210	/* check if we need to update it */
1451	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1211	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1212	if (spell->cached_sp != val)
1452	{	1213	{
1453	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1214	spell->cached_sp = val;
1454	flags |= UPD_SP_MANA;	1215	flags |= UPD_SP_MANA;
1455	}	1216	}
1456		1217
1457	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1218	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1219	if (spell->cached_grace != val)
1458	{	1220	{
1459	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1221	spell->cached_grace = val;
1460	flags |= UPD_SP_GRACE;	1222	flags |= UPD_SP_GRACE;
1461	}	1223	}
1462		1224
1463	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1225	val = casting_level (pl->ob, spell);
		1226	if (spell->cached_eat != val)
1464	{	1227	{
1465	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1228	spell->cached_eat = val;
1466	flags |= UPD_SP_DAMAGE;	1229	flags |= UPD_SP_LEVEL;
1467	}	1230	}
1468		1231
1469	if (flags)	1232	if (flags)
1470	{	1233	{
1471	packet sl;	1234	packet sl;
1472		1235
1473	sl << "updspell "	1236	sl << "updspell "
1474	<< uint8 (flags)	1237	<< uint8 (flags)
1475	<< uint32 (spell->count);	1238	<< uint32 (spell->count);
1476		1239
1477	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1240	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1478	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1241	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1479	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1242	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1480		1243
1481	pl->ns->send_packet (sl);	1244	pl->ns->send_packet (sl);
1482	}	1245	}
1483	}	1246	}
1484	}
1485	}	1247	}
1486		1248
1487	void	1249	void
1488	esrv_remove_spell (player *pl, object *spell)	1250	esrv_remove_spell (player *pl, object *spell)
1489	{	1251	{
…		…
1514	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1276	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1515	return;	1277	return;
1516	}	1278	}
1517		1279
1518	/* store costs and damage in the object struct, to compare to later */	1280	/* store costs and damage in the object struct, to compare to later */
1519	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1281	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1520	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1282	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1521	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1283	spell->cached_eat = casting_level (pl->ob, spell);
1522		1284
1523	/* figure out which skill it uses, if it uses one */	1285	/* figure out which skill it uses, if it uses one */
1524	if (spell->skill)	1286	if (spell->skill)
1525	{	1287	if (object *tmp = pl->find_skill (spell->skill))
1526	for (i = 1; i < NUM_SKILLS; i++)	1288	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1527	if (!strcmp (spell->skill, skill_names[i]))
1528	{
1529	skill = i + CS_STAT_SKILLINFO;
1530	break;
1531	}
1532	}
1533		1289
1534	// spells better have a face	1290	// spells better have a face
1535	if (!spell->face)	1291	if (!spell->face)
1536	{	1292	{
1537	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1293	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1538	spell->face = face_find ("burnout.x11", blank_face);	1294	spell->face = face_find ("burnout.x11", blank_face);
1539	}	1295	}
		1296
		1297	pl->ns->send_face (spell->face);
1540		1298
1541	/* send the current values */	1299	/* send the current values */
1542	sl << uint32 (spell->count)	1300	sl << uint32 (spell->count)
1543	<< uint16 (spell->level)	1301	<< uint16 (spell->level)
1544	<< uint16 (spell->casting_time)	1302	<< uint16 (spell->casting_time)
1545	<< uint16 (spell->last_sp)	1303	<< uint16 (spell->cached_sp)
1546	<< uint16 (spell->last_grace)	1304	<< uint16 (spell->cached_grace)
1547	<< uint16 (spell->last_eat)	1305	<< uint16 (spell->cached_eat)
1548	<< uint8 (skill)	1306	<< uint8 (skill)
1549	<< uint32 (spell->path_attuned)	1307	<< uint32 (spell->path_attuned)
1550	<< uint32 (spell->face)	1308	<< uint32 (spell->face)
1551	<< data8 (spell->name)	1309	<< data8 (spell->name)
1552	<< data16 (spell->msg);	1310	<< data16 (spell->msg);
…		…
1580	* bytes and 3 strings (because that is the spec) so we need to	1338	* bytes and 3 strings (because that is the spec) so we need to
1581	* check that the length of those 3 strings, plus the 23 bytes,	1339	* check that the length of those 3 strings, plus the 23 bytes,
1582	* won't take us over the length limit for the socket, if it does,	1340	* won't take us over the length limit for the socket, if it does,
1583	* we need to send what we already have, and restart packet formation	1341	* we need to send what we already have, and restart packet formation
1584	*/	1342	*/
		1343	if (spell->type != SPELL)
		1344	continue;
		1345
1585	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1346	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1586	* to show add_spell is 26 bytes + 2 strings. However, the overun	1347	* to show add_spell is 26 bytes + 2 strings. However, the overun
1587	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1348	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1588	* like it will fix this	1349	* like it will fix this
1589	*/	1350	*/
1590	if (spell->type != SPELL)
1591	continue;
1592
1593	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1351	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1594	{	1352	{
		1353	pl->ns->flush_fx ();
1595	pl->ns->send_packet (sl);	1354	pl->ns->send_packet (sl);
1596		1355
1597	sl.reset ();	1356	sl.reset ();
1598	sl << "addspell ";	1357	sl << "addspell ";
1599	}	1358	}
…		…
1607	return;	1366	return;
1608	}	1367	}
1609	else	1368	else
1610	append_spell (pl, sl, spell);	1369	append_spell (pl, sl, spell);
1611		1370
1612	if (sl.length () >= MAXSOCKBUF)	1371	if (sl.length () > MAXSOCKBUF)
1613	{
1614	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1372	cleanup ("buffer overflow in esrv_add_spells!");
1615	fatal (0);
1616	}
1617		1373
1618	/* finally, we can send the packet */	1374	/* finally, we can send the packet */
		1375	pl->ns->flush_fx ();
1619	pl->ns->send_packet (sl);	1376	pl->ns->send_packet (sl);
1620	}	1377	}
1621		1378
		1379	//-GPL
		1380

Diff Legend

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