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.104 by root, Tue Jun 5 13:05:03 2007 UTC vs.
Revision 1.169 by root, Thu Apr 8 17:36:54 2010 UTC

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

Diff Legend

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