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

Diff Legend

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