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.51 by root, Fri Dec 22 16:34:00 2006 UTC vs.
Revision 1.121 by root, Fri Aug 24 01:03:09 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20
21	The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/**	24	/**
25	* \file	25	* \file
26	* Client handling.	26	* Client handling.
27	*	27	*
…		…
35	* have the prototype of (char *data, int datalen, int client_num). This	35	* have the prototype of (char *data, int datalen, int client_num). This
36	* way, we can use one dispatch table.	36	* way, we can use one dispatch table.
37	*	37	*
38	* esrv_map_new starts updating the map	38	* esrv_map_new starts updating the map
39	*	39	*
40	* esrv_map_setbelow allows filling in all of the faces for the map.
41	* if a face has not already been sent to the client, it is sent now.
42	*
43	*/	40	*/
44		41
45	#include <global.h>	42	#include <global.h>
46	#include <sproto.h>	43	#include <sproto.h>
47		44
…		…
100	* that much difference in bandwidth.	97	* that much difference in bandwidth.
101	*/	98	*/
102	mx = ns->mapx;	99	mx = ns->mapx;
103	my = ns->mapy;	100	my = ns->mapy;
104		101
105	if (ns->mapmode == Map1aCmd)
106	{
107	mx += MAX_HEAD_OFFSET;
108	my += MAX_HEAD_OFFSET;
109	}
110
111	/* the x and y here are coordinates for the new map, i.e. if we moved	102	/* the x and y here are coordinates for the new map, i.e. if we moved
112	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	103	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
113	* if the destination x or y coordinate is outside the viewable	104	* if the destination x or y coordinate is outside the viewable
114	* area, we clear the values - otherwise, the old values	105	* area, we clear the values - otherwise, the old values
115	* are preserved, and the check_head thinks it needs to clear them.	106	* are preserved, and the check_head thinks it needs to clear them.
…		…
138	}	129	}
139		130
140	static void	131	static void
141	clear_map (player *pl)	132	clear_map (player *pl)
142	{	133	{
		134	pl->ns->mapinfo_queue_clear ();
		135
143	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;
144		139
145	if (pl->ns->newmapcmd == 1)	140	if (pl->ns->newmapcmd == 1)
146	pl->ns->send_packet ("newmap");	141	pl->ns->send_packet ("newmap");
147		142
148	pl->ns->floorbox_reset ();	143	pl->ns->floorbox_reset ();
149	}	144	}
150		145
151	/** check for map change and send new map data */	146	/** check for map/region change and send new map data */
152	static void	147	static void
153	check_map_change (player *pl)	148	check_map_change (player *pl)
154	{	149	{
155	client &socket = *pl->ns;	150	client &socket = *pl->ns;
156	object *ob = pl->ob;	151	object *ob = pl->observe;
157	char buf[MAX_BUF]; /* eauugggh */
158		152
159	if (socket.current_map != ob->map)	153	if (socket.current_map != ob->map || socket.force_newmap)
160	{	154	{
		155	clear_map (pl);
161	socket.current_map = ob->map;	156	socket.current_map = ob->map;
162
163	clear_map (pl);
164		157
165	if (socket.mapinfocmd)	158	if (socket.mapinfocmd)
166	{	159	{
167	if (ob->map && ob->map->path[0])	160	if (ob->map && ob->map->path[0])
168	{	161	{
169	int flags = 0;	162	int flags = 0;
170		163
171	if (ob->map->tile_path[0])	164	if (ob->map->tile_path[0]) flags |= 1;
172	flags |= 1;
173	if (ob->map->tile_path[1])	165	if (ob->map->tile_path[1]) flags |= 2;
174	flags |= 2;
175	if (ob->map->tile_path[2])	166	if (ob->map->tile_path[2]) flags |= 4;
176	flags |= 4;
177	if (ob->map->tile_path[3])	167	if (ob->map->tile_path[3]) flags |= 8;
178	flags |= 8;
179		168
180	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",
181	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);
182	}	172	}
183	else	173	else
184	snprintf (buf, MAX_BUF, "mapinfo current");
185
186	socket.send_packet (buf);	174	socket.send_packet ("mapinfo current");
187	}	175	}
188	}	176	}
189	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)
190	{	178	{
191	int dx = ob->x - socket.current_x;	179	int dx = ob->x - socket.current_x;
…		…
200	}	188	}
201	}	189	}
202		190
203	socket.current_x = ob->x;	191	socket.current_x = ob->x;
204	socket.current_y = ob->y;	192	socket.current_y = ob->y;
		193
		194	region *reg = ob->region ();
		195	if (socket.current_region != reg)
		196	{
		197	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		198	socket.current_region = reg;
		199	}
205	}	200	}
206		201
207	/**	202	/**
208	* RequestInfo is sort of a meta command. There is some specific	203	* RequestInfo is sort of a meta command. There is some specific
209	* request of information, but we call other functions to provide	204	* request of information, but we call other functions to provide
210	* that information.	205	* that information.
211	*/	206	*/
212	void	207	void
213	RequestInfo (char *buf, int len, client * ns)	208	RequestInfo (char *buf, int len, client *ns)
214	{	209	{
215	char *params = NULL, *cp;	210	char *params;
216
217	/* No match */
218	char bigbuf[MAX_BUF];
219	int slen;
220
221	/* Set up replyinfo before we modify any of the buffers - this is used
222	* if we don't find a match.
223	*/
224	strcpy (bigbuf, "replyinfo ");
225	slen = strlen (bigbuf);
226	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227		211
228	/* find the first space, make it null, and update the	212	/* find the first space, make it null, and update the
229	* params pointer.	213	* params pointer.
230	*/	214	*/
231	for (cp = buf; *cp != '\0'; cp++)	215	for (params = buf; *params; params++)
232	if (*cp == ' ')	216	if (*params == ' ')
233	{	217	{
234	*cp = '\0';
235	params = cp + 1;	218	*params++ = 0;
236	break;	219	break;
237	}	220	}
238		221
239	if (!strcmp (buf, "image_info"))	222	if (!strcmp (buf, "image_info"))
240	send_image_info (ns, params);	223	send_image_info (ns, params);
…		…
243	else if (!strcmp (buf, "skill_info"))	226	else if (!strcmp (buf, "skill_info"))
244	send_skill_info (ns, params);	227	send_skill_info (ns, params);
245	else if (!strcmp (buf, "spell_paths"))	228	else if (!strcmp (buf, "spell_paths"))
246	send_spell_paths (ns, params);	229	send_spell_paths (ns, params);
247	else	230	else
248	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	}
249	}	238	}
250		239
251	void	240	void
252	ExtCmd (char *buf, int len, player *pl)	241	ExtCmd (char *buf, int len, player *pl)
253	{	242	{
…		…
256		245
257	void	246	void
258	ExtiCmd (char *buf, int len, client *ns)	247	ExtiCmd (char *buf, int len, client *ns)
259	{	248	{
260	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->ob->map;
		269	int mapx = pl->ns->mapx / 2 - pl->ob->x;
		270	int mapy = pl->ns->mapy / 2 - pl->ob->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;
261	}	336	}
262		337
263	void	338	void
264	MapInfoCmd (char *buf, int len, player *pl)	339	MapInfoCmd (char *buf, int len, player *pl)
265	{	340	{
266	// <mapinfo tag spatial tile-path	341	// <mapinfo tag spatial tile-path
267	// >mapinfo tag spatial flags x y w h hash	342	// >mapinfo tag spatial flags x y w h hash
268		343
269	char bigbuf[MAX_BUF], *token;
270
271	token = buf;	344	char *token = buf;
272	// copy token	345
273	if (!(buf = strchr (buf, ' ')))	346	if (!(buf = strchr (buf, ' ')))
274	return;	347	return;
275		348
276	*buf++ = 0;
277
278	if (!strncmp (buf, "spatial ", 8))	349	if (!strncmp (buf, " spatial ", 9))
279	{	350	{
280	buf += 8;	351	char *copy = strdup (token);
		352	copy [buf - token] = 0;
281		353
282	// initial map and its origin	354	#if 0
283	maptile *map = pl->ob->map;	355	// this makes only sense when we flush the buffer immediately
284	sint16 dx, dy;	356	if (pl->ns->mapinfo_try (copy))
285	int mapx = pl->ns->mapx / 2 - pl->ob->x;	357	free (copy);
286	int mapy = pl->ns->mapy / 2 - pl->ob->y;
287	int max_distance = 8; // limit maximum path length to something generous
288
289	while (*buf && map && max_distance)
290	{
291	int dir = *buf++;
292
293	switch (dir)
294	{
295	case '1':
296	dx = 0;
297	dy = -1;
298	map = get_map_from_coord (map, &dx, &dy);
299	map && (mapy -= map->height);
300	break;
301	case '2':
302	mapx += map->width;
303	dx = map->width;
304	dy = 0;
305	map = get_map_from_coord (map, &dx, &dy);
306	break;
307	case '3':
308	mapy += map->height;
309	dx = 0;
310	dy = map->height;
311	map = get_map_from_coord (map, &dx, &dy);
312	break;
313	case '4':
314	dx = -1;
315	dy = 0;
316	map = get_map_from_coord (map, &dx, &dy);
317	map && (mapx -= map->width);
318	break;
319	}
320
321	--max_distance;
322	}
323
324	if (!max_distance)
325	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326	else if (map && map->path[0])
327	{
328	int flags = 0;
329
330	if (map->tile_path[0])
331	flags |= 1;
332	if (map->tile_path[1])
333	flags |= 2;
334	if (map->tile_path[2])
335	flags |= 4;
336	if (map->tile_path[3])
337	flags |= 8;
338
339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);
340	}
341	else	358	else
342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	359	#endif
		360	pl->ns->mapinfo_queue.push_back (copy);
343	}	361	}
344	else	362	else
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	363	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347	pl->ns->send_packet (bigbuf);
348	}	364	}
349		365
350	/** This is the Setup cmd - easy first implementation */	366	/** This is the Setup cmd */
351	void	367	void
352	SetUp (char *buf, int len, client * ns)	368	SetUp (char *buf, int len, client * ns)
353	{	369	{
354	int s, slen;	370	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
355	char *cmd, *param, cmdback[HUGE_BUF];
356
357	/* run through the cmds of setup
358	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
359	*
360	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
361	* The client then must sort this out
362	*/
363
364	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
365
366	strcpy (cmdback, "setup");
367	for (s = 0; s < len; )
368	{
369	cmd = &buf[s];
370
371	/* find the next space, and put a null there */
372	for (; buf[s] && buf[s] != ' '; s++)
373	;
374
375	buf[s++] = 0;
376
377	while (buf[s] == ' ')
378	s++;
379
380	if (s >= len)
381	break;
382
383	param = &buf[s];
384
385	for (; buf[s] && buf[s] != ' '; s++)
386	;
387
388	buf[s++] = 0;
389
390	while (buf[s] == ' ')
391	s++;
392
393	slen = strlen (cmdback);
394	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
395	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
396	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
397
398	if (!strcmp (cmd, "sound"))
399	{
400	ns->sound = atoi (param);
401	safe_strcat (cmdback, param, &slen, HUGE_BUF);
402	}
403	else if (!strcmp (cmd, "exp64"))
404	{
405	ns->exp64 = atoi (param);
406	safe_strcat (cmdback, param, &slen, HUGE_BUF);
407	}
408	else if (!strcmp (cmd, "spellmon"))
409	{
410	ns->monitor_spells = atoi (param);
411	safe_strcat (cmdback, param, &slen, HUGE_BUF);
412	}
413	else if (!strcmp (cmd, "darkness"))
414	{
415	ns->darkness = atoi (param);
416	safe_strcat (cmdback, param, &slen, HUGE_BUF);
417	}
418	else if (!strcmp (cmd, "map1cmd"))
419	{
420	if (atoi (param))
421	ns->mapmode = Map1Cmd;
422	/* if beyond this size, need to use map1cmd no matter what */
423	if (ns->mapx > 11 || ns->mapy > 11)
424	ns->mapmode = Map1Cmd;
425	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
426	}
427	else if (!strcmp (cmd, "map1acmd"))
428	{
429	if (atoi (param))
430	ns->mapmode = Map1aCmd;
431	/* if beyond this size, need to use map1acmd no matter what */
432	if (ns->mapx > 11 || ns->mapy > 11)
433	ns->mapmode = Map1aCmd;
434	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
435	}
436	else if (!strcmp (cmd, "newmapcmd"))
437	{
438	ns->newmapcmd = atoi (param);
439	safe_strcat (cmdback, param, &slen, HUGE_BUF);
440	// } else if (!strcmp(cmd,"plugincmd")) {
441	// ns->plugincmd = atoi(param);
442	// safe_strcat(cmdback, param, &slen, HUGE_BUF);
443	}
444	else if (!strcmp (cmd, "mapinfocmd"))
445	{
446	ns->mapinfocmd = atoi (param);
447	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
448	}
449	else if (!strcmp (cmd, "extcmd"))
450	{
451	ns->extcmd = atoi (param);
452	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
453	}
454	else if (!strcmp (cmd, "extmap"))
455	{
456	ns->extmap = atoi (param);
457	safe_strcat (cmdback, "1", &slen, HUGE_BUF);
458	}
459	else if (!strcmp (cmd, "facecache"))
460	{
461	ns->facecache = atoi (param);
462	safe_strcat (cmdback, param, &slen, HUGE_BUF);
463	}
464	else if (!strcmp (cmd, "faceset"))
465	{
466	char tmpbuf[20];
467	int q = atoi (param);
468
469	if (is_valid_faceset (q))
470	ns->faceset = q;
471	sprintf (tmpbuf, "%d", ns->faceset);
472	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
473	/* if the client is using faceset, it knows about image2 command */
474	ns->image2 = 1;
475	}
476	else if (!strcmp (cmd, "itemcmd"))
477	{
478	/* Version of the item protocol command to use. Currently,
479	* only supported versions are 1 and 2. Using a numeric
480	* value will make it very easy to extend this in the future.
481	*/
482	char tmpbuf[20];
483	int q = atoi (param);
484
485	if (q < 1 || q > 2)
486	{
487	strcpy (tmpbuf, "FALSE");
488	}
489	else
490	{
491	ns->itemcmd = q;
492	sprintf (tmpbuf, "%d", ns->itemcmd);
493	}
494	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
495	}
496	else if (!strcmp (cmd, "mapsize"))
497	{
498	int x, y = 0;
499	char tmpbuf[MAX_BUF], *cp;
500
501	x = atoi (param);
502	for (cp = param; *cp != 0; cp++)
503	if (*cp == 'x' || *cp == 'X')
504	{
505	y = atoi (cp + 1);
506	break;
507	}
508	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
509	{
510	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
511	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
512	}
513	else
514	{
515	ns->mapx = x;
516	ns->mapy = y;
517	/* better to send back what we are really using and not the
518	* param as given to us in case it gets parsed differently.
519	*/
520	sprintf (tmpbuf, "%dx%d", x, y);
521	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
522	/* If beyond this size and still using orig map command, need to
523	* go to map1cmd.
524	*/
525	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
526	ns->mapmode = Map1Cmd;
527	}
528	}
529	else if (!strcmp (cmd, "extendedMapInfos"))
530	{
531	/* Added by tchize
532	* prepare to use the mapextended command
533	*/
534	char tmpbuf[20];
535
536	ns->ext_mapinfos = (atoi (param));
537	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
538	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
539	}
540	else if (!strcmp (cmd, "extendedTextInfos"))
541	{
542	/* Added by tchize
543	* prepare to use the extended text commands
544	* Client toggle this to non zero to get exttext
545	*/
546	char tmpbuf[20];
547
548	ns->has_readable_type = (atoi (param));
549	sprintf (tmpbuf, "%d", ns->has_readable_type);
550	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
551	}
552	else
553	{
554	/* Didn't get a setup command we understood -
555	* report a failure to the client.
556	*/
557	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
558	}
559	} /* for processing all the setup commands */
560
561	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
562	ns->send_packet (cmdback);
563	}	371	}
564		372
565	/**	373	/**
566	* The client has requested to be added to the game.	374	* The client has requested to be added to the game.
567	* 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.
568	* 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,
569	* 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.
570	*/	378	*/
571	void	379	void
572	AddMeCmd (char *buf, int len, client * ns)	380	AddMeCmd (char *buf, int len, client *ns)
573	{	381	{
574	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	382	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575	}	383	}
576		384
577	/** Reply to ExtendedInfos command */	385	/** Reply to ExtendedInfos command */
…		…
689		497
690	ns->send_packet (cmdback);	498	ns->send_packet (cmdback);
691	}	499	}
692		500
693	/**	501	/**
694	* A lot like the old AskSmooth (in fact, now called by AskSmooth).
695	* Basically, it makes no sense to wait for the client to request a
696	* a piece of data from us that we know the client wants. So
697	* if we know the client wants it, might as well push it to the
698	* client.
699	*/
700	static void
701	SendSmooth (client *ns, uint16 face)
702	{
703	uint16 smoothface;
704
705	/* If we can't find a face, return and set it so we won't try to send this
706	* again.
707	*/
708	if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
709	{
710
711	LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
712	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
713	return;
714	}
715
716	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
717	esrv_send_face (ns, smoothface, 0);
718
719	ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
720
721	packet sl ("smooth");
722
723	sl << uint16 (face)
724	<< uint16 (smoothface);
725
726	ns->send_packet (sl);
727	}
728
729	/**
730	* Tells client the picture it has to use
731	* to smooth a picture number given as argument.
732	*/
733	void
734	AskSmooth (char *buf, int len, client *ns)
735	{
736	SendSmooth (ns, atoi (buf));
737	}
738
739	/**
740	* 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,
741	* etc.)	503	* etc.)
742	*/	504	*/
743	void	505	void
744	PlayerCmd (char *buf, int len, player *pl)	506	PlayerCmd (char *buf, int len, player *pl)
…		…
765	* commands.	527	* commands.
766	*/	528	*/
767	pl->count = 0;	529	pl->count = 0;
768	}	530	}
769		531
770
771	/**	532	/**
772	* 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,
773	* 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
774	* '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
775	* can throttle.	536	* can throttle.
…		…
777	void	538	void
778	NewPlayerCmd (char *buf, int len, player *pl)	539	NewPlayerCmd (char *buf, int len, player *pl)
779	{	540	{
780	if (len <= 6)	541	if (len <= 6)
781	{	542	{
782	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);
783	return;	544	return;
784	}	545	}
785		546
786	uint16 cmdid = net_uint16 ((uint8 *)buf);	547	uint16 cmdid = net_uint16 ((uint8 *)buf);
787	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	548	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
800	* commands.	561	* commands.
801	*/	562	*/
802	pl->count = 0;	563	pl->count = 0;
803		564
804	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	565	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
805	int time = FABS (pl->ob->speed) < 0.001	566	int time = fabs (pl->ob->speed) < 0.001
806	? time = MAX_TIME * 100	567	? time = MAX_TIME * 100
807	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	568	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
808		569
809	/* Send confirmation of command execution now */	570	/* Send confirmation of command execution now */
810	packet sl ("comc");	571	packet sl ("comc");
811	sl << uint16 (cmdid) << uint32 (time);	572	sl << uint16 (cmdid) << uint32 (time);
812	pl->ns->send_packet (sl);	573	pl->ns->send_packet (sl);
…		…
844	{	605	{
845	case ST_PLAYING:	606	case ST_PLAYING:
846	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	607	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
847	break;	608	break;
848		609
849	case ST_CHANGE_CLASS:
850	key_change_class (pl->ob, buf[0]);
851	break;
852
853	case ST_CONFIRM_QUIT:
854	key_confirm_quit (pl->ob, buf[0]);
855	break;
856
857	case ST_GET_PARTY_PASSWORD: /* Get password for party */	610	case ST_GET_PARTY_PASSWORD: /* Get password for party */
858	receive_party_password (pl->ob, 13);	611	receive_party_password (pl->ob, 13);
859	break;	612	break;
860		613
861	default:	614	default:
…		…
882	ns->cs_version = atoi (buf);	635	ns->cs_version = atoi (buf);
883	ns->sc_version = ns->cs_version;	636	ns->sc_version = ns->cs_version;
884		637
885	LOG (llevDebug, "connection from client <%s>\n", buf);	638	LOG (llevDebug, "connection from client <%s>\n", buf);
886		639
887
888	//TODO: should log here just for statistics	640	//TODO: should log here just for statistics
889		641
890	//if (VERSION_CS != ns->cs_version)	642	//if (VERSION_CS != ns->cs_version)
891	// unchecked;	643	// unchecked;
892		644
…		…
901		653
902	cp = strchr (cp + 1, ' ');	654	cp = strchr (cp + 1, ' ');
903		655
904	if (cp)	656	if (cp)
905	{	657	{
906	assign (ns->version, cp + 1);	658	ns->version = cp + 1;
907		659
908	if (ns->sc_version < 1026)	660	if (ns->sc_version < 1026)
909	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	661	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
910	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	662	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
911	}	663	}
…		…
917	{	669	{
918	ns->sound = atoi (buf);	670	ns->sound = atoi (buf);
919	}	671	}
920		672
921	/** client wants the map resent */	673	/** client wants the map resent */
922
923	void	674	void
924	MapRedrawCmd (char *buf, int len, player *pl)	675	MapRedrawCmd (char *buf, int len, player *pl)
925	{	676	{
926	/* This function is currently disabled; just clearing the map state results in	677	/* This function is currently disabled; just clearing the map state results in
927	* display errors. It should clear the cache and send a newmap command.	678	* display errors. It should clear the cache and send a newmap command.
…		…
972	/**	723	/**
973	* 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
974	* 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)
975	*/	726	*/
976	void	727	void
977	send_query (client *ns, uint8 flags, char *text)	728	send_query (client *ns, uint8 flags, const char *text)
978	{	729	{
979	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);
980	}	759	}
981		760
982	#define AddIfInt64(Old,New,Type) if (Old != New) {\	761	#define AddIfInt64(Old,New,Type) if (Old != New) {\
983	Old = New; \	762	Old = New; \
984	sl << uint8 (Type) << uint64 (New); \	763	sl << uint8 (Type) << uint64 (New); \
…		…
992	#define AddIfShort(Old,New,Type) if (Old != New) {\	771	#define AddIfShort(Old,New,Type) if (Old != New) {\
993	Old = New; \	772	Old = New; \
994	sl << uint8 (Type) << uint16 (New); \	773	sl << uint8 (Type) << uint16 (New); \
995	}	774	}
996		775
997	#define AddIfFloat(Old,New,Type) if (Old != New) {\	776	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
998	Old = New; \	777	Old = New; \
999	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	778	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1000	}	779	}
1001		780
1002	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	781	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1003	free(Old); Old = strdup (New);\	782	free(Old); Old = strdup (New);\
1004	sl << uint8 (Type) << data8 (New); \	783	sl << uint8 (Type) << data8 (New); \
…		…
1014	esrv_update_stats (player *pl)	793	esrv_update_stats (player *pl)
1015	{	794	{
1016	char buf[MAX_BUF];	795	char buf[MAX_BUF];
1017	uint16 flags;	796	uint16 flags;
1018		797
		798	client *ns = pl->ns;
		799	if (!ns)
		800	return;
		801
		802	object *ob = pl->observe;
		803	if (!ob)
		804	return;
		805
		806	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
		807
1019	packet sl ("stats");	808	packet sl ("stats");
1020		809
1021	if (pl->ob)
1022	{
1023	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	810	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1024	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	811	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1025	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	812	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1026	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	813	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1027	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	814	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1028	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	815	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1029	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	816	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1030	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	817	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1031	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	818	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1032	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);	819	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1033	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);	820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1034	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);	821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1035	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1036	}
1037		823
1038	if (pl->ns->exp64)
1039	for (int s = 0; s < NUM_SKILLS; s++)	824	for (int s = 0; s < NUM_SKILLS; s++)
1040	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	825	if (object *skill = opl->last_skill_ob[s])
		826	if (skill->stats.exp != ns->last_skill_exp [s])
1041	{	827	{
		828	ns->last_skill_exp [s] = skill->stats.exp;
		829
1042	/* Always send along the level if exp changes. This is only	830	/* Always send along the level if exp changes. This is only
1043	* 1 extra byte, but keeps processing simpler.	831	* 1 extra byte, but keeps processing simpler.
1044	*/	832	*/
1045	sl << uint8 (s + CS_STAT_SKILLINFO)	833	sl << uint8 (s + CS_STAT_SKILLINFO)
1046	<< uint8 (pl->last_skill_ob[s]->level)	834	<< uint8 (skill->level)
1047	<< uint64 (pl->last_skill_ob[s]->stats.exp);	835	<< uint64 (skill->stats.exp);
1048
1049	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1050	}	836	}
1051		837
1052	if (pl->ns->exp64)
1053	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	838	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1054	else
1055	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1056
1057	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	839	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1058	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	840	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1059	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	841	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1060	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	842	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1061	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	843	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1062	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	844	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1063	AddIfFloat (pl->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);
1064	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	846	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		847
1065	flags = 0;	848	flags = 0;
1066		849
1067	if (pl->fire_on)	850	if (opl->fire_on)
1068	flags |= SF_FIREON;	851	flags |= SF_FIREON;
1069		852
1070	if (pl->run_on)	853	if (opl->run_on)
1071	flags |= SF_RUNON;	854	flags |= SF_RUNON;
1072		855
1073	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	856	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1074		857
1075	if (pl->ns->sc_version < 1025)	858	if (ns->sc_version < 1025)
1076	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	859	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1077	else	860	else
1078	for (int i = 0; i < NROFATTACKS; i++)	861	for (int i = 0; i < NROFATTACKS; i++)
1079	{	862	{
1080	/* Skip ones we won't send */	863	/* Skip ones we won't send */
1081	if (atnr_cs_stat[i] == -1)	864	if (atnr_cs_stat[i] == -1)
1082	continue;	865	continue;
1083		866
1084	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	867	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1085	}	868	}
1086		869
1087	if (pl->ns->monitor_spells)	870	if (pl->ns->monitor_spells)
1088	{	871	{
1089	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	872	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1090	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	873	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1091	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	874	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1092	}	875	}
1093		876
1094	rangetostring (pl->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 */
1095	AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);	878	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1096	set_title (pl->ob, buf);	879	set_title (ob, buf);
1097	AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);	880	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1098		881
1099	/* Only send it away if we have some actual data */	882	/* Only send it away if we have some actual data */
1100	if (sl.length () > 6)	883	if (sl.length () > 6)
1101	pl->ns->send_packet (sl);	884	ns->send_packet (sl);
1102	}	885	}
1103		886
1104	/**	887	/**
1105	* 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.
1106	*/	889	*/
1107	void	890	void
1108	esrv_new_player (player *pl, uint32 weight)	891	esrv_new_player (player *pl, uint32 weight)
1109	{	892	{
1110	pl->last_weight = weight;
1111
1112	packet sl ("player");	893	packet sl ("player");
1113		894
1114	sl << uint32 (pl->ob->count)	895	sl << uint32 (pl->ob->count)
1115	<< uint32 (weight)	896	<< uint32 (weight)
1116	<< uint32 (pl->ob->face->number)	897	<< uint32 (pl->ob->face)
1117	<< data8 (pl->ob->name);	898	<< data8 (pl->ob->name);
1118		899
		900	pl->ns->last_weight = weight;
1119	pl->ns->send_packet (sl);	901	pl->ns->send_packet (sl);
1120	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	902	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1121	}	903	}
1122
1123	/**
1124	* Need to send an animation sequence to the client.
1125	* We will send appropriate face commands to the client if we haven't
1126	* sent them the face yet (this can become quite costly in terms of
1127	* how much we are sending - on the other hand, this should only happen
1128	* when the player logs in and picks stuff up.
1129	*/
1130	void
1131	esrv_send_animation (client * ns, short anim_num)
1132	{
1133	/* Do some checking on the anim_num we got. Note that the animations
1134	* are added in contigous order, so if the number is in the valid
1135	* range, it must be a valid animation.
1136	*/
1137	if (anim_num < 0 || anim_num > num_animations)
1138	{
1139	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1140	return;
1141	}
1142
1143	packet sl ("anim");
1144
1145	sl << uint16 (anim_num)
1146	<< uint16 (0); /* flags - not used right now */
1147
1148	/* Build up the list of faces. Also, send any information (ie, the
1149	* the face itself) down to the client.
1150	*/
1151	for (int i = 0; i < animations[anim_num].num_animations; i++)
1152	{
1153	if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
1154	esrv_send_face (ns, animations[anim_num].faces[i], 0);
1155
1156	sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
1157	}
1158
1159	ns->send_packet (sl);
1160
1161	ns->anims_sent[anim_num] = 1;
1162	}
1163
1164		904
1165	/******************************************************************************	905	/******************************************************************************
1166	*	906	*
1167	* Start of map related commands.	907	* Start of map related commands.
1168	*	908	*
1169	******************************************************************************/	909	******************************************************************************/
1170		910
1171	/**
1172	* This adds face_num to a map cell at x,y. If the client doesn't have
1173	* the face yet, we will also send it.
1174	*/
1175	static void
1176	esrv_map_setbelow (client * ns, int x, int y, short face_num, struct Map *newmap)
1177	{
1178	if (newmap->cells[x][y].count >= MAP_LAYERS)
1179	{
1180	//TODO: one or the other, can't both have abort and return, verify and act
1181	LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
1182	return;
1183	abort ();
1184	}
1185
1186	newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
1187	newmap->cells[x][y].count++;
1188
1189	if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
1190	esrv_send_face (ns, face_num, 0);
1191	}
1192
1193	/** Clears a map cell */	911	/** Clears a map cell */
1194	static void	912	static void
1195	map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)	913	map_clearcell (struct MapCell *cell, int count)
1196	{	914	{
1197	cell->faces[0] = face0;	915	cell->faces[0] = 0;
1198	cell->faces[1] = face1;	916	cell->faces[1] = 0;
1199	cell->faces[2] = face2;	917	cell->faces[2] = 0;
		918	cell->smooth[0] = 0;
		919	cell->smooth[1] = 0;
		920	cell->smooth[2] = 0;
1200	cell->count = count;	921	cell->count = count;
1201	cell->stat_hp = 0;	922	cell->stat_hp = 0;
1202	cell->flags = 0;	923	cell->flags = 0;
1203	cell->player = 0;	924	cell->player = 0;
1204	}	925	}
1205		926
1206	#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
1207	#define MAX_LAYERS 3	927	#define MAX_LAYERS 3
1208
1209	/* Using a global really isn't a good approach, but saves the over head of
1210	* allocating and deallocating such a block of data each time run through,
1211	* and saves the space of allocating this in the socket object when we only
1212	* need it for this cycle. If the server is ever threaded, this needs to be
1213	* re-examined.
1214	*/
1215	static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
1216
1217	/**
1218	* Returns true if any of the heads for this
1219	* space is set. Returns false if all are blank - this is used
1220	* for empty space checking.
1221	*/
1222	static inline int
1223	have_head (int ax, int ay)
1224	{
1225	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
1226	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
1227	return 1;
1228
1229	return 0;
1230	}
1231
1232	/**
1233	* check_head is a bit simplistic version of update_space below.
1234	* basically, it only checks the that the head on space ax,ay at layer
1235	* needs to get sent - if so, it adds the data, sending the head
1236	* if needed, and returning 1. If this no data needs to get
1237	* sent, it returns zero.
1238	*/
1239	static int
1240	check_head (packet &sl, client &ns, int ax, int ay, int layer)
1241	{
1242	short face_num;
1243
1244	if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
1245	face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
1246	else
1247	face_num = 0;
1248
1249	if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
1250	{
1251	sl << uint16 (face_num);
1252	if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
1253	esrv_send_face (&ns, face_num, 0);
1254
1255	heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
1256	ns.lastmap.cells[ax][ay].faces[layer] = face_num;
1257	return 1;
1258	}
1259
1260	return 0; /* No change */
1261	}
1262		928
1263	/**	929	/**
1264	* Removes the need to replicate the same code for each layer.	930	* Removes the need to replicate the same code for each layer.
1265	* this returns true if this space is now in fact different than	931	* this returns true if this space is now in fact different than
1266	* it was.	932	* it was.
1267	* sl is the socklist this data is going into.	933	* sl is the socklist this data is going into.
1268	* 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
1269	* 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
1270	* entire player object.	936	* entire player object.
1271	* mx and my are map coordinate offsets for map mp
1272	* sx and sy are the offsets into the socket structure that
1273	* holds the old values.
1274	* 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
1275	* 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)
1276	* take. Interesting to note that before this function, the map1 function	939	* take. Interesting to note that before this function, the map1 function
1277	* numbers the spaces differently - I think this was a leftover from	940	* numbers the spaces differently - I think this was a leftover from
1278	* 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
1279	* 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
1280	* actually match.	943	* actually match.
1281	*/	944	*/
1282	static int	945	static int
1283	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)
1284	{	947	{
1285	object *ob, *head;	948	object *ob = ms.faces_obj [layer];
1286	uint16 face_num;
1287	int bx, by, i;
1288
1289	/* If there is a multipart object stored away, treat that as more important.
1290	* If not, then do the normal processing.
1291	*/
1292	head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
1293
1294	/* Check to see if this head is part of the set of objects
1295	* we would normally send for this space. If so, then
1296	* don't use the head value. We need to do the check
1297	* here and not when setting up the heads[] value for two reasons -
1298	* 1) the heads[] values will get used even if the space is not visible.
1299	* 2) its possible the head is not on the same map as a part, and I'd
1300	* rather not need to do the map translation overhead.
1301	* 3) We need to do some extra checking to make sure that we will
1302	* otherwise send the image as this layer, eg, either it matches
1303	* the head value, or is not multipart.
1304	*/
1305	if (head && !head->more)
1306	{
1307	for (i = 0; i < MAP_LAYERS; i++)
1308	{
1309	ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
1310	if (!ob)
1311	continue;
1312
1313	if (ob->head)
1314	ob = ob->head;
1315
1316	if (ob == head)
1317	{
1318	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
1319	head = NULL;
1320	break;
1321	}
1322	}
1323	}
1324
1325	ob = head;
1326	if (!ob)
1327	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1328		949
1329	/* 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
1330	* is the blank face, set the face number to zero.	951	* is the blank face, set the face number to zero.
1331	* 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
1332	* precedence over the other object for this space.	953	* precedence over the other object for this space.
1333	* otherwise, we do special head processing	954	* otherwise, we do special head processing
1334	*/	955	*/
1335	if (!ob || ob->face == blank_face)	956	uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
1336	face_num = 0;
1337	else if (head)
1338	{
1339	/* if this is a head that had previously been stored */
1340	face_num = ob->face->number;
1341	}
1342	else
1343	{
1344	/* if the faces for the different parts of a multipart object
1345	* are the same, we only want to send the bottom right most
1346	* portion of the object. That info is in the tail_.. values
1347	* of the head. Note that for the head itself, ob->head will
1348	* be null, so we only do this block if we are working on
1349	* a tail piece.
1350	*/
1351
1352	/* tail_x and tail_y will only be set in the head object. If
1353	* this is the head object and these are set, we proceed
1354	* with logic to only send bottom right. Similarly, if
1355	* this is one of the more parts but the head has those values
1356	* set, we want to do the processing. There can be cases where
1357	* the head is not visible but one of its parts is, so we just
1358	* can always expect that ob->arch->tail_x will be true for all
1359	* object we may want to display.
1360	*/
1361	if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
1362	{
1363
1364	if (ob->head)
1365	head = ob->head;
1366	else
1367	head = ob;
1368
1369	/* Basically figure out where the offset is from where we are right
1370	* now. the ob->arch->clone.{x,y} values hold the offset that this current
1371	* piece is from the head, and the tail is where the tail is from the
1372	* head. Note that bx and by will equal sx and sy if we are already working
1373	* on the bottom right corner. If ob is the head, the clone values
1374	* will be zero, so the right thing will still happen.
1375	*/
1376	bx = sx + head->arch->tail_x - ob->arch->clone.x;
1377	by = sy + head->arch->tail_y - ob->arch->clone.y;
1378
1379	/* I don't think this can ever happen, but better to check for it just
1380	* in case.
1381	*/
1382	if (bx < sx || by < sy)
1383	{
1384	LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
1385	face_num = 0;
1386	}
1387	/* single part object, multipart object with non merged faces,
1388	* of multipart object already at lower right.
1389	*/
1390	else if (bx == sx && by == sy)
1391	{
1392	face_num = ob->face->number;
1393
1394	/* if this face matches one stored away, clear that one away.
1395	* this code relies on the fact that the map1 commands
1396	* goes from 2 down to 0.
1397	*/
1398	for (i = 0; i < MAP_LAYERS; i++)
1399	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
1400	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
1401	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
1402	}
1403	else
1404	{
1405	/* If this head is stored away, clear it - otherwise,
1406	* there can be cases where a object is on multiple layers -
1407	* we only want to send it once.
1408	*/
1409	face_num = head->face->number;
1410	for (i = 0; i < MAP_LAYERS; i++)
1411	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
1412	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
1413	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
1414
1415	/* First, try to put the new head on the same layer. If that is used up,
1416	* then find another layer.
1417	*/
1418	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
1419	{
1420	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
1421	}
1422	else
1423	for (i = 0; i < MAX_LAYERS; i++)
1424	{
1425	if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
1426	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
1427	{
1428	heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
1429	}
1430	}
1431	face_num = 0; /* Don't send this object - we'll send the head later */
1432	}
1433	}
1434	else
1435	{
1436	/* In this case, we are already at the lower right or single part object,
1437	* so nothing special
1438	*/
1439	face_num = ob->face->number;
1440
1441	/* clear out any head entries that have the same face as this one */
1442	for (bx = 0; bx < layer; bx++)
1443	if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
1444	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
1445	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
1446	}
1447	} /* else not already head object or blank face */
1448
1449	/* This is a real hack. Basically, if we have nothing to send for this layer,
1450	* but there is a head on the next layer, send that instead.
1451	* Without this, what happens is you can get the case where the player stands
1452	* on the same space as the head. However, if you have overlapping big objects
1453	* of the same type, what happens then is it doesn't think it needs to send
1454	* This tends to make stacking also work/look better.
1455	*/
1456	if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
1457	{
1458	face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
1459	heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
1460	}
1461
1462	/* Another hack - because of heads and whatnot, this face may match one
1463	* we already sent for a lower layer. In that case, don't send
1464	* this one.
1465	*/
1466	if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
1467	face_num = 0;
1468		957
1469	/* 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
1470	* 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.
1471	*/	960	*/
1472	if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)	961	if (lastcell.faces[layer] != face_num)
1473	{	962	{
1474	ns.lastmap.cells[sx][sy].faces[layer] = face_num;	963	lastcell.faces[layer] = face_num;
		964
1475	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
1476	esrv_send_face (&ns, face_num, 0);	969	ns.send_face (face_num, 10);
1477		970
1478	sl << uint16 (face_num);	971	sl << uint16 (face_num);
1479	return 1;
1480	}
1481
1482	/* Nothing changed */
1483	return 0;
1484	}
1485
1486	/**
1487	* This function is mainly a copy of update_space,
1488	* except it handles update of the smoothing updates,
1489	* not the face updates.
1490	* Removes the need to replicate the same code for each layer.
1491	* this returns true if this smooth is now in fact different
1492	* than it was.
1493	* sl is the socklist this data is going into.
1494	* ns is the socket we are working on - all the info we care
1495	* about is in this socket structure, so know need to pass the
1496	* entire player object.
1497	* mx and my are map coordinate offsets for map mp
1498	* sx and sy are the offsets into the socket structure that
1499	* holds the old values.
1500	* layer is the layer to update, with 2 being the floor and 0 the
1501	* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
1502	* take.
1503	*/
1504
1505	static inline int
1506	update_smooth (packet &sl, client &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
1507	{
1508	object *ob;
1509	int smoothlevel; /* old face_num; */
1510
1511	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1512
1513	/* If there is no object for this space, or if the face for the object
1514	* is the blank face, set the smoothlevel to zero.
1515	*/
1516	if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
1517	smoothlevel = 0;
1518	else
1519	{
1520	smoothlevel = ob->smoothlevel;
1521	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
1522	SendSmooth (&ns, ob->face->number);
1523	} /* else not already head object or blank face */
1524
1525	/* We've gotten what face we want to use for the object. Now see if
1526	* if it has changed since we last sent it to the client.
1527	*/
1528	if (smoothlevel > 255)
1529	smoothlevel = 255;
1530	else if (smoothlevel < 0)
1531	smoothlevel = 0;
1532
1533	if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
1534	{
1535	ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
1536	sl << uint8 (smoothlevel);
1537	return 1;	972	return 1;
1538	}	973	}
1539		974
1540	/* Nothing changed */	975	/* Nothing changed */
1541	return 0;	976	return 0;
…		…
1558	}	993	}
1559		994
1560	return result;	995	return result;
1561	}	996	}
1562		997
		998	// prefetch (and touch) all maps within a specific distancd
		999	static void
		1000	prefetch_surrounding_maps (maptile *map, int distance)
		1001	{
		1002	map->last_access = runtime;
		1003
		1004	if (--distance)
		1005	for (int dir = 4; --dir; )
		1006	if (const shstr &path = map->tile_path [dir])
		1007	if (maptile *&neigh = map->tile_map [dir])
		1008	prefetch_surrounding_maps (neigh, distance);
		1009	else
		1010	neigh = maptile::find_async (path, map);
		1011	}
		1012
		1013	// prefetch a generous area around the player
		1014	static void
		1015	prefetch_surrounding_maps (object *op)
		1016	{
		1017	prefetch_surrounding_maps (op->map, 3);
		1018	}
		1019
1563	/**	1020	/**
1564	* This function uses the new map1 protocol command to send the map	1021	* Draws client map.
1565	* to the client. It is necessary because the old map command supports
1566	* a maximum map size of 15x15.
1567	* This function is much simpler than the old one. This is because
1568	* the old function optimized to send as few face identifiers as possible,
1569	* at the expense of sending more coordinate location (coordinates were
1570	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1571	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1572	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1573	* and use the other 4 bits for other informatiion. For full documentation
1574	* of what we send, see the doc/Protocol file.
1575	* I will describe internally what we do:
1576	* the ns->lastmap shows how the map last looked when sent to the client.
1577	* in the lastmap structure, there is a cells array, which is set to the
1578	* maximum viewable size (As set in config.h).
1579	* in the cells, there are faces and a count value.
1580	* we use the count value to hold the darkness value. If -1, then this space
1581	* is not viewable.
1582	* we use faces[0] faces[1] faces[2] to hold what the three layers
1583	* look like.
1584	*/	1022	*/
1585	void	1023	void
1586	draw_client_map1 (object *pl)	1024	draw_client_map (player *pl)
1587	{	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_IN_MEMORY)
		1037	return;
		1038
1588	int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;	1039	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1589	sint16 nx, ny;
1590	int estartlen, eoldlen;	1040	int estartlen, eoldlen;
1591	uint16 mask, emask;
1592	uint8 eentrysize;	1041	uint8 eentrysize;
1593	uint16 ewhatstart, ewhatflag;	1042	uint16 ewhatstart, ewhatflag;
1594	uint8 extendedinfos;	1043	uint8 extendedinfos;
1595	maptile *m;
1596		1044
		1045	check_map_change (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
1597	client &socket = *pl->contr->ns;	1080	client &socket = *pl->ns;
1598
1599	check_map_change (pl->contr);
1600		1081
1601	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1082	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1602	packet esl;	1083	packet esl;
1603		1084
1604	startlen = sl.length ();	1085	startlen = sl.length ();
…		…
1619	<< uint8 (extendedinfos)	1100	<< uint8 (extendedinfos)
1620	<< uint8 (eentrysize);	1101	<< uint8 (eentrysize);
1621		1102
1622	estartlen = esl.length ();	1103	estartlen = esl.length ();
1623	}	1104	}
1624	else
1625	{
1626	/* suppress compiler warnings */
1627	ewhatstart = 0;
1628	ewhatflag = 0;
1629	estartlen = 0;
1630	}
1631
1632	/* Init data to zero */
1633	memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
1634		1105
1635	/* 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
1636	* locations.	1107	* locations.
1637	*/	1108	*/
1638	ay = 0;	1109	ay = 0;
1639		1110
1640	/* We could do this logic as conditionals in the if statement,	1111	/* We could do this logic as conditionals in the if statement,
1641	* but that started to get a bit messy to look at.	1112	* but that started to get a bit messy to look at.
1642	*/	1113	*/
1643	max_x = pl->x + (socket.mapx + 1) / 2;	1114	max_x = ob->x + (socket.mapx + 1) / 2;
1644	max_y = pl->y + (socket.mapy + 1) / 2;	1115	max_y = ob->y + (socket.mapy + 1) / 2;
1645		1116
1646	if (socket.mapmode == Map1aCmd)
1647	{
1648	max_x += MAX_HEAD_OFFSET;
1649	max_y += MAX_HEAD_OFFSET;
1650	}
1651
1652	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++)
1653	{	1118	{
		1119	sint16 nx, ny;
		1120	maptile *m = 0;
		1121
1654	ax = 0;	1122	ax = 0;
1655	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++)
1656	{	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;
1657	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1141	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1658		1142
1659	/* If this space is out of the normal viewable area, we only check
1660	* the heads value ax or ay will only be greater than what
1661	* the client wants if using the map1a command - this is because
1662	* if the map1a command is not used, max_x and max_y will be
1663	* set to lower values.
1664	*/
1665	if (ax >= socket.mapx || ay >= socket.mapy)
1666	{
1667	int i, got_one;
1668
1669	oldlen = sl.length ();
1670
1671	sl << uint16 (mask);
1672
1673	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1674	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1675	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1676
1677	/* If all we are doing is sending 0 (blank) faces, we don't
1678	* actually need to send that - just the coordinates
1679	* with no faces tells the client to blank out the
1680	* space.
1681	*/
1682	got_one = 0;
1683	for (i = oldlen + 2; i < sl.length (); i++)
1684	if (sl[i])
1685	got_one = 1;
1686
1687	if (got_one && (mask & 0xf))
1688	sl[oldlen + 1] = mask & 0xff;
1689	else
1690	{ /*either all faces blank, either no face at all */
1691	if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
1692	sl.reset (oldlen + 2);
1693	else
1694	sl.reset (oldlen);
1695	}
1696
1697	/*What concerns extendinfos, nothing to be done for now
1698	* (perhaps effects layer later)
1699	*/
1700	continue; /* don't do processing below */
1701	}
1702
1703	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1143	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1704
1705	d = pl->contr->blocked_los[ax][ay];
1706		1144
1707	/* 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,
1708	* we tell the client as such	1146	* we tell the client as such
1709	*/	1147	*/
1710	nx = x;
1711	ny = y;
1712	m = get_map_from_coord (pl->map, &nx, &ny);
1713
1714	if (!m)	1148	if (!m)
1715	{	1149	{
1716	/* space is out of map. Update space and clear values	1150	/* space is out of map. Update space and clear values
1717	* 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
1718	* of the map, it shouldn't have a head	1152	* of the map, it shouldn't have a head
1719	*/	1153	*/
1720	if (lastcell.count != -1)	1154	if (lastcell.count != -1)
1721	{	1155	{
1722	sl << uint16 (mask);	1156	sl << uint16 (mask);
1723	map_clearcell (&lastcell, 0, 0, 0, -1);	1157	map_clearcell (&lastcell, -1);
1724	}	1158	}
		1159
		1160	continue;
1725	}	1161	}
		1162
		1163	int d = pl->blocked_los[ax][ay];
		1164
1726	else if (d > 3)	1165	if (d > 3)
1727	{	1166	{
		1167
1728	int need_send = 0, count;	1168	int need_send = 0, count;
1729		1169
1730	/* This block deals with spaces that are not visible for whatever	1170	/* This block deals with spaces that are not visible for whatever
1731	* reason. Still may need to send the head for this space.	1171	* reason. Still may need to send the head for this space.
1732	*/	1172	*/
1733		1173
1734	oldlen = sl.length ();	1174	oldlen = sl.length ();
1735		1175
1736	sl << uint16 (mask);	1176	sl << uint16 (mask);
…		…
1738	if (lastcell.count != -1)	1178	if (lastcell.count != -1)
1739	need_send = 1;	1179	need_send = 1;
1740		1180
1741	count = -1;	1181	count = -1;
1742		1182
1743	if (socket.mapmode == Map1aCmd && have_head (ax, ay))
1744	{
1745	/* Now check to see if any heads need to be sent */
1746
1747	if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
1748	if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
1749	if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
1750
1751	lastcell.count = count;
1752	}
1753	else
1754	{
1755	/* properly clear a previously sent big face */	1183	/* properly clear a previously sent big face */
1756	if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0	1184	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1757	|| lastcell.stat_hp || lastcell.flags || lastcell.player)	1185	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1758	need_send = 1;	1186	need_send = 1;
1759		1187
1760	map_clearcell (&lastcell, 0, 0, 0, count);	1188	map_clearcell (&lastcell, count);
1761	}
1762		1189
1763	if ((mask & 0xf) || need_send)	1190	if ((mask & 0xf) || need_send)
1764	sl[oldlen + 1] = mask & 0xff;	1191	sl[oldlen + 1] = mask & 0xff;
1765	else	1192	else
1766	sl.reset (oldlen);	1193	sl.reset (oldlen);
1767	}	1194	}
1768	else	1195	else
1769	{	1196	{
1770	/* In this block, the space is visible or there are head objects	1197	/* In this block, the space is visible.
1771	* we need to send.
1772	*/	1198	*/
1773		1199
1774	/* Rather than try to figure out what everything that we might	1200	/* Rather than try to figure out what everything that we might
1775	* need to send is, then form the packet after that,	1201	* need to send is, then form the packet after that,
1776	* we presume that we will in fact form a packet, and update	1202	* we presume that we will in fact form a packet, and update
…		…
1779	* is done.	1205	* is done.
1780	* 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
1781	* what if anything we need to send, setting the bits, then	1207	* what if anything we need to send, setting the bits, then
1782	* doing those checks again to add the real data.	1208	* doing those checks again to add the real data.
1783	*/	1209	*/
1784	oldlen = sl.length ();	1210	oldlen = sl.length ();
1785	mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1786	eoldlen = esl.length ();	1211	eoldlen = esl.length ();
1787	emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;	1212
1788	sl << uint16 (mask);	1213	sl << uint16 (mask);
1789
1790	if (socket.ext_mapinfos)
1791	esl << uint16 (emask);
1792		1214
1793	unsigned char dummy;	1215	unsigned char dummy;
1794	unsigned char *last_ext = &dummy;	1216	unsigned char *last_ext = &dummy;
1795		1217
1796	/* Darkness changed */	1218	/* Darkness changed */
…		…
1808	sl << uint8 (255 - 64 * d);	1230	sl << uint8 (255 - 64 * d);
1809	}	1231	}
1810		1232
1811	lastcell.count = d;	1233	lastcell.count = d;
1812		1234
		1235	mapspace &ms = m->at (nx, ny);
		1236	ms.update ();
		1237
1813	if (socket.extmap)	1238	if (socket.extmap)
1814	{	1239	{
1815	uint8 stat_hp = 0;	1240	uint8 stat_hp = 0;
1816	uint8 stat_width = 0;	1241	uint8 stat_width = 0;
1817	uint8 flags = 0;	1242	uint8 flags = 0;
1818	UUID player = 0;	1243	tag_t player = 0;
1819		1244
1820	// send hp information, if applicable	1245	// send hp information, if applicable
1821	if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))	1246	if (object *op = ms.faces_obj [0])
1822	{	1247	{
1823	if (op->head || op->invisible)	1248	if (op->head || op->invisible)
1824	; // do not show	1249	; // do not show
1825	else if (op->type == PLAYER	1250	else if (op->type == PLAYER
1826	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))	1251	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1827	{	1252	{
1828	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)	1253	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1829	{	1254	{
1830	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1255	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1831	stat_width = op->arch->tail_x;	1256	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1832	}	1257	}
1833	}	1258	}
1834		1259
1835	if (op->msg && op->msg[0] == '@')	1260	if (op->msg && op->msg[0] == '@')
1836	flags |= 1;	1261	flags |= 1;
1837		1262
1838	if (op->type == PLAYER && op != pl)	1263	if (op->type == PLAYER && op != ob)
1839	player = op->count;	1264	player = op->count;
1840	}	1265	}
1841		1266
1842	if (lastcell.stat_hp != stat_hp)	1267	if (lastcell.stat_hp != stat_hp)
1843	{	1268	{
…		…
1864		1289
1865	mask |= 0x8;	1290	mask |= 0x8;
1866	*last_ext |= 0x80;	1291	*last_ext |= 0x80;
1867	last_ext = &sl[sl.length ()];	1292	last_ext = &sl[sl.length ()];
1868		1293
1869	sl << uint8 (0x47) << uint8 (8) << (uint64)player;	1294	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1870	}	1295	}
1871		1296
1872	if (lastcell.flags != flags)	1297	if (lastcell.flags != flags)
1873	{	1298	{
1874	lastcell.flags = flags;	1299	lastcell.flags = flags;
…		…
1880	sl << uint8 (8) << uint8 (flags);	1305	sl << uint8 (8) << uint8 (flags);
1881	}	1306	}
1882	}	1307	}
1883		1308
1884	/* Floor face */	1309	/* Floor face */
1885	if (update_space (sl, socket, m, nx, ny, ax, ay, 2))	1310	if (update_space (sl, socket, ms, lastcell, 2))
1886	mask |= 0x4;	1311	mask |= 0x4;
1887		1312
1888	if (socket.EMI_smooth)
1889	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
1890	emask |= 0x4;
1891
1892	/* Middle face */	1313	/* Middle face */
1893	if (update_space (sl, socket, m, nx, ny, ax, ay, 1))	1314	if (update_space (sl, socket, ms, lastcell, 1))
1894	mask |= 0x2;	1315	mask |= 0x2;
1895		1316
1896	if (socket.EMI_smooth)	1317	if (ms.player () == ob
1897	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))	1318	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1898	emask |= 0x2;
1899
1900	if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
1901	{	1319	{
		1320	// force player to be visible to himself if invisible
1902	if (lastcell.faces[0] != pl->face->number)	1321	if (lastcell.faces[0] != ob->face)
1903	{	1322	{
1904	lastcell.faces[0] = pl->face->number;	1323	lastcell.faces[0] = ob->face;
		1324
1905	mask |= 0x1;	1325	mask |= 0x1;
1906
1907	if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
1908	esrv_send_face (&socket, pl->face->number, 0);
1909
1910	sl << uint16 (pl->face->number);	1326	sl << uint16 (ob->face);
		1327
		1328	socket.send_faces (ob);
1911	}	1329	}
1912	}	1330	}
1913	else
1914	{
1915	/* Top face */	1331	/* Top face */
1916	if (update_space (sl, socket, m, nx, ny, ax, ay, 0))	1332	else if (update_space (sl, socket, ms, lastcell, 0))
1917	mask |= 0x1;	1333	mask |= 0x1;
1918
1919	if (socket.EMI_smooth)
1920	if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
1921	emask |= 0x1;
1922	}
1923		1334
1924	/* Check to see if we are in fact sending anything for this	1335	/* Check to see if we are in fact sending anything for this
1925	* space by checking the mask. If so, update the mask.	1336	* space by checking the mask. If so, update the mask.
1926	* if not, reset the len to that from before adding the mask	1337	* if not, reset the len to that from before adding the mask
1927	* value, so we don't send those bits.	1338	* value, so we don't send those bits.
…		…
1929	if (mask & 0xf)	1340	if (mask & 0xf)
1930	sl[oldlen + 1] = mask & 0xff;	1341	sl[oldlen + 1] = mask & 0xff;
1931	else	1342	else
1932	sl.reset (oldlen);	1343	sl.reset (oldlen);
1933		1344
		1345	if (socket.ext_mapinfos)
		1346	esl << uint16 (emask);
		1347
		1348	if (socket.EMI_smooth)
		1349	{
		1350	for (int layer = 2+1; layer--; )
		1351	{
		1352	object *ob = ms.faces_obj [layer];
		1353
		1354	// If there is no object for this space, or if the face for the object
		1355	// is the blank face, set the smoothlevel to zero.
		1356	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
		1357
		1358	// We've gotten what face we want to use for the object. Now see if
		1359	// if it has changed since we last sent it to the client.
		1360	if (lastcell.smooth[layer] != smoothlevel)
		1361	{
		1362	lastcell.smooth[layer] = smoothlevel;
		1363	esl << uint8 (smoothlevel);
		1364	emask |= 1 << layer;
		1365	}
		1366	}
		1367
1934	if (emask & 0xf)	1368	if (emask & 0xf)
1935	esl[eoldlen + 1] = emask & 0xff;	1369	esl[eoldlen + 1] = emask & 0xff;
1936	else	1370	else
1937	esl.reset (eoldlen);	1371	esl.reset (eoldlen);
		1372	}
1938	} /* else this is a viewable space */	1373	} /* else this is a viewable space */
1939	} /* for x loop */	1374	} /* for x loop */
1940	} /* for y loop */	1375	} /* for y loop */
		1376
		1377	socket.flush_fx ();
1941		1378
1942	/* Verify that we in fact do need to send this */	1379	/* Verify that we in fact do need to send this */
1943	if (socket.ext_mapinfos)	1380	if (socket.ext_mapinfos)
1944	{	1381	{
1945	if (!(sl.length () > startlen || socket.sent_scroll))	1382	if (!(sl.length () > startlen || socket.sent_scroll))
1946	{	1383	{
1947	/* No map data will follow, so don't say the client	1384	/* No map data will follow, so don't say the client
1948	* it doesn't need draw!	1385	* it doesn't need draw!
1949	*/	1386	*/
1950	ewhatflag &= (~EMI_NOREDRAW);	1387	ewhatflag &= ~EMI_NOREDRAW;
1951	esl[ewhatstart + 1] = ewhatflag & 0xff;	1388	esl[ewhatstart + 1] = ewhatflag & 0xff;
1952	}	1389	}
1953		1390
1954	if (esl.length () > estartlen)	1391	if (esl.length () > estartlen)
1955	socket.send_packet (esl);	1392	socket.send_packet (esl);
…		…
1960	socket.send_packet (sl);	1397	socket.send_packet (sl);
1961	socket.sent_scroll = 0;	1398	socket.sent_scroll = 0;
1962	}	1399	}
1963	}	1400	}
1964		1401
1965	/**
1966	* Draws client map.
1967	*/
1968	void
1969	draw_client_map (object *pl)
1970	{
1971	int i, j;
1972	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1973	New_Face *face, *floor;
1974	New_Face *floor2;
1975	int d, mflags;
1976	struct Map newmap;
1977	maptile *m, *pm;
1978
1979	if (pl->type != PLAYER)
1980	{
1981	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1982	return;
1983	}
1984
1985	pm = pl->map;
1986
1987	/* If player is just joining the game, he isn't here yet, so the map
1988	* can get swapped out. If so, don't try to send them a map. All will
1989	* be OK once they really log in.
1990	*/
1991	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
1992	return;
1993
1994	memset (&newmap, 0, sizeof (struct Map));
1995
1996	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
1997	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
1998	{
1999	ax = i;
2000	ay = j;
2001	m = pm;
2002	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2003
2004	if (mflags & P_OUT_OF_MAP)
2005	continue;
2006
2007	/* If a map is visible to the player, we don't want to swap it out
2008	* just to reload it. This should really call something like
2009	* swap_map, but this is much more efficient and 'good enough'
2010	*/
2011	if (mflags & P_NEW_MAP)
2012	m->timeout = 50;
2013	}
2014
2015	/* do LOS after calls to update_position */
2016	if (pl->contr->do_los)
2017	{
2018	update_los (pl);
2019	pl->contr->do_los = 0;
2020	}
2021
2022	/* Big maps need a different drawing mechanism to work */
2023	draw_client_map1 (pl);
2024	}
2025
2026
2027	/*****************************************************************************/	1402	/*****************************************************************************/
2028
2029	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1403	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
2030
2031	/* a player. Of course, the client need to know the command to be able to */	1404	/* a player. Of course, the client need to know the command to be able to */
2032
2033	/* manage it ! */	1405	/* manage it ! */
2034
2035	/*****************************************************************************/	1406	/*****************************************************************************/
2036	void	1407	void
2037	send_plugin_custom_message (object *pl, char *buf)	1408	send_plugin_custom_message (object *pl, char *buf)
2038	{	1409	{
2039	pl->contr->ns->send_packet (buf);	1410	pl->contr->ns->send_packet (buf);
…		…
2050	sl << "replyinfo skill_info\n";	1421	sl << "replyinfo skill_info\n";
2051		1422
2052	for (int i = 1; i < NUM_SKILLS; i++)	1423	for (int i = 1; i < NUM_SKILLS; i++)
2053	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1424	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
2054		1425
2055	if (sl.length () >= MAXSOCKBUF)	1426	if (sl.length () > MAXSOCKBUF)
2056	{	1427	{
2057	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1428	LOG (llevError, "Buffer overflow in send_skill_info!\n");
2058	fatal (0);	1429	fatal (0);
2059	}	1430	}
2060		1431
…		…
2073	sl << "replyinfo spell_paths\n";	1444	sl << "replyinfo spell_paths\n";
2074		1445
2075	for (int i = 0; i < NRSPELLPATHS; i++)	1446	for (int i = 0; i < NRSPELLPATHS; i++)
2076	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1447	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
2077		1448
2078	if (sl.length () >= MAXSOCKBUF)	1449	if (sl.length () > MAXSOCKBUF)
2079	{	1450	{
2080	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1451	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
2081	fatal (0);	1452	fatal (0);
2082	}	1453	}
2083		1454
…		…
2089	* it then sends an updspell packet for each spell that has changed in this way	1460	* it then sends an updspell packet for each spell that has changed in this way
2090	*/	1461	*/
2091	void	1462	void
2092	esrv_update_spells (player *pl)	1463	esrv_update_spells (player *pl)
2093	{	1464	{
		1465	if (!pl->ns)
		1466	return;
		1467
2094	if (!pl->ns->monitor_spells)	1468	if (!pl->ns->monitor_spells)
2095	return;	1469	return;
2096		1470
2097	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1471	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2098	{	1472	{
…		…
2158		1532
2159	/* appends the spell *spell to the Socklist we will send the data to. */	1533	/* appends the spell *spell to the Socklist we will send the data to. */
2160	static void	1534	static void
2161	append_spell (player *pl, packet &sl, object *spell)	1535	append_spell (player *pl, packet &sl, object *spell)
2162	{	1536	{
2163	int len, i, skill = 0;	1537	int i, skill = 0;
2164		1538
2165	if (!(spell->name))	1539	if (!(spell->name))
2166	{	1540	{
2167	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1541	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
2168	return;	1542	return;
…		…
2181	{	1555	{
2182	skill = i + CS_STAT_SKILLINFO;	1556	skill = i + CS_STAT_SKILLINFO;
2183	break;	1557	break;
2184	}	1558	}
2185	}	1559	}
		1560
		1561	// spells better have a face
		1562	if (!spell->face)
		1563	{
		1564	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
		1565	spell->face = face_find ("burnout.x11", blank_face);
		1566	}
		1567
		1568	pl->ns->send_face (spell->face);
2186		1569
2187	/* send the current values */	1570	/* send the current values */
2188	sl << uint32 (spell->count)	1571	sl << uint32 (spell->count)
2189	<< uint16 (spell->level)	1572	<< uint16 (spell->level)
2190	<< uint16 (spell->casting_time)	1573	<< uint16 (spell->casting_time)
2191	<< uint16 (spell->last_sp)	1574	<< uint16 (spell->last_sp)
2192	<< uint16 (spell->last_grace)	1575	<< uint16 (spell->last_grace)
2193	<< uint16 (spell->last_eat)	1576	<< uint16 (spell->last_eat)
2194	<< uint8 (skill)	1577	<< uint8 (skill)
2195	<< uint32 (spell->path_attuned)	1578	<< uint32 (spell->path_attuned)
2196	<< uint32 (spell->face ? spell->face->number : 0)	1579	<< uint32 (spell->face)
2197	<< data8 (spell->name)	1580	<< data8 (spell->name)
2198	<< data16 (spell->msg);	1581	<< data16 (spell->msg);
2199	}	1582	}
2200		1583
2201	/**	1584	/**
…		…
2216		1599
2217	packet sl ("addspell");	1600	packet sl ("addspell");
2218		1601
2219	if (!spell)	1602	if (!spell)
2220	{	1603	{
2221	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	1604	for (spell = pl->ob->inv; spell; spell = spell->below)
2222	{	1605	{
2223	/* were we to simply keep appending data here, we could exceed	1606	/* were we to simply keep appending data here, we could exceed
2224	* MAXSOCKBUF if the player has enough spells to add, we know that	1607	* MAXSOCKBUF if the player has enough spells to add, we know that
2225	* append_spells will always append 19 data bytes, plus 4 length	1608	* append_spells will always append 19 data bytes, plus 4 length
2226	* bytes and 3 strings (because that is the spec) so we need to	1609	* bytes and 3 strings (because that is the spec) so we need to
2227	* check that the length of those 3 strings, plus the 23 bytes,	1610	* check that the length of those 3 strings, plus the 23 bytes,
2228	* won't take us over the length limit for the socket, if it does,	1611	* won't take us over the length limit for the socket, if it does,
2229	* we need to send what we already have, and restart packet formation	1612	* we need to send what we already have, and restart packet formation
2230	*/	1613	*/
		1614	if (spell->type != SPELL)
		1615	continue;
		1616
2231	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1617	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
2232	* to show add_spell is 26 bytes + 2 strings. However, the overun	1618	* to show add_spell is 26 bytes + 2 strings. However, the overun
2233	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1619	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
2234	* like it will fix this	1620	* like it will fix this
2235	*/	1621	*/
2236	if (spell->type != SPELL)
2237	continue;
2238
2239	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1622	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2240	{	1623	{
		1624	pl->ns->flush_fx ();
2241	pl->ns->send_packet (sl);	1625	pl->ns->send_packet (sl);
2242		1626
2243	sl.reset ();	1627	sl.reset ();
2244	sl << "addspell ";	1628	sl << "addspell ";
2245	}	1629	}
…		…
2253	return;	1637	return;
2254	}	1638	}
2255	else	1639	else
2256	append_spell (pl, sl, spell);	1640	append_spell (pl, sl, spell);
2257		1641
2258	if (sl.length () >= MAXSOCKBUF)	1642	if (sl.length () > MAXSOCKBUF)
2259	{	1643	{
2260	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1644	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2261	fatal (0);	1645	fatal (0);
2262	}	1646	}
2263		1647
2264	/* finally, we can send the packet */	1648	/* finally, we can send the packet */
		1649	pl->ns->flush_fx ();
2265	pl->ns->send_packet (sl);	1650	pl->ns->send_packet (sl);
2266	}	1651	}
2267		1652

Diff Legend

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