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.118 by root, Sun Jul 29 19:11:47 2007 UTC vs.
Revision 1.198 by root, Wed Dec 5 19:03:27 2018 UTC

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

Diff Legend

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