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

Diff Legend

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