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

Diff Legend

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