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.79 by root, Thu Mar 15 16:25:45 2007 UTC vs.
Revision 1.150 by root, Mon Oct 12 14:00:59 2009 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	/**	25	/**
26	* \file	26	* \file
27	* Client handling.	27	* Client handling.
…		…
99	*/	99	*/
100	mx = ns->mapx;	100	mx = ns->mapx;
101	my = ns->mapy;	101	my = ns->mapy;
102		102
103	/* the x and y here are coordinates for the new map, i.e. if we moved	103	/* the x and y here are coordinates for the new map, i.e. if we moved
104	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	104	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
105	* if the destination x or y coordinate is outside the viewable	105	* if the destination x or y coordinate is outside the viewable
106	* area, we clear the values - otherwise, the old values	106	* area, we clear the values - otherwise, the old values
107	* are preserved, and the check_head thinks it needs to clear them.	107	* are preserved, and the check_head thinks it needs to clear them.
108	*/	108	*/
109	for (x = 0; x < mx; x++)	109	for (x = 0; x < mx; x++)
110	{
111	for (y = 0; y < my; y++)	110	for (y = 0; y < my; y++)
112	{
113	if (x >= ns->mapx || y >= ns->mapy)	111	if (x >= ns->mapx || y >= ns->mapy)
114	/* clear cells outside the viewable area */	112	/* clear cells outside the viewable area */
115	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	113	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116	else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)	114	else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
117	/* clear newly visible tiles within the viewable area */	115	/* clear newly visible tiles within the viewable area */
118	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	116	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119	else	117	else
120	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	118	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121	}
122	}
123		119
124	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	120	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125		121
126	/* Make sure that the next "map1" command will be sent (even if it is	122	/* Make sure that the next "map1" command will be sent (even if it is
127	* empty).	123	* empty).
…		…
130	}	126	}
131		127
132	static void	128	static void
133	clear_map (player *pl)	129	clear_map (player *pl)
134	{	130	{
		131	pl->ns->mapinfo_queue_clear ();
		132
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	133	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136		134
137	pl->ns->force_newmap = false;	135	pl->ns->force_newmap = false;
138		136
139	if (pl->ns->newmapcmd == 1)	137	if (pl->ns->newmapcmd == 1)
140	pl->ns->send_packet ("newmap");	138	pl->ns->send_packet ("newmap");
141		139
142	pl->ns->floorbox_reset ();	140	pl->ns->floorbox_reset ();
		141	}
		142
		143	static void
		144	send_map_info (player *pl)
		145	{
		146	client &socket = *pl->ns;
		147	object *ob = pl->observe;
		148
		149	if (socket.mapinfocmd)
		150	{
		151	if (ob->map && ob->map->path[0])
		152	{
		153	int flags = 0;
		154
		155	if (ob->map->tile_path[0]) flags |= 1;
		156	if (ob->map->tile_path[1]) flags |= 2;
		157	if (ob->map->tile_path[2]) flags |= 4;
		158	if (ob->map->tile_path[3]) flags |= 8;
		159
		160	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		161	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		162	ob->map->width, ob->map->height, &ob->map->path);
		163	}
		164	else
		165	socket.send_packet ("mapinfo current");
		166	}
143	}	167	}
144		168
145	/** check for map/region change and send new map data */	169	/** check for map/region change and send new map data */
146	static void	170	static void
147	check_map_change (player *pl)	171	check_map_change (player *pl)
148	{	172	{
149	client &socket = *pl->ns;	173	client &socket = *pl->ns;
150	object *ob = pl->ob;	174	object *ob = pl->observe;
151	char buf[MAX_BUF]; /* eauugggh */
152		175
153	if (socket.force_newmap && 0)	176	region *reg = ob->region ();
		177	if (socket.current_region != reg)
		178	{
		179	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		180	socket.current_region = reg;
154	{	181	}
155	// force newmap is used for clients that do not redraw their map	182
156	// after image uploads.	183	// first try to aovid a full newmap on tiled map scrolls
		184	if (socket.current_map != ob->map && !socket.force_newmap)
		185	{
		186	rv_vector rv;
		187
		188	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		189
		190	// manhattan distance is very handy here
		191	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		192	{
		193	socket.current_map = ob->map;
		194	socket.current_x = ob->x;
		195	socket.current_y = ob->y;
		196
		197	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		198	socket.floorbox_reset ();
		199	send_map_info (pl);
		200	}
		201	}
		202
		203	if (socket.current_map != ob->map || socket.force_newmap)
		204	{
		205	clear_map (pl);
157	socket.current_map = ob->map;	206	socket.current_map = ob->map;
158	clear_map (pl);	207	send_map_info (pl);
159	}
160	else if (socket.current_map != ob->map)
161	{
162	clear_map (pl);
163
164	if (socket.mapinfocmd)
165	{
166	if (ob->map && ob->map->path[0])
167	{
168	int flags = 0;
169
170	if (ob->map->tile_path[0])
171	flags |= 1;
172	if (ob->map->tile_path[1])
173	flags |= 2;
174	if (ob->map->tile_path[2])
175	flags |= 4;
176	if (ob->map->tile_path[3])
177	flags |= 8;
178
179	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
180	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
181	}
182	else
183	snprintf (buf, MAX_BUF, "mapinfo current");
184
185	socket.send_packet (buf);
186	}
187	}	208	}
188	else if (socket.current_x != ob->x || socket.current_y != ob->y)	209	else if (socket.current_x != ob->x || socket.current_y != ob->y)
189	{	210	{
190	int dx = ob->x - socket.current_x;	211	int dx = ob->x - socket.current_x;
191	int dy = ob->y - socket.current_y;	212	int dy = ob->y - socket.current_y;
192		213
193	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
194	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
195	else
196	{
197	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	214	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
198	socket.floorbox_reset ();	215	socket.floorbox_reset ();
199	}
200	}	216	}
201		217
202	socket.current_x = ob->x;	218	socket.current_x = ob->x;
203	socket.current_y = ob->y;	219	socket.current_y = ob->y;
204
205	region *reg = ob->region ();
206	if (socket.current_region != reg)
207	{
208	socket.current_region = reg;
209	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
210	}
211	}	220	}
212		221
213	/**	222	/**
214	* RequestInfo is sort of a meta command. There is some specific	223	* RequestInfo is sort of a meta command. There is some specific
215	* request of information, but we call other functions to provide	224	* request of information, but we call other functions to provide
216	* that information.	225	* that information.
217	*/	226	*/
218	void	227	void
219	RequestInfo (char *buf, int len, client * ns)	228	RequestInfo (char *buf, int len, client *ns)
220	{	229	{
221	char *params = NULL, *cp;	230	char *params;
222
223	/* No match */
224	char bigbuf[MAX_BUF];
225	int slen;
226
227	/* Set up replyinfo before we modify any of the buffers - this is used
228	* if we don't find a match.
229	*/
230	strcpy (bigbuf, "replyinfo ");
231	slen = strlen (bigbuf);
232	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
233		231
234	/* find the first space, make it null, and update the	232	/* find the first space, make it null, and update the
235	* params pointer.	233	* params pointer.
236	*/	234	*/
237	for (cp = buf; *cp != '\0'; cp++)	235	for (params = buf; *params; params++)
238	if (*cp == ' ')	236	if (*params == ' ')
239	{	237	{
240	*cp = '\0';
241	params = cp + 1;	238	*params++ = 0;
242	break;	239	break;
243	}	240	}
244		241
245	if (!strcmp (buf, "image_info"))	242	if (!strcmp (buf, "image_info"))
246	send_image_info (ns, params);	243	send_image_info (ns, params);
…		…
249	else if (!strcmp (buf, "skill_info"))	246	else if (!strcmp (buf, "skill_info"))
250	send_skill_info (ns, params);	247	send_skill_info (ns, params);
251	else if (!strcmp (buf, "spell_paths"))	248	else if (!strcmp (buf, "spell_paths"))
252	send_spell_paths (ns, params);	249	send_spell_paths (ns, params);
253	else	250	else
254	ns->send_packet (bigbuf, len);	251	{
		252	// undo tokenisation above and send replyinfo with the request unchanged
		253	if (*params)
		254	*--params = ' ';
		255
		256	ns->send_packet_printf ("replyinfo %s", buf);
		257	}
255	}	258	}
256		259
257	void	260	void
258	ExtCmd (char *buf, int len, player *pl)	261	ExtCmd (char *buf, int len, player *pl)
259	{	262	{
…		…
262		265
263	void	266	void
264	ExtiCmd (char *buf, int len, client *ns)	267	ExtiCmd (char *buf, int len, client *ns)
265	{	268	{
266	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	269	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		270	}
		271
		272	void
		273	client::mapinfo_queue_clear ()
		274	{
		275	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		276	free (*i);
		277
		278	mapinfo_queue.clear ();
		279	}
		280
		281	bool
		282	client::mapinfo_try (char *buf)
		283	{
		284	char *token = buf;
		285	buf += strlen (buf) + 9;
		286
		287	// initial map and its origin
		288	maptile *map = pl->observe->map;
		289	int mapx = pl->ns->mapx / 2 - pl->observe->x;
		290	int mapy = pl->ns->mapy / 2 - pl->observe->y;
		291	int max_distance = 8; // limit maximum path length to something generous
		292
		293	while (*buf && map && max_distance)
		294	{
		295	int dir = *buf++ - '1';
		296
		297	if (dir >= 0 && dir <= 3)
		298	{
		299	if (!map->tile_path [dir])
		300	map = 0;
		301	else if (map->tile_available (dir, false))
		302	{
		303	maptile *neigh = map->tile_map [dir];
		304
		305	switch (dir)
		306	{
		307	case 0: mapy -= neigh->height; break;
		308	case 2: mapy += map ->height; break;
		309	case 3: mapx -= neigh->width ; break;
		310	case 1: mapx += map ->width ; break;
		311	}
		312
		313	map = neigh;
		314	--max_distance;
		315	}
		316	else
		317	return 0;
		318	}
		319	else
		320	max_distance = 0;
		321	}
		322
		323	if (!max_distance)
		324	send_packet_printf ("mapinfo %s error", token);
		325	else if (!map || !map->path)
		326	send_packet_printf ("mapinfo %s nomap", token);
		327	else
		328	{
		329	int flags = 0;
		330
		331	if (map->tile_path[0]) flags |= 1;
		332	if (map->tile_path[1]) flags |= 2;
		333	if (map->tile_path[2]) flags |= 4;
		334	if (map->tile_path[3]) flags |= 8;
		335
		336	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		337	}
		338
		339	return 1;
		340	}
		341
		342	void
		343	client::mapinfo_queue_run ()
		344	{
		345	if (mapinfo_queue.empty () || !pl)
		346	return;
		347
		348	for (int i = 0; i < mapinfo_queue.size (); ++i)
		349	if (mapinfo_try (mapinfo_queue [i]))
		350	{
		351	free (mapinfo_queue [i]);
		352	mapinfo_queue.erase (i);
		353	}
		354	else
		355	++i;
267	}	356	}
268		357
269	void	358	void
270	MapInfoCmd (char *buf, int len, player *pl)	359	MapInfoCmd (char *buf, int len, player *pl)
271	{	360	{
272	// <mapinfo tag spatial tile-path	361	// <mapinfo tag spatial tile-path
273	// >mapinfo tag spatial flags x y w h hash	362	// >mapinfo tag spatial flags x y w h hash
274		363
275	char bigbuf[MAX_BUF], *token;
276
277	token = buf;	364	char *token = buf;
278	// copy token	365
279	if (!(buf = strchr (buf, ' ')))	366	if (!(buf = strchr (buf, ' ')))
280	return;	367	return;
281		368
282	*buf++ = 0;
283
284	if (!strncmp (buf, "spatial ", 8))	369	if (!strncmp (buf, " spatial ", 9))
285	{	370	{
286	buf += 8;	371	char *copy = strdup (token);
		372	copy [buf - token] = 0;
287		373
288	// initial map and its origin	374	#if 0
289	maptile *map = pl->ob->map;	375	// this makes only sense when we flush the buffer immediately
290	sint16 dx, dy;	376	if (pl->ns->mapinfo_try (copy))
291	int mapx = pl->ns->mapx / 2 - pl->ob->x;	377	free (copy);
292	int mapy = pl->ns->mapy / 2 - pl->ob->y;
293	int max_distance = 8; // limit maximum path length to something generous
294
295	while (*buf && map && max_distance)
296	{
297	int dir = *buf++;
298
299	switch (dir)
300	{
301	case '1':
302	dx = 0;
303	dy = -1;
304	map = map->xy_find (dx, dy);
305	map && (mapy -= map->height);
306	break;
307	case '2':
308	mapx += map->width;
309	dx = map->width;
310	dy = 0;
311	map = map->xy_find (dx, dy);
312	break;
313	case '3':
314	mapy += map->height;
315	dx = 0;
316	dy = map->height;
317	map = map->xy_find (dx, dy);
318	break;
319	case '4':
320	dx = -1;
321	dy = 0;
322	map = map->xy_find (dx, dy);
323	map && (mapx -= map->width);
324	break;
325	}
326
327	--max_distance;
328	}
329
330	if (!max_distance)
331	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
332	else if (map && map->path[0])
333	{
334	int flags = 0;
335
336	if (map->tile_path[0])
337	flags |= 1;
338	if (map->tile_path[1])
339	flags |= 2;
340	if (map->tile_path[2])
341	flags |= 4;
342	if (map->tile_path[3])
343	flags |= 8;
344
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
346	}
347	else	378	else
348	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	379	#endif
		380	pl->ns->mapinfo_queue.push_back (copy);
349	}	381	}
350	else	382	else
351	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	383	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
352
353	pl->ns->send_packet (bigbuf);
354	}	384	}
355		385
356	/** This is the Setup cmd - easy first implementation */	386	/** This is the Setup cmd */
357	void	387	void
358	SetUp (char *buf, int len, client * ns)	388	SetUp (char *buf, int len, client * ns)
359	{	389	{
360	int s, slen;	390	INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
361	char *cmd, *param, cmdback[HUGE_BUF];
362
363	/* run through the cmds of setup
364	* syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
365	*
366	* we send the status of the cmd back, or a FALSE is the cmd is the server unknown
367	* The client then must sort this out
368	*/
369
370	//LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
371
372	strcpy (cmdback, "setup");
373	for (s = 0; s < len; )
374	{
375	cmd = &buf[s];
376
377	/* find the next space, and put a null there */
378	for (; buf[s] && buf[s] != ' '; s++)
379	;
380
381	buf[s++] = 0;
382
383	while (buf[s] == ' ')
384	s++;
385
386	if (s >= len)
387	break;
388
389	param = &buf[s];
390
391	for (; buf[s] && buf[s] != ' '; s++)
392	;
393
394	buf[s++] = 0;
395
396	while (buf[s] == ' ')
397	s++;
398
399	slen = strlen (cmdback);
400	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
401	safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
402	safe_strcat (cmdback, " ", &slen, HUGE_BUF);
403
404	if (!strcmp (cmd, "sound"))
405	{
406	ns->sound = atoi (param);
407	safe_strcat (cmdback, param, &slen, HUGE_BUF);
408	}
409	else if (!strcmp (cmd, "exp64"))
410	safe_strcat (cmdback, param, &slen, HUGE_BUF);
411	else if (!strcmp (cmd, "spellmon"))
412	{
413	ns->monitor_spells = atoi (param);
414	safe_strcat (cmdback, param, &slen, HUGE_BUF);
415	}
416	else if (!strcmp (cmd, "darkness"))
417	{
418	ns->darkness = atoi (param);
419	safe_strcat (cmdback, param, &slen, HUGE_BUF);
420	}
421	else if (!strcmp (cmd, "map1cmd"))
422	{
423	if (atoi (param))
424	ns->mapmode = Map1Cmd;
425	/* if beyond this size, need to use map1cmd no matter what */
426	if (ns->mapx > 11 || ns->mapy > 11)
427	ns->mapmode = Map1Cmd;
428	safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
429	}
430	else if (!strcmp (cmd, "map1acmd"))
431	{
432	if (atoi (param))
433	ns->mapmode = Map1aCmd;
434	/* if beyond this size, need to use map1acmd no matter what */
435	if (ns->mapx > 11 || ns->mapy > 11)
436	ns->mapmode = Map1aCmd;
437	safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
438	}
439	else if (!strcmp (cmd, "newmapcmd"))
440	{
441	ns->newmapcmd = 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
472	sprintf (tmpbuf, "%d", ns->faceset);
473	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
474	/* if the client is using faceset, it knows about image2 command */
475	ns->image2 = 1;
476	}
477	else if (!strcmp (cmd, "itemcmd"))
478	{
479	/* Version of the item protocol command to use. Currently,
480	* only supported versions are 1 and 2. Using a numeric
481	* value will make it very easy to extend this in the future.
482	*/
483	char tmpbuf[20];
484	int q = atoi (param);
485
486	if (q < 1 || q > 2)
487	{
488	strcpy (tmpbuf, "FALSE");
489	}
490	else
491	{
492	ns->itemcmd = q;
493	sprintf (tmpbuf, "%d", ns->itemcmd);
494	}
495	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
496	}
497	else if (!strcmp (cmd, "mapsize"))
498	{
499	int x, y = 0;
500	char tmpbuf[MAX_BUF], *cp;
501
502	x = atoi (param);
503	for (cp = param; *cp != 0; cp++)
504	if (*cp == 'x' || *cp == 'X')
505	{
506	y = atoi (cp + 1);
507	break;
508	}
509
510	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
511	{
512	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
513	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
514	}
515	else
516	{
517	ns->mapx = x;
518	ns->mapy = y;
519	/* better to send back what we are really using and not the
520	* param as given to us in case it gets parsed differently.
521	*/
522	sprintf (tmpbuf, "%dx%d", x, y);
523	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
524	/* If beyond this size and still using orig map command, need to
525	* go to map1cmd.
526	*/
527	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
528	ns->mapmode = Map1Cmd;
529	}
530	}
531	else if (!strcmp (cmd, "extendedMapInfos"))
532	{
533	/* Added by tchize
534	* prepare to use the mapextended command
535	*/
536	char tmpbuf[20];
537
538	ns->ext_mapinfos = (atoi (param));
539	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
540	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
541	}
542	else if (!strcmp (cmd, "extendedTextInfos"))
543	{
544	/* Added by tchize
545	* prepare to use the extended text commands
546	* Client toggle this to non zero to get exttext
547	*/
548	char tmpbuf[20];
549
550	ns->has_readable_type = (atoi (param));
551	sprintf (tmpbuf, "%d", ns->has_readable_type);
552	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
553	}
554	else
555	{
556	/* Didn't get a setup command we understood -
557	* report a failure to the client.
558	*/
559	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
560	}
561	} /* for processing all the setup commands */
562
563	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
564	ns->send_packet (cmdback);
565	}	391	}
566		392
567	/**	393	/**
568	* The client has requested to be added to the game.	394	* The client has requested to be added to the game.
569	* This is what takes care of it. We tell the client how things worked out.	395	* This is what takes care of it. We tell the client how things worked out.
…		…
571	* it either has to be here or init_sockets needs to be exported.	397	* it either has to be here or init_sockets needs to be exported.
572	*/	398	*/
573	void	399	void
574	AddMeCmd (char *buf, int len, client *ns)	400	AddMeCmd (char *buf, int len, client *ns)
575	{	401	{
576	// face caching is mandatory
577	if (!ns->facecache)
578	{
579	ns->send_drawinfo (
580	"\n"
581	"\n"
582	"***\n"
583	"*** WARNING:\n"
584	"*** Your client does not support face/image caching,\n"
585	"*** or it has been disabled. Face caching is mandatory\n"
586	"*** so please enable it or use a newer client.\n"
587	"***\n"
588	"*** Look at your client preferences:\n"
589	"***\n"
590	"*** CFPlus: all known versions automatically enable the facecache.\n"
591	"*** cfclient: use the -cache commandline option.\n"
592	"*** cfclient: map will not redraw automatically (bug).\n"
593	"*** gcfclient: use -cache commandline option, or enable\n"
594	"*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.\n"
595	"*** jcrossclient: your client is broken, use CFPlus or gcfclient.\n"
596	"***\n"
597	"***\n",
598	NDI_RED
599	);
600
601	if (strstr (ns->version, "jcrossclient"))
602	/* let them, for now*/;
603	else
604	{
605	ns->flush ();
606	//ns->destroy ();
607	}
608	//ns->facecache = true;
609	}
610
611	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	402	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
612	}
613
614	/** Reply to ExtendedInfos command */
615	void
616	ToggleExtendedInfos (char *buf, int len, client * ns)
617	{
618	char cmdback[MAX_BUF];
619	char command[50];
620	int info, nextinfo;
621
622	cmdback[0] = '\0';
623	nextinfo = 0;
624
625	while (1)
626	{
627	/* 1. Extract an info */
628	info = nextinfo;
629
630	while ((info < len) && (buf[info] == ' '))
631	info++;
632
633	if (info >= len)
634	break;
635
636	nextinfo = info + 1;
637
638	while ((nextinfo < len) && (buf[nextinfo] != ' '))
639	nextinfo++;
640
641	if (nextinfo - info >= 49) /*Erroneous info asked */
642	continue;
643
644	strncpy (command, &(buf[info]), nextinfo - info);
645
646	/* 2. Interpret info */
647	if (!strcmp ("smooth", command))
648	/* Toggle smoothing */
649	ns->EMI_smooth = !ns->EMI_smooth;
650	else
651	/*bad value */;
652
653	/*3. Next info */
654	}
655
656	strcpy (cmdback, "ExtendedInfoSet");
657
658	if (ns->EMI_smooth)
659	{
660	strcat (cmdback, " ");
661	strcat (cmdback, "smoothing");
662	}
663
664	ns->send_packet (cmdback);
665	}	403	}
666		404
667	/*	405	/*
668	#define MSG_TYPE_BOOK 1	406	#define MSG_TYPE_BOOK 1
669	#define MSG_TYPE_CARD 2	407	#define MSG_TYPE_CARD 2
…		…
726		464
727	ns->send_packet (cmdback);	465	ns->send_packet (cmdback);
728	}	466	}
729		467
730	/**	468	/**
731	* client requested an image. send it rate-limited
732	* before flushing.
733	*/
734	void
735	AskFaceCmd (char *buf, int len, client *ns)
736	{
737	ns->askface.push_back (atoi (buf));
738	}
739
740	/**
741	* Tells client the picture it has to use
742	* to smooth a picture number given as argument.
743	*/
744	void
745	AskSmooth (char *buf, int len, client *ns)
746	{
747	ns->send_face (atoi (buf));
748	}
749
750	/**
751	* This handles the general commands from the client (ie, north, fire, cast,	469	* This handles the general commands from the client (ie, north, fire, cast,
752	* etc.)	470	* etc.)
753	*/	471	*/
754	void	472	void
755	PlayerCmd (char *buf, int len, player *pl)	473	PlayerCmd (char *buf, int len, player *pl)
…		…
776	* commands.	494	* commands.
777	*/	495	*/
778	pl->count = 0;	496	pl->count = 0;
779	}	497	}
780		498
781
782	/**	499	/**
783	* This handles the general commands from the client (ie, north, fire, cast,	500	* This handles the general commands from the client (ie, north, fire, cast,
784	* etc.). It is a lot like PlayerCmd above, but is called with the	501	* etc.). It is a lot like PlayerCmd above, but is called with the
785	* 'ncom' method which gives more information back to the client so it	502	* 'ncom' method which gives more information back to the client so it
786	* can throttle.	503	* can throttle.
…		…
788	void	505	void
789	NewPlayerCmd (char *buf, int len, player *pl)	506	NewPlayerCmd (char *buf, int len, player *pl)
790	{	507	{
791	if (len <= 6)	508	if (len <= 6)
792	{	509	{
793	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	510	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
794	return;	511	return;
795	}	512	}
796		513
797	uint16 cmdid = net_uint16 ((uint8 *)buf);	514	uint16 cmdid = net_uint16 ((uint8 *)buf);
798	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	515	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
855	{	572	{
856	case ST_PLAYING:	573	case ST_PLAYING:
857	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	574	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
858	break;	575	break;
859		576
860	case ST_CHANGE_CLASS:
861	key_change_class (pl->ob, buf[0]);
862	break;
863
864	case ST_GET_PARTY_PASSWORD: /* Get password for party */	577	case ST_GET_PARTY_PASSWORD: /* Get password for party */
865	receive_party_password (pl->ob, 13);	578	receive_party_password (pl->ob, 13);
866	break;	579	break;
867		580
868	default:	581	default:
…		…
907		620
908	cp = strchr (cp + 1, ' ');	621	cp = strchr (cp + 1, ' ');
909		622
910	if (cp)	623	if (cp)
911	{	624	{
912	assign (ns->version, cp + 1);	625	ns->version = cp + 1;
913		626
914	if (ns->sc_version < 1026)	627	if (ns->sc_version < 1026)
915	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	628	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
916	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	629	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
917	}	630	}
…		…
940	* syntax is: move (to) (tag) (nrof)	653	* syntax is: move (to) (tag) (nrof)
941	*/	654	*/
942	void	655	void
943	MoveCmd (char *buf, int len, player *pl)	656	MoveCmd (char *buf, int len, player *pl)
944	{	657	{
945	int vals[3], i;	658	int to, tag, nrof;
946		659
947	/* A little funky here. We only cycle for 2 records, because	660	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
948	* we obviously are not going to find a space after the third
949	* record. Perhaps we should just replace this with a
950	* sscanf?
951	*/
952	for (i = 0; i < 2; i++)
953	{	661	{
954	vals[i] = atoi (buf);
955
956	if (!(buf = strchr (buf, ' ')))
957	{
958	LOG (llevError, "Incomplete move command: %s\n", buf);	662	LOG (llevError, "Incomplete move command: %s\n", buf);
959	return;	663	return;
960	}
961
962	buf++;
963	}	664	}
964		665
965	vals[2] = atoi (buf);	666	esrv_move_object (pl->ob, to, tag, nrof);
966
967	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
968	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
969	}	667	}
970		668
971	/******************************************************************************	669	/******************************************************************************
972	*	670	*
973	* Start of commands the server sends to the client.	671	* Start of commands the server sends to the client.
…		…
977	/**	675	/**
978	* Asks the client to query the user. This way, the client knows	676	* Asks the client to query the user. This way, the client knows
979	* it needs to send something back (vs just printing out a message)	677	* it needs to send something back (vs just printing out a message)
980	*/	678	*/
981	void	679	void
982	send_query (client *ns, uint8 flags, char *text)	680	send_query (client *ns, uint8 flags, const char *text)
983	{	681	{
984	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	682	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
		683	}
		684
		685	/**
		686	* Get player's current range attack in obuf.
		687	*/
		688	static void
		689	rangetostring (player *pl, char *obuf)
		690	{
		691	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		692
		693	if (pl->ranged_ob)
		694	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		695
		696	if (pl->combat_ob)
		697	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		698
		699	#if 0
		700	//TODO: remove this when slot system is working, this is only for debugging
		701	if (pl->ob->chosen_skill)
		702	buf << " Skill*: " << pl->ob->chosen_skill->name;
		703	#endif
		704
		705	//TODO: maybe golem should become the current_weapon, quite simply?
		706	if (pl->golem)
		707	buf << " Golem*: " << pl->golem->name;
		708
		709	buf << '\0';
		710	buf.linearise (obuf);
985	}	711	}
986		712
987	#define AddIfInt64(Old,New,Type) if (Old != New) {\	713	#define AddIfInt64(Old,New,Type) if (Old != New) {\
988	Old = New; \	714	Old = New; \
989	sl << uint8 (Type) << uint64 (New); \	715	sl << uint8 (Type) << uint64 (New); \
…		…
997	#define AddIfShort(Old,New,Type) if (Old != New) {\	723	#define AddIfShort(Old,New,Type) if (Old != New) {\
998	Old = New; \	724	Old = New; \
999	sl << uint8 (Type) << uint16 (New); \	725	sl << uint8 (Type) << uint16 (New); \
1000	}	726	}
1001		727
1002	#define AddIfFloat(Old,New,Type) if (Old != New) {\	728	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
1003	Old = New; \	729	Old = New; \
1004	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	730	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
1005	}	731	}
1006		732
1007	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	733	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
1008	free(Old); Old = strdup (New);\	734	free(Old); Old = strdup (New);\
1009	sl << uint8 (Type) << data8 (New); \	735	sl << uint8 (Type) << data8 (New); \
…		…
1023		749
1024	client *ns = pl->ns;	750	client *ns = pl->ns;
1025	if (!ns)	751	if (!ns)
1026	return;	752	return;
1027		753
1028	object *ob = pl->ob;	754	object *ob = pl->observe;
1029	if (!ob)	755	if (!ob)
1030	return;	756	return;
		757
		758	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
1031		759
1032	packet sl ("stats");	760	packet sl ("stats");
1033		761
1034	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	762	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1035	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	763	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
1044	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	772	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1045	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	773	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1046	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	774	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1047		775
1048	for (int s = 0; s < NUM_SKILLS; s++)	776	for (int s = 0; s < NUM_SKILLS; s++)
1049	if (object *skill = pl->last_skill_ob[s])	777	if (object *skill = opl->last_skill_ob [s])
1050	if (skill->stats.exp != ns->last_skill_exp [s])	778	if (skill->stats.exp != ns->last_skill_exp [s])
1051	{	779	{
1052	ns->last_skill_exp [s] = skill->stats.exp;	780	ns->last_skill_exp [s] = skill->stats.exp;
1053		781
1054	/* Always send along the level if exp changes. This is only	782	/* Always send along the level if exp changes. This is only
…		…
1062	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	790	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1063	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	791	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1064	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	792	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1065	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	793	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1066	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	794	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1067	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	795	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1068	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	796	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1069	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	797	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1070	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	798	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1071		799
1072	flags = 0;	800	flags = 0;
1073		801
1074	if (pl->fire_on)	802	if (opl->fire_on)
1075	flags |= SF_FIREON;	803	flags |= SF_FIREON;
1076		804
1077	if (pl->run_on)	805	if (opl->run_on)
1078	flags |= SF_RUNON;	806	flags |= SF_RUNON;
1079		807
1080	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	808	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1081		809
1082	if (ns->sc_version < 1025)	810	if (ns->sc_version < 1025)
…		…
1096	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	824	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1097	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	825	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1098	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	826	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1099	}	827	}
1100		828
1101	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	829	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1102	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	830	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1103	set_title (ob, buf);	831	set_title (ob, buf);
1104	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	832	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1105		833
1106	/* Only send it away if we have some actual data */	834	/* Only send it away if we have some actual data */
…		…
1110		838
1111	/**	839	/**
1112	* Tells the client that here is a player it should start using.	840	* Tells the client that here is a player it should start using.
1113	*/	841	*/
1114	void	842	void
1115	esrv_new_player (player *pl, uint32 weight)	843	esrv_new_player (player *pl)
1116	{	844	{
		845	sint32 weight = pl->ob->client_weight ();
		846
1117	packet sl ("player");	847	packet sl ("player");
1118		848
1119	sl << uint32 (pl->ob->count)	849	sl << uint32 (pl->ob->count)
1120	<< uint32 (weight)	850	<< uint32 (weight)
1121	<< uint32 (pl->ob->face)	851	<< uint32 (pl->ob->face)
1122	<< data8 (pl->ob->name);	852	<< data8 (pl->ob->name);
1123		853
1124	pl->ns->last_weight = weight;	854	pl->ns->last_weight = weight;
1125	pl->ns->send_packet (sl);	855	pl->ns->send_packet (sl);
1126	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1127	}	856	}
1128		857
1129	/******************************************************************************	858	/******************************************************************************
1130	*	859	*
1131	* Start of map related commands.	860	* Start of map related commands.
…		…
1188		917
1189	if (!ns.faces_sent[face_num])	918	if (!ns.faces_sent[face_num])
1190	if (ob)	919	if (ob)
1191	ns.send_faces (ob);	920	ns.send_faces (ob);
1192	else	921	else
1193	ns.send_face (face_num);	922	ns.send_face (face_num, 10);
1194		923
1195	sl << uint16 (face_num);	924	sl << uint16 (face_num);
1196	return 1;	925	return 1;
1197	}	926	}
1198		927
1199	/* Nothing changed */	928	/* Nothing changed */
1200	return 0;	929	return 0;
1201	}
1202
1203	/**
1204	* Returns the size of a data for a map square as returned by
1205	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1206	* available.
1207	*/
1208	int
1209	getExtendedMapInfoSize (client * ns)
1210	{
1211	int result = 0;
1212
1213	if (ns->ext_mapinfos)
1214	{
1215	if (ns->EMI_smooth)
1216	result += 1; /*One byte for smoothlevel */
1217	}
1218
1219	return result;
1220	}	930	}
1221		931
1222	// prefetch (and touch) all maps within a specific distancd	932	// prefetch (and touch) all maps within a specific distancd
1223	static void	933	static void
1224	prefetch_surrounding_maps (maptile *map, int distance)	934	prefetch_surrounding_maps (maptile *map, int distance)
1225	{	935	{
1226	map->last_access = runtime;	936	map->touch ();
1227		937
1228	if (--distance)	938	if (--distance)
1229	for (int dir = 4; --dir; )	939	for (int dir = 4; --dir; )
1230	if (const shstr &path = map->tile_path [dir])	940	if (const shstr &path = map->tile_path [dir])
1231	if (maptile *&neigh = map->tile_map [dir])	941	if (maptile *&neigh = map->tile_map [dir])
…		…
1240	{	950	{
1241	prefetch_surrounding_maps (op->map, 3);	951	prefetch_surrounding_maps (op->map, 3);
1242	}	952	}
1243		953
1244	/**	954	/**
1245	* This function uses the new map1 protocol command to send the map	955	* Draws client map.
1246	* to the client. It is necessary because the old map command supports
1247	* a maximum map size of 15x15.
1248	* This function is much simpler than the old one. This is because
1249	* the old function optimized to send as few face identifiers as possible,
1250	* at the expense of sending more coordinate location (coordinates were
1251	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1252	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1253	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1254	* and use the other 4 bits for other informatiion. For full documentation
1255	* of what we send, see the doc/Protocol file.
1256	* I will describe internally what we do:
1257	* the ns->lastmap shows how the map last looked when sent to the client.
1258	* in the lastmap structure, there is a cells array, which is set to the
1259	* maximum viewable size (As set in config.h).
1260	* in the cells, there are faces and a count value.
1261	* we use the count value to hold the darkness value. If -1, then this space
1262	* is not viewable.
1263	* we use faces[0] faces[1] faces[2] to hold what the three layers
1264	* look like.
1265	*/	956	*/
1266	void	957	void
1267	draw_client_map1 (object *pl)	958	draw_client_map (player *pl)
1268	{	959	{
1269	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	960	object *ob = pl->observe;
1270	sint16 nx, ny;
1271	int estartlen, eoldlen;
1272	uint8 eentrysize;
1273	uint16 ewhatstart, ewhatflag;
1274	uint8 extendedinfos;
1275	maptile *m;
1276
1277	client &socket = *pl->contr->ns;
1278
1279	if (!pl->active)	961	if (!ob->active)
1280	return;	962	return;
1281
1282	check_map_change (pl->contr);
1283	prefetch_surrounding_maps (pl);
1284
1285	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1286	packet esl;
1287
1288	startlen = sl.length ();
1289
1290	/*Extendedmapinfo structure initialisation */
1291	if (socket.ext_mapinfos)
1292	{
1293	extendedinfos = EMI_NOREDRAW;
1294
1295	if (socket.EMI_smooth)
1296	extendedinfos |= EMI_SMOOTH;
1297
1298	ewhatstart = esl.length ();
1299	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1300	could need to be taken away */
1301	eentrysize = getExtendedMapInfoSize (&socket);
1302	esl << "mapextended "
1303	<< uint8 (extendedinfos)
1304	<< uint8 (eentrysize);
1305
1306	estartlen = esl.length ();
1307	}
1308
1309	/* x,y are the real map locations. ax, ay are viewport relative
1310	* locations.
1311	*/
1312	ay = 0;
1313
1314	/* We could do this logic as conditionals in the if statement,
1315	* but that started to get a bit messy to look at.
1316	*/
1317	max_x = pl->x + (socket.mapx + 1) / 2;
1318	max_y = pl->y + (socket.mapy + 1) / 2;
1319
1320	maptile *plmap = pl->map;
1321
1322	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1323	{
1324	ax = 0;
1325	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1326	{
1327	int emask, mask;
1328	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1329
1330	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1331
1332	/* If the coordinates are not valid, or it is too dark to see,
1333	* we tell the client as such
1334	*/
1335	nx = x;
1336	ny = y;
1337	m = get_map_from_coord (plmap, &nx, &ny);
1338
1339	if (!m)
1340	{
1341	/* space is out of map. Update space and clear values
1342	* if this hasn't already been done. If the space is out
1343	* of the map, it shouldn't have a head
1344	*/
1345	if (lastcell.count != -1)
1346	{
1347	sl << uint16 (mask);
1348	map_clearcell (&lastcell, -1);
1349	}
1350
1351	continue;
1352	}
1353
1354	m->touch ();
1355
1356	int d = pl->contr->blocked_los[ax][ay];
1357
1358	if (d > 3)
1359	{
1360
1361	int need_send = 0, count;
1362
1363	/* This block deals with spaces that are not visible for whatever
1364	* reason. Still may need to send the head for this space.
1365	*/
1366
1367	oldlen = sl.length ();
1368
1369	sl << uint16 (mask);
1370
1371	if (lastcell.count != -1)
1372	need_send = 1;
1373
1374	count = -1;
1375
1376	/* properly clear a previously sent big face */
1377	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1378	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1379	need_send = 1;
1380
1381	map_clearcell (&lastcell, count);
1382
1383	if ((mask & 0xf) || need_send)
1384	sl[oldlen + 1] = mask & 0xff;
1385	else
1386	sl.reset (oldlen);
1387	}
1388	else
1389	{
1390	/* In this block, the space is visible.
1391	*/
1392
1393	/* Rather than try to figure out what everything that we might
1394	* need to send is, then form the packet after that,
1395	* we presume that we will in fact form a packet, and update
1396	* the bits by what we do actually send. If we send nothing,
1397	* we just back out sl.length () to the old value, and no harm
1398	* is done.
1399	* I think this is simpler than doing a bunch of checks to see
1400	* what if anything we need to send, setting the bits, then
1401	* doing those checks again to add the real data.
1402	*/
1403	oldlen = sl.length ();
1404	eoldlen = esl.length ();
1405
1406	sl << uint16 (mask);
1407
1408	unsigned char dummy;
1409	unsigned char *last_ext = &dummy;
1410
1411	/* Darkness changed */
1412	if (lastcell.count != d && socket.darkness)
1413	{
1414	mask |= 0x8;
1415
1416	if (socket.extmap)
1417	{
1418	*last_ext |= 0x80;
1419	last_ext = &sl[sl.length ()];
1420	sl << uint8 (d);
1421	}
1422	else
1423	sl << uint8 (255 - 64 * d);
1424	}
1425
1426	lastcell.count = d;
1427
1428	mapspace &ms = m->at (nx, ny);
1429
1430	if (socket.extmap)
1431	{
1432	uint8 stat_hp = 0;
1433	uint8 stat_width = 0;
1434	uint8 flags = 0;
1435	UUID player = 0;
1436
1437	// send hp information, if applicable
1438	if (object *op = ms.faces_obj [0])
1439	{
1440	if (op->head || op->invisible)
1441	; // do not show
1442	else if (op->type == PLAYER
1443	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1444	{
1445	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1446	{
1447	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1448	stat_width = op->arch->tail_x;
1449	}
1450	}
1451
1452	if (op->msg && op->msg[0] == '@')
1453	flags |= 1;
1454
1455	if (op->type == PLAYER && op != pl)
1456	player = op->count;
1457	}
1458
1459	if (lastcell.stat_hp != stat_hp)
1460	{
1461	lastcell.stat_hp = stat_hp;
1462
1463	mask |= 0x8;
1464	*last_ext |= 0x80;
1465	last_ext = &sl[sl.length ()];
1466
1467	sl << uint8 (5) << uint8 (stat_hp);
1468
1469	if (stat_width > 1)
1470	{
1471	*last_ext |= 0x80;
1472	last_ext = &sl[sl.length ()];
1473
1474	sl << uint8 (6) << uint8 (stat_width);
1475	}
1476	}
1477
1478	if (lastcell.player != player)
1479	{
1480	lastcell.player = player;
1481
1482	mask |= 0x8;
1483	*last_ext |= 0x80;
1484	last_ext = &sl[sl.length ()];
1485
1486	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1487	}
1488
1489	if (lastcell.flags != flags)
1490	{
1491	lastcell.flags = flags;
1492
1493	mask |= 0x8;
1494	*last_ext |= 0x80;
1495	last_ext = &sl[sl.length ()];
1496
1497	sl << uint8 (8) << uint8 (flags);
1498	}
1499	}
1500
1501	/* Floor face */
1502	if (update_space (sl, socket, ms, lastcell, 2))
1503	mask |= 0x4;
1504
1505	/* Middle face */
1506	if (update_space (sl, socket, ms, lastcell, 1))
1507	mask |= 0x2;
1508
1509	if (ms.player () == pl
1510	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1511	{
1512	// force player to be visible to himself if invisible
1513	if (lastcell.faces[0] != pl->face)
1514	{
1515	lastcell.faces[0] = pl->face;
1516
1517	mask |= 0x1;
1518	sl << uint16 (pl->face);
1519
1520	socket.send_faces (pl);
1521	}
1522	}
1523	/* Top face */
1524	else if (update_space (sl, socket, ms, lastcell, 0))
1525	mask |= 0x1;
1526
1527
1528	/* Check to see if we are in fact sending anything for this
1529	* space by checking the mask. If so, update the mask.
1530	* if not, reset the len to that from before adding the mask
1531	* value, so we don't send those bits.
1532	*/
1533	if (mask & 0xf)
1534	sl[oldlen + 1] = mask & 0xff;
1535	else
1536	sl.reset (oldlen);
1537
1538	if (socket.ext_mapinfos)
1539	esl << uint16 (emask);
1540
1541	if (socket.EMI_smooth)
1542	{
1543	for (int layer = 2+1; layer--; )
1544	{
1545	object *ob = ms.faces_obj [layer];
1546
1547	// If there is no object for this space, or if the face for the object
1548	// is the blank face, set the smoothlevel to zero.
1549	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1550
1551	// We've gotten what face we want to use for the object. Now see if
1552	// if it has changed since we last sent it to the client.
1553	if (lastcell.smooth[layer] != smoothlevel)
1554	{
1555	lastcell.smooth[layer] = smoothlevel;
1556	esl << uint8 (smoothlevel);
1557	emask |= 1 << layer;
1558	}
1559	}
1560
1561	if (emask & 0xf)
1562	esl[eoldlen + 1] = emask & 0xff;
1563	else
1564	esl.reset (eoldlen);
1565	}
1566	} /* else this is a viewable space */
1567	} /* for x loop */
1568	} /* for y loop */
1569
1570	/* Verify that we in fact do need to send this */
1571	if (socket.ext_mapinfos)
1572	{
1573	if (!(sl.length () > startlen || socket.sent_scroll))
1574	{
1575	/* No map data will follow, so don't say the client
1576	* it doesn't need draw!
1577	*/
1578	ewhatflag &= ~EMI_NOREDRAW;
1579	esl[ewhatstart + 1] = ewhatflag & 0xff;
1580	}
1581
1582	if (esl.length () > estartlen)
1583	socket.send_packet (esl);
1584	}
1585
1586	if (sl.length () > startlen || socket.sent_scroll)
1587	{
1588	socket.send_packet (sl);
1589	socket.sent_scroll = 0;
1590	}
1591	}
1592
1593	/**
1594	* Draws client map.
1595	*/
1596	void
1597	draw_client_map (object *pl)
1598	{
1599	int i, j;
1600	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1601	int mflags;
1602	struct Map newmap;
1603	maptile *m, *pm;
1604
1605	if (pl->type != PLAYER)
1606	{
1607	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1608	return;
1609	}
1610
1611	pm = pl->map;
1612		963
1613	/* If player is just joining the game, he isn't here yet, so the map	964	/* If player is just joining the game, he isn't here yet, so the map
1614	* can get swapped out. If so, don't try to send them a map. All will	965	* can get swapped out. If so, don't try to send them a map. All will
1615	* be OK once they really log in.	966	* be OK once they really log in.
1616	*/	967	*/
1617	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	968	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1618	return;	969	return;
1619		970
1620	memset (&newmap, 0, sizeof (struct Map));	971	int startlen, oldlen;
1621		972
1622	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)	973	check_map_change (pl);
1623	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)	974	prefetch_surrounding_maps (pl->ob);
		975
		976	/* do LOS after calls to update_position */
		977	/* unfortunately, we need to udpate los when observing, currently */
		978	if (pl->do_los || pl->observe != pl->ob)
		979	{
		980	pl->do_los = 0;
		981	pl->update_los ();
		982	}
		983
		984	/**
		985	* This function uses the new map1 protocol command to send the map
		986	* to the client. It is necessary because the old map command supports
		987	* a maximum map size of 15x15.
		988	* This function is much simpler than the old one. This is because
		989	* the old function optimized to send as few face identifiers as possible,
		990	* at the expense of sending more coordinate location (coordinates were
		991	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		992	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		993	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		994	* and use the other 4 bits for other informatiion. For full documentation
		995	* of what we send, see the doc/Protocol file.
		996	* I will describe internally what we do:
		997	* the ns->lastmap shows how the map last looked when sent to the client.
		998	* in the lastmap structure, there is a cells array, which is set to the
		999	* maximum viewable size (As set in config.h).
		1000	* in the cells, there are faces and a count value.
		1001	* we use the count value to hold the darkness value. If -1, then this space
		1002	* is not viewable.
		1003	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1004	* look like.
		1005	*/
		1006
		1007	client &socket = *pl->ns;
		1008
		1009	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
		1010
		1011	startlen = sl.length ();
		1012
		1013	int hx = socket.mapx / 2;
		1014	int hy = socket.mapy / 2;
		1015
		1016	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
		1017	int ax = dx + hx;
		1018	int ay = dy + hy;
		1019
		1020	int mask = (ax << 10) | (ay << 4);
		1021	MapCell &lastcell = socket.lastmap.cells[ax][ay];
		1022
		1023	/* If the coordinates are not valid, or it is too dark to see,
		1024	* we tell the client as such
		1025	*/
		1026	if (!m)
1624	{	1027	{
1625	ax = i;	1028	/* space is out of map. Update space and clear values
1626	ay = j;	1029	* if this hasn't already been done. If the space is out
1627	m = pm;	1030	* of the map, it shouldn't have a head.
1628	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1629
1630	if (mflags & P_OUT_OF_MAP)
1631	continue;
1632
1633	/* If a map is visible to the player, we don't want to swap it out
1634	* just to reload it. This should really call something like
1635	* swap_map, but this is much more efficient and 'good enough'
1636	*/	1031	*/
1637	if (mflags & P_NEW_MAP)	1032	if (lastcell.count != -1)
1638	m->timeout = 50;	1033	{
		1034	sl << uint16 (mask);
		1035	map_clearcell (&lastcell, -1);
		1036	}
		1037
		1038	continue;
1639	}	1039	}
		1040
		1041	int d = pl->blocked_los_uc (dx, dy);
1640		1042
1641	/* do LOS after calls to update_position */	1043	if (d > 3)
1642	if (pl->contr->do_los)
1643	{	1044	{
1644	update_los (pl);	1045	/* This block deals with spaces that are not visible for whatever
1645	pl->contr->do_los = 0;	1046	* reason. Still may need to send the head for this space.
		1047	*/
		1048	if (lastcell.count != -1
		1049	|| lastcell.faces[0]
		1050	|| lastcell.faces[1]
		1051	|| lastcell.faces[2]
		1052	|| lastcell.stat_hp
		1053	|| lastcell.flags
		1054	|| lastcell.player)
		1055	sl << uint16 (mask);
		1056
		1057	/* properly clear a previously sent big face */
		1058	map_clearcell (&lastcell, -1);
1646	}	1059	}
		1060	else
		1061	{
		1062	/* In this block, the space is visible.
		1063	*/
1647		1064
1648	/* Big maps need a different drawing mechanism to work */	1065	/* Rather than try to figure out what everything that we might
1649	draw_client_map1 (pl);	1066	* need to send is, then form the packet after that,
1650	}	1067	* we presume that we will in fact form a packet, and update
		1068	* the bits by what we do actually send. If we send nothing,
		1069	* we just back out sl.length () to the old value, and no harm
		1070	* is done.
		1071	* I think this is simpler than doing a bunch of checks to see
		1072	* what if anything we need to send, setting the bits, then
		1073	* doing those checks again to add the real data.
		1074	*/
		1075	oldlen = sl.length ();
1651		1076
		1077	sl << uint16 (mask);
		1078
		1079	unsigned char dummy;
		1080	unsigned char *last_ext = &dummy;
		1081
		1082	/* Darkness changed */
		1083	if (lastcell.count != d)
		1084	{
		1085	mask |= 0x8;
		1086
		1087	*last_ext |= 0x80;
		1088	last_ext = &sl[sl.length ()];
		1089	sl << uint8 (d);
		1090	}
		1091
		1092	lastcell.count = d;
		1093
		1094	mapspace &ms = m->at (nx, ny);
		1095	ms.update ();
		1096
		1097	// extmap handling
		1098	uint8 stat_hp = 0;
		1099	uint8 stat_width = 0;
		1100	uint8 flags = 0;
		1101	tag_t player = 0;
		1102
		1103	// send hp information, if applicable
		1104	if (object *op = ms.faces_obj [0])
		1105	if (op->is_head () && !op->invisible)
		1106	{
		1107	if (op->stats.maxhp > op->stats.hp
		1108	&& op->stats.maxhp > 0
		1109	&& (op->type == PLAYER
		1110	|| op->type == DOOR // does not work, have maxhp 0
		1111	|| QUERY_FLAG (op, FLAG_MONSTER)
		1112	|| QUERY_FLAG (op, FLAG_ALIVE)
		1113	|| QUERY_FLAG (op, FLAG_GENERATOR)))
		1114	{
		1115	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1116	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1117	}
		1118
		1119	if (expect_false (op->has_dialogue ()))
		1120	flags |= 1;
		1121
		1122	if (expect_false (op->type == PLAYER))
		1123	player = op == ob ? pl->ob->count
		1124	: op == pl->ob ? ob->count
		1125	: op->count;
		1126	}
		1127
		1128	if (expect_false (lastcell.stat_hp != stat_hp))
		1129	{
		1130	lastcell.stat_hp = stat_hp;
		1131
		1132	mask |= 0x8;
		1133	*last_ext |= 0x80;
		1134	last_ext = &sl[sl.length ()];
		1135
		1136	sl << uint8 (5) << uint8 (stat_hp);
		1137
		1138	if (stat_width > 1)
		1139	{
		1140	*last_ext |= 0x80;
		1141	last_ext = &sl[sl.length ()];
		1142
		1143	sl << uint8 (6) << uint8 (stat_width);
		1144	}
		1145	}
		1146
		1147	if (expect_false (lastcell.player != player))
		1148	{
		1149	lastcell.player = player;
		1150
		1151	mask |= 0x8;
		1152	*last_ext |= 0x80;
		1153	last_ext = &sl[sl.length ()];
		1154
		1155	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
		1156	}
		1157
		1158	if (expect_false (lastcell.flags != flags))
		1159	{
		1160	lastcell.flags = flags;
		1161
		1162	mask |= 0x8;
		1163	*last_ext |= 0x80;
		1164	last_ext = &sl[sl.length ()];
		1165
		1166	sl << uint8 (8) << uint8 (flags);
		1167	}
		1168
		1169	// faces
		1170
		1171	/* Floor face */
		1172	if (update_space (sl, socket, ms, lastcell, 2))
		1173	mask |= 0x4;
		1174
		1175	/* Middle face */
		1176	if (update_space (sl, socket, ms, lastcell, 1))
		1177	mask |= 0x2;
		1178
		1179	if (expect_false (ob->invisible)
		1180	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
		1181	&& ms.player () == ob)
		1182	{
		1183	// force player to be visible to himself if invisible
		1184	if (lastcell.faces[0] != ob->face)
		1185	{
		1186	lastcell.faces[0] = ob->face;
		1187
		1188	mask |= 0x1;
		1189	sl << uint16 (ob->face);
		1190
		1191	socket.send_faces (ob);
		1192	}
		1193	}
		1194	/* Top face */
		1195	else if (update_space (sl, socket, ms, lastcell, 0))
		1196	mask |= 0x1;
		1197
		1198	/* Check to see if we are in fact sending anything for this
		1199	* space by checking the mask. If so, update the mask.
		1200	* if not, reset the len to that from before adding the mask
		1201	* value, so we don't send those bits.
		1202	*/
		1203	if (mask & 0xf)
		1204	sl[oldlen + 1] = mask & 0xff;
		1205	else
		1206	sl.reset (oldlen);
		1207	} /* else this is a viewable space */
		1208	ordered_mapwalk_end
		1209
		1210	socket.flush_fx ();
		1211
		1212	if (sl.length () > startlen || socket.sent_scroll)
		1213	{
		1214	socket.send_packet (sl);
		1215	socket.sent_scroll = 0;
		1216	}
		1217	}
1652		1218
1653	/*****************************************************************************/	1219	/*****************************************************************************/
1654
1655	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1220	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1656
1657	/* a player. Of course, the client need to know the command to be able to */	1221	/* a player. Of course, the client need to know the command to be able to */
1658
1659	/* manage it ! */	1222	/* manage it ! */
1660
1661	/*****************************************************************************/	1223	/*****************************************************************************/
1662	void	1224	void
1663	send_plugin_custom_message (object *pl, char *buf)	1225	send_plugin_custom_message (object *pl, char *buf)
1664	{	1226	{
1665	pl->contr->ns->send_packet (buf);	1227	pl->contr->ns->send_packet (buf);
…		…
1674	{	1236	{
1675	packet sl;	1237	packet sl;
1676	sl << "replyinfo skill_info\n";	1238	sl << "replyinfo skill_info\n";
1677		1239
1678	for (int i = 1; i < NUM_SKILLS; i++)	1240	for (int i = 1; i < NUM_SKILLS; i++)
1679	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1241	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1680		1242
1681	if (sl.length () >= MAXSOCKBUF)	1243	if (sl.length () > MAXSOCKBUF)
1682	{	1244	{
1683	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1245	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1684	fatal (0);	1246	fatal (0);
1685	}	1247	}
1686		1248
…		…
1699	sl << "replyinfo spell_paths\n";	1261	sl << "replyinfo spell_paths\n";
1700		1262
1701	for (int i = 0; i < NRSPELLPATHS; i++)	1263	for (int i = 0; i < NRSPELLPATHS; i++)
1702	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1264	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1703		1265
1704	if (sl.length () >= MAXSOCKBUF)	1266	if (sl.length () > MAXSOCKBUF)
1705	{	1267	{
1706	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1268	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1707	fatal (0);	1269	fatal (0);
1708	}	1270	}
1709		1271
…		…
1728	if (spell->type == SPELL)	1290	if (spell->type == SPELL)
1729	{	1291	{
1730	int flags = 0;	1292	int flags = 0;
1731		1293
1732	/* check if we need to update it */	1294	/* check if we need to update it */
1733	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1295	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1734	{	1296	{
1735	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1297	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1736	flags |= UPD_SP_MANA;	1298	flags |= UPD_SP_MANA;
1737	}	1299	}
1738		1300
1739	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1301	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1740	{	1302	{
1741	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1303	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1742	flags |= UPD_SP_GRACE;	1304	flags |= UPD_SP_GRACE;
1743	}	1305	}
1744		1306
1745	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1307	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1746	{	1308	{
1747	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1309	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1748	flags |= UPD_SP_DAMAGE;	1310	flags |= UPD_SP_DAMAGE;
1749	}	1311	}
1750		1312
1751	if (flags)	1313	if (flags)
1752	{	1314	{
…		…
1754		1316
1755	sl << "updspell "	1317	sl << "updspell "
1756	<< uint8 (flags)	1318	<< uint8 (flags)
1757	<< uint32 (spell->count);	1319	<< uint32 (spell->count);
1758		1320
1759	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1321	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1760	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1322	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1761	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1323	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1762		1324
1763	pl->ns->send_packet (sl);	1325	pl->ns->send_packet (sl);
1764	}	1326	}
1765	}	1327	}
1766	}	1328	}
…		…
1796	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1358	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1797	return;	1359	return;
1798	}	1360	}
1799		1361
1800	/* store costs and damage in the object struct, to compare to later */	1362	/* store costs and damage in the object struct, to compare to later */
1801	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1363	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1802	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1364	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1803	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1365	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1804		1366
1805	/* figure out which skill it uses, if it uses one */	1367	/* figure out which skill it uses, if it uses one */
1806	if (spell->skill)	1368	if (spell->skill)
1807	{	1369	if (object *tmp = pl->find_skill (spell->skill))
1808	for (i = 1; i < NUM_SKILLS; i++)
1809	if (!strcmp (spell->skill, skill_names[i]))
1810	{
1811	skill = i + CS_STAT_SKILLINFO;	1370	skill = tmp->subtype + CS_STAT_SKILLINFO;
1812	break;
1813	}
1814	}
1815		1371
1816	// spells better have a face	1372	// spells better have a face
1817	if (!spell->face)	1373	if (!spell->face)
1818	{	1374	{
1819	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1375	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1820	spell->face = face_find ("burnout.x11", blank_face);	1376	spell->face = face_find ("burnout.x11", blank_face);
1821	}	1377	}
		1378
		1379	pl->ns->send_face (spell->face);
1822		1380
1823	/* send the current values */	1381	/* send the current values */
1824	sl << uint32 (spell->count)	1382	sl << uint32 (spell->count)
1825	<< uint16 (spell->level)	1383	<< uint16 (spell->level)
1826	<< uint16 (spell->casting_time)	1384	<< uint16 (spell->casting_time)
1827	<< uint16 (spell->last_sp)	1385	<< uint16 (spell->cached_sp)
1828	<< uint16 (spell->last_grace)	1386	<< uint16 (spell->cached_grace)
1829	<< uint16 (spell->last_eat)	1387	<< uint16 (spell->cached_eat)
1830	<< uint8 (skill)	1388	<< uint8 (skill)
1831	<< uint32 (spell->path_attuned)	1389	<< uint32 (spell->path_attuned)
1832	<< uint32 (spell->face)	1390	<< uint32 (spell->face)
1833	<< data8 (spell->name)	1391	<< data8 (spell->name)
1834	<< data16 (spell->msg);	1392	<< data16 (spell->msg);
…		…
1862	* bytes and 3 strings (because that is the spec) so we need to	1420	* bytes and 3 strings (because that is the spec) so we need to
1863	* check that the length of those 3 strings, plus the 23 bytes,	1421	* check that the length of those 3 strings, plus the 23 bytes,
1864	* won't take us over the length limit for the socket, if it does,	1422	* won't take us over the length limit for the socket, if it does,
1865	* we need to send what we already have, and restart packet formation	1423	* we need to send what we already have, and restart packet formation
1866	*/	1424	*/
		1425	if (spell->type != SPELL)
		1426	continue;
		1427
1867	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1428	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1868	* to show add_spell is 26 bytes + 2 strings. However, the overun	1429	* to show add_spell is 26 bytes + 2 strings. However, the overun
1869	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1430	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1870	* like it will fix this	1431	* like it will fix this
1871	*/	1432	*/
1872	if (spell->type != SPELL)
1873	continue;
1874
1875	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1433	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1876	{	1434	{
		1435	pl->ns->flush_fx ();
1877	pl->ns->send_packet (sl);	1436	pl->ns->send_packet (sl);
1878		1437
1879	sl.reset ();	1438	sl.reset ();
1880	sl << "addspell ";	1439	sl << "addspell ";
1881	}	1440	}
…		…
1889	return;	1448	return;
1890	}	1449	}
1891	else	1450	else
1892	append_spell (pl, sl, spell);	1451	append_spell (pl, sl, spell);
1893		1452
1894	if (sl.length () >= MAXSOCKBUF)	1453	if (sl.length () > MAXSOCKBUF)
1895	{	1454	{
1896	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1455	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1897	fatal (0);	1456	fatal (0);
1898	}	1457	}
1899		1458
1900	/* finally, we can send the packet */	1459	/* finally, we can send the packet */
		1460	pl->ns->flush_fx ();
1901	pl->ns->send_packet (sl);	1461	pl->ns->send_packet (sl);
1902	}	1462	}
1903		1463

Diff Legend

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