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.91 by root, Mon Apr 30 04:25:30 2007 UTC vs.
Revision 1.157 by root, Fri Nov 6 13:05:57 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]) flags |= 1;
165	if (ob->map->tile_path[1]) flags |= 2;
166	if (ob->map->tile_path[2]) flags |= 4;
167	if (ob->map->tile_path[3]) flags |= 8;
168
169	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
170	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
171	}
172	else
173	snprintf (buf, MAX_BUF, "mapinfo current");
174
175	socket.send_packet (buf);
176	}
177	}	210	}
178	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)
179	{	212	{
180	int dx = ob->x - socket.current_x;	213	int dx = ob->x - socket.current_x;
181	int dy = ob->y - socket.current_y;	214	int dy = ob->y - socket.current_y;
182		215
183	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
184	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
185	else
186	{
187	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);
188	socket.floorbox_reset ();	217	socket.floorbox_reset ();
189	}
190	}	218	}
191		219
192	socket.current_x = ob->x;	220	socket.current_x = ob->x;
193	socket.current_y = ob->y;	221	socket.current_y = ob->y;
		222	}
194		223
195	region *reg = ob->region ();	224	/**
196	if (socket.current_region != reg)	225	* This sends the skill number to name mapping. We ignore
197	{	226	* the params - we always send the same info no matter what.
198	socket.current_region = reg;	227	*/
199	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);	228	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)
200	}	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	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);
201	}	267	}
202		268
203	/**	269	/**
204	* RequestInfo is sort of a meta command. There is some specific	270	* RequestInfo is sort of a meta command. There is some specific
205	* request of information, but we call other functions to provide	271	* request of information, but we call other functions to provide
206	* that information.	272	* that information.
207	*/	273	*/
208	void	274	void
209	RequestInfo (char *buf, int len, client * ns)	275	RequestInfo (char *buf, int len, client *ns)
210	{	276	{
211	char *params = NULL, *cp;	277	char *params;
212
213	/* No match */
214	char bigbuf[MAX_BUF];
215	int slen;
216
217	/* Set up replyinfo before we modify any of the buffers - this is used
218	* if we don't find a match.
219	*/
220	strcpy (bigbuf, "replyinfo ");
221	slen = strlen (bigbuf);
222	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
223		278
224	/* find the first space, make it null, and update the	279	/* find the first space, make it null, and update the
225	* params pointer.	280	* params pointer.
226	*/	281	*/
227	for (cp = buf; *cp != '\0'; cp++)	282	for (params = buf; *params; params++)
228	if (*cp == ' ')	283	if (*params == ' ')
229	{	284	{
230	*cp = '\0';
231	params = cp + 1;	285	*params++ = 0;
232	break;	286	break;
233	}	287	}
234		288
235	if (!strcmp (buf, "image_info"))
236	send_image_info (ns, params);
237	else if (!strcmp (buf, "image_sums"))
238	send_image_sums (ns, params);
239	else if (!strcmp (buf, "skill_info"))	289	if (!strcmp (buf, "skill_info"))
240	send_skill_info (ns, params);	290	send_skill_info (ns, params);
241	else if (!strcmp (buf, "spell_paths"))	291	else if (!strcmp (buf, "spell_paths"))
242	send_spell_paths (ns, params);	292	send_spell_paths (ns, params);
243	else	293	else
244	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	}
245	}	301	}
246		302
247	void	303	void
248	ExtCmd (char *buf, int len, player *pl)	304	ExtCmd (char *buf, int len, player *pl)
249	{	305	{
…		…
252		308
253	void	309	void
254	ExtiCmd (char *buf, int len, client *ns)	310	ExtiCmd (char *buf, int len, client *ns)
255	{	311	{
256	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;
257	}	401	}
258		402
259	void	403	void
260	MapInfoCmd (char *buf, int len, player *pl)	404	MapInfoCmd (char *buf, int len, player *pl)
261	{	405	{
262	// <mapinfo tag spatial tile-path	406	// <mapinfo tag spatial tile-path
263	// >mapinfo tag spatial flags x y w h hash	407	// >mapinfo tag spatial flags x y w h hash
264		408
265	char bigbuf[MAX_BUF], *token;
266
267	token = buf;	409	char *token = buf;
268	// copy token	410
269	if (!(buf = strchr (buf, ' ')))	411	if (!(buf = strchr (buf, ' ')))
270	return;	412	return;
271		413
272	*buf++ = 0;
273
274	if (!strncmp (buf, "spatial ", 8))	414	if (!strncmp (buf, " spatial ", 9))
275	{	415	{
276	buf += 8;	416	char *copy = strdup (token);
		417	copy [buf - token] = 0;
277		418
278	// initial map and its origin	419	#if 0
279	maptile *map = pl->ob->map;	420	// this makes only sense when we flush the buffer immediately
280	sint16 dx, dy;	421	if (pl->ns->mapinfo_try (copy))
281	int mapx = pl->ns->mapx / 2 - pl->ob->x;	422	free (copy);
282	int mapy = pl->ns->mapy / 2 - pl->ob->y;
283	int max_distance = 8; // limit maximum path length to something generous
284
285	while (*buf && map && max_distance)
286	{
287	int dir = *buf++;
288
289	switch (dir)
290	{
291	case '1':
292	dx = 0;
293	dy = -1;
294	map = map->xy_find (dx, dy);
295	map && (mapy -= map->height);
296	break;
297	case '2':
298	mapx += map->width;
299	dx = map->width;
300	dy = 0;
301	map = map->xy_find (dx, dy);
302	break;
303	case '3':
304	mapy += map->height;
305	dx = 0;
306	dy = map->height;
307	map = map->xy_find (dx, dy);
308	break;
309	case '4':
310	dx = -1;
311	dy = 0;
312	map = map->xy_find (dx, dy);
313	map && (mapx -= map->width);
314	break;
315	}
316
317	--max_distance;
318	}
319
320	if (!max_distance)
321	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
322	else if (map && map->path[0])
323	{
324	int flags = 0;
325
326	if (map->tile_path[0]) flags |= 1;
327	if (map->tile_path[1]) flags |= 2;
328	if (map->tile_path[2]) flags |= 4;
329	if (map->tile_path[3]) flags |= 8;
330
331	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
332	}
333	else	423	else
334	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	424	#endif
		425	pl->ns->mapinfo_queue.push_back (copy);
335	}	426	}
336	else	427	else
337	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	428	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
338
339	pl->ns->send_packet (bigbuf);
340	}	429	}
341		430
342	/** This is the Setup cmd */	431	/** This is the Setup cmd */
343	void	432	void
344	SetUp (char *buf, int len, client * ns)	433	SetUp (char *buf, int len, client * ns)
…		…
356	AddMeCmd (char *buf, int len, client *ns)	445	AddMeCmd (char *buf, int len, client *ns)
357	{	446	{
358	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	447	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
359	}	448	}
360		449
361	/** Reply to ExtendedInfos command */	450	//+GPL
362	void
363	ToggleExtendedInfos (char *buf, int len, client * ns)
364	{
365	char cmdback[MAX_BUF];
366	char command[50];
367	int info, nextinfo;
368
369	cmdback[0] = '\0';
370	nextinfo = 0;
371
372	while (1)
373	{
374	/* 1. Extract an info */
375	info = nextinfo;
376
377	while ((info < len) && (buf[info] == ' '))
378	info++;
379
380	if (info >= len)
381	break;
382
383	nextinfo = info + 1;
384
385	while ((nextinfo < len) && (buf[nextinfo] != ' '))
386	nextinfo++;
387
388	if (nextinfo - info >= 49) /*Erroneous info asked */
389	continue;
390
391	strncpy (command, &(buf[info]), nextinfo - info);
392
393	/* 2. Interpret info */
394	if (!strcmp ("smooth", command))
395	/* Toggle smoothing */
396	ns->EMI_smooth = !ns->EMI_smooth;
397	else
398	/*bad value */;
399
400	/*3. Next info */
401	}
402
403	strcpy (cmdback, "ExtendedInfoSet");
404
405	if (ns->EMI_smooth)
406	{
407	strcat (cmdback, " ");
408	strcat (cmdback, "smoothing");
409	}
410
411	ns->send_packet (cmdback);
412	}
413		451
414	/*	452	/*
415	#define MSG_TYPE_BOOK 1	453	#define MSG_TYPE_BOOK 1
416	#define MSG_TYPE_CARD 2	454	#define MSG_TYPE_CARD 2
417	#define MSG_TYPE_PAPER 3	455	#define MSG_TYPE_PAPER 3
…		…
434	while (1)	472	while (1)
435	{	473	{
436	/* 1. Extract an info */	474	/* 1. Extract an info */
437	info = nextinfo;	475	info = nextinfo;
438		476
439	while ((info < len) && (buf[info] == ' '))	477	while ((info < len) && (buf [info] == ' '))
440	info++;	478	info++;
441		479
442	if (info >= len)	480	if (info >= len)
443	break;	481	break;
444		482
445	nextinfo = info + 1;	483	nextinfo = info + 1;
446		484
447	while ((nextinfo < len) && (buf[nextinfo] != ' '))	485	while ((nextinfo < len) && (buf [nextinfo] != ' '))
448	nextinfo++;	486	nextinfo++;
449		487
450	if (nextinfo - info >= 49) /*Erroneous info asked */	488	if (nextinfo - info >= 49) /*Erroneous info asked */
451	continue;	489	continue;
452		490
453	strncpy (command, &(buf[info]), nextinfo - info);	491	memcpy (command, buf + info, nextinfo - info);
454	command[nextinfo - info] = '\0';	492	command [nextinfo - info] = 0;
		493
455	/* 2. Interpret info */	494	/* 2. Interpret info */
456	i = sscanf (command, "%d", &flag);	495	i = sscanf (command, "%d", &flag);
457		496
458	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	497	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
459	ns->supported_readables |= (1 << flag);	498	ns->supported_readables |= (1 << flag);
…		…
473		512
474	ns->send_packet (cmdback);	513	ns->send_packet (cmdback);
475	}	514	}
476		515
477	/**	516	/**
478	* client requested an image. send it rate-limited
479	* before flushing.
480	*/
481	void
482	AskFaceCmd (char *buf, int len, client *ns)
483	{
484	ns->askface.push_back (atoi (buf));
485	}
486
487	/**
488	* Tells client the picture it has to use
489	* to smooth a picture number given as argument.
490	*/
491	void
492	AskSmooth (char *buf, int len, client *ns)
493	{
494	ns->send_face (atoi (buf));
495	ns->flush_fx ();
496	}
497
498	/**
499	* 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,
500	* etc.)	518	* etc.)
501	*/	519	*/
502	void	520	void
503	PlayerCmd (char *buf, int len, player *pl)	521	PlayerCmd (char *buf, int len, player *pl)
…		…
514	return;	532	return;
515		533
516	buf++;	534	buf++;
517	}	535	}
518		536
519	execute_newserver_command (pl->ob, (char *) buf);	537	execute_newserver_command (pl->ob, (char *)buf);
520		538
521	/* Perhaps something better should be done with a left over count.	539	/* Perhaps something better should be done with a left over count.
522	* Cleaning up the input should probably be done first - all actions	540	* Cleaning up the input should probably be done first - all actions
523	* 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
524	* commands.	542	* commands.
525	*/	543	*/
526	pl->count = 0;	544	pl->count = 0;
527	}	545	}
528		546
529
530	/**	547	/**
531	* 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,
532	* 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
533	* '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
534	* can throttle.	551	* can throttle.
…		…
536	void	553	void
537	NewPlayerCmd (char *buf, int len, player *pl)	554	NewPlayerCmd (char *buf, int len, player *pl)
538	{	555	{
539	if (len <= 6)	556	if (len <= 6)
540	{	557	{
541	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);
542	return;	559	return;
543	}	560	}
544		561
545	uint16 cmdid = net_uint16 ((uint8 *)buf);	562	uint16 cmdid = net_uint16 ((uint8 *)buf);
546	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	563	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
684	* syntax is: move (to) (tag) (nrof)	701	* syntax is: move (to) (tag) (nrof)
685	*/	702	*/
686	void	703	void
687	MoveCmd (char *buf, int len, player *pl)	704	MoveCmd (char *buf, int len, player *pl)
688	{	705	{
689	int vals[3], i;	706	int to, tag, nrof;
690		707
691	/* A little funky here. We only cycle for 2 records, because	708	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
692	* we obviously are not going to find a space after the third
693	* record. Perhaps we should just replace this with a
694	* sscanf?
695	*/
696	for (i = 0; i < 2; i++)
697	{	709	{
698	vals[i] = atoi (buf);
699
700	if (!(buf = strchr (buf, ' ')))
701	{
702	LOG (llevError, "Incomplete move command: %s\n", buf);	710	LOG (llevError, "Incomplete move command: %s\n", buf);
703	return;	711	return;
704	}
705
706	buf++;
707	}	712	}
708		713
709	vals[2] = atoi (buf);	714	esrv_move_object (pl->ob, to, tag, nrof);
710
711	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
712	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
713	}	715	}
714		716
715	/******************************************************************************	717	/******************************************************************************
716	*	718	*
717	* Start of commands the server sends to the client.	719	* Start of commands the server sends to the client.
…		…
730		732
731	/**	733	/**
732	* Get player's current range attack in obuf.	734	* Get player's current range attack in obuf.
733	*/	735	*/
734	static void	736	static void
735	rangetostring (object *ob, char *obuf)	737	rangetostring (player *pl, char *obuf)
736	{	738	{
737	dynbuf_text buf;	739	dynbuf_text &buf = msg_dynbuf; buf.clear ();
738		740
739	player *pl = ob->contr;
740
741	if (pl->ranged_skill)
742	{
743	buf.printf (" Range: %s", &pl->ranged_skill->name);
744
745	if (pl->ranged_ob)	741	if (pl->ranged_ob)
746	buf.printf (" (%s)", query_base_name (pl->ranged_ob, 0));	742	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
747	}
748		743
749	if (pl->combat_skill)
750	{
751	buf.printf (" Combat: %s", &pl->combat_skill->name);
752
753	if (pl->combat_ob)	744	if (pl->combat_ob)
754	buf.printf (" (%s)", query_base_name (pl->combat_ob, 0));	745	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
755	}
756		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?
757	if (pl->golem)	754	if (pl->golem)
758	buf.printf (" Golem: %s", &pl->golem->name);	755	buf << " Golem*: " << pl->golem->name;
759		756
760	strcpy (obuf, buf.linearise () + 1);	757	buf << '\0';
		758	buf.linearise (obuf);
761	}	759	}
762		760
763	#define AddIfInt64(Old,New,Type) if (Old != New) {\	761	#define AddIfInt64(Old,New,Type) if (Old != New) {\
764	Old = New; \	762	Old = New; \
765	sl << uint8 (Type) << uint64 (New); \	763	sl << uint8 (Type) << uint64 (New); \
…		…
773	#define AddIfShort(Old,New,Type) if (Old != New) {\	771	#define AddIfShort(Old,New,Type) if (Old != New) {\
774	Old = New; \	772	Old = New; \
775	sl << uint8 (Type) << uint16 (New); \	773	sl << uint8 (Type) << uint16 (New); \
776	}	774	}
777		775
778	#define AddIfFloat(Old,New,Type) if (Old != New) {\	776	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
779	Old = New; \	777	Old = New; \
780	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	778	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
781	}	779	}
782		780
783	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	781	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
784	free(Old); Old = strdup (New);\	782	free(Old); Old = strdup (New);\
785	sl << uint8 (Type) << data8 (New); \	783	sl << uint8 (Type) << data8 (New); \
…		…
799		797
800	client *ns = pl->ns;	798	client *ns = pl->ns;
801	if (!ns)	799	if (!ns)
802	return;	800	return;
803		801
804	object *ob = pl->ob;	802	object *ob = pl->observe;
805	if (!ob)	803	if (!ob)
806	return;	804	return;
		805
		806	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
807		807
808	packet sl ("stats");	808	packet sl ("stats");
809		809
810	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	810	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
811	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	811	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823		823
824	for (int s = 0; s < NUM_SKILLS; s++)	824	for (int s = 0; s < NUM_SKILLS; s++)
825	if (object *skill = pl->last_skill_ob[s])	825	if (object *skill = opl->last_skill_ob [s])
826	if (skill->stats.exp != ns->last_skill_exp [s])	826	if (skill->stats.exp != ns->last_skill_exp [s])
827	{	827	{
828	ns->last_skill_exp [s] = skill->stats.exp;	828	ns->last_skill_exp [s] = skill->stats.exp;
829		829
830	/* Always send along the level if exp changes. This is only	830	/* Always send along the level if exp changes. This is only
…		…
838	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	838	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
839	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	839	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
840	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	840	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
841	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	841	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
842	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	842	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
843	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	843	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
844	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	844	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
845	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);
846	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);
847		847
848	flags = 0;	848	flags = 0;
849		849
850	if (pl->fire_on)	850	if (opl->fire_on)
851	flags |= SF_FIREON;	851	flags |= SF_FIREON;
852		852
853	if (pl->run_on)	853	if (opl->run_on)
854	flags |= SF_RUNON;	854	flags |= SF_RUNON;
855		855
856	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	856	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
857		857
858	if (ns->sc_version < 1025)	858	if (ns->sc_version < 1025)
…		…
872	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);
873	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);
874	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);
875	}	875	}
876		876
877	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 */
878	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	878	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
879	set_title (ob, buf);	879	set_title (ob, buf);
880	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	880	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
881		881
882	/* Only send it away if we have some actual data */	882	/* Only send it away if we have some actual data */
…		…
886		886
887	/**	887	/**
888	* 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.
889	*/	889	*/
890	void	890	void
891	esrv_new_player (player *pl, uint32 weight)	891	esrv_new_player (player *pl)
892	{	892	{
		893	sint32 weight = pl->ob->client_weight ();
		894
893	packet sl ("player");	895	packet sl ("player");
894		896
895	sl << uint32 (pl->ob->count)	897	sl << uint32 (pl->ob->count)
896	<< uint32 (weight)	898	<< uint32 (weight)
897	<< uint32 (pl->ob->face)	899	<< uint32 (pl->ob->face)
898	<< data8 (pl->ob->name);	900	<< data8 (pl->ob->name);
899		901
900	pl->ns->last_weight = weight;	902	pl->ns->last_weight = weight;
901	pl->ns->send_packet (sl);	903	pl->ns->send_packet (sl);
902	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
903	}	904	}
904		905
905	/******************************************************************************	906	/******************************************************************************
906	*	907	*
907	* Start of map related commands.	908	* Start of map related commands.
…		…
964		965
965	if (!ns.faces_sent[face_num])	966	if (!ns.faces_sent[face_num])
966	if (ob)	967	if (ob)
967	ns.send_faces (ob);	968	ns.send_faces (ob);
968	else	969	else
969	ns.send_face (face_num);	970	ns.send_face (face_num, 10);
970		971
971	sl << uint16 (face_num);	972	sl << uint16 (face_num);
972	return 1;	973	return 1;
973	}	974	}
974		975
975	/* Nothing changed */	976	/* Nothing changed */
976	return 0;	977	return 0;
977	}	978	}
978		979
979	/**	980	//-GPL
980	* Returns the size of a data for a map square as returned by
981	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
982	* available.
983	*/
984	int
985	getExtendedMapInfoSize (client * ns)
986	{
987	int result = 0;
988
989	if (ns->ext_mapinfos)
990	{
991	if (ns->EMI_smooth)
992	result += 1; /*One byte for smoothlevel */
993	}
994
995	return result;
996	}
997		981
998	// prefetch (and touch) all maps within a specific distancd	982	// prefetch (and touch) all maps within a specific distancd
999	static void	983	static void
1000	prefetch_surrounding_maps (maptile *map, int distance)	984	prefetch_surrounding_maps (maptile *map, int distance)
1001	{	985	{
1002	map->last_access = runtime;	986	map->touch ();
1003		987
1004	if (--distance)	988	if (--distance)
1005	for (int dir = 4; --dir; )	989	for (int dir = 4; --dir; )
1006	if (const shstr &path = map->tile_path [dir])	990	if (const shstr &path = map->tile_path [dir])
1007	if (maptile *&neigh = map->tile_map [dir])	991	if (maptile *&neigh = map->tile_map [dir])
…		…
1015	prefetch_surrounding_maps (object *op)	999	prefetch_surrounding_maps (object *op)
1016	{	1000	{
1017	prefetch_surrounding_maps (op->map, 3);	1001	prefetch_surrounding_maps (op->map, 3);
1018	}	1002	}
1019		1003
		1004	//+GPL
		1005
1020	/**	1006	/**
1021	* This function uses the new map1 protocol command to send the map	1007	* Draws client map.
1022	* to the client. It is necessary because the old map command supports
1023	* a maximum map size of 15x15.
1024	* This function is much simpler than the old one. This is because
1025	* the old function optimized to send as few face identifiers as possible,
1026	* at the expense of sending more coordinate location (coordinates were
1027	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1028	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1029	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1030	* and use the other 4 bits for other informatiion. For full documentation
1031	* of what we send, see the doc/Protocol file.
1032	* I will describe internally what we do:
1033	* the ns->lastmap shows how the map last looked when sent to the client.
1034	* in the lastmap structure, there is a cells array, which is set to the
1035	* maximum viewable size (As set in config.h).
1036	* in the cells, there are faces and a count value.
1037	* we use the count value to hold the darkness value. If -1, then this space
1038	* is not viewable.
1039	* we use faces[0] faces[1] faces[2] to hold what the three layers
1040	* look like.
1041	*/	1008	*/
1042	void	1009	void
1043	draw_client_map1 (object *pl)	1010	draw_client_map (player *pl)
1044	{	1011	{
1045	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	1012	object *ob = pl->viewpoint;
1046	sint16 nx, ny;
1047	int estartlen, eoldlen;
1048	uint8 eentrysize;
1049	uint16 ewhatstart, ewhatflag;
1050	uint8 extendedinfos;
1051	maptile *m;
1052
1053	client &socket = *pl->contr->ns;
1054
1055	if (!pl->active)	1013	if (!pl->observe->active)
1056	return;	1014	return;
1057
1058	check_map_change (pl->contr);
1059	prefetch_surrounding_maps (pl);
1060
1061	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1062	packet esl;
1063
1064	startlen = sl.length ();
1065
1066	/*Extendedmapinfo structure initialisation */
1067	if (socket.ext_mapinfos)
1068	{
1069	extendedinfos = EMI_NOREDRAW;
1070
1071	if (socket.EMI_smooth)
1072	extendedinfos |= EMI_SMOOTH;
1073
1074	ewhatstart = esl.length ();
1075	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1076	could need to be taken away */
1077	eentrysize = getExtendedMapInfoSize (&socket);
1078	esl << "mapextended "
1079	<< uint8 (extendedinfos)
1080	<< uint8 (eentrysize);
1081
1082	estartlen = esl.length ();
1083	}
1084
1085	/* x,y are the real map locations. ax, ay are viewport relative
1086	* locations.
1087	*/
1088	ay = 0;
1089
1090	/* We could do this logic as conditionals in the if statement,
1091	* but that started to get a bit messy to look at.
1092	*/
1093	max_x = pl->x + (socket.mapx + 1) / 2;
1094	max_y = pl->y + (socket.mapy + 1) / 2;
1095
1096	maptile *plmap = pl->map;
1097
1098	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1099	{
1100	ax = 0;
1101	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1102	{
1103	int emask, mask;
1104	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1105
1106	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1107
1108	/* If the coordinates are not valid, or it is too dark to see,
1109	* we tell the client as such
1110	*/
1111	nx = x;
1112	ny = y;
1113	m = get_map_from_coord (plmap, &nx, &ny);
1114
1115	if (!m)
1116	{
1117	/* space is out of map. Update space and clear values
1118	* if this hasn't already been done. If the space is out
1119	* of the map, it shouldn't have a head
1120	*/
1121	if (lastcell.count != -1)
1122	{
1123	sl << uint16 (mask);
1124	map_clearcell (&lastcell, -1);
1125	}
1126
1127	continue;
1128	}
1129
1130	m->touch ();
1131
1132	int d = pl->contr->blocked_los[ax][ay];
1133
1134	if (d > 3)
1135	{
1136
1137	int need_send = 0, count;
1138
1139	/* This block deals with spaces that are not visible for whatever
1140	* reason. Still may need to send the head for this space.
1141	*/
1142
1143	oldlen = sl.length ();
1144
1145	sl << uint16 (mask);
1146
1147	if (lastcell.count != -1)
1148	need_send = 1;
1149
1150	count = -1;
1151
1152	/* properly clear a previously sent big face */
1153	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1154	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1155	need_send = 1;
1156
1157	map_clearcell (&lastcell, count);
1158
1159	if ((mask & 0xf) || need_send)
1160	sl[oldlen + 1] = mask & 0xff;
1161	else
1162	sl.reset (oldlen);
1163	}
1164	else
1165	{
1166	/* In this block, the space is visible.
1167	*/
1168
1169	/* Rather than try to figure out what everything that we might
1170	* need to send is, then form the packet after that,
1171	* we presume that we will in fact form a packet, and update
1172	* the bits by what we do actually send. If we send nothing,
1173	* we just back out sl.length () to the old value, and no harm
1174	* is done.
1175	* I think this is simpler than doing a bunch of checks to see
1176	* what if anything we need to send, setting the bits, then
1177	* doing those checks again to add the real data.
1178	*/
1179	oldlen = sl.length ();
1180	eoldlen = esl.length ();
1181
1182	sl << uint16 (mask);
1183
1184	unsigned char dummy;
1185	unsigned char *last_ext = &dummy;
1186
1187	/* Darkness changed */
1188	if (lastcell.count != d && socket.darkness)
1189	{
1190	mask |= 0x8;
1191
1192	if (socket.extmap)
1193	{
1194	*last_ext |= 0x80;
1195	last_ext = &sl[sl.length ()];
1196	sl << uint8 (d);
1197	}
1198	else
1199	sl << uint8 (255 - 64 * d);
1200	}
1201
1202	lastcell.count = d;
1203
1204	mapspace &ms = m->at (nx, ny);
1205
1206	if (socket.extmap)
1207	{
1208	uint8 stat_hp = 0;
1209	uint8 stat_width = 0;
1210	uint8 flags = 0;
1211	tag_t player = 0;
1212
1213	// send hp information, if applicable
1214	if (object *op = ms.faces_obj [0])
1215	{
1216	if (op->head || op->invisible)
1217	; // do not show
1218	else if (op->type == PLAYER
1219	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1220	{
1221	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1222	{
1223	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1224	stat_width = op->arch->tail_x;
1225	}
1226	}
1227
1228	if (op->msg && op->msg[0] == '@')
1229	flags |= 1;
1230
1231	if (op->type == PLAYER && op != pl)
1232	player = op->count;
1233	}
1234
1235	if (lastcell.stat_hp != stat_hp)
1236	{
1237	lastcell.stat_hp = stat_hp;
1238
1239	mask |= 0x8;
1240	*last_ext |= 0x80;
1241	last_ext = &sl[sl.length ()];
1242
1243	sl << uint8 (5) << uint8 (stat_hp);
1244
1245	if (stat_width > 1)
1246	{
1247	*last_ext |= 0x80;
1248	last_ext = &sl[sl.length ()];
1249
1250	sl << uint8 (6) << uint8 (stat_width);
1251	}
1252	}
1253
1254	if (lastcell.player != player)
1255	{
1256	lastcell.player = player;
1257
1258	mask |= 0x8;
1259	*last_ext |= 0x80;
1260	last_ext = &sl[sl.length ()];
1261
1262	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1263	}
1264
1265	if (lastcell.flags != flags)
1266	{
1267	lastcell.flags = flags;
1268
1269	mask |= 0x8;
1270	*last_ext |= 0x80;
1271	last_ext = &sl[sl.length ()];
1272
1273	sl << uint8 (8) << uint8 (flags);
1274	}
1275	}
1276
1277	/* Floor face */
1278	if (update_space (sl, socket, ms, lastcell, 2))
1279	mask |= 0x4;
1280
1281	/* Middle face */
1282	if (update_space (sl, socket, ms, lastcell, 1))
1283	mask |= 0x2;
1284
1285	if (ms.player () == pl
1286	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1287	{
1288	// force player to be visible to himself if invisible
1289	if (lastcell.faces[0] != pl->face)
1290	{
1291	lastcell.faces[0] = pl->face;
1292
1293	mask |= 0x1;
1294	sl << uint16 (pl->face);
1295
1296	socket.send_faces (pl);
1297	}
1298	}
1299	/* Top face */
1300	else if (update_space (sl, socket, ms, lastcell, 0))
1301	mask |= 0x1;
1302
1303
1304	/* Check to see if we are in fact sending anything for this
1305	* space by checking the mask. If so, update the mask.
1306	* if not, reset the len to that from before adding the mask
1307	* value, so we don't send those bits.
1308	*/
1309	if (mask & 0xf)
1310	sl[oldlen + 1] = mask & 0xff;
1311	else
1312	sl.reset (oldlen);
1313
1314	if (socket.ext_mapinfos)
1315	esl << uint16 (emask);
1316
1317	if (socket.EMI_smooth)
1318	{
1319	for (int layer = 2+1; layer--; )
1320	{
1321	object *ob = ms.faces_obj [layer];
1322
1323	// If there is no object for this space, or if the face for the object
1324	// is the blank face, set the smoothlevel to zero.
1325	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1326
1327	// We've gotten what face we want to use for the object. Now see if
1328	// if it has changed since we last sent it to the client.
1329	if (lastcell.smooth[layer] != smoothlevel)
1330	{
1331	lastcell.smooth[layer] = smoothlevel;
1332	esl << uint8 (smoothlevel);
1333	emask |= 1 << layer;
1334	}
1335	}
1336
1337	if (emask & 0xf)
1338	esl[eoldlen + 1] = emask & 0xff;
1339	else
1340	esl.reset (eoldlen);
1341	}
1342	} /* else this is a viewable space */
1343	} /* for x loop */
1344	} /* for y loop */
1345
1346	socket.flush_fx ();
1347
1348	/* Verify that we in fact do need to send this */
1349	if (socket.ext_mapinfos)
1350	{
1351	if (!(sl.length () > startlen || socket.sent_scroll))
1352	{
1353	/* No map data will follow, so don't say the client
1354	* it doesn't need draw!
1355	*/
1356	ewhatflag &= ~EMI_NOREDRAW;
1357	esl[ewhatstart + 1] = ewhatflag & 0xff;
1358	}
1359
1360	if (esl.length () > estartlen)
1361	socket.send_packet (esl);
1362	}
1363
1364	if (sl.length () > startlen || socket.sent_scroll)
1365	{
1366	socket.send_packet (sl);
1367	socket.sent_scroll = 0;
1368	}
1369	}
1370
1371	/**
1372	* Draws client map.
1373	*/
1374	void
1375	draw_client_map (object *pl)
1376	{
1377	int i, j;
1378	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1379	int mflags;
1380	struct Map newmap;
1381	maptile *m, *pm;
1382
1383	if (pl->type != PLAYER)
1384	{
1385	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1386	return;
1387	}
1388
1389	pm = pl->map;
1390		1015
1391	/* 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
1392	* 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
1393	* be OK once they really log in.	1018	* be OK once they really log in.
1394	*/	1019	*/
1395	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	1020	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1396	return;	1021	return;
1397		1022
1398	memset (&newmap, 0, sizeof (struct Map));	1023	int startlen, oldlen;
1399		1024
1400	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)	1025	check_map_change (pl);
1401	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)
1402	{	1079	{
1403	ax = i;	1080	/* space is out of map. Update space and clear values
1404	ay = j;	1081	* if this hasn't already been done. If the space is out
1405	m = pm;	1082	* of the map, it shouldn't have a head.
1406	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1407
1408	if (mflags & P_OUT_OF_MAP)
1409	continue;
1410
1411	/* If a map is visible to the player, we don't want to swap it out
1412	* just to reload it. This should really call something like
1413	* swap_map, but this is much more efficient and 'good enough'
1414	*/	1083	*/
1415	if (mflags & P_NEW_MAP)	1084	if (lastcell.count != -1)
1416	m->timeout = 50;	1085	{
		1086	sl << uint16 (mask);
		1087	map_clearcell (&lastcell, -1);
		1088	}
		1089
		1090	continue;
1417	}	1091	}
		1092
		1093	int d = pl->blocked_los_uc (dx, dy);
1418		1094
1419	/* do LOS after calls to update_position */	1095	if (d > 3)
1420	if (pl->contr->do_los)
1421	{	1096	{
1422	update_los (pl);	1097	/* This block deals with spaces that are not visible for whatever
1423	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);
1424	}	1111	}
		1112	else
		1113	{
		1114	/* In this block, the space is visible.
		1115	*/
1425		1116
1426	/* Big maps need a different drawing mechanism to work */	1117	/* Rather than try to figure out what everything that we might
1427	draw_client_map1 (pl);	1118	* need to send is, then form the packet after that,
1428	}	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 ();
1429		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)
		1265	{
		1266	socket.send_packet (sl);
		1267	socket.sent_scroll = 0;
		1268	}
		1269	}
1430		1270
1431	/*****************************************************************************/	1271	/*****************************************************************************/
1432
1433	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1272	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1434
1435	/* a player. Of course, the client need to know the command to be able to */	1273	/* a player. Of course, the client need to know the command to be able to */
1436
1437	/* manage it ! */	1274	/* manage it ! */
1438
1439	/*****************************************************************************/	1275	/*****************************************************************************/
1440	void	1276	void
1441	send_plugin_custom_message (object *pl, char *buf)	1277	send_plugin_custom_message (object *pl, char *buf)
1442	{	1278	{
1443	pl->contr->ns->send_packet (buf);	1279	pl->contr->ns->send_packet (buf);
1444	}
1445
1446	/**
1447	* This sends the skill number to name mapping. We ignore
1448	* the params - we always send the same info no matter what.
1449	*/
1450	void
1451	send_skill_info (client *ns, char *params)
1452	{
1453	packet sl;
1454	sl << "replyinfo skill_info\n";
1455
1456	for (int i = 1; i < NUM_SKILLS; i++)
1457	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1458
1459	if (sl.length () >= MAXSOCKBUF)
1460	{
1461	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1462	fatal (0);
1463	}
1464
1465	ns->send_packet (sl);
1466	}
1467
1468	/**
1469	* This sends the spell path to name mapping. We ignore
1470	* the params - we always send the same info no matter what.
1471	*/
1472	void
1473	send_spell_paths (client * ns, char *params)
1474	{
1475	packet sl;
1476
1477	sl << "replyinfo spell_paths\n";
1478
1479	for (int i = 0; i < NRSPELLPATHS; i++)
1480	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1481
1482	if (sl.length () >= MAXSOCKBUF)
1483	{
1484	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1485	fatal (0);
1486	}
1487
1488	ns->send_packet (sl);
1489	}	1280	}
1490		1281
1491	/**	1282	/**
1492	* This looks for any spells the player may have that have changed their stats.	1283	* This looks for any spells the player may have that have changed their stats.
1493	* it then sends an updspell packet for each spell that has changed in this way	1284	* it then sends an updspell packet for each spell that has changed in this way
…		…
1506	if (spell->type == SPELL)	1297	if (spell->type == SPELL)
1507	{	1298	{
1508	int flags = 0;	1299	int flags = 0;
1509		1300
1510	/* check if we need to update it */	1301	/* check if we need to update it */
1511	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1302	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1512	{	1303	{
1513	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1304	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1514	flags |= UPD_SP_MANA;	1305	flags |= UPD_SP_MANA;
1515	}	1306	}
1516		1307
1517	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1308	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1518	{	1309	{
1519	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1310	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1520	flags |= UPD_SP_GRACE;	1311	flags |= UPD_SP_GRACE;
1521	}	1312	}
1522		1313
1523	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1314	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1524	{	1315	{
1525	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1316	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1526	flags |= UPD_SP_DAMAGE;	1317	flags |= UPD_SP_DAMAGE;
1527	}	1318	}
1528		1319
1529	if (flags)	1320	if (flags)
1530	{	1321	{
…		…
1532		1323
1533	sl << "updspell "	1324	sl << "updspell "
1534	<< uint8 (flags)	1325	<< uint8 (flags)
1535	<< uint32 (spell->count);	1326	<< uint32 (spell->count);
1536		1327
1537	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1328	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1538	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1329	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1539	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1330	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1540		1331
1541	pl->ns->send_packet (sl);	1332	pl->ns->send_packet (sl);
1542	}	1333	}
1543	}	1334	}
1544	}	1335	}
…		…
1574	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1365	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1575	return;	1366	return;
1576	}	1367	}
1577		1368
1578	/* store costs and damage in the object struct, to compare to later */	1369	/* store costs and damage in the object struct, to compare to later */
1579	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1370	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1580	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1371	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1581	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1372	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1582		1373
1583	/* figure out which skill it uses, if it uses one */	1374	/* figure out which skill it uses, if it uses one */
1584	if (spell->skill)	1375	if (spell->skill)
1585	{	1376	if (object *tmp = pl->find_skill (spell->skill))
1586	for (i = 1; i < NUM_SKILLS; i++)
1587	if (!strcmp (spell->skill, skill_names[i]))
1588	{
1589	skill = i + CS_STAT_SKILLINFO;	1377	skill = tmp->subtype + CS_STAT_SKILLINFO;
1590	break;
1591	}
1592	}
1593		1378
1594	// spells better have a face	1379	// spells better have a face
1595	if (!spell->face)	1380	if (!spell->face)
1596	{	1381	{
1597	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1382	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1598	spell->face = face_find ("burnout.x11", blank_face);	1383	spell->face = face_find ("burnout.x11", blank_face);
1599	}	1384	}
		1385
		1386	pl->ns->send_face (spell->face);
1600		1387
1601	/* send the current values */	1388	/* send the current values */
1602	sl << uint32 (spell->count)	1389	sl << uint32 (spell->count)
1603	<< uint16 (spell->level)	1390	<< uint16 (spell->level)
1604	<< uint16 (spell->casting_time)	1391	<< uint16 (spell->casting_time)
1605	<< uint16 (spell->last_sp)	1392	<< uint16 (spell->cached_sp)
1606	<< uint16 (spell->last_grace)	1393	<< uint16 (spell->cached_grace)
1607	<< uint16 (spell->last_eat)	1394	<< uint16 (spell->cached_eat)
1608	<< uint8 (skill)	1395	<< uint8 (skill)
1609	<< uint32 (spell->path_attuned)	1396	<< uint32 (spell->path_attuned)
1610	<< uint32 (spell->face)	1397	<< uint32 (spell->face)
1611	<< data8 (spell->name)	1398	<< data8 (spell->name)
1612	<< data16 (spell->msg);	1399	<< data16 (spell->msg);
…		…
1640	* bytes and 3 strings (because that is the spec) so we need to	1427	* bytes and 3 strings (because that is the spec) so we need to
1641	* check that the length of those 3 strings, plus the 23 bytes,	1428	* check that the length of those 3 strings, plus the 23 bytes,
1642	* won't take us over the length limit for the socket, if it does,	1429	* won't take us over the length limit for the socket, if it does,
1643	* we need to send what we already have, and restart packet formation	1430	* we need to send what we already have, and restart packet formation
1644	*/	1431	*/
		1432	if (spell->type != SPELL)
		1433	continue;
		1434
1645	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1435	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1646	* to show add_spell is 26 bytes + 2 strings. However, the overun	1436	* to show add_spell is 26 bytes + 2 strings. However, the overun
1647	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1437	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1648	* like it will fix this	1438	* like it will fix this
1649	*/	1439	*/
1650	if (spell->type != SPELL)
1651	continue;
1652
1653	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1440	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1654	{	1441	{
		1442	pl->ns->flush_fx ();
1655	pl->ns->send_packet (sl);	1443	pl->ns->send_packet (sl);
1656		1444
1657	sl.reset ();	1445	sl.reset ();
1658	sl << "addspell ";	1446	sl << "addspell ";
1659	}	1447	}
…		…
1667	return;	1455	return;
1668	}	1456	}
1669	else	1457	else
1670	append_spell (pl, sl, spell);	1458	append_spell (pl, sl, spell);
1671		1459
1672	if (sl.length () >= MAXSOCKBUF)	1460	if (sl.length () > MAXSOCKBUF)
1673	{	1461	{
1674	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1462	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1675	fatal (0);	1463	fatal (0);
1676	}	1464	}
1677		1465
1678	/* finally, we can send the packet */	1466	/* finally, we can send the packet */
		1467	pl->ns->flush_fx ();
1679	pl->ns->send_packet (sl);	1468	pl->ns->send_packet (sl);
1680	}	1469	}
1681		1470
		1471	//-GPL
		1472

Diff Legend

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