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.103 by root, Mon Jun 4 13:04:01 2007 UTC vs.
Revision 1.176 by root, Thu Apr 29 15:59:10 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
198	}	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)
		251	cleanup ("buffer overflow in send_skill_info!");
		252
		253	ns->send_packet (sl);
		254	}
		255
		256	/**
		257	* This sends the spell path to name mapping. We ignore
		258	* the params - we always send the same info no matter what.
		259	*/
		260	static void
		261	send_spell_paths (client * ns, char *params)
		262	{
		263	packet sl;
		264
		265	sl << "replyinfo spell_paths\n";
		266
		267	for (int i = 0; i < NRSPELLPATHS; i++)
		268	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		269
		270	if (sl.length () > MAXSOCKBUF)
		271	cleanup ("buffer overflow in send_spell_paths!");
		272
		273	ns->send_packet (sl);
199	}	274	}
200		275
201	/**	276	/**
202	* RequestInfo is sort of a meta command. There is some specific	277	* RequestInfo is sort of a meta command. There is some specific
203	* request of information, but we call other functions to provide	278	* request of information, but we call other functions to provide
204	* that information.	279	* that information.
205	*/	280	*/
206	void	281	void
207	RequestInfo (char *buf, int len, client * ns)	282	RequestInfo (char *buf, int len, client *ns)
208	{	283	{
209	char *params = NULL, *cp;	284	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		285
222	/* find the first space, make it null, and update the	286	/* find the first space, make it null, and update the
223	* params pointer.	287	* params pointer.
224	*/	288	*/
225	for (cp = buf; *cp != '\0'; cp++)	289	for (params = buf; *params; params++)
226	if (*cp == ' ')	290	if (*params == ' ')
227	{	291	{
228	*cp = '\0';
229	params = cp + 1;	292	*params++ = 0;
230	break;	293	break;
231	}	294	}
232		295
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"))	296	if (!strcmp (buf, "skill_info"))
238	send_skill_info (ns, params);	297	send_skill_info (ns, params);
239	else if (!strcmp (buf, "spell_paths"))	298	else if (!strcmp (buf, "spell_paths"))
240	send_spell_paths (ns, params);	299	send_spell_paths (ns, params);
241	else	300	else
242	ns->send_packet (bigbuf, len);	301	{
		302	// undo tokenisation above and send replyinfo with the request unchanged
		303	if (*params)
		304	*--params = ' ';
		305
		306	ns->send_packet_printf ("replyinfo %s", buf);
		307	}
243	}	308	}
244		309
245	void	310	void
246	ExtCmd (char *buf, int len, player *pl)	311	ExtCmd (char *buf, int len, player *pl)
247	{	312	{
…		…
250		315
251	void	316	void
252	ExtiCmd (char *buf, int len, client *ns)	317	ExtiCmd (char *buf, int len, client *ns)
253	{	318	{
254	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	319	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		320	}
		321
		322	//-GPL
		323
		324	void
		325	client::mapinfo_queue_clear ()
		326	{
		327	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		328	free (*i);
		329
		330	mapinfo_queue.clear ();
		331	}
		332
		333	bool
		334	client::mapinfo_try (char *buf)
		335	{
		336	char *token = buf;
		337	buf += strlen (buf) + 9;
		338
		339	// initial map and its origin
		340	maptile *map = pl->viewpoint->map;
		341	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
		342	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
		343	int max_distance = 8; // limit maximum path length to something generous
		344
		345	while (*buf && map && max_distance)
		346	{
		347	int dir = *buf++ - '1';
		348
		349	if (dir >= 0 && dir <= 3)
		350	{
		351	if (!map->tile_path [dir])
		352	map = 0;
		353	else if (map->tile_available (dir, false))
		354	{
		355	maptile *neigh = map->tile_map [dir];
		356
		357	switch (dir)
		358	{
		359	case 0: mapy -= neigh->height; break;
		360	case 2: mapy += map ->height; break;
		361	case 3: mapx -= neigh->width ; break;
		362	case 1: mapx += map ->width ; break;
		363	}
		364
		365	map = neigh;
		366	--max_distance;
		367	}
		368	else
		369	return 0;
		370	}
		371	else
		372	max_distance = 0;
		373	}
		374
		375	if (!max_distance)
		376	send_packet_printf ("mapinfo %s error", token);
		377	else if (!map || !map->path)
		378	send_packet_printf ("mapinfo %s nomap", token);
		379	else
		380	{
		381	int flags = 0;
		382
		383	if (map->tile_path[0]) flags |= 1;
		384	if (map->tile_path[1]) flags |= 2;
		385	if (map->tile_path[2]) flags |= 4;
		386	if (map->tile_path[3]) flags |= 8;
		387
		388	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		389	}
		390
		391	return 1;
		392	}
		393
		394	void
		395	client::mapinfo_queue_run ()
		396	{
		397	if (mapinfo_queue.empty () || !pl)
		398	return;
		399
		400	for (int i = 0; i < mapinfo_queue.size (); ++i)
		401	if (mapinfo_try (mapinfo_queue [i]))
		402	{
		403	free (mapinfo_queue [i]);
		404	mapinfo_queue.erase (i);
		405	}
		406	else
		407	++i;
255	}	408	}
256		409
257	void	410	void
258	MapInfoCmd (char *buf, int len, player *pl)	411	MapInfoCmd (char *buf, int len, player *pl)
259	{	412	{
260	// <mapinfo tag spatial tile-path	413	// <mapinfo tag spatial tile-path
261	// >mapinfo tag spatial flags x y w h hash	414	// >mapinfo tag spatial flags x y w h hash
262		415
263	char bigbuf[MAX_BUF], *token;
264
265	token = buf;	416	char *token = buf;
266	// copy token	417
267	if (!(buf = strchr (buf, ' ')))	418	if (!(buf = strchr (buf, ' ')))
268	return;	419	return;
269		420
270	*buf++ = 0;
271
272	if (!strncmp (buf, "spatial ", 8))	421	if (!strncmp (buf, " spatial ", 9))
273	{	422	{
274	buf += 8;	423	char *copy = strdup (token);
		424	copy [buf - token] = 0;
275		425
276	// initial map and its origin	426	#if 0
277	maptile *map = pl->ob->map;	427	// this makes only sense when we flush the buffer immediately
278	sint16 dx, dy;	428	if (pl->ns->mapinfo_try (copy))
279	int mapx = pl->ns->mapx / 2 - pl->ob->x;	429	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	430	else
332	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	431	#endif
		432	pl->ns->mapinfo_queue.push_back (copy);
333	}	433	}
334	else	434	else
335	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	435	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337	pl->ns->send_packet (bigbuf);
338	}	436	}
339		437
340	/** This is the Setup cmd */	438	/** This is the Setup cmd */
341	void	439	void
342	SetUp (char *buf, int len, client * ns)	440	SetUp (char *buf, int len, client * ns)
…		…
354	AddMeCmd (char *buf, int len, client *ns)	452	AddMeCmd (char *buf, int len, client *ns)
355	{	453	{
356	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	454	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
357	}	455	}
358		456
359	/** Reply to ExtendedInfos command */	457	//+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		458
496	/**	459	/**
497	* This handles the general commands from the client (ie, north, fire, cast,	460	* This handles the general commands from the client (ie, north, fire, cast,
498	* etc.)	461	* etc.)
499	*/	462	*/
…		…
512	return;	475	return;
513		476
514	buf++;	477	buf++;
515	}	478	}
516		479
517	execute_newserver_command (pl->ob, (char *) buf);	480	execute_newserver_command (pl->ob, (char *)buf);
518		481
519	/* Perhaps something better should be done with a left over count.	482	/* Perhaps something better should be done with a left over count.
520	* Cleaning up the input should probably be done first - all actions	483	* 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	484	* for the command that issued the count should be done before any other
522	* commands.	485	* commands.
523	*/	486	*/
524	pl->count = 0;	487	pl->count = 0;
525	}	488	}
526		489
527
528	/**	490	/**
529	* This handles the general commands from the client (ie, north, fire, cast,	491	* This handles the general commands from the client (ie, north, fire, cast,
530	* etc.). It is a lot like PlayerCmd above, but is called with the	492	* etc.). It is a lot like PlayerCmd above, but is called with the
531	* 'ncom' method which gives more information back to the client so it	493	* 'ncom' method which gives more information back to the client so it
532	* can throttle.	494	* can throttle.
…		…
534	void	496	void
535	NewPlayerCmd (char *buf, int len, player *pl)	497	NewPlayerCmd (char *buf, int len, player *pl)
536	{	498	{
537	if (len <= 6)	499	if (len <= 6)
538	{	500	{
539	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	501	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
540	return;	502	return;
541	}	503	}
542		504
543	uint16 cmdid = net_uint16 ((uint8 *)buf);	505	uint16 cmdid = net_uint16 ((uint8 *)buf);
544	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	506	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
557	* commands.	519	* commands.
558	*/	520	*/
559	pl->count = 0;	521	pl->count = 0;
560		522
561	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	523	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
562	int time = fabs (pl->ob->speed) < 0.001	524	int time = pl->ob->has_active_speed ()
563	? time = MAX_TIME * 100
564	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	525	? (int) (MAX_TIME / pl->ob->speed)
		526	: MAX_TIME * 100;
565		527
566	/* Send confirmation of command execution now */	528	/* Send confirmation of command execution now */
567	packet sl ("comc");	529	packet sl ("comc");
568	sl << uint16 (cmdid) << uint32 (time);	530	sl << uint16 (cmdid) << uint32 (time);
569	pl->ns->send_packet (sl);	531	pl->ns->send_packet (sl);
…		…
611	LOG (llevError, "Unknown input state: %d\n", ns->state);	573	LOG (llevError, "Unknown input state: %d\n", ns->state);
612	}	574	}
613	}	575	}
614		576
615	/**	577	/**
616	* Client tells its version. If there is a mismatch, we close the	578	* Client tells its version info.
617	* socket. In real life, all we should care about is the client having
618	* something older than the server. If we assume the client will be
619	* backwards compatible, having it be a later version should not be a
620	* problem.
621	*/	579	*/
622	void	580	void
623	VersionCmd (char *buf, int len, client * ns)	581	VersionCmd (char *buf, int len, client *ns)
624	{	582	{
625	if (!buf)	583	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
626	{
627	LOG (llevError, "CS: received corrupted version command\n");
628	return;
629	}
630
631	ns->cs_version = atoi (buf);
632	ns->sc_version = ns->cs_version;
633
634	LOG (llevDebug, "connection from client <%s>\n", buf);
635
636	//TODO: should log here just for statistics
637
638	//if (VERSION_CS != ns->cs_version)
639	// unchecked;
640
641	char *cp = strchr (buf + 1, ' ');
642	if (!cp)
643	return;
644
645	ns->sc_version = atoi (cp);
646
647	//if (VERSION_SC != ns->sc_version)
648	// unchecked;
649
650	cp = strchr (cp + 1, ' ');
651
652	if (cp)
653	{
654	ns->version = cp + 1;
655
656	if (ns->sc_version < 1026)
657	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
658	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
659	}
660	}	584	}
661		585
662	/** sound related functions. */	586	/** sound related functions. */
663	void	587	void
664	SetSound (char *buf, int len, client * ns)	588	SetSound (char *buf, int len, client * ns)
…		…
682	* syntax is: move (to) (tag) (nrof)	606	* syntax is: move (to) (tag) (nrof)
683	*/	607	*/
684	void	608	void
685	MoveCmd (char *buf, int len, player *pl)	609	MoveCmd (char *buf, int len, player *pl)
686	{	610	{
687	int vals[3], i;	611	int to, tag, nrof;
688		612
689	/* A little funky here. We only cycle for 2 records, because	613	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
690	* we obviously are not going to find a space after the third
691	* record. Perhaps we should just replace this with a
692	* sscanf?
693	*/
694	for (i = 0; i < 2; i++)
695	{	614	{
696	vals[i] = atoi (buf);
697
698	if (!(buf = strchr (buf, ' ')))
699	{
700	LOG (llevError, "Incomplete move command: %s\n", buf);	615	LOG (llevError, "Incomplete move command: %s\n", buf);
701	return;	616	return;
702	}
703
704	buf++;
705	}	617	}
706		618
707	vals[2] = atoi (buf);	619	esrv_move_object (pl->ob, to, tag, nrof);
708
709	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
710	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
711	}	620	}
712		621
713	/******************************************************************************	622	/******************************************************************************
714	*	623	*
715	* Start of commands the server sends to the client.	624	* Start of commands the server sends to the client.
…		…
730	* Get player's current range attack in obuf.	639	* Get player's current range attack in obuf.
731	*/	640	*/
732	static void	641	static void
733	rangetostring (player *pl, char *obuf)	642	rangetostring (player *pl, char *obuf)
734	{	643	{
735	dynbuf_text buf;	644	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		645
		646	#if 0
		647	// print ranged/chosen_skill etc. objects every call
		648	printf ("%s %s => %s (%s)\n",
		649	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		650	pl->combat_ob ? &pl->combat_ob->name : "-",
		651	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		652	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		653	);
		654	#endif
736		655
737	if (pl->ranged_ob)	656	if (pl->ranged_ob)
738	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	657	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
739		658
740	if (pl->combat_ob)	659	if (pl->combat_ob)
741	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;	660	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
742		661
		662	#if 0
743	//TODO: remove this when slot system is working, this is only for debugging	663	//TODO: remove this when slot system is working, this is only for debugging
744	if (pl->ob->chosen_skill)	664	if (pl->ob->chosen_skill)
745	buf << " Skill*: " << pl->ob->chosen_skill->name;	665	buf << " Skill*: " << pl->ob->chosen_skill->name;
		666	#endif
746		667
747	//TODO: maybe golem should become the current_weapon, quite simply?	668	//TODO: maybe golem should become the current_weapon, quite simply?
748	if (pl->golem)	669	if (pl->golem)
749	buf << " Golem*: " << pl->golem->name;	670	buf << " Golem*: " << pl->golem->name;
750		671
		672	buf << '\0';
751	buf.linearise (obuf);	673	buf.linearise (obuf);
752	obuf [buf.size ()] = 0;
753	}	674	}
754		675
755	#define AddIfInt64(Old,New,Type) if (Old != New) {\	676	#define AddIfInt64(Old,New,Type) if (Old != New) {\
756	Old = New; \	677	Old = New; \
757	sl << uint8 (Type) << uint64 (New); \	678	sl << uint8 (Type) << uint64 (New); \
…		…
784	* commands for now.	705	* commands for now.
785	*/	706	*/
786	void	707	void
787	esrv_update_stats (player *pl)	708	esrv_update_stats (player *pl)
788	{	709	{
789	char buf[MAX_BUF];
790	uint16 flags;
791
792	client *ns = pl->ns;	710	client *ns = pl->ns;
793	if (!ns)	711	if (!ns)
794	return;	712	return;
795		713
796	object *ob = pl->observe;	714	object *ob = pl->observe;
797	if (!ob)	715	if (!ob)
798	return;	716	return;
		717
		718	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
799		719
800	packet sl ("stats");	720	packet sl ("stats");
801		721
802	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	722	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
803	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	723	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
811	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	731	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
812	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	732	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
813	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	733	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
814	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	734	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
815		735
816	for (int s = 0; s < NUM_SKILLS; s++)	736	for (int s = 0; s < CS_NUM_SKILLS; s++)
817	if (object *skill = pl->last_skill_ob[s])	737	if (object *skill = opl->last_skill_ob [s])
818	if (skill->stats.exp != ns->last_skill_exp [s])	738	if (skill->stats.exp != ns->last_skill_exp [s])
819	{	739	{
820	ns->last_skill_exp [s] = skill->stats.exp;	740	ns->last_skill_exp [s] = skill->stats.exp;
821		741
822	/* Always send along the level if exp changes. This is only	742	/* Always send along the level if exp changes. This is only
823	* 1 extra byte, but keeps processing simpler.	743	* 1 extra byte, but keeps processing simpler.
824	*/	744	*/
825	sl << uint8 (s + CS_STAT_SKILLINFO)	745	sl << uint8 (CS_STAT_SKILLINFO + s)
826	<< uint8 (skill->level)	746	<< uint8 (skill->level)
827	<< uint64 (skill->stats.exp);	747	<< uint64 (skill->stats.exp);
828	}	748	}
829		749
830	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	750	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
831	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	751	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
832	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	752	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
833	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	753	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
834	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	754	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
835	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	755	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
836	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	756	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
837	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	757	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
838	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	758	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
839		759
840	flags = 0;	760	int flags = (opl->fire_on ? SF_FIREON : 0)
841		761	| (opl->run_on ? SF_RUNON : 0);
842	if (pl->fire_on)
843	flags |= SF_FIREON;
844
845	if (pl->run_on)
846	flags |= SF_RUNON;
847		762
848	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	763	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
849		764
850	if (ns->sc_version < 1025)
851	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
852	else
853	for (int i = 0; i < NROFATTACKS; i++)	765	for (int i = 0; i < NROFATTACKS; i++)
854	{
855	/* Skip ones we won't send */	766	/* Skip ones we won't send */
856	if (atnr_cs_stat[i] == -1)	767	if (atnr_cs_stat[i] >= 0)
857	continue;
858
859	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	768	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
860	}
861		769
862	if (pl->ns->monitor_spells)	770	if (pl->ns->monitor_spells)
863	{	771	{
864	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	772	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
865	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	773	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
866	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	774	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
867	}	775	}
868		776
		777	char buf[MAX_BUF];
869	rangetostring (pl, buf); /* we want use the new fire & run system in new client */	778	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
870	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	779	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
871	set_title (ob, buf);	780	set_title (ob, buf);
872	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	781	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
873		782
874	/* Only send it away if we have some actual data */	783	/* Only send it away if we have some actual data */
…		…
878		787
879	/**	788	/**
880	* Tells the client that here is a player it should start using.	789	* Tells the client that here is a player it should start using.
881	*/	790	*/
882	void	791	void
883	esrv_new_player (player *pl, uint32 weight)	792	esrv_new_player (player *pl)
884	{	793	{
		794	sint32 weight = pl->ob->client_weight ();
		795
885	packet sl ("player");	796	packet sl ("player");
886		797
887	sl << uint32 (pl->ob->count)	798	sl << uint32 (pl->ob->count)
888	<< uint32 (weight)	799	<< uint32 (weight)
889	<< uint32 (pl->ob->face)	800	<< uint32 (pl->ob->face)
890	<< data8 (pl->ob->name);	801	<< data8 (pl->ob->name);
891		802
892	pl->ns->last_weight = weight;	803	pl->ns->last_weight = weight;
893	pl->ns->send_packet (sl);	804	pl->ns->send_packet (sl);
894	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
895	}	805	}
896		806
897	/******************************************************************************	807	/******************************************************************************
898	*	808	*
899	* Start of map related commands.	809	* Start of map related commands.
…		…
956		866
957	if (!ns.faces_sent[face_num])	867	if (!ns.faces_sent[face_num])
958	if (ob)	868	if (ob)
959	ns.send_faces (ob);	869	ns.send_faces (ob);
960	else	870	else
961	ns.send_face (face_num);	871	ns.send_face (face_num, 10);
962		872
963	sl << uint16 (face_num);	873	sl << uint16 (face_num);
964	return 1;	874	return 1;
965	}	875	}
966		876
967	/* Nothing changed */	877	/* Nothing changed */
968	return 0;	878	return 0;
969	}	879	}
970		880
971	/**	881	//-GPL
972	* Returns the size of a data for a map square as returned by
973	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
974	* available.
975	*/
976	int
977	getExtendedMapInfoSize (client * ns)
978	{
979	int result = 0;
980		882
981	if (ns->ext_mapinfos)	883	// prefetch maps in an area of PREFETCH x PREFETCH around the player
982	{	884	#define PREFETCH 40
983	if (ns->EMI_smooth)
984	result += 1; /*One byte for smoothlevel */
985	}
986
987	return result;
988	}
989
990	// prefetch (and touch) all maps within a specific distancd
991	static void
992	prefetch_surrounding_maps (maptile *map, int distance)
993	{
994	map->last_access = runtime;
995
996	if (--distance)
997	for (int dir = 4; --dir; )
998	if (const shstr &path = map->tile_path [dir])
999	if (maptile *&neigh = map->tile_map [dir])
1000	prefetch_surrounding_maps (neigh, distance);
1001	else
1002	neigh = maptile::find_async (path, map);
1003	}
1004		885
1005	// prefetch a generous area around the player	886	// prefetch a generous area around the player
1006	static void	887	static void
1007	prefetch_surrounding_maps (object *op)	888	prefetch_surrounding_maps (object *op)
1008	{	889	{
1009	prefetch_surrounding_maps (op->map, 3);	890	for (maprect *rect = op->map->split_to_tiles (mapwalk_buf,
		891	op->x - PREFETCH , op->y - PREFETCH ,
		892	op->x + PREFETCH + 1, op->y + PREFETCH + 1);
		893	rect->m;
		894	++rect)
		895	rect->m->touch ();
1010	}	896	}
		897
		898	//+GPL
1011		899
1012	/**	900	/**
1013	* Draws client map.	901	* Draws client map.
1014	*/	902	*/
1015	void	903	void
1016	draw_client_map (player *pl)	904	draw_client_map (player *pl)
1017	{	905	{
1018	object *ob = pl->observe;	906	object *ob = pl->viewpoint;
1019	if (!ob->active)	907	if (!pl->observe->active)
1020	return;	908	return;
1021
1022	maptile *plmap = ob->map;
1023		909
1024	/* If player is just joining the game, he isn't here yet, so the map	910	/* If player is just joining the game, he isn't here yet, so the map
1025	* can get swapped out. If so, don't try to send them a map. All will	911	* can get swapped out. If so, don't try to send them a map. All will
1026	* be OK once they really log in.	912	* be OK once they really log in.
1027	*/	913	*/
1028	if (!plmap || plmap->in_memory != MAP_IN_MEMORY)	914	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1029	return;	915	return;
1030		916
1031	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1032	sint16 nx, ny;
1033	int estartlen, eoldlen;	917	int startlen, oldlen;
1034	uint8 eentrysize;
1035	uint16 ewhatstart, ewhatflag;
1036	uint8 extendedinfos;
1037	maptile *m;
1038		918
1039	check_map_change (pl);	919	check_map_change (pl);
1040	prefetch_surrounding_maps (pl->ob);	920	prefetch_surrounding_maps (pl->ob);
1041		921
1042	/* do LOS after calls to update_position */	922	/* do LOS after calls to update_position */
1043	if (ob != pl->ob)	923	/* unfortunately, we need to udpate los when observing, currently */
1044	clear_los (pl);	924	if (pl->do_los || pl->viewpoint != pl->ob)
1045	else if (pl->do_los)
1046	{	925	{
1047	update_los (ob);
1048	pl->do_los = 0;	926	pl->do_los = 0;
		927	pl->update_los ();
1049	}	928	}
1050		929
1051	/**	930	/**
1052	* This function uses the new map1 protocol command to send the map	931	* This function uses the new map1 protocol command to send the map
1053	* to the client. It is necessary because the old map command supports	932	* to the client. It is necessary because the old map command supports
…		…
1072	*/	951	*/
1073		952
1074	client &socket = *pl->ns;	953	client &socket = *pl->ns;
1075		954
1076	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	955	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1077	packet esl;
1078		956
1079	startlen = sl.length ();	957	startlen = sl.length ();
1080		958
1081	/*Extendedmapinfo structure initialisation */	959	int hx = socket.mapx / 2;
1082	if (socket.ext_mapinfos)	960	int hy = socket.mapy / 2;
1083	{
1084	extendedinfos = EMI_NOREDRAW;
1085		961
1086	if (socket.EMI_smooth)	962	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1087	extendedinfos |= EMI_SMOOTH;	963	int ax = dx + hx;
		964	int ay = dy + hy;
1088		965
1089	ewhatstart = esl.length ();	966	int mask = (ax << 10) | (ay << 4);
1090	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1091	could need to be taken away */
1092	eentrysize = getExtendedMapInfoSize (&socket);
1093	esl << "mapextended "
1094	<< uint8 (extendedinfos)
1095	<< uint8 (eentrysize);
1096
1097	estartlen = esl.length ();
1098	}
1099
1100	/* x,y are the real map locations. ax, ay are viewport relative
1101	* locations.
1102	*/
1103	ay = 0;
1104
1105	/* We could do this logic as conditionals in the if statement,
1106	* but that started to get a bit messy to look at.
1107	*/
1108	max_x = ob->x + (socket.mapx + 1) / 2;
1109	max_y = ob->y + (socket.mapy + 1) / 2;
1110
1111	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1112	{
1113	ax = 0;
1114	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1115	{
1116	int emask, mask;
1117	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1118
1119	MapCell &lastcell = socket.lastmap.cells[ax][ay];	967	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1120		968
1121	/* If the coordinates are not valid, or it is too dark to see,	969	/* If the coordinates are not valid, or it is too dark to see,
1122	* we tell the client as such	970	* we tell the client as such
		971	*/
		972	if (!m)
		973	{
		974	/* space is out of map. Update space and clear values
		975	* if this hasn't already been done. If the space is out
		976	* of the map, it shouldn't have a head.
1123	*/	977	*/
1124	nx = x;	978	if (lastcell.count != -1)
1125	ny = y;	979	{
1126	m = get_map_from_coord (plmap, &nx, &ny);	980	sl << uint16 (mask);
		981	map_clearcell (&lastcell, -1);
		982	}
1127		983
1128	if (!m)	984	continue;
		985	}
		986
		987	int d = pl->blocked_los_uc (dx, dy);
		988
		989	if (d > 3)
		990	{
		991	/* This block deals with spaces that are not visible for whatever
		992	* reason. Still may need to send the head for this space.
		993	*/
		994	if (lastcell.count != -1
		995	|| lastcell.faces[0]
		996	|| lastcell.faces[1]
		997	|| lastcell.faces[2]
		998	|| lastcell.stat_hp
		999	|| lastcell.flags
		1000	|| lastcell.player)
		1001	sl << uint16 (mask);
		1002
		1003	/* properly clear a previously sent big face */
		1004	map_clearcell (&lastcell, -1);
		1005	}
		1006	else
		1007	{
		1008	/* In this block, the space is visible.
		1009	*/
		1010
		1011	/* Rather than try to figure out what everything that we might
		1012	* need to send is, then form the packet after that,
		1013	* we presume that we will in fact form a packet, and update
		1014	* the bits by what we do actually send. If we send nothing,
		1015	* we just back out sl.length () to the old value, and no harm
		1016	* is done.
		1017	* I think this is simpler than doing a bunch of checks to see
		1018	* what if anything we need to send, setting the bits, then
		1019	* doing those checks again to add the real data.
		1020	*/
		1021	oldlen = sl.length ();
		1022
		1023	sl << uint16 (mask);
		1024
		1025	unsigned char dummy;
		1026	unsigned char *last_ext = &dummy;
		1027
		1028	/* Darkness changed */
		1029	if (lastcell.count != d)
		1030	{
		1031	mask |= 0x8;
		1032
		1033	*last_ext |= 0x80;
		1034	last_ext = &sl[sl.length ()];
		1035	sl << uint8 (d);
		1036	}
		1037
		1038	lastcell.count = d;
		1039
		1040	mapspace &ms = m->at (nx, ny);
		1041	ms.update ();
		1042
		1043	// extmap handling
		1044	uint8 stat_hp = 0;
		1045	uint8 stat_width = 0;
		1046	uint8 flags = 0;
		1047	tag_t player = 0;
		1048
		1049	// send hp information, if applicable
		1050	if (object *op = ms.faces_obj [0])
		1051	if (op->is_head () && !op->invisible)
1129	{	1052	{
1130	/* space is out of map. Update space and clear values	1053	if (op->stats.maxhp > op->stats.hp
1131	* if this hasn't already been done. If the space is out	1054	&& op->stats.maxhp > 0
1132	* of the map, it shouldn't have a head	1055	&& (op->type == PLAYER
1133	*/	1056	|| op->type == DOOR // does not work, have maxhp 0
1134	if (lastcell.count != -1)	1057	|| op->flag [FLAG_MONSTER]
		1058	|| op->flag [FLAG_ALIVE]
		1059	|| op->flag [FLAG_GENERATOR]))
1135	{	1060	{
1136	sl << uint16 (mask);	1061	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1137	map_clearcell (&lastcell, -1);	1062	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1138	}	1063	}
1139		1064
1140	continue;	1065	if (expect_false (op->has_dialogue ()))
		1066	flags |= 1;
		1067
		1068	if (expect_false (op->type == PLAYER))
		1069	player = op == ob ? pl->ob->count
		1070	: op == pl->ob ? ob->count
		1071	: op->count;
1141	}	1072	}
1142
1143	m->touch ();
1144		1073
1145	int d = pl->blocked_los[ax][ay];	1074	if (expect_false (lastcell.stat_hp != stat_hp))
1146
1147	if (d > 3)
1148	{	1075	{
		1076	lastcell.stat_hp = stat_hp;
1149		1077
1150	int need_send = 0, count;	1078	mask |= 0x8;
		1079	*last_ext |= 0x80;
		1080	last_ext = &sl[sl.length ()];
1151		1081
1152	/* This block deals with spaces that are not visible for whatever	1082	sl << uint8 (5) << uint8 (stat_hp);
1153	* reason. Still may need to send the head for this space.
1154	*/
1155		1083
1156	oldlen = sl.length ();	1084	if (stat_width > 1)
1157
1158	sl << uint16 (mask);
1159
1160	if (lastcell.count != -1)
1161	need_send = 1;
1162
1163	count = -1;
1164
1165	/* properly clear a previously sent big face */
1166	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1167	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1168	need_send = 1;
1169
1170	map_clearcell (&lastcell, count);
1171
1172	if ((mask & 0xf) || need_send)
1173	sl[oldlen + 1] = mask & 0xff;
1174	else
1175	sl.reset (oldlen);
1176	}
1177	else
1178	{
1179	/* In this block, the space is visible.
1180	*/
1181
1182	/* Rather than try to figure out what everything that we might
1183	* need to send is, then form the packet after that,
1184	* we presume that we will in fact form a packet, and update
1185	* the bits by what we do actually send. If we send nothing,
1186	* we just back out sl.length () to the old value, and no harm
1187	* is done.
1188	* I think this is simpler than doing a bunch of checks to see
1189	* what if anything we need to send, setting the bits, then
1190	* doing those checks again to add the real data.
1191	*/
1192	oldlen = sl.length ();
1193	eoldlen = esl.length ();
1194
1195	sl << uint16 (mask);
1196
1197	unsigned char dummy;
1198	unsigned char *last_ext = &dummy;
1199
1200	/* Darkness changed */
1201	if (lastcell.count != d && socket.darkness)
1202	{	1085	{
1203	mask |= 0x8;
1204
1205	if (socket.extmap)
1206	{
1207	*last_ext |= 0x80;	1086	*last_ext |= 0x80;
1208	last_ext = &sl[sl.length ()];	1087	last_ext = &sl[sl.length ()];
1209	sl << uint8 (d);	1088
1210	}	1089	sl << uint8 (6) << uint8 (stat_width);
1211	else
1212	sl << uint8 (255 - 64 * d);
1213	}	1090	}
		1091	}
1214		1092
1215	lastcell.count = d;	1093	if (expect_false (lastcell.player != player))
1216
1217	mapspace &ms = m->at (nx, ny);
1218
1219	if (socket.extmap)
1220	{	1094	{
1221	uint8 stat_hp = 0;	1095	lastcell.player = player;
1222	uint8 stat_width = 0;
1223	uint8 flags = 0;
1224	tag_t player = 0;
1225		1096
1226	// send hp information, if applicable
1227	if (object *op = ms.faces_obj [0])
1228	{
1229	if (op->head || op->invisible)
1230	; // do not show
1231	else if (op->type == PLAYER
1232	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1233	{
1234	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1235	{
1236	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1237	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1238	}
1239	}
1240
1241	if (op->msg && op->msg[0] == '@')
1242	flags |= 1;
1243
1244	if (op->type == PLAYER && op != ob)
1245	player = op->count;
1246	}
1247
1248	if (lastcell.stat_hp != stat_hp)
1249	{
1250	lastcell.stat_hp = stat_hp;
1251
1252	mask |= 0x8;	1097	mask |= 0x8;
1253	*last_ext |= 0x80;	1098	*last_ext |= 0x80;
1254	last_ext = &sl[sl.length ()];	1099	last_ext = &sl[sl.length ()];
1255		1100
1256	sl << uint8 (5) << uint8 (stat_hp);
1257
1258	if (stat_width > 1)
1259	{
1260	*last_ext |= 0x80;
1261	last_ext = &sl[sl.length ()];
1262
1263	sl << uint8 (6) << uint8 (stat_width);
1264	}
1265	}
1266
1267	if (lastcell.player != player)
1268	{
1269	lastcell.player = player;
1270
1271	mask |= 0x8;
1272	*last_ext |= 0x80;
1273	last_ext = &sl[sl.length ()];
1274
1275	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1101	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1276	}	1102	}
1277		1103
1278	if (lastcell.flags != flags)	1104	if (expect_false (lastcell.flags != flags))
1279	{	1105	{
1280	lastcell.flags = flags;	1106	lastcell.flags = flags;
1281		1107
1282	mask |= 0x8;	1108	mask |= 0x8;
1283	*last_ext |= 0x80;	1109	*last_ext |= 0x80;
1284	last_ext = &sl[sl.length ()];	1110	last_ext = &sl[sl.length ()];
1285		1111
1286	sl << uint8 (8) << uint8 (flags);	1112	sl << uint8 (8) << uint8 (flags);
1287	}
1288	}	1113	}
1289		1114
		1115	// faces
		1116
1290	/* Floor face */	1117	/* Floor face */
1291	if (update_space (sl, socket, ms, lastcell, 2))	1118	if (update_space (sl, socket, ms, lastcell, 2))
1292	mask |= 0x4;	1119	mask |= 0x4;
1293		1120
1294	/* Middle face */	1121	/* Middle face */
1295	if (update_space (sl, socket, ms, lastcell, 1))	1122	if (update_space (sl, socket, ms, lastcell, 1))
1296	mask |= 0x2;	1123	mask |= 0x2;
1297		1124
		1125	if (expect_false (ob->invisible)
		1126	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1298	if (ms.player () == ob	1127	&& ms.player () == ob)
1299	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1300	{	1128	{
1301	// force player to be visible to himself if invisible	1129	// force player to be visible to himself if invisible
1302	if (lastcell.faces[0] != ob->face)	1130	if (lastcell.faces[0] != ob->face)
1303	{	1131	{
1304	lastcell.faces[0] = ob->face;	1132	lastcell.faces[0] = ob->face;
1305		1133
1306	mask |= 0x1;
1307	sl << uint16 (ob->face);
1308
1309	socket.send_faces (ob);
1310	}
1311	}
1312	/* Top face */
1313	else if (update_space (sl, socket, ms, lastcell, 0))
1314	mask |= 0x1;	1134	mask |= 0x1;
		1135	sl << uint16 (ob->face);
1315		1136
		1137	socket.send_faces (ob);
		1138	}
		1139	}
		1140	/* Top face */
		1141	else if (update_space (sl, socket, ms, lastcell, 0))
		1142	mask |= 0x1;
		1143
1316	/* Check to see if we are in fact sending anything for this	1144	/* Check to see if we are in fact sending anything for this
1317	* space by checking the mask. If so, update the mask.	1145	* space by checking the mask. If so, update the mask.
1318	* if not, reset the len to that from before adding the mask	1146	* if not, reset the len to that from before adding the mask
1319	* value, so we don't send those bits.	1147	* value, so we don't send those bits.
1320	*/	1148	*/
1321	if (mask & 0xf)	1149	if (mask & 0xf)
1322	sl[oldlen + 1] = mask & 0xff;	1150	sl[oldlen + 1] = mask & 0xff;
1323	else	1151	else
1324	sl.reset (oldlen);	1152	sl.reset (oldlen);
1325
1326	if (socket.ext_mapinfos)
1327	esl << uint16 (emask);
1328
1329	if (socket.EMI_smooth)
1330	{
1331	for (int layer = 2+1; layer--; )
1332	{
1333	object *ob = ms.faces_obj [layer];
1334
1335	// If there is no object for this space, or if the face for the object
1336	// is the blank face, set the smoothlevel to zero.
1337	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1338
1339	// We've gotten what face we want to use for the object. Now see if
1340	// if it has changed since we last sent it to the client.
1341	if (lastcell.smooth[layer] != smoothlevel)
1342	{
1343	lastcell.smooth[layer] = smoothlevel;
1344	esl << uint8 (smoothlevel);
1345	emask |= 1 << layer;
1346	}
1347	}
1348
1349	if (emask & 0xf)
1350	esl[eoldlen + 1] = emask & 0xff;
1351	else
1352	esl.reset (eoldlen);
1353	}
1354	} /* else this is a viewable space */	1153	} /* else this is a viewable space */
1355	} /* for x loop */	1154	ordered_mapwalk_end
1356	} /* for y loop */
1357		1155
1358	socket.flush_fx ();	1156	socket.flush_fx ();
1359
1360	/* Verify that we in fact do need to send this */
1361	if (socket.ext_mapinfos)
1362	{
1363	if (!(sl.length () > startlen || socket.sent_scroll))
1364	{
1365	/* No map data will follow, so don't say the client
1366	* it doesn't need draw!
1367	*/
1368	ewhatflag &= ~EMI_NOREDRAW;
1369	esl[ewhatstart + 1] = ewhatflag & 0xff;
1370	}
1371
1372	if (esl.length () > estartlen)
1373	socket.send_packet (esl);
1374	}
1375		1157
1376	if (sl.length () > startlen || socket.sent_scroll)	1158	if (sl.length () > startlen || socket.sent_scroll)
1377	{	1159	{
1378	socket.send_packet (sl);	1160	socket.send_packet (sl);
1379	socket.sent_scroll = 0;	1161	socket.sent_scroll = 0;
1380	}	1162	}
1381	}	1163	}
1382		1164
1383	/*****************************************************************************/
1384	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1385	/* a player. Of course, the client need to know the command to be able to */
1386	/* manage it ! */
1387	/*****************************************************************************/
1388	void
1389	send_plugin_custom_message (object *pl, char *buf)
1390	{
1391	pl->contr->ns->send_packet (buf);
1392	}
1393
1394	/**
1395	* This sends the skill number to name mapping. We ignore
1396	* the params - we always send the same info no matter what.
1397	*/
1398	void
1399	send_skill_info (client *ns, char *params)
1400	{
1401	packet sl;
1402	sl << "replyinfo skill_info\n";
1403
1404	for (int i = 1; i < NUM_SKILLS; i++)
1405	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1406
1407	if (sl.length () >= MAXSOCKBUF)
1408	{
1409	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1410	fatal (0);
1411	}
1412
1413	ns->send_packet (sl);
1414	}
1415
1416	/**
1417	* This sends the spell path to name mapping. We ignore
1418	* the params - we always send the same info no matter what.
1419	*/
1420	void
1421	send_spell_paths (client * ns, char *params)
1422	{
1423	packet sl;
1424
1425	sl << "replyinfo spell_paths\n";
1426
1427	for (int i = 0; i < NRSPELLPATHS; i++)
1428	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1429
1430	if (sl.length () >= MAXSOCKBUF)
1431	{
1432	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1433	fatal (0);
1434	}
1435
1436	ns->send_packet (sl);
1437	}
1438
1439	/**	1165	/**
1440	* This looks for any spells the player may have that have changed their stats.	1166	* This looks for any spells the player may have that have changed their stats.
1441	* it then sends an updspell packet for each spell that has changed in this way	1167	* it then sends an updspell packet for each spell that has changed in this way
1442	*/	1168	*/
1443	void	1169	void
1444	esrv_update_spells (player *pl)	1170	esrv_update_spells (player *pl)
1445	{	1171	{
1446	if (!pl->ns)	1172	if (!pl->ns)
1447	return;	1173	return;
1448		1174
		1175	pl->ns->update_spells = false;
		1176
1449	if (!pl->ns->monitor_spells)	1177	if (!pl->ns->monitor_spells)
1450	return;	1178	return;
1451		1179
1452	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1180	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1453	{
1454	if (spell->type == SPELL)	1181	if (spell->type == SPELL)
1455	{	1182	{
1456	int flags = 0;	1183	int flags = 0;
		1184	int val;
1457		1185
1458	/* check if we need to update it */	1186	/* check if we need to update it */
1459	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1187	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1188	if (spell->cached_sp != val)
1460	{	1189	{
1461	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1190	spell->cached_sp = val;
1462	flags |= UPD_SP_MANA;	1191	flags |= UPD_SP_MANA;
1463	}	1192	}
1464		1193
1465	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1194	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1195	if (spell->cached_grace != val)
1466	{	1196	{
1467	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1197	spell->cached_grace = val;
1468	flags |= UPD_SP_GRACE;	1198	flags |= UPD_SP_GRACE;
1469	}	1199	}
1470		1200
1471	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1201	val = casting_level (pl->ob, spell);
		1202	if (spell->cached_eat != val)
1472	{	1203	{
1473	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1204	spell->cached_eat = val;
1474	flags |= UPD_SP_DAMAGE;	1205	flags |= UPD_SP_LEVEL;
1475	}	1206	}
1476		1207
1477	if (flags)	1208	if (flags)
1478	{	1209	{
1479	packet sl;	1210	packet sl;
1480		1211
1481	sl << "updspell "	1212	sl << "updspell "
1482	<< uint8 (flags)	1213	<< uint8 (flags)
1483	<< uint32 (spell->count);	1214	<< uint32 (spell->count);
1484		1215
1485	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1216	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1486	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1217	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1487	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1218	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1488		1219
1489	pl->ns->send_packet (sl);	1220	pl->ns->send_packet (sl);
1490	}	1221	}
1491	}	1222	}
1492	}
1493	}	1223	}
1494		1224
1495	void	1225	void
1496	esrv_remove_spell (player *pl, object *spell)	1226	esrv_remove_spell (player *pl, object *spell)
1497	{	1227	{
…		…
1522	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1252	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1523	return;	1253	return;
1524	}	1254	}
1525		1255
1526	/* store costs and damage in the object struct, to compare to later */	1256	/* store costs and damage in the object struct, to compare to later */
1527	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1257	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1528	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1258	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1529	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1259	spell->cached_eat = casting_level (pl->ob, spell);
1530		1260
1531	/* figure out which skill it uses, if it uses one */	1261	/* figure out which skill it uses, if it uses one */
1532	if (spell->skill)	1262	if (spell->skill)
1533	{	1263	if (object *tmp = pl->find_skill (spell->skill))
1534	for (i = 1; i < NUM_SKILLS; i++)	1264	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1535	if (!strcmp (spell->skill, skill_names[i]))
1536	{
1537	skill = i + CS_STAT_SKILLINFO;
1538	break;
1539	}
1540	}
1541		1265
1542	// spells better have a face	1266	// spells better have a face
1543	if (!spell->face)	1267	if (!spell->face)
1544	{	1268	{
1545	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1269	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1546	spell->face = face_find ("burnout.x11", blank_face);	1270	spell->face = face_find ("burnout.x11", blank_face);
1547	}	1271	}
		1272
		1273	pl->ns->send_face (spell->face);
1548		1274
1549	/* send the current values */	1275	/* send the current values */
1550	sl << uint32 (spell->count)	1276	sl << uint32 (spell->count)
1551	<< uint16 (spell->level)	1277	<< uint16 (spell->level)
1552	<< uint16 (spell->casting_time)	1278	<< uint16 (spell->casting_time)
1553	<< uint16 (spell->last_sp)	1279	<< uint16 (spell->cached_sp)
1554	<< uint16 (spell->last_grace)	1280	<< uint16 (spell->cached_grace)
1555	<< uint16 (spell->last_eat)	1281	<< uint16 (spell->cached_eat)
1556	<< uint8 (skill)	1282	<< uint8 (skill)
1557	<< uint32 (spell->path_attuned)	1283	<< uint32 (spell->path_attuned)
1558	<< uint32 (spell->face)	1284	<< uint32 (spell->face)
1559	<< data8 (spell->name)	1285	<< data8 (spell->name)
1560	<< data16 (spell->msg);	1286	<< data16 (spell->msg);
…		…
1588	* bytes and 3 strings (because that is the spec) so we need to	1314	* bytes and 3 strings (because that is the spec) so we need to
1589	* check that the length of those 3 strings, plus the 23 bytes,	1315	* check that the length of those 3 strings, plus the 23 bytes,
1590	* won't take us over the length limit for the socket, if it does,	1316	* won't take us over the length limit for the socket, if it does,
1591	* we need to send what we already have, and restart packet formation	1317	* we need to send what we already have, and restart packet formation
1592	*/	1318	*/
		1319	if (spell->type != SPELL)
		1320	continue;
		1321
1593	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1322	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1594	* to show add_spell is 26 bytes + 2 strings. However, the overun	1323	* to show add_spell is 26 bytes + 2 strings. However, the overun
1595	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1324	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1596	* like it will fix this	1325	* like it will fix this
1597	*/	1326	*/
1598	if (spell->type != SPELL)
1599	continue;
1600
1601	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1327	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1602	{	1328	{
		1329	pl->ns->flush_fx ();
1603	pl->ns->send_packet (sl);	1330	pl->ns->send_packet (sl);
1604		1331
1605	sl.reset ();	1332	sl.reset ();
1606	sl << "addspell ";	1333	sl << "addspell ";
1607	}	1334	}
…		…
1615	return;	1342	return;
1616	}	1343	}
1617	else	1344	else
1618	append_spell (pl, sl, spell);	1345	append_spell (pl, sl, spell);
1619		1346
1620	if (sl.length () >= MAXSOCKBUF)	1347	if (sl.length () > MAXSOCKBUF)
1621	{
1622	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1348	cleanup ("buffer overflow in esrv_add_spells!");
1623	fatal (0);
1624	}
1625		1349
1626	/* finally, we can send the packet */	1350	/* finally, we can send the packet */
		1351	pl->ns->flush_fx ();
1627	pl->ns->send_packet (sl);	1352	pl->ns->send_packet (sl);
1628	}	1353	}
1629		1354
		1355	//-GPL
		1356

Diff Legend

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