[ViewVC] Diff of: cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.108 by root, Sat Jun 9 20:51:45 2007 UTC vs.
Revision 1.127 by root, Tue Apr 22 07:28:05 2008 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 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
9	* under the terms of the GNU General Public License as published by the Free	9	* it under the terms of the GNU General Public License as published by
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* the Free Software Foundation, either version 3 of the License, or
11	* any later version.	11	* (at your 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 GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	20	*
22	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/**	24	/**
26	* \file	25	* \file
27	* Client handling.	26	* Client handling.
130	}	129	}
131		130
132	static void	131	static void
133	clear_map (player *pl)	132	clear_map (player *pl)
134	{	133	{
		134	pl->ns->mapinfo_queue_clear ();
		135
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	136	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136		137
137	pl->ns->force_newmap = false;	138	pl->ns->force_newmap = false;
138		139
139	if (pl->ns->newmapcmd == 1)	140	if (pl->ns->newmapcmd == 1)
…		…
191	socket.current_y = ob->y;	192	socket.current_y = ob->y;
192		193
193	region *reg = ob->region ();	194	region *reg = ob->region ();
194	if (socket.current_region != reg)	195	if (socket.current_region != reg)
195	{	196	{
		197	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
196	socket.current_region = reg;	198	socket.current_region = reg;
197	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
198	}	199	}
199	}	200	}
200		201
201	/**	202	/**
202	* RequestInfo is sort of a meta command. There is some specific	203	* RequestInfo is sort of a meta command. There is some specific
203	* request of information, but we call other functions to provide	204	* request of information, but we call other functions to provide
204	* that information.	205	* that information.
205	*/	206	*/
206	void	207	void
207	RequestInfo (char buf, int len, client ns)	208	RequestInfo (char buf, int len, client ns)
208	{	209	{
209	char params = NULL, cp;	210	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		211
222	/* find the first space, make it null, and update the	212	/* find the first space, make it null, and update the
223	* params pointer.	213	* params pointer.
224	*/	214	*/
225	for (cp = buf; *cp != '\0'; cp++)	215	for (params = buf; *params; params++)
226	if (*cp == ' ')	216	if (*params == ' ')
227	{	217	{
228	*cp = '\0';
229	params = cp + 1;	218	*params++ = 0;
230	break;	219	break;
231	}	220	}
232		221
233	if (!strcmp (buf, "image_info"))	222	if (!strcmp (buf, "image_info"))
234	send_image_info (ns, params);	223	send_image_info (ns, params);
…		…
237	else if (!strcmp (buf, "skill_info"))	226	else if (!strcmp (buf, "skill_info"))
238	send_skill_info (ns, params);	227	send_skill_info (ns, params);
239	else if (!strcmp (buf, "spell_paths"))	228	else if (!strcmp (buf, "spell_paths"))
240	send_spell_paths (ns, params);	229	send_spell_paths (ns, params);
241	else	230	else
242	ns->send_packet (bigbuf, len);	231	{
		232	// undo tokenisation above and send replyinfo with the request unchanged
		233	if (*params)
		234	*--params = ' ';
		235
		236	ns->send_packet_printf ("replyinfo %s", buf);
		237	}
243	}	238	}
244		239
245	void	240	void
246	ExtCmd (char buf, int len, player pl)	241	ExtCmd (char buf, int len, player pl)
247	{	242	{
…		…
250		245
251	void	246	void
252	ExtiCmd (char buf, int len, client ns)	247	ExtiCmd (char buf, int len, client ns)
253	{	248	{
254	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	249	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		250	}
		251
		252	void
		253	client::mapinfo_queue_clear ()
		254	{
		255	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		256	free (*i);
		257
		258	mapinfo_queue.clear ();
		259	}
		260
		261	bool
		262	client::mapinfo_try (char *buf)
		263	{
		264	char *token = buf;
		265	buf += strlen (buf) + 9;
		266
		267	// initial map and its origin
		268	maptile *map = pl->observe->map;
		269	int mapx = pl->ns->mapx / 2 - pl->observe->x;
		270	int mapy = pl->ns->mapy / 2 - pl->observe->y;
		271	int max_distance = 8; // limit maximum path length to something generous
		272
		273	while (*buf && map && max_distance)
		274	{
		275	int dir = *buf++ - '1';
		276
		277	if (dir >= 0 && dir <= 3)
		278	{
		279	if (!map->tile_path [dir])
		280	map = 0;
		281	else if (map->tile_available (dir, false))
		282	{
		283	maptile *neigh = map->tile_map [dir];
		284
		285	switch (dir)
		286	{
		287	case 0: mapy -= neigh->height; break;
		288	case 2: mapy += map ->height; break;
		289	case 3: mapx -= neigh->width ; break;
		290	case 1: mapx += map ->width ; break;
		291	}
		292
		293	map = neigh;
		294	--max_distance;
		295	}
		296	else
		297	return 0;
		298	}
		299	else
		300	max_distance = 0;
		301	}
		302
		303	if (!max_distance)
		304	send_packet_printf ("mapinfo %s error", token);
		305	else if (!map \|\| !map->path)
		306	send_packet_printf ("mapinfo %s nomap", token);
		307	else
		308	{
		309	int flags = 0;
		310
		311	if (map->tile_path[0]) flags \|= 1;
		312	if (map->tile_path[1]) flags \|= 2;
		313	if (map->tile_path[2]) flags \|= 4;
		314	if (map->tile_path[3]) flags \|= 8;
		315
		316	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		317	}
		318
		319	return 1;
		320	}
		321
		322	void
		323	client::mapinfo_queue_run ()
		324	{
		325	if (mapinfo_queue.empty () \|\| !pl)
		326	return;
		327
		328	for (int i = 0; i < mapinfo_queue.size (); ++i)
		329	if (mapinfo_try (mapinfo_queue [i]))
		330	{
		331	free (mapinfo_queue [i]);
		332	mapinfo_queue.erase (i);
		333	}
		334	else
		335	++i;
255	}	336	}
256		337
257	void	338	void
258	MapInfoCmd (char buf, int len, player pl)	339	MapInfoCmd (char buf, int len, player pl)
259	{	340	{
260	// <mapinfo tag spatial tile-path	341	// <mapinfo tag spatial tile-path
261	// >mapinfo tag spatial flags x y w h hash	342	// >mapinfo tag spatial flags x y w h hash
262		343
263	char bigbuf[MAX_BUF], *token;
264
265	token = buf;	344	char *token = buf;
266	// copy token	345
267	if (!(buf = strchr (buf, ' ')))	346	if (!(buf = strchr (buf, ' ')))
268	return;	347	return;
269		348
270	*buf++ = 0;
271
272	if (!strncmp (buf, "spatial ", 8))	349	if (!strncmp (buf, " spatial ", 9))
273	{	350	{
274	buf += 8;	351	char *copy = strdup (token);
		352	copy [buf - token] = 0;
275		353
276	// initial map and its origin	354	#if 0
277	maptile *map = pl->ob->map;	355	// this makes only sense when we flush the buffer immediately
278	sint16 dx, dy;	356	if (pl->ns->mapinfo_try (copy))
279	int mapx = pl->ns->mapx / 2 - pl->ob->x;	357	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	358	else
332	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	359	#endif
		360	pl->ns->mapinfo_queue.push_back (copy);
333	}	361	}
334	else	362	else
335	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	363	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337	pl->ns->send_packet (bigbuf);
338	}	364	}
339		365
340	/** This is the Setup cmd */	366	/** This is the Setup cmd */
341	void	367	void
342	SetUp (char buf, int len, client ns)	368	SetUp (char buf, int len, client ns)
…		…
471		497
472	ns->send_packet (cmdback);	498	ns->send_packet (cmdback);
473	}	499	}
474		500
475	/**	501	/**
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
496	/**
497	* This handles the general commands from the client (ie, north, fire, cast,	502	* This handles the general commands from the client (ie, north, fire, cast,
498	* etc.)	503	* etc.)
499	*/	504	*/
500	void	505	void
501	PlayerCmd (char buf, int len, player pl)	506	PlayerCmd (char buf, int len, player pl)
…		…
533	void	538	void
534	NewPlayerCmd (char buf, int len, player pl)	539	NewPlayerCmd (char buf, int len, player pl)
535	{	540	{
536	if (len <= 6)	541	if (len <= 6)
537	{	542	{
538	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	543	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
539	return;	544	return;
540	}	545	}
541		546
542	uint16 cmdid = net_uint16 ((uint8 *)buf);	547	uint16 cmdid = net_uint16 ((uint8 *)buf);
543	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	548	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
747		752
748	//TODO: maybe golem should become the current_weapon, quite simply?	753	//TODO: maybe golem should become the current_weapon, quite simply?
749	if (pl->golem)	754	if (pl->golem)
750	buf << " Golem*: " << pl->golem->name;	755	buf << " Golem*: " << pl->golem->name;
751		756
		757	buf << '\0';
752	buf.linearise (obuf);	758	buf.linearise (obuf);
753	obuf [buf.size ()] = 0;
754	}	759	}
755		760
756	#define AddIfInt64(Old,New,Type) if (Old != New) {\	761	#define AddIfInt64(Old,New,Type) if (Old != New) {\
757	Old = New; \	762	Old = New; \
758	sl << uint8 (Type) << uint64 (New); \	763	sl << uint8 (Type) << uint64 (New); \
…		…
881		886
882	/**	887	/**
883	* Tells the client that here is a player it should start using.	888	* Tells the client that here is a player it should start using.
884	*/	889	*/
885	void	890	void
886	esrv_new_player (player *pl, uint32 weight)	891	esrv_new_player (player *pl)
887	{	892	{
		893	sint32 weight = pl->ob->client_weight ();
		894
888	packet sl ("player");	895	packet sl ("player");
889		896
890	sl << uint32 (pl->ob->count)	897	sl << uint32 (pl->ob->count)
891	<< uint32 (weight)	898	<< uint32 (weight)
892	<< uint32 (pl->ob->face)	899	<< uint32 (pl->ob->face)
…		…
959		966
960	if (!ns.faces_sent[face_num])	967	if (!ns.faces_sent[face_num])
961	if (ob)	968	if (ob)
962	ns.send_faces (ob);	969	ns.send_faces (ob);
963	else	970	else
964	ns.send_face (face_num);	971	ns.send_face (face_num, 10);
965		972
966	sl << uint16 (face_num);	973	sl << uint16 (face_num);
967	return 1;	974	return 1;
968	}	975	}
969		976
…		…
1026		1033
1027	/* If player is just joining the game, he isn't here yet, so the map	1034	/* If player is just joining the game, he isn't here yet, so the map
1028	* can get swapped out. If so, don't try to send them a map. All will	1035	* can get swapped out. If so, don't try to send them a map. All will
1029	* be OK once they really log in.	1036	* be OK once they really log in.
1030	*/	1037	*/
1031	if (!plmap \|\| plmap->in_memory != MAP_IN_MEMORY)	1038	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)
1032	return;	1039	return;
1033		1040
1034	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	1041	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1035	int estartlen, eoldlen;	1042	int estartlen, eoldlen;
1036	uint8 eentrysize;	1043	uint8 eentrysize;
…		…
1124		1131
1125	if (!m)	1132	if (!m)
1126	{	1133	{
1127	nx = x; ny = y; m = plmap;	1134	nx = x; ny = y; m = plmap;
1128		1135
1129	if (!xy_normalise (m, nx, ny))	1136	if (xy_normalise (m, nx, ny))
		1137	m->touch ();
		1138	else
1130	m = 0;	1139	m = 0;
1131	}	1140	}
1132		1141
1133	int emask, mask;	1142	int emask, mask;
1134	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1143	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
…		…
1151	}	1160	}
1152		1161
1153	continue;	1162	continue;
1154	}	1163	}
1155		1164
1156	m->touch ();
1157
1158	int d = pl->blocked_los[ax][ay];	1165	int d = pl->blocked_los[ax][ay];
1159		1166
1160	if (d > 3)	1167	if (d > 3)
1161	{	1168	{
1162		1169
…		…
1237	uint8 flags = 0;	1244	uint8 flags = 0;
1238	tag_t player = 0;	1245	tag_t player = 0;
1239		1246
1240	// send hp information, if applicable	1247	// send hp information, if applicable
1241	if (object *op = ms.faces_obj [0])	1248	if (object *op = ms.faces_obj [0])
		1249	if (op->is_head () && !op->invisible)
1242	{	1250	{
1243	if (op->head \|\| op->invisible)	1251	if (op->stats.maxhp > op->stats.hp
1244	; // do not show	1252	&& op->stats.maxhp > 0
1245	else if (op->type == PLAYER	1253	&& (op->type == PLAYER
		1254	\|\| op->type == DOOR // does not work, have maxhp 0
1246	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR))	1255	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1247	{
1248	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1249	{	1256	{
1250	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1257	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1251	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge	1258	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1252	}	1259	}
1253	}
1254		1260
1255	if (op->msg && op->msg[0] == '@')	1261	if (op->msg && op->msg[0] == '@')
1256	flags \|= 1;	1262	flags \|= 1;
1257		1263
1258	if (op->type == PLAYER && op != ob)	1264	if (op->type == PLAYER && op != ob)
1259	player = op->count;	1265	player = op->count;
1260	}	1266	}
1261		1267
1262	if (lastcell.stat_hp != stat_hp)	1268	if (lastcell.stat_hp != stat_hp)
1263	{	1269	{
1264	lastcell.stat_hp = stat_hp;	1270	lastcell.stat_hp = stat_hp;
1265		1271
…		…
1416	sl << "replyinfo skill_info\n";	1422	sl << "replyinfo skill_info\n";
1417		1423
1418	for (int i = 1; i < NUM_SKILLS; i++)	1424	for (int i = 1; i < NUM_SKILLS; i++)
1419	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1425	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1420		1426
1421	if (sl.length () >= MAXSOCKBUF)	1427	if (sl.length () > MAXSOCKBUF)
1422	{	1428	{
1423	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1429	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1424	fatal (0);	1430	fatal (0);
1425	}	1431	}
1426		1432
…		…
1439	sl << "replyinfo spell_paths\n";	1445	sl << "replyinfo spell_paths\n";
1440		1446
1441	for (int i = 0; i < NRSPELLPATHS; i++)	1447	for (int i = 0; i < NRSPELLPATHS; i++)
1442	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1448	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1443		1449
1444	if (sl.length () >= MAXSOCKBUF)	1450	if (sl.length () > MAXSOCKBUF)
1445	{	1451	{
1446	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1452	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1447	fatal (0);	1453	fatal (0);
1448	}	1454	}
1449		1455
…		…
1557	if (!spell->face)	1563	if (!spell->face)
1558	{	1564	{
1559	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1565	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1560	spell->face = face_find ("burnout.x11", blank_face);	1566	spell->face = face_find ("burnout.x11", blank_face);
1561	}	1567	}
		1568
		1569	pl->ns->send_face (spell->face);
1562		1570
1563	/* send the current values */	1571	/* send the current values */
1564	sl << uint32 (spell->count)	1572	sl << uint32 (spell->count)
1565	<< uint16 (spell->level)	1573	<< uint16 (spell->level)
1566	<< uint16 (spell->casting_time)	1574	<< uint16 (spell->casting_time)
…		…
1602	* bytes and 3 strings (because that is the spec) so we need to	1610	* bytes and 3 strings (because that is the spec) so we need to
1603	* check that the length of those 3 strings, plus the 23 bytes,	1611	* check that the length of those 3 strings, plus the 23 bytes,
1604	* won't take us over the length limit for the socket, if it does,	1612	* won't take us over the length limit for the socket, if it does,
1605	* we need to send what we already have, and restart packet formation	1613	* we need to send what we already have, and restart packet formation
1606	*/	1614	*/
		1615	if (spell->type != SPELL)
		1616	continue;
		1617
1607	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1618	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1608	* to show add_spell is 26 bytes + 2 strings. However, the overun	1619	* to show add_spell is 26 bytes + 2 strings. However, the overun
1609	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1620	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1610	* like it will fix this	1621	* like it will fix this
1611	*/	1622	*/
1612	if (spell->type != SPELL)
1613	continue;
1614
1615	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1623	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1616	{	1624	{
		1625	pl->ns->flush_fx ();
1617	pl->ns->send_packet (sl);	1626	pl->ns->send_packet (sl);
1618		1627
1619	sl.reset ();	1628	sl.reset ();
1620	sl << "addspell ";	1629	sl << "addspell ";
1621	}	1630	}
…		…
1629	return;	1638	return;
1630	}	1639	}
1631	else	1640	else
1632	append_spell (pl, sl, spell);	1641	append_spell (pl, sl, spell);
1633		1642
1634	if (sl.length () >= MAXSOCKBUF)	1643	if (sl.length () > MAXSOCKBUF)
1635	{	1644	{
1636	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1645	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1637	fatal (0);	1646	fatal (0);
1638	}	1647	}
1639		1648
1640	/* finally, we can send the packet */	1649	/* finally, we can send the packet */
		1650	pl->ns->flush_fx ();
1641	pl->ns->send_packet (sl);	1651	pl->ns->send_packet (sl);
1642	}	1652	}
1643		1653

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.108 by root, Sat Jun 9 20:51:45 2007 UTC vs. Revision 1.127 by root, Tue Apr 22 07:28:05 2008 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.108 by root, Sat Jun 9 20:51:45 2007 UTC vs.
Revision 1.127 by root, Tue Apr 22 07:28:05 2008 UTC