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.71 by root, Mon Mar 12 01:13:10 2007 UTC vs.
Revision 1.125 by root, Tue Apr 22 04:33:20 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) 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,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author 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));
		137
		138	pl->ns->force_newmap = false;
136		139
137	if (pl->ns->newmapcmd == 1)	140	if (pl->ns->newmapcmd == 1)
138	pl->ns->send_packet ("newmap");	141	pl->ns->send_packet ("newmap");
139		142
140	pl->ns->floorbox_reset ();	143	pl->ns->floorbox_reset ();
…		…
143	/** check for map/region change and send new map data */	146	/** check for map/region change and send new map data */
144	static void	147	static void
145	check_map_change (player *pl)	148	check_map_change (player *pl)
146	{	149	{
147	client &socket = *pl->ns;	150	client &socket = *pl->ns;
148	object *ob = pl->ob;	151	object *ob = pl->observe;
149	char buf[MAX_BUF]; /* eauugggh */
150		152
151	if (socket.current_map != ob->map)	153	if (socket.current_map != ob->map || socket.force_newmap)
152	{	154	{
		155	clear_map (pl);
153	socket.current_map = ob->map;	156	socket.current_map = ob->map;
154
155	clear_map (pl);
156		157
157	if (socket.mapinfocmd)	158	if (socket.mapinfocmd)
158	{	159	{
159	if (ob->map && ob->map->path[0])	160	if (ob->map && ob->map->path[0])
160	{	161	{
161	int flags = 0;	162	int flags = 0;
162		163
163	if (ob->map->tile_path[0])	164	if (ob->map->tile_path[0]) flags |= 1;
164	flags |= 1;
165	if (ob->map->tile_path[1])	165	if (ob->map->tile_path[1]) flags |= 2;
166	flags |= 2;
167	if (ob->map->tile_path[2])	166	if (ob->map->tile_path[2]) flags |= 4;
168	flags |= 4;
169	if (ob->map->tile_path[3])	167	if (ob->map->tile_path[3]) flags |= 8;
170	flags |= 8;
171		168
172	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	169	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
173	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);	170	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		171	ob->map->width, ob->map->height, &ob->map->path);
174	}	172	}
175	else	173	else
176	snprintf (buf, MAX_BUF, "mapinfo current");
177
178	socket.send_packet (buf);	174	socket.send_packet ("mapinfo current");
179	}	175	}
180	}	176	}
181	else if (socket.current_x != ob->x || socket.current_y != ob->y)	177	else if (socket.current_x != ob->x || socket.current_y != ob->y)
182	{	178	{
183	int dx = ob->x - socket.current_x;	179	int dx = ob->x - socket.current_x;
…		…
196	socket.current_y = ob->y;	192	socket.current_y = ob->y;
197		193
198	region *reg = ob->region ();	194	region *reg = ob->region ();
199	if (socket.current_region != reg)	195	if (socket.current_region != reg)
200	{	196	{
		197	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
201	socket.current_region = reg;	198	socket.current_region = reg;
202	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
203	}	199	}
204	}	200	}
205		201
206	/**	202	/**
207	* RequestInfo is sort of a meta command. There is some specific	203	* RequestInfo is sort of a meta command. There is some specific
208	* request of information, but we call other functions to provide	204	* request of information, but we call other functions to provide
209	* that information.	205	* that information.
210	*/	206	*/
211	void	207	void
212	RequestInfo (char *buf, int len, client * ns)	208	RequestInfo (char *buf, int len, client *ns)
213	{	209	{
214	char *params = NULL, *cp;	210	char *params;
215
216	/* No match */
217	char bigbuf[MAX_BUF];
218	int slen;
219
220	/* Set up replyinfo before we modify any of the buffers - this is used
221	* if we don't find a match.
222	*/
223	strcpy (bigbuf, "replyinfo ");
224	slen = strlen (bigbuf);
225	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
226		211
227	/* find the first space, make it null, and update the	212	/* find the first space, make it null, and update the
228	* params pointer.	213	* params pointer.
229	*/	214	*/
230	for (cp = buf; *cp != '\0'; cp++)	215	for (params = buf; *params; params++)
231	if (*cp == ' ')	216	if (*params == ' ')
232	{	217	{
233	*cp = '\0';
234	params = cp + 1;	218	*params++ = 0;
235	break;	219	break;
236	}	220	}
237		221
238	if (!strcmp (buf, "image_info"))	222	if (!strcmp (buf, "image_info"))
239	send_image_info (ns, params);	223	send_image_info (ns, params);
…		…
242	else if (!strcmp (buf, "skill_info"))	226	else if (!strcmp (buf, "skill_info"))
243	send_skill_info (ns, params);	227	send_skill_info (ns, params);
244	else if (!strcmp (buf, "spell_paths"))	228	else if (!strcmp (buf, "spell_paths"))
245	send_spell_paths (ns, params);	229	send_spell_paths (ns, params);
246	else	230	else
247	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	}
248	}	238	}
249		239
250	void	240	void
251	ExtCmd (char *buf, int len, player *pl)	241	ExtCmd (char *buf, int len, player *pl)
252	{	242	{
…		…
255		245
256	void	246	void
257	ExtiCmd (char *buf, int len, client *ns)	247	ExtiCmd (char *buf, int len, client *ns)
258	{	248	{
259	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;
260	}	336	}
261		337
262	void	338	void
263	MapInfoCmd (char *buf, int len, player *pl)	339	MapInfoCmd (char *buf, int len, player *pl)
264	{	340	{
265	// <mapinfo tag spatial tile-path	341	// <mapinfo tag spatial tile-path
266	// >mapinfo tag spatial flags x y w h hash	342	// >mapinfo tag spatial flags x y w h hash
267		343
268	char bigbuf[MAX_BUF], *token;
269
270	token = buf;	344	char *token = buf;
271	// copy token	345
272	if (!(buf = strchr (buf, ' ')))	346	if (!(buf = strchr (buf, ' ')))
273	return;	347	return;
274		348
275	*buf++ = 0;
276
277	if (!strncmp (buf, "spatial ", 8))	349	if (!strncmp (buf, " spatial ", 9))
278	{	350	{
279	buf += 8;	351	char *copy = strdup (token);
		352	copy [buf - token] = 0;
280		353
281	// initial map and its origin	354	#if 0
282	maptile *map = pl->ob->map;	355	// this makes only sense when we flush the buffer immediately
283	sint16 dx, dy;	356	if (pl->ns->mapinfo_try (copy))
284	int mapx = pl->ns->mapx / 2 - pl->ob->x;	357	free (copy);
285	int mapy = pl->ns->mapy / 2 - pl->ob->y;
286	int max_distance = 8; // limit maximum path length to something generous
287
288	while (*buf && map && max_distance)
289	{
290	int dir = *buf++;
291
292	switch (dir)
293	{
294	case '1':
295	dx = 0;
296	dy = -1;
297	map = map->xy_find (dx, dy);
298	map && (mapy -= map->height);
299	break;
300	case '2':
301	mapx += map->width;
302	dx = map->width;
303	dy = 0;
304	map = map->xy_find (dx, dy);
305	break;
306	case '3':
307	mapy += map->height;
308	dx = 0;
309	dy = map->height;
310	map = map->xy_find (dx, dy);
311	break;
312	case '4':
313	dx = -1;
314	dy = 0;
315	map = map->xy_find (dx, dy);
316	map && (mapx -= map->width);
317	break;
318	}
319
320	--max_distance;
321	}
322
323	if (!max_distance)
324	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
325	else if (map && map->path[0])
326	{
327	int flags = 0;
328
329	if (map->tile_path[0])
330	flags |= 1;
331	if (map->tile_path[1])
332	flags |= 2;
333	if (map->tile_path[2])
334	flags |= 4;
335	if (map->tile_path[3])
336	flags |= 8;
337
338	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
339	}
340	else	358	else
341	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	359	#endif
		360	pl->ns->mapinfo_queue.push_back (copy);
342	}	361	}
343	else	362	else
344	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	363	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346	pl->ns->send_packet (bigbuf);
347	}	364	}
348		365
349	/** This is the Setup cmd - easy first implementation */	366	/** This is the Setup cmd */
350	void	367	void
351	SetUp (char *buf, int len, client * ns)	368	SetUp (char *buf, int len, client * ns)
352	{	369	{
353	int s, slen;	370	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
354	char *cmd, *param, cmdback[HUGE_BUF];
355
356	/* run through the cmds of setup
357	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
358	*
359	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
360	* The client then must sort this out
361	*/
362
363	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
364
365	strcpy (cmdback, "setup");
366	for (s = 0; s < len; )
367	{
368	cmd = &buf[s];
369
370	/* find the next space, and put a null there */
371	for (; buf[s] && buf[s] != ' '; s++)
372	;
373
374	buf[s++] = 0;
375
376	while (buf[s] == ' ')
377	s++;
378
379	if (s >= len)
380	break;
381
382	param = &buf[s];
383
384	for (; buf[s] && buf[s] != ' '; s++)
385	;
386
387	buf[s++] = 0;
388
389	while (buf[s] == ' ')
390	s++;
391
392	slen = strlen (cmdback);
393	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
394	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
395	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
396
397	if (!strcmp (cmd, "sound"))
398	{
399	ns->sound = atoi (param);
400	safe_strcat (cmdback, param, &slen, HUGE_BUF);
401	}
402	else if (!strcmp (cmd, "exp64"))
403	safe_strcat (cmdback, param, &slen, HUGE_BUF);
404	else if (!strcmp (cmd, "spellmon"))
405	{
406	ns->monitor_spells = atoi (param);
407	safe_strcat (cmdback, param, &slen, HUGE_BUF);
408	}
409	else if (!strcmp (cmd, "darkness"))
410	{
411	ns->darkness = atoi (param);
412	safe_strcat (cmdback, param, &slen, HUGE_BUF);
413	}
414	else if (!strcmp (cmd, "map1cmd"))
415	{
416	if (atoi (param))
417	ns->mapmode = Map1Cmd;
418	/* if beyond this size, need to use map1cmd no matter what */
419	if (ns->mapx > 11 || ns->mapy > 11)
420	ns->mapmode = Map1Cmd;
421	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
422	}
423	else if (!strcmp (cmd, "map1acmd"))
424	{
425	if (atoi (param))
426	ns->mapmode = Map1aCmd;
427	/* if beyond this size, need to use map1acmd no matter what */
428	if (ns->mapx > 11 || ns->mapy > 11)
429	ns->mapmode = Map1aCmd;
430	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
431	}
432	else if (!strcmp (cmd, "newmapcmd"))
433	{
434	ns->newmapcmd = atoi (param);
435	safe_strcat (cmdback, param, &slen, HUGE_BUF);
436	}
437	else if (!strcmp (cmd, "mapinfocmd"))
438	{
439	ns->mapinfocmd = atoi (param);
440	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
441	}
442	else if (!strcmp (cmd, "extcmd"))
443	{
444	ns->extcmd = atoi (param);
445	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
446	}
447	else if (!strcmp (cmd, "extmap"))
448	{
449	ns->extmap = atoi (param);
450	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
451	}
452	else if (!strcmp (cmd, "facecache"))
453	{
454	ns->facecache = atoi (param);
455	safe_strcat (cmdback, param, &slen, HUGE_BUF);
456	}
457	else if (!strcmp (cmd, "faceset"))
458	{
459	char tmpbuf[20];
460	int q = atoi (param);
461
462	if (is_valid_faceset (q))
463	ns->faceset = q;
464	sprintf (tmpbuf, "%d", ns->faceset);
465	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466	/* if the client is using faceset, it knows about image2 command */
467	ns->image2 = 1;
468	}
469	else if (!strcmp (cmd, "itemcmd"))
470	{
471	/* Version of the item protocol command to use. Currently,
472	* only supported versions are 1 and 2. Using a numeric
473	* value will make it very easy to extend this in the future.
474	*/
475	char tmpbuf[20];
476	int q = atoi (param);
477
478	if (q < 1 || q > 2)
479	{
480	strcpy (tmpbuf, "FALSE");
481	}
482	else
483	{
484	ns->itemcmd = q;
485	sprintf (tmpbuf, "%d", ns->itemcmd);
486	}
487	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488	}
489	else if (!strcmp (cmd, "mapsize"))
490	{
491	int x, y = 0;
492	char tmpbuf[MAX_BUF], *cp;
493
494	x = atoi (param);
495	for (cp = param; *cp != 0; cp++)
496	if (*cp == 'x' || *cp == 'X')
497	{
498	y = atoi (cp + 1);
499	break;
500	}
501
502	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503	{
504	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506	}
507	else
508	{
509	ns->mapx = x;
510	ns->mapy = y;
511	/* better to send back what we are really using and not the
512	* param as given to us in case it gets parsed differently.
513	*/
514	sprintf (tmpbuf, "%dx%d", x, y);
515	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516	/* If beyond this size and still using orig map command, need to
517	* go to map1cmd.
518	*/
519	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520	ns->mapmode = Map1Cmd;
521	}
522	}
523	else if (!strcmp (cmd, "extendedMapInfos"))
524	{
525	/* Added by tchize
526	* prepare to use the mapextended command
527	*/
528	char tmpbuf[20];
529
530	ns->ext_mapinfos = (atoi (param));
531	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533	}
534	else if (!strcmp (cmd, "extendedTextInfos"))
535	{
536	/* Added by tchize
537	* prepare to use the extended text commands
538	* Client toggle this to non zero to get exttext
539	*/
540	char tmpbuf[20];
541
542	ns->has_readable_type = (atoi (param));
543	sprintf (tmpbuf, "%d", ns->has_readable_type);
544	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545	}
546	else
547	{
548	/* Didn't get a setup command we understood -
549	* report a failure to the client.
550	*/
551	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552	}
553	} /* for processing all the setup commands */
554
555	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556	ns->send_packet (cmdback);
557	}	371	}
558		372
559	/**	373	/**
560	* The client has requested to be added to the game.	374	* The client has requested to be added to the game.
561	* This is what takes care of it. We tell the client how things worked out.	375	* This is what takes care of it. We tell the client how things worked out.
562	* I am not sure if this file is the best place for this function. however,	376	* I am not sure if this file is the best place for this function. however,
563	* it either has to be here or init_sockets needs to be exported.	377	* it either has to be here or init_sockets needs to be exported.
564	*/	378	*/
565	void	379	void
566	AddMeCmd (char *buf, int len, client * ns)	380	AddMeCmd (char *buf, int len, client *ns)
567	{	381	{
568	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	382	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569	}	383	}
570		384
571	/** Reply to ExtendedInfos command */	385	/** Reply to ExtendedInfos command */
…		…
683		497
684	ns->send_packet (cmdback);	498	ns->send_packet (cmdback);
685	}	499	}
686		500
687	/**	501	/**
688	* A lot like the old AskSmooth (in fact, now called by AskSmooth).
689	* Basically, it makes no sense to wait for the client to request a
690	* a piece of data from us that we know the client wants. So
691	* if we know the client wants it, might as well push it to the
692	* client.
693	*/
694	static void
695	SendSmooth (client *ns, uint16 face)
696	{
697	uint16 smoothface;
698
699	/* If we can't find a face, return and set it so we won't try to send this
700	* again.
701	*/
702	if (!FindSmooth (face, &smoothface))
703	{
704
705	LOG (llevError, "could not findsmooth for %d.\n", face);
706	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
707	return;
708	}
709
710	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
711	esrv_send_face (ns, smoothface, 0);
712
713	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
714
715	packet sl ("smooth");
716
717	sl << uint16 (face)
718	<< uint16 (smoothface);
719
720	ns->send_packet (sl);
721	}
722
723	/**
724	* Tells client the picture it has to use
725	* to smooth a picture number given as argument.
726	*/
727	void
728	AskSmooth (char *buf, int len, client *ns)
729	{
730	SendSmooth (ns, atoi (buf));
731	}
732
733	/**
734	* 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,
735	* etc.)	503	* etc.)
736	*/	504	*/
737	void	505	void
738	PlayerCmd (char *buf, int len, player *pl)	506	PlayerCmd (char *buf, int len, player *pl)
…		…
759	* commands.	527	* commands.
760	*/	528	*/
761	pl->count = 0;	529	pl->count = 0;
762	}	530	}
763		531
764
765	/**	532	/**
766	* This handles the general commands from the client (ie, north, fire, cast,	533	* This handles the general commands from the client (ie, north, fire, cast,
767	* etc.). It is a lot like PlayerCmd above, but is called with the	534	* etc.). It is a lot like PlayerCmd above, but is called with the
768	* 'ncom' method which gives more information back to the client so it	535	* 'ncom' method which gives more information back to the client so it
769	* can throttle.	536	* can throttle.
…		…
771	void	538	void
772	NewPlayerCmd (char *buf, int len, player *pl)	539	NewPlayerCmd (char *buf, int len, player *pl)
773	{	540	{
774	if (len <= 6)	541	if (len <= 6)
775	{	542	{
776	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);
777	return;	544	return;
778	}	545	}
779		546
780	uint16 cmdid = net_uint16 ((uint8 *)buf);	547	uint16 cmdid = net_uint16 ((uint8 *)buf);
781	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	548	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
838	{	605	{
839	case ST_PLAYING:	606	case ST_PLAYING:
840	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	607	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
841	break;	608	break;
842		609
843	case ST_CHANGE_CLASS:
844	key_change_class (pl->ob, buf[0]);
845	break;
846
847	case ST_GET_PARTY_PASSWORD: /* Get password for party */	610	case ST_GET_PARTY_PASSWORD: /* Get password for party */
848	receive_party_password (pl->ob, 13);	611	receive_party_password (pl->ob, 13);
849	break;	612	break;
850		613
851	default:	614	default:
…		…
890		653
891	cp = strchr (cp + 1, ' ');	654	cp = strchr (cp + 1, ' ');
892		655
893	if (cp)	656	if (cp)
894	{	657	{
895	assign (ns->version, cp + 1);	658	ns->version = cp + 1;
896		659
897	if (ns->sc_version < 1026)	660	if (ns->sc_version < 1026)
898	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	661	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
899	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	662	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
900	}	663	}
…		…
960	/**	723	/**
961	* Asks the client to query the user. This way, the client knows	724	* Asks the client to query the user. This way, the client knows
962	* it needs to send something back (vs just printing out a message)	725	* it needs to send something back (vs just printing out a message)
963	*/	726	*/
964	void	727	void
965	send_query (client *ns, uint8 flags, char *text)	728	send_query (client *ns, uint8 flags, const char *text)
966	{	729	{
967	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	730	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
		731	}
		732
		733	/**
		734	* Get player's current range attack in obuf.
		735	*/
		736	static void
		737	rangetostring (player *pl, char *obuf)
		738	{
		739	dynbuf_text buf;
		740
		741	if (pl->ranged_ob)
		742	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		743
		744	if (pl->combat_ob)
		745	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		746
		747	#if 0
		748	//TODO: remove this when slot system is working, this is only for debugging
		749	if (pl->ob->chosen_skill)
		750	buf << " Skill*: " << pl->ob->chosen_skill->name;
		751	#endif
		752
		753	//TODO: maybe golem should become the current_weapon, quite simply?
		754	if (pl->golem)
		755	buf << " Golem*: " << pl->golem->name;
		756
		757	buf << '\0';
		758	buf.linearise (obuf);
968	}	759	}
969		760
970	#define AddIfInt64(Old,New,Type) if (Old != New) {\	761	#define AddIfInt64(Old,New,Type) if (Old != New) {\
971	Old = New; \	762	Old = New; \
972	sl << uint8 (Type) << uint64 (New); \	763	sl << uint8 (Type) << uint64 (New); \
…		…
980	#define AddIfShort(Old,New,Type) if (Old != New) {\	771	#define AddIfShort(Old,New,Type) if (Old != New) {\
981	Old = New; \	772	Old = New; \
982	sl << uint8 (Type) << uint16 (New); \	773	sl << uint8 (Type) << uint16 (New); \
983	}	774	}
984		775
985	#define AddIfFloat(Old,New,Type) if (Old != New) {\	776	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
986	Old = New; \	777	Old = New; \
987	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	778	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
988	}	779	}
989		780
990	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	781	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
991	free(Old); Old = strdup (New);\	782	free(Old); Old = strdup (New);\
992	sl << uint8 (Type) << data8 (New); \	783	sl << uint8 (Type) << data8 (New); \
…		…
1006		797
1007	client *ns = pl->ns;	798	client *ns = pl->ns;
1008	if (!ns)	799	if (!ns)
1009	return;	800	return;
1010		801
1011	object *ob = pl->ob;	802	object *ob = pl->observe;
1012	if (!ob)	803	if (!ob)
1013	return;	804	return;
		805
		806	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1014		807
1015	packet sl ("stats");	808	packet sl ("stats");
1016		809
1017	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	810	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1018	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	811	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
1027	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1028	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1029	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1030		823
1031	for (int s = 0; s < NUM_SKILLS; s++)	824	for (int s = 0; s < NUM_SKILLS; s++)
1032	if (object *skill = pl->last_skill_ob[s])	825	if (object *skill = opl->last_skill_ob[s])
1033	if (skill->stats.exp != ns->last_skill_exp [s])	826	if (skill->stats.exp != ns->last_skill_exp [s])
1034	{	827	{
1035	ns->last_skill_exp [s] = skill->stats.exp;	828	ns->last_skill_exp [s] = skill->stats.exp;
1036		829
1037	/* Always send along the level if exp changes. This is only	830	/* Always send along the level if exp changes. This is only
…		…
1045	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	838	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1046	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	839	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1047	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	840	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1048	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	841	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1049	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	842	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1050	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	843	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1051	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	844	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1052	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	845	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1053	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	846	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1054		847
1055	flags = 0;	848	flags = 0;
1056		849
1057	if (pl->fire_on)	850	if (opl->fire_on)
1058	flags |= SF_FIREON;	851	flags |= SF_FIREON;
1059		852
1060	if (pl->run_on)	853	if (opl->run_on)
1061	flags |= SF_RUNON;	854	flags |= SF_RUNON;
1062		855
1063	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	856	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1064		857
1065	if (ns->sc_version < 1025)	858	if (ns->sc_version < 1025)
…		…
1079	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	872	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1080	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	873	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1081	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	874	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1082	}	875	}
1083		876
1084	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	877	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1085	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	878	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1086	set_title (ob, buf);	879	set_title (ob, buf);
1087	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	880	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1088		881
1089	/* Only send it away if we have some actual data */	882	/* Only send it away if we have some actual data */
…		…
1106		899
1107	pl->ns->last_weight = weight;	900	pl->ns->last_weight = weight;
1108	pl->ns->send_packet (sl);	901	pl->ns->send_packet (sl);
1109	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	902	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1110	}	903	}
1111
1112	/**
1113	* Need to send an animation sequence to the client.
1114	* We will send appropriate face commands to the client if we haven't
1115	* sent them the face yet (this can become quite costly in terms of
1116	* how much we are sending - on the other hand, this should only happen
1117	* when the player logs in and picks stuff up.
1118	*/
1119	void
1120	esrv_send_animation (client * ns, short anim_num)
1121	{
1122	/* Do some checking on the anim_num we got. Note that the animations
1123	* are added in contigous order, so if the number is in the valid
1124	* range, it must be a valid animation.
1125	*/
1126	if (anim_num < 0 || anim_num > num_animations)
1127	{
1128	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1129	return;
1130	}
1131
1132	packet sl ("anim");
1133
1134	sl << uint16 (anim_num)
1135	<< uint16 (0); /* flags - not used right now */
1136
1137	/* Build up the list of faces. Also, send any information (ie, the
1138	* the face itself) down to the client.
1139	*/
1140	for (int i = 0; i < animations[anim_num].num_animations; i++)
1141	{
1142	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1143	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1144
1145	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1146	}
1147
1148	ns->send_packet (sl);
1149
1150	ns->anims_sent[anim_num] = 1;
1151	}
1152
1153		904
1154	/******************************************************************************	905	/******************************************************************************
1155	*	906	*
1156	* Start of map related commands.	907	* Start of map related commands.
1157	*	908	*
…		…
1159		910
1160	/** Clears a map cell */	911	/** Clears a map cell */
1161	static void	912	static void
1162	map_clearcell (struct MapCell *cell, int count)	913	map_clearcell (struct MapCell *cell, int count)
1163	{	914	{
1164	cell->faces[0] = 0;	915	cell->faces[0] = 0;
1165	cell->faces[1] = 0;	916	cell->faces[1] = 0;
1166	cell->faces[2] = 0;	917	cell->faces[2] = 0;
		918	cell->smooth[0] = 0;
		919	cell->smooth[1] = 0;
		920	cell->smooth[2] = 0;
1167	cell->count = count;	921	cell->count = count;
1168	cell->stat_hp = 0;	922	cell->stat_hp = 0;
1169	cell->flags = 0;	923	cell->flags = 0;
1170	cell->player = 0;	924	cell->player = 0;
1171	}	925	}
1172		926
1173	#define MAX_LAYERS 3	927	#define MAX_LAYERS 3
1174		928
1175	/**	929	/**
…		…
1178	* it was.	932	* it was.
1179	* sl is the socklist this data is going into.	933	* sl is the socklist this data is going into.
1180	* ns is the socket we are working on - all the info we care	934	* ns is the socket we are working on - all the info we care
1181	* about is in this socket structure, so now need not pass the	935	* about is in this socket structure, so now need not pass the
1182	* entire player object.	936	* entire player object.
1183	* mx and my are map coordinate offsets for map mp
1184	* sx and sy are the offsets into the socket structure that
1185	* holds the old values.
1186	* layer is the layer to update, with 2 being the floor and 0 the	937	* layer is the layer to update, with 2 being the floor and 0 the
1187	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)	938	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
1188	* take. Interesting to note that before this function, the map1 function	939	* take. Interesting to note that before this function, the map1 function
1189	* numbers the spaces differently - I think this was a leftover from	940	* numbers the spaces differently - I think this was a leftover from
1190	* the map command, where the faces stack up. Sinces that is no longer	941	* the map command, where the faces stack up. Sinces that is no longer
1191	* the case, it seems to make more sense to have these layer values	942	* the case, it seems to make more sense to have these layer values
1192	* actually match.	943	* actually match.
1193	*/	944	*/
1194	static int	945	static int
1195	update_space (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)	946	update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
1196	{	947	{
1197	uint16 face_num;	948	object *ob = ms.faces_obj [layer];
1198	int bx, by, i;
1199
1200	object *ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1201		949
1202	/* If there is no object for this space, or if the face for the object	950	/* If there is no object for this space, or if the face for the object
1203	* is the blank face, set the face number to zero.	951	* is the blank face, set the face number to zero.
1204	* else if we have the stored head object for this space, that takes	952	* else if we have the stored head object for this space, that takes
1205	* precedence over the other object for this space.	953	* precedence over the other object for this space.
1206	* otherwise, we do special head processing	954	* otherwise, we do special head processing
1207	*/	955	*/
1208	if (!ob || ob->face == blank_face)	956	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1209	face_num = 0;
1210	else
1211	/* In this case, we are already at the lower right or single part object,
1212	* so nothing special
1213	*/
1214	face_num = ob->face;
1215		957
1216	/* We've gotten what face we want to use for the object. Now see if	958	/* We've gotten what face we want to use for the object. Now see if
1217	* if it has changed since we last sent it to the client.	959	* if it has changed since we last sent it to the client.
1218	*/	960	*/
1219	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	961	if (lastcell.faces[layer] != face_num)
1220	{	962	{
1221	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	963	lastcell.faces[layer] = face_num;
		964
1222	if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))	965	if (!ns.faces_sent[face_num])
		966	if (ob)
		967	ns.send_faces (ob);
		968	else
1223	esrv_send_face (&ns, face_num, 0);	969	ns.send_face (face_num, 10);
1224		970
1225	sl << uint16 (face_num);	971	sl << uint16 (face_num);
1226	return 1;
1227	}
1228
1229	/* Nothing changed */
1230	return 0;
1231	}
1232
1233	/**
1234	* This function is mainly a copy of update_space,
1235	* except it handles update of the smoothing updates,
1236	* not the face updates.
1237	* Removes the need to replicate the same code for each layer.
1238	* this returns true if this smooth is now in fact different
1239	* than it was.
1240	* sl is the socklist this data is going into.
1241	* ns is the socket we are working on - all the info we care
1242	* about is in this socket structure, so know need to pass the
1243	* entire player object.
1244	* mx and my are map coordinate offsets for map mp
1245	* sx and sy are the offsets into the socket structure that
1246	* holds the old values.
1247	* layer is the layer to update, with 2 being the floor and 0 the
1248	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1249	* take.
1250	*/
1251	static inline int
1252	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1253	{
1254	object *ob;
1255	int smoothlevel; /* old face_num; */
1256
1257	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1258
1259	/* If there is no object for this space, or if the face for the object
1260	* is the blank face, set the smoothlevel to zero.
1261	*/
1262	if (!ob || ob->face == blank_face)
1263	smoothlevel = 0;
1264	else
1265	{
1266	smoothlevel = ob->smoothlevel;
1267	if (smoothlevel && !(ns.faces_sent[ob->face] & NS_FACESENT_SMOOTH))
1268	SendSmooth (&ns, ob->face);
1269	} /* else not already head object or blank face */
1270
1271	/* We've gotten what face we want to use for the object. Now see if
1272	* if it has changed since we last sent it to the client.
1273	*/
1274	if (smoothlevel > 255)
1275	smoothlevel = 255;
1276	else if (smoothlevel < 0)
1277	smoothlevel = 0;
1278
1279	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1280	{
1281	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1282	sl << uint8 (smoothlevel);
1283	return 1;	972	return 1;
1284	}	973	}
1285		974
1286	/* Nothing changed */	975	/* Nothing changed */
1287	return 0;	976	return 0;
…		…
1327	{	1016	{
1328	prefetch_surrounding_maps (op->map, 3);	1017	prefetch_surrounding_maps (op->map, 3);
1329	}	1018	}
1330		1019
1331	/**	1020	/**
1332	* This function uses the new map1 protocol command to send the map	1021	* Draws client map.
1333	* to the client. It is necessary because the old map command supports
1334	* a maximum map size of 15x15.
1335	* This function is much simpler than the old one. This is because
1336	* the old function optimized to send as few face identifiers as possible,
1337	* at the expense of sending more coordinate location (coordinates were
1338	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1339	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1340	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1341	* and use the other 4 bits for other informatiion. For full documentation
1342	* of what we send, see the doc/Protocol file.
1343	* I will describe internally what we do:
1344	* the ns->lastmap shows how the map last looked when sent to the client.
1345	* in the lastmap structure, there is a cells array, which is set to the
1346	* maximum viewable size (As set in config.h).
1347	* in the cells, there are faces and a count value.
1348	* we use the count value to hold the darkness value. If -1, then this space
1349	* is not viewable.
1350	* we use faces[0] faces[1] faces[2] to hold what the three layers
1351	* look like.
1352	*/	1022	*/
1353	void	1023	void
1354	draw_client_map1 (object *pl)	1024	draw_client_map (player *pl)
1355	{	1025	{
		1026	object *ob = pl->observe;
		1027	if (!ob->active)
		1028	return;
		1029
		1030	maptile *plmap = ob->map;
		1031
		1032	/* If player is just joining the game, he isn't here yet, so the map
		1033	* can get swapped out. If so, don't try to send them a map. All will
		1034	* be OK once they really log in.
		1035	*/
		1036	if (!plmap || plmap->in_memory != MAP_ACTIVE)
		1037	return;
		1038
1356	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1039	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1357	sint16 nx, ny;
1358	int estartlen, eoldlen;	1040	int estartlen, eoldlen;
1359	uint16 mask, emask;
1360	uint8 eentrysize;	1041	uint8 eentrysize;
1361	uint16 ewhatstart, ewhatflag;	1042	uint16 ewhatstart, ewhatflag;
1362	uint8 extendedinfos;	1043	uint8 extendedinfos;
1363	maptile *m;
1364		1044
1365	client &socket = *pl->contr->ns;
1366
1367	if (!pl->active)
1368	return;
1369
1370	check_map_change (pl->contr);	1045	check_map_change (pl);
1371	prefetch_surrounding_maps (pl);	1046	prefetch_surrounding_maps (pl->ob);
		1047
		1048	/* do LOS after calls to update_position */
		1049	if (ob != pl->ob)
		1050	clear_los (pl);
		1051	else if (pl->do_los)
		1052	{
		1053	update_los (ob);
		1054	pl->do_los = 0;
		1055	}
		1056
		1057	/**
		1058	* This function uses the new map1 protocol command to send the map
		1059	* to the client. It is necessary because the old map command supports
		1060	* a maximum map size of 15x15.
		1061	* This function is much simpler than the old one. This is because
		1062	* the old function optimized to send as few face identifiers as possible,
		1063	* at the expense of sending more coordinate location (coordinates were
		1064	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		1065	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		1066	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		1067	* and use the other 4 bits for other informatiion. For full documentation
		1068	* of what we send, see the doc/Protocol file.
		1069	* I will describe internally what we do:
		1070	* the ns->lastmap shows how the map last looked when sent to the client.
		1071	* in the lastmap structure, there is a cells array, which is set to the
		1072	* maximum viewable size (As set in config.h).
		1073	* in the cells, there are faces and a count value.
		1074	* we use the count value to hold the darkness value. If -1, then this space
		1075	* is not viewable.
		1076	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1077	* look like.
		1078	*/
		1079
		1080	client &socket = *pl->ns;
1372		1081
1373	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1082	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1374	packet esl;	1083	packet esl;
1375		1084
1376	startlen = sl.length ();	1085	startlen = sl.length ();
…		…
1391	<< uint8 (extendedinfos)	1100	<< uint8 (extendedinfos)
1392	<< uint8 (eentrysize);	1101	<< uint8 (eentrysize);
1393		1102
1394	estartlen = esl.length ();	1103	estartlen = esl.length ();
1395	}	1104	}
1396	else
1397	{
1398	/* suppress compiler warnings */
1399	ewhatstart = 0;
1400	ewhatflag = 0;
1401	estartlen = 0;
1402	}
1403		1105
1404	/* x,y are the real map locations. ax, ay are viewport relative	1106	/* x,y are the real map locations. ax, ay are viewport relative
1405	* locations.	1107	* locations.
1406	*/	1108	*/
1407	ay = 0;	1109	ay = 0;
1408		1110
1409	/* We could do this logic as conditionals in the if statement,	1111	/* We could do this logic as conditionals in the if statement,
1410	* but that started to get a bit messy to look at.	1112	* but that started to get a bit messy to look at.
1411	*/	1113	*/
1412	max_x = pl->x + (socket.mapx + 1) / 2;	1114	max_x = ob->x + (socket.mapx + 1) / 2;
1413	max_y = pl->y + (socket.mapy + 1) / 2;	1115	max_y = ob->y + (socket.mapy + 1) / 2;
1414		1116
1415	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1117	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1416	{	1118	{
		1119	sint16 nx, ny;
		1120	maptile *m = 0;
		1121
1417	ax = 0;	1122	ax = 0;
1418	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1123	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1419	{	1124	{
		1125	// check to see if we can simply go one right quickly
		1126	++nx;
		1127	if (m && nx >= m->width)
		1128	m = 0;
		1129
		1130	if (!m)
		1131	{
		1132	nx = x; ny = y; m = plmap;
		1133
		1134	if (xy_normalise (m, nx, ny))
		1135	m->touch ();
		1136	else
		1137	m = 0;
		1138	}
		1139
		1140	int emask, mask;
1420	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1141	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1421		1142
1422	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1143	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1423
1424	d = pl->contr->blocked_los[ax][ay];
1425		1144
1426	/* If the coordinates are not valid, or it is too dark to see,	1145	/* If the coordinates are not valid, or it is too dark to see,
1427	* we tell the client as such	1146	* we tell the client as such
1428	*/	1147	*/
1429	nx = x;
1430	ny = y;
1431	m = get_map_from_coord (pl->map, &nx, &ny);
1432
1433	if (!m)	1148	if (!m)
1434	{	1149	{
1435	/* space is out of map. Update space and clear values	1150	/* space is out of map. Update space and clear values
1436	* if this hasn't already been done. If the space is out	1151	* if this hasn't already been done. If the space is out
1437	* of the map, it shouldn't have a head	1152	* of the map, it shouldn't have a head
…		…
1439	if (lastcell.count != -1)	1154	if (lastcell.count != -1)
1440	{	1155	{
1441	sl << uint16 (mask);	1156	sl << uint16 (mask);
1442	map_clearcell (&lastcell, -1);	1157	map_clearcell (&lastcell, -1);
1443	}	1158	}
		1159
		1160	continue;
1444	}	1161	}
		1162
		1163	int d = pl->blocked_los[ax][ay];
		1164
1445	else if (d > 3)	1165	if (d > 3)
1446	{	1166	{
1447	m->touch ();
1448		1167
1449	int need_send = 0, count;	1168	int need_send = 0, count;
1450		1169
1451	/* This block deals with spaces that are not visible for whatever	1170	/* This block deals with spaces that are not visible for whatever
1452	* reason. Still may need to send the head for this space.	1171	* reason. Still may need to send the head for this space.
…		…
1460	need_send = 1;	1179	need_send = 1;
1461		1180
1462	count = -1;	1181	count = -1;
1463		1182
1464	/* properly clear a previously sent big face */	1183	/* properly clear a previously sent big face */
1465	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1184	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1466	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1185	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1467	need_send = 1;	1186	need_send = 1;
1468		1187
1469	map_clearcell (&lastcell, count);	1188	map_clearcell (&lastcell, count);
1470		1189
…		…
1473	else	1192	else
1474	sl.reset (oldlen);	1193	sl.reset (oldlen);
1475	}	1194	}
1476	else	1195	else
1477	{	1196	{
1478	m->touch ();
1479
1480	/* In this block, the space is visible.	1197	/* In this block, the space is visible.
1481	*/	1198	*/
1482		1199
1483	/* Rather than try to figure out what everything that we might	1200	/* Rather than try to figure out what everything that we might
1484	* need to send is, then form the packet after that,	1201	* need to send is, then form the packet after that,
…		…
1488	* is done.	1205	* is done.
1489	* I think this is simpler than doing a bunch of checks to see	1206	* I think this is simpler than doing a bunch of checks to see
1490	* what if anything we need to send, setting the bits, then	1207	* what if anything we need to send, setting the bits, then
1491	* doing those checks again to add the real data.	1208	* doing those checks again to add the real data.
1492	*/	1209	*/
1493	oldlen = sl.length ();	1210	oldlen = sl.length ();
1494	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1495	eoldlen = esl.length ();	1211	eoldlen = esl.length ();
1496	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1212
1497	sl << uint16 (mask);	1213	sl << uint16 (mask);
1498
1499	if (socket.ext_mapinfos)
1500	esl << uint16 (emask);
1501		1214
1502	unsigned char dummy;	1215	unsigned char dummy;
1503	unsigned char *last_ext = &dummy;	1216	unsigned char *last_ext = &dummy;
1504		1217
1505	/* Darkness changed */	1218	/* Darkness changed */
…		…
1517	sl << uint8 (255 - 64 * d);	1230	sl << uint8 (255 - 64 * d);
1518	}	1231	}
1519		1232
1520	lastcell.count = d;	1233	lastcell.count = d;
1521		1234
		1235	mapspace &ms = m->at (nx, ny);
		1236	ms.update ();
		1237
1522	if (socket.extmap)	1238	if (socket.extmap)
1523	{	1239	{
1524	uint8 stat_hp = 0;	1240	uint8 stat_hp = 0;
1525	uint8 stat_width = 0;	1241	uint8 stat_width = 0;
1526	uint8 flags = 0;	1242	uint8 flags = 0;
1527	UUID player = 0;	1243	tag_t player = 0;
1528		1244
1529	// send hp information, if applicable	1245	// send hp information, if applicable
1530	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1246	if (object *op = ms.faces_obj [0])
		1247	if (op->is_head () && !op->invisible)
1531	{	1248	{
1532	if (op->head || op->invisible)	1249	if (op->stats.maxhp > op->stats.hp
1533	; // do not show	1250	&& op->stats.maxhp > 0
1534	else if (op->type == PLAYER	1251	&& (op->type == PLAYER
		1252	|| op->type == DOOR // does not work, have maxhp 0
1535	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1253	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
1536	{
1537	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1538	{	1254	{
1539	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1255	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1540	stat_width = op->arch->tail_x;	1256	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1541	}	1257	}
1542	}
1543		1258
1544	if (op->msg && op->msg[0] == '@')	1259	if (op->msg && op->msg[0] == '@')
1545	flags |= 1;	1260	flags |= 1;
1546		1261
1547	if (op->type == PLAYER && op != pl)	1262	if (op->type == PLAYER && op != ob)
1548	player = op->count;	1263	player = op->count;
1549	}	1264	}
1550		1265
1551	if (lastcell.stat_hp != stat_hp)	1266	if (lastcell.stat_hp != stat_hp)
1552	{	1267	{
1553	lastcell.stat_hp = stat_hp;	1268	lastcell.stat_hp = stat_hp;
1554		1269
…		…
1573		1288
1574	mask |= 0x8;	1289	mask |= 0x8;
1575	*last_ext |= 0x80;	1290	*last_ext |= 0x80;
1576	last_ext = &sl[sl.length ()];	1291	last_ext = &sl[sl.length ()];
1577		1292
1578	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1293	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1579	}	1294	}
1580		1295
1581	if (lastcell.flags != flags)	1296	if (lastcell.flags != flags)
1582	{	1297	{
1583	lastcell.flags = flags;	1298	lastcell.flags = flags;
…		…
1589	sl << uint8 (8) << uint8 (flags);	1304	sl << uint8 (8) << uint8 (flags);
1590	}	1305	}
1591	}	1306	}
1592		1307
1593	/* Floor face */	1308	/* Floor face */
1594	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1309	if (update_space (sl, socket, ms, lastcell, 2))
1595	mask |= 0x4;	1310	mask |= 0x4;
1596		1311
1597	if (socket.EMI_smooth)
1598	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1599	emask |= 0x4;
1600
1601	/* Middle face */	1312	/* Middle face */
1602	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1313	if (update_space (sl, socket, ms, lastcell, 1))
1603	mask |= 0x2;	1314	mask |= 0x2;
1604		1315
1605	if (socket.EMI_smooth)	1316	if (ms.player () == ob
1606	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1317	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1607	emask |= 0x2;
1608
1609	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1610	{	1318	{
		1319	// force player to be visible to himself if invisible
1611	if (lastcell.faces[0] != pl->face)	1320	if (lastcell.faces[0] != ob->face)
1612	{	1321	{
1613	lastcell.faces[0] = pl->face;	1322	lastcell.faces[0] = ob->face;
		1323
1614	mask |= 0x1;	1324	mask |= 0x1;
1615
1616	if (!(socket.faces_sent[pl->face] & NS_FACESENT_FACE))
1617	esrv_send_face (&socket, pl->face, 0);
1618
1619	sl << uint16 (pl->face);	1325	sl << uint16 (ob->face);
		1326
		1327	socket.send_faces (ob);
1620	}	1328	}
1621	}	1329	}
1622	else
1623	{
1624	/* Top face */	1330	/* Top face */
1625	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1331	else if (update_space (sl, socket, ms, lastcell, 0))
1626	mask |= 0x1;	1332	mask |= 0x1;
1627
1628	if (socket.EMI_smooth)
1629	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1630	emask |= 0x1;
1631	}
1632		1333
1633	/* Check to see if we are in fact sending anything for this	1334	/* Check to see if we are in fact sending anything for this
1634	* space by checking the mask. If so, update the mask.	1335	* space by checking the mask. If so, update the mask.
1635	* if not, reset the len to that from before adding the mask	1336	* if not, reset the len to that from before adding the mask
1636	* value, so we don't send those bits.	1337	* value, so we don't send those bits.
…		…
1638	if (mask & 0xf)	1339	if (mask & 0xf)
1639	sl[oldlen + 1] = mask & 0xff;	1340	sl[oldlen + 1] = mask & 0xff;
1640	else	1341	else
1641	sl.reset (oldlen);	1342	sl.reset (oldlen);
1642		1343
		1344	if (socket.ext_mapinfos)
		1345	esl << uint16 (emask);
		1346
		1347	if (socket.EMI_smooth)
		1348	{
		1349	for (int layer = 2+1; layer--; )
		1350	{
		1351	object *ob = ms.faces_obj [layer];
		1352
		1353	// If there is no object for this space, or if the face for the object
		1354	// is the blank face, set the smoothlevel to zero.
		1355	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1356
		1357	// We've gotten what face we want to use for the object. Now see if
		1358	// if it has changed since we last sent it to the client.
		1359	if (lastcell.smooth[layer] != smoothlevel)
		1360	{
		1361	lastcell.smooth[layer] = smoothlevel;
		1362	esl << uint8 (smoothlevel);
		1363	emask |= 1 << layer;
		1364	}
		1365	}
		1366
1643	if (emask & 0xf)	1367	if (emask & 0xf)
1644	esl[eoldlen + 1] = emask & 0xff;	1368	esl[eoldlen + 1] = emask & 0xff;
1645	else	1369	else
1646	esl.reset (eoldlen);	1370	esl.reset (eoldlen);
		1371	}
1647	} /* else this is a viewable space */	1372	} /* else this is a viewable space */
1648	} /* for x loop */	1373	} /* for x loop */
1649	} /* for y loop */	1374	} /* for y loop */
		1375
		1376	socket.flush_fx ();
1650		1377
1651	/* Verify that we in fact do need to send this */	1378	/* Verify that we in fact do need to send this */
1652	if (socket.ext_mapinfos)	1379	if (socket.ext_mapinfos)
1653	{	1380	{
1654	if (!(sl.length () > startlen || socket.sent_scroll))	1381	if (!(sl.length () > startlen || socket.sent_scroll))
1655	{	1382	{
1656	/* No map data will follow, so don't say the client	1383	/* No map data will follow, so don't say the client
1657	* it doesn't need draw!	1384	* it doesn't need draw!
1658	*/	1385	*/
1659	ewhatflag &= (~EMI_NOREDRAW);	1386	ewhatflag &= ~EMI_NOREDRAW;
1660	esl[ewhatstart + 1] = ewhatflag & 0xff;	1387	esl[ewhatstart + 1] = ewhatflag & 0xff;
1661	}	1388	}
1662		1389
1663	if (esl.length () > estartlen)	1390	if (esl.length () > estartlen)
1664	socket.send_packet (esl);	1391	socket.send_packet (esl);
…		…
1669	socket.send_packet (sl);	1396	socket.send_packet (sl);
1670	socket.sent_scroll = 0;	1397	socket.sent_scroll = 0;
1671	}	1398	}
1672	}	1399	}
1673		1400
1674	/**
1675	* Draws client map.
1676	*/
1677	void
1678	draw_client_map (object *pl)
1679	{
1680	int i, j;
1681	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1682	int mflags;
1683	struct Map newmap;
1684	maptile *m, *pm;
1685
1686	if (pl->type != PLAYER)
1687	{
1688	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1689	return;
1690	}
1691
1692	pm = pl->map;
1693
1694	/* If player is just joining the game, he isn't here yet, so the map
1695	* can get swapped out. If so, don't try to send them a map. All will
1696	* be OK once they really log in.
1697	*/
1698	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1699	return;
1700
1701	memset (&newmap, 0, sizeof (struct Map));
1702
1703	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1704	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1705	{
1706	ax = i;
1707	ay = j;
1708	m = pm;
1709	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1710
1711	if (mflags & P_OUT_OF_MAP)
1712	continue;
1713
1714	/* If a map is visible to the player, we don't want to swap it out
1715	* just to reload it. This should really call something like
1716	* swap_map, but this is much more efficient and 'good enough'
1717	*/
1718	if (mflags & P_NEW_MAP)
1719	m->timeout = 50;
1720	}
1721
1722	/* do LOS after calls to update_position */
1723	if (pl->contr->do_los)
1724	{
1725	update_los (pl);
1726	pl->contr->do_los = 0;
1727	}
1728
1729	/* Big maps need a different drawing mechanism to work */
1730	draw_client_map1 (pl);
1731	}
1732
1733
1734	/*****************************************************************************/	1401	/*****************************************************************************/
1735
1736	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1402	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1737
1738	/* a player. Of course, the client need to know the command to be able to */	1403	/* a player. Of course, the client need to know the command to be able to */
1739
1740	/* manage it ! */	1404	/* manage it ! */
1741
1742	/*****************************************************************************/	1405	/*****************************************************************************/
1743	void	1406	void
1744	send_plugin_custom_message (object *pl, char *buf)	1407	send_plugin_custom_message (object *pl, char *buf)
1745	{	1408	{
1746	pl->contr->ns->send_packet (buf);	1409	pl->contr->ns->send_packet (buf);
…		…
1757	sl << "replyinfo skill_info\n";	1420	sl << "replyinfo skill_info\n";
1758		1421
1759	for (int i = 1; i < NUM_SKILLS; i++)	1422	for (int i = 1; i < NUM_SKILLS; i++)
1760	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1423	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1761		1424
1762	if (sl.length () >= MAXSOCKBUF)	1425	if (sl.length () > MAXSOCKBUF)
1763	{	1426	{
1764	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1427	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1765	fatal (0);	1428	fatal (0);
1766	}	1429	}
1767		1430
…		…
1780	sl << "replyinfo spell_paths\n";	1443	sl << "replyinfo spell_paths\n";
1781		1444
1782	for (int i = 0; i < NRSPELLPATHS; i++)	1445	for (int i = 0; i < NRSPELLPATHS; i++)
1783	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1446	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1784		1447
1785	if (sl.length () >= MAXSOCKBUF)	1448	if (sl.length () > MAXSOCKBUF)
1786	{	1449	{
1787	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1450	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1788	fatal (0);	1451	fatal (0);
1789	}	1452	}
1790		1453
…		…
1898	if (!spell->face)	1561	if (!spell->face)
1899	{	1562	{
1900	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1563	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1901	spell->face = face_find ("burnout.x11", blank_face);	1564	spell->face = face_find ("burnout.x11", blank_face);
1902	}	1565	}
		1566
		1567	pl->ns->send_face (spell->face);
1903		1568
1904	/* send the current values */	1569	/* send the current values */
1905	sl << uint32 (spell->count)	1570	sl << uint32 (spell->count)
1906	<< uint16 (spell->level)	1571	<< uint16 (spell->level)
1907	<< uint16 (spell->casting_time)	1572	<< uint16 (spell->casting_time)
…		…
1943	* bytes and 3 strings (because that is the spec) so we need to	1608	* bytes and 3 strings (because that is the spec) so we need to
1944	* check that the length of those 3 strings, plus the 23 bytes,	1609	* check that the length of those 3 strings, plus the 23 bytes,
1945	* won't take us over the length limit for the socket, if it does,	1610	* won't take us over the length limit for the socket, if it does,
1946	* we need to send what we already have, and restart packet formation	1611	* we need to send what we already have, and restart packet formation
1947	*/	1612	*/
		1613	if (spell->type != SPELL)
		1614	continue;
		1615
1948	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1616	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1949	* to show add_spell is 26 bytes + 2 strings. However, the overun	1617	* to show add_spell is 26 bytes + 2 strings. However, the overun
1950	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1618	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1951	* like it will fix this	1619	* like it will fix this
1952	*/	1620	*/
1953	if (spell->type != SPELL)
1954	continue;
1955
1956	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1621	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1957	{	1622	{
		1623	pl->ns->flush_fx ();
1958	pl->ns->send_packet (sl);	1624	pl->ns->send_packet (sl);
1959		1625
1960	sl.reset ();	1626	sl.reset ();
1961	sl << "addspell ";	1627	sl << "addspell ";
1962	}	1628	}
…		…
1970	return;	1636	return;
1971	}	1637	}
1972	else	1638	else
1973	append_spell (pl, sl, spell);	1639	append_spell (pl, sl, spell);
1974		1640
1975	if (sl.length () >= MAXSOCKBUF)	1641	if (sl.length () > MAXSOCKBUF)
1976	{	1642	{
1977	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1643	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1978	fatal (0);	1644	fatal (0);
1979	}	1645	}
1980		1646
1981	/* finally, we can send the packet */	1647	/* finally, we can send the packet */
		1648	pl->ns->flush_fx ();
1982	pl->ns->send_packet (sl);	1649	pl->ns->send_packet (sl);
1983	}	1650	}
1984		1651

Diff Legend

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