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.88 by root, Tue Apr 24 00:42:03 2007 UTC vs.
Revision 1.158 by root, Fri Nov 6 13:11:28 2009 UTC

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

Diff Legend

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