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

Diff Legend

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