ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.104 by root, Tue Jun 5 13:05:03 2007 UTC vs.
Revision 1.174 by root, Thu Apr 15 00:40:34 2010 UTC

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

Diff Legend

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