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.75 by root, Wed Mar 14 04:12:29 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));
		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"))	242	if (!strcmp (buf, "image_info"))
239	send_image_info (ns, params);	243	send_image_info (ns, params);
…		…
242	else if (!strcmp (buf, "skill_info"))	246	else if (!strcmp (buf, "skill_info"))
243	send_skill_info (ns, params);	247	send_skill_info (ns, params);
244	else if (!strcmp (buf, "spell_paths"))	248	else if (!strcmp (buf, "spell_paths"))
245	send_spell_paths (ns, params);	249	send_spell_paths (ns, params);
246	else	250	else
247	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	}
248	}	258	}
249		259
250	void	260	void
251	ExtCmd (char *buf, int len, player *pl)	261	ExtCmd (char *buf, int len, player *pl)
252	{	262	{
…		…
255		265
256	void	266	void
257	ExtiCmd (char *buf, int len, client *ns)	267	ExtiCmd (char *buf, int len, client *ns)
258	{	268	{
259	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;
260	}	356	}
261		357
262	void	358	void
263	MapInfoCmd (char *buf, int len, player *pl)	359	MapInfoCmd (char *buf, int len, player *pl)
264	{	360	{
265	// <mapinfo tag spatial tile-path	361	// <mapinfo tag spatial tile-path
266	// >mapinfo tag spatial flags x y w h hash	362	// >mapinfo tag spatial flags x y w h hash
267		363
268	char bigbuf[MAX_BUF], *token;
269
270	token = buf;	364	char *token = buf;
271	// copy token	365
272	if (!(buf = strchr (buf, ' ')))	366	if (!(buf = strchr (buf, ' ')))
273	return;	367	return;
274		368
275	*buf++ = 0;
276
277	if (!strncmp (buf, "spatial ", 8))	369	if (!strncmp (buf, " spatial ", 9))
278	{	370	{
279	buf += 8;	371	char *copy = strdup (token);
		372	copy [buf - token] = 0;
280		373
281	// initial map and its origin	374	#if 0
282	maptile *map = pl->ob->map;	375	// this makes only sense when we flush the buffer immediately
283	sint16 dx, dy;	376	if (pl->ns->mapinfo_try (copy))
284	int mapx = pl->ns->mapx / 2 - pl->ob->x;	377	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	378	else
341	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	379	#endif
		380	pl->ns->mapinfo_queue.push_back (copy);
342	}	381	}
343	else	382	else
344	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	383	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
345
346	pl->ns->send_packet (bigbuf);
347	}	384	}
348		385
349	/** This is the Setup cmd - easy first implementation */	386	/** This is the Setup cmd */
350	void	387	void
351	SetUp (char *buf, int len, client * ns)	388	SetUp (char *buf, int len, client * ns)
352	{	389	{
353	int s, slen;	390	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	sprintf (tmpbuf, "%d", ns->faceset);
465	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
466	/* if the client is using faceset, it knows about image2 command */
467	ns->image2 = 1;
468	}
469	else if (!strcmp (cmd, "itemcmd"))
470	{
471	/* Version of the item protocol command to use. Currently,
472	* only supported versions are 1 and 2. Using a numeric
473	* value will make it very easy to extend this in the future.
474	*/
475	char tmpbuf[20];
476	int q = atoi (param);
477
478	if (q < 1 || q > 2)
479	{
480	strcpy (tmpbuf, "FALSE");
481	}
482	else
483	{
484	ns->itemcmd = q;
485	sprintf (tmpbuf, "%d", ns->itemcmd);
486	}
487	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
488	}
489	else if (!strcmp (cmd, "mapsize"))
490	{
491	int x, y = 0;
492	char tmpbuf[MAX_BUF], *cp;
493
494	x = atoi (param);
495	for (cp = param; *cp != 0; cp++)
496	if (*cp == 'x' || *cp == 'X')
497	{
498	y = atoi (cp + 1);
499	break;
500	}
501
502	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
503	{
504	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
505	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
506	}
507	else
508	{
509	ns->mapx = x;
510	ns->mapy = y;
511	/* better to send back what we are really using and not the
512	* param as given to us in case it gets parsed differently.
513	*/
514	sprintf (tmpbuf, "%dx%d", x, y);
515	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
516	/* If beyond this size and still using orig map command, need to
517	* go to map1cmd.
518	*/
519	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
520	ns->mapmode = Map1Cmd;
521	}
522	}
523	else if (!strcmp (cmd, "extendedMapInfos"))
524	{
525	/* Added by tchize
526	* prepare to use the mapextended command
527	*/
528	char tmpbuf[20];
529
530	ns->ext_mapinfos = (atoi (param));
531	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
532	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
533	}
534	else if (!strcmp (cmd, "extendedTextInfos"))
535	{
536	/* Added by tchize
537	* prepare to use the extended text commands
538	* Client toggle this to non zero to get exttext
539	*/
540	char tmpbuf[20];
541
542	ns->has_readable_type = (atoi (param));
543	sprintf (tmpbuf, "%d", ns->has_readable_type);
544	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
545	}
546	else
547	{
548	/* Didn't get a setup command we understood -
549	* report a failure to the client.
550	*/
551	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
552	}
553	} /* for processing all the setup commands */
554
555	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
556	ns->send_packet (cmdback);
557	}	391	}
558		392
559	/**	393	/**
560	* The client has requested to be added to the game.	394	* The client has requested to be added to the game.
561	* 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.
562	* I am not sure if this file is the best place for this function. however,	396	* I am not sure if this file is the best place for this function. however,
563	* 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.
564	*/	398	*/
565	void	399	void
566	AddMeCmd (char *buf, int len, client * ns)	400	AddMeCmd (char *buf, int len, client *ns)
567	{	401	{
568	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	402	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
569	}
570
571	/** Reply to ExtendedInfos command */
572	void
573	ToggleExtendedInfos (char *buf, int len, client * ns)
574	{
575	char cmdback[MAX_BUF];
576	char command[50];
577	int info, nextinfo;
578
579	cmdback[0] = '\0';
580	nextinfo = 0;
581
582	while (1)
583	{
584	/* 1. Extract an info */
585	info = nextinfo;
586
587	while ((info < len) && (buf[info] == ' '))
588	info++;
589
590	if (info >= len)
591	break;
592
593	nextinfo = info + 1;
594
595	while ((nextinfo < len) && (buf[nextinfo] != ' '))
596	nextinfo++;
597
598	if (nextinfo - info >= 49) /*Erroneous info asked */
599	continue;
600
601	strncpy (command, &(buf[info]), nextinfo - info);
602
603	/* 2. Interpret info */
604	if (!strcmp ("smooth", command))
605	/* Toggle smoothing */
606	ns->EMI_smooth = !ns->EMI_smooth;
607	else
608	/*bad value */;
609
610	/*3. Next info */
611	}
612
613	strcpy (cmdback, "ExtendedInfoSet");
614
615	if (ns->EMI_smooth)
616	{
617	strcat (cmdback, " ");
618	strcat (cmdback, "smoothing");
619	}
620
621	ns->send_packet (cmdback);
622	}	403	}
623		404
624	/*	405	/*
625	#define MSG_TYPE_BOOK 1	406	#define MSG_TYPE_BOOK 1
626	#define MSG_TYPE_CARD 2	407	#define MSG_TYPE_CARD 2
…		…
644	while (1)	425	while (1)
645	{	426	{
646	/* 1. Extract an info */	427	/* 1. Extract an info */
647	info = nextinfo;	428	info = nextinfo;
648		429
649	while ((info < len) && (buf[info] == ' '))	430	while ((info < len) && (buf [info] == ' '))
650	info++;	431	info++;
651		432
652	if (info >= len)	433	if (info >= len)
653	break;	434	break;
654		435
655	nextinfo = info + 1;	436	nextinfo = info + 1;
656		437
657	while ((nextinfo < len) && (buf[nextinfo] != ' '))	438	while ((nextinfo < len) && (buf [nextinfo] != ' '))
658	nextinfo++;	439	nextinfo++;
659		440
660	if (nextinfo - info >= 49) /*Erroneous info asked */	441	if (nextinfo - info >= 49) /*Erroneous info asked */
661	continue;	442	continue;
662		443
663	strncpy (command, &(buf[info]), nextinfo - info);	444	memcpy (command, buf + info, nextinfo - info);
664	command[nextinfo - info] = '\0';	445	command [nextinfo - info] = 0;
		446
665	/* 2. Interpret info */	447	/* 2. Interpret info */
666	i = sscanf (command, "%d", &flag);	448	i = sscanf (command, "%d", &flag);
667		449
668	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	450	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
669	ns->supported_readables |= (1 << flag);	451	ns->supported_readables |= (1 << flag);
…		…
683		465
684	ns->send_packet (cmdback);	466	ns->send_packet (cmdback);
685	}	467	}
686		468
687	/**	469	/**
688	* Tells client the picture it has to use
689	* to smooth a picture number given as argument.
690	*/
691	void
692	AskSmooth (char *buf, int len, client *ns)
693	{
694	ns->send_face (atoi (buf));
695	}
696
697	/**
698	* 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,
699	* etc.)	471	* etc.)
700	*/	472	*/
701	void	473	void
702	PlayerCmd (char *buf, int len, player *pl)	474	PlayerCmd (char *buf, int len, player *pl)
…		…
713	return;	485	return;
714		486
715	buf++;	487	buf++;
716	}	488	}
717		489
718	execute_newserver_command (pl->ob, (char *) buf);	490	execute_newserver_command (pl->ob, (char *)buf);
719		491
720	/* Perhaps something better should be done with a left over count.	492	/* Perhaps something better should be done with a left over count.
721	* Cleaning up the input should probably be done first - all actions	493	* Cleaning up the input should probably be done first - all actions
722	* 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
723	* commands.	495	* commands.
724	*/	496	*/
725	pl->count = 0;	497	pl->count = 0;
726	}	498	}
727		499
728
729	/**	500	/**
730	* 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,
731	* 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
732	* '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
733	* can throttle.	504	* can throttle.
…		…
735	void	506	void
736	NewPlayerCmd (char *buf, int len, player *pl)	507	NewPlayerCmd (char *buf, int len, player *pl)
737	{	508	{
738	if (len <= 6)	509	if (len <= 6)
739	{	510	{
740	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);
741	return;	512	return;
742	}	513	}
743		514
744	uint16 cmdid = net_uint16 ((uint8 *)buf);	515	uint16 cmdid = net_uint16 ((uint8 *)buf);
745	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	516	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
802	{	573	{
803	case ST_PLAYING:	574	case ST_PLAYING:
804	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	575	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
805	break;	576	break;
806		577
807	case ST_CHANGE_CLASS:
808	key_change_class (pl->ob, buf[0]);
809	break;
810
811	case ST_GET_PARTY_PASSWORD: /* Get password for party */	578	case ST_GET_PARTY_PASSWORD: /* Get password for party */
812	receive_party_password (pl->ob, 13);	579	receive_party_password (pl->ob, 13);
813	break;	580	break;
814		581
815	default:	582	default:
…		…
854		621
855	cp = strchr (cp + 1, ' ');	622	cp = strchr (cp + 1, ' ');
856		623
857	if (cp)	624	if (cp)
858	{	625	{
859	assign (ns->version, cp + 1);	626	ns->version = cp + 1;
860		627
861	if (ns->sc_version < 1026)	628	if (ns->sc_version < 1026)
862	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	629	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
863	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	630	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
864	}	631	}
…		…
887	* syntax is: move (to) (tag) (nrof)	654	* syntax is: move (to) (tag) (nrof)
888	*/	655	*/
889	void	656	void
890	MoveCmd (char *buf, int len, player *pl)	657	MoveCmd (char *buf, int len, player *pl)
891	{	658	{
892	int vals[3], i;	659	int to, tag, nrof;
893		660
894	/* A little funky here. We only cycle for 2 records, because	661	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
895	* we obviously are not going to find a space after the third
896	* record. Perhaps we should just replace this with a
897	* sscanf?
898	*/
899	for (i = 0; i < 2; i++)
900	{	662	{
901	vals[i] = atoi (buf);
902
903	if (!(buf = strchr (buf, ' ')))
904	{
905	LOG (llevError, "Incomplete move command: %s\n", buf);	663	LOG (llevError, "Incomplete move command: %s\n", buf);
906	return;	664	return;
907	}
908
909	buf++;
910	}	665	}
911		666
912	vals[2] = atoi (buf);	667	esrv_move_object (pl->ob, to, tag, nrof);
913
914	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
915	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
916	}	668	}
917		669
918	/******************************************************************************	670	/******************************************************************************
919	*	671	*
920	* Start of commands the server sends to the client.	672	* Start of commands the server sends to the client.
…		…
924	/**	676	/**
925	* 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
926	* 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)
927	*/	679	*/
928	void	680	void
929	send_query (client *ns, uint8 flags, char *text)	681	send_query (client *ns, uint8 flags, const char *text)
930	{	682	{
931	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);
932	}	712	}
933		713
934	#define AddIfInt64(Old,New,Type) if (Old != New) {\	714	#define AddIfInt64(Old,New,Type) if (Old != New) {\
935	Old = New; \	715	Old = New; \
936	sl << uint8 (Type) << uint64 (New); \	716	sl << uint8 (Type) << uint64 (New); \
…		…
944	#define AddIfShort(Old,New,Type) if (Old != New) {\	724	#define AddIfShort(Old,New,Type) if (Old != New) {\
945	Old = New; \	725	Old = New; \
946	sl << uint8 (Type) << uint16 (New); \	726	sl << uint8 (Type) << uint16 (New); \
947	}	727	}
948		728
949	#define AddIfFloat(Old,New,Type) if (Old != New) {\	729	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
950	Old = New; \	730	Old = New; \
951	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	731	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
952	}	732	}
953		733
954	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	734	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
955	free(Old); Old = strdup (New);\	735	free(Old); Old = strdup (New);\
956	sl << uint8 (Type) << data8 (New); \	736	sl << uint8 (Type) << data8 (New); \
…		…
970		750
971	client *ns = pl->ns;	751	client *ns = pl->ns;
972	if (!ns)	752	if (!ns)
973	return;	753	return;
974		754
975	object *ob = pl->ob;	755	object *ob = pl->observe;
976	if (!ob)	756	if (!ob)
977	return;	757	return;
		758
		759	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
978		760
979	packet sl ("stats");	761	packet sl ("stats");
980		762
981	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	763	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
982	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	764	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
991	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	773	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
992	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	774	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
993	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	775	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
994		776
995	for (int s = 0; s < NUM_SKILLS; s++)	777	for (int s = 0; s < NUM_SKILLS; s++)
996	if (object *skill = pl->last_skill_ob[s])	778	if (object *skill = opl->last_skill_ob [s])
997	if (skill->stats.exp != ns->last_skill_exp [s])	779	if (skill->stats.exp != ns->last_skill_exp [s])
998	{	780	{
999	ns->last_skill_exp [s] = skill->stats.exp;	781	ns->last_skill_exp [s] = skill->stats.exp;
1000		782
1001	/* Always send along the level if exp changes. This is only	783	/* Always send along the level if exp changes. This is only
…		…
1009	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	791	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1010	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	792	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1011	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	793	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1012	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	794	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1013	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	795	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1014	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	796	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1015	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	797	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1016	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);
1017	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);
1018		800
1019	flags = 0;	801	flags = 0;
1020		802
1021	if (pl->fire_on)	803	if (opl->fire_on)
1022	flags |= SF_FIREON;	804	flags |= SF_FIREON;
1023		805
1024	if (pl->run_on)	806	if (opl->run_on)
1025	flags |= SF_RUNON;	807	flags |= SF_RUNON;
1026		808
1027	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	809	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1028		810
1029	if (ns->sc_version < 1025)	811	if (ns->sc_version < 1025)
…		…
1043	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);
1044	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);
1045	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);
1046	}	828	}
1047		829
1048	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 */
1049	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	831	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1050	set_title (ob, buf);	832	set_title (ob, buf);
1051	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	833	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1052		834
1053	/* Only send it away if we have some actual data */	835	/* Only send it away if we have some actual data */
…		…
1057		839
1058	/**	840	/**
1059	* 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.
1060	*/	842	*/
1061	void	843	void
1062	esrv_new_player (player *pl, uint32 weight)	844	esrv_new_player (player *pl)
1063	{	845	{
		846	sint32 weight = pl->ob->client_weight ();
		847
1064	packet sl ("player");	848	packet sl ("player");
1065		849
1066	sl << uint32 (pl->ob->count)	850	sl << uint32 (pl->ob->count)
1067	<< uint32 (weight)	851	<< uint32 (weight)
1068	<< uint32 (pl->ob->face)	852	<< uint32 (pl->ob->face)
1069	<< data8 (pl->ob->name);	853	<< data8 (pl->ob->name);
1070		854
1071	pl->ns->last_weight = weight;	855	pl->ns->last_weight = weight;
1072	pl->ns->send_packet (sl);	856	pl->ns->send_packet (sl);
1073	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1074	}	857	}
1075		858
1076	/******************************************************************************	859	/******************************************************************************
1077	*	860	*
1078	* Start of map related commands.	861	* Start of map related commands.
…		…
1135		918
1136	if (!ns.faces_sent[face_num])	919	if (!ns.faces_sent[face_num])
1137	if (ob)	920	if (ob)
1138	ns.send_faces (ob);	921	ns.send_faces (ob);
1139	else	922	else
1140	ns.send_face (face_num);	923	ns.send_face (face_num, 10);
1141		924
1142	sl << uint16 (face_num);	925	sl << uint16 (face_num);
1143	return 1;	926	return 1;
1144	}	927	}
1145		928
1146	/* Nothing changed */	929	/* Nothing changed */
1147	return 0;	930	return 0;
1148	}
1149
1150	/**
1151	* Returns the size of a data for a map square as returned by
1152	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1153	* available.
1154	*/
1155	int
1156	getExtendedMapInfoSize (client * ns)
1157	{
1158	int result = 0;
1159
1160	if (ns->ext_mapinfos)
1161	{
1162	if (ns->EMI_smooth)
1163	result += 1; /*One byte for smoothlevel */
1164	}
1165
1166	return result;
1167	}	931	}
1168		932
1169	// prefetch (and touch) all maps within a specific distancd	933	// prefetch (and touch) all maps within a specific distancd
1170	static void	934	static void
1171	prefetch_surrounding_maps (maptile *map, int distance)	935	prefetch_surrounding_maps (maptile *map, int distance)
1172	{	936	{
1173	map->last_access = runtime;	937	map->touch ();
1174		938
1175	if (--distance)	939	if (--distance)
1176	for (int dir = 4; --dir; )	940	for (int dir = 4; --dir; )
1177	if (const shstr &path = map->tile_path [dir])	941	if (const shstr &path = map->tile_path [dir])
1178	if (maptile *&neigh = map->tile_map [dir])	942	if (maptile *&neigh = map->tile_map [dir])
…		…
1187	{	951	{
1188	prefetch_surrounding_maps (op->map, 3);	952	prefetch_surrounding_maps (op->map, 3);
1189	}	953	}
1190		954
1191	/**	955	/**
1192	* This function uses the new map1 protocol command to send the map	956	* Draws client map.
1193	* to the client. It is necessary because the old map command supports
1194	* a maximum map size of 15x15.
1195	* This function is much simpler than the old one. This is because
1196	* the old function optimized to send as few face identifiers as possible,
1197	* at the expense of sending more coordinate location (coordinates were
1198	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1199	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1200	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1201	* and use the other 4 bits for other informatiion. For full documentation
1202	* of what we send, see the doc/Protocol file.
1203	* I will describe internally what we do:
1204	* the ns->lastmap shows how the map last looked when sent to the client.
1205	* in the lastmap structure, there is a cells array, which is set to the
1206	* maximum viewable size (As set in config.h).
1207	* in the cells, there are faces and a count value.
1208	* we use the count value to hold the darkness value. If -1, then this space
1209	* is not viewable.
1210	* we use faces[0] faces[1] faces[2] to hold what the three layers
1211	* look like.
1212	*/	957	*/
1213	void	958	void
1214	draw_client_map1 (object *pl)	959	draw_client_map (player *pl)
1215	{	960	{
1216	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	961	object *ob = pl->observe;
1217	sint16 nx, ny;
1218	int estartlen, eoldlen;
1219	uint8 eentrysize;
1220	uint16 ewhatstart, ewhatflag;
1221	uint8 extendedinfos;
1222	maptile *m;
1223
1224	client &socket = *pl->contr->ns;
1225
1226	if (!pl->active)	962	if (!ob->active)
1227	return;	963	return;
1228
1229	check_map_change (pl->contr);
1230	prefetch_surrounding_maps (pl);
1231
1232	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1233	packet esl;
1234
1235	startlen = sl.length ();
1236
1237	/*Extendedmapinfo structure initialisation */
1238	if (socket.ext_mapinfos)
1239	{
1240	extendedinfos = EMI_NOREDRAW;
1241
1242	if (socket.EMI_smooth)
1243	extendedinfos |= EMI_SMOOTH;
1244
1245	ewhatstart = esl.length ();
1246	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1247	could need to be taken away */
1248	eentrysize = getExtendedMapInfoSize (&socket);
1249	esl << "mapextended "
1250	<< uint8 (extendedinfos)
1251	<< uint8 (eentrysize);
1252
1253	estartlen = esl.length ();
1254	}
1255	else
1256	{
1257	/* suppress compiler warnings */
1258	ewhatstart = 0;
1259	ewhatflag = 0;
1260	estartlen = 0;
1261	}
1262
1263	/* x,y are the real map locations. ax, ay are viewport relative
1264	* locations.
1265	*/
1266	ay = 0;
1267
1268	/* We could do this logic as conditionals in the if statement,
1269	* but that started to get a bit messy to look at.
1270	*/
1271	max_x = pl->x + (socket.mapx + 1) / 2;
1272	max_y = pl->y + (socket.mapy + 1) / 2;
1273
1274	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1275	{
1276	ax = 0;
1277	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1278	{
1279	int emask, mask;
1280	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1281
1282	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1283
1284	/* If the coordinates are not valid, or it is too dark to see,
1285	* we tell the client as such
1286	*/
1287	nx = x;
1288	ny = y;
1289	m = get_map_from_coord (pl->map, &nx, &ny);
1290
1291	if (!m)
1292	{
1293	/* space is out of map. Update space and clear values
1294	* if this hasn't already been done. If the space is out
1295	* of the map, it shouldn't have a head
1296	*/
1297	if (lastcell.count != -1)
1298	{
1299	sl << uint16 (mask);
1300	map_clearcell (&lastcell, -1);
1301	}
1302
1303	continue;
1304	}
1305
1306	m->touch ();
1307
1308	int d = pl->contr->blocked_los[ax][ay];
1309
1310	if (d > 3)
1311	{
1312
1313	int need_send = 0, count;
1314
1315	/* This block deals with spaces that are not visible for whatever
1316	* reason. Still may need to send the head for this space.
1317	*/
1318
1319	oldlen = sl.length ();
1320
1321	sl << uint16 (mask);
1322
1323	if (lastcell.count != -1)
1324	need_send = 1;
1325
1326	count = -1;
1327
1328	/* properly clear a previously sent big face */
1329	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1330	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1331	need_send = 1;
1332
1333	map_clearcell (&lastcell, count);
1334
1335	if ((mask & 0xf) || need_send)
1336	sl[oldlen + 1] = mask & 0xff;
1337	else
1338	sl.reset (oldlen);
1339	}
1340	else
1341	{
1342	/* In this block, the space is visible.
1343	*/
1344
1345	/* Rather than try to figure out what everything that we might
1346	* need to send is, then form the packet after that,
1347	* we presume that we will in fact form a packet, and update
1348	* the bits by what we do actually send. If we send nothing,
1349	* we just back out sl.length () to the old value, and no harm
1350	* is done.
1351	* I think this is simpler than doing a bunch of checks to see
1352	* what if anything we need to send, setting the bits, then
1353	* doing those checks again to add the real data.
1354	*/
1355	oldlen = sl.length ();
1356	eoldlen = esl.length ();
1357
1358	sl << uint16 (mask);
1359
1360	unsigned char dummy;
1361	unsigned char *last_ext = &dummy;
1362
1363	/* Darkness changed */
1364	if (lastcell.count != d && socket.darkness)
1365	{
1366	mask |= 0x8;
1367
1368	if (socket.extmap)
1369	{
1370	*last_ext |= 0x80;
1371	last_ext = &sl[sl.length ()];
1372	sl << uint8 (d);
1373	}
1374	else
1375	sl << uint8 (255 - 64 * d);
1376	}
1377
1378	lastcell.count = d;
1379
1380	mapspace &ms = m->at (nx, ny);
1381
1382	if (socket.extmap)
1383	{
1384	uint8 stat_hp = 0;
1385	uint8 stat_width = 0;
1386	uint8 flags = 0;
1387	UUID player = 0;
1388
1389	// send hp information, if applicable
1390	if (object *op = ms.faces_obj [0])
1391	{
1392	if (op->head || op->invisible)
1393	; // do not show
1394	else if (op->type == PLAYER
1395	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1396	{
1397	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1398	{
1399	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1400	stat_width = op->arch->tail_x;
1401	}
1402	}
1403
1404	if (op->msg && op->msg[0] == '@')
1405	flags |= 1;
1406
1407	if (op->type == PLAYER && op != pl)
1408	player = op->count;
1409	}
1410
1411	if (lastcell.stat_hp != stat_hp)
1412	{
1413	lastcell.stat_hp = stat_hp;
1414
1415	mask |= 0x8;
1416	*last_ext |= 0x80;
1417	last_ext = &sl[sl.length ()];
1418
1419	sl << uint8 (5) << uint8 (stat_hp);
1420
1421	if (stat_width > 1)
1422	{
1423	*last_ext |= 0x80;
1424	last_ext = &sl[sl.length ()];
1425
1426	sl << uint8 (6) << uint8 (stat_width);
1427	}
1428	}
1429
1430	if (lastcell.player != player)
1431	{
1432	lastcell.player = player;
1433
1434	mask |= 0x8;
1435	*last_ext |= 0x80;
1436	last_ext = &sl[sl.length ()];
1437
1438	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1439	}
1440
1441	if (lastcell.flags != flags)
1442	{
1443	lastcell.flags = flags;
1444
1445	mask |= 0x8;
1446	*last_ext |= 0x80;
1447	last_ext = &sl[sl.length ()];
1448
1449	sl << uint8 (8) << uint8 (flags);
1450	}
1451	}
1452
1453	/* Floor face */
1454	if (update_space (sl, socket, ms, lastcell, 2))
1455	mask |= 0x4;
1456
1457	/* Middle face */
1458	if (update_space (sl, socket, ms, lastcell, 1))
1459	mask |= 0x2;
1460
1461	if (ms.player () == pl
1462	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1463	{
1464	// force player to be visible to himself if invisible
1465	if (lastcell.faces[0] != pl->face)
1466	{
1467	lastcell.faces[0] = pl->face;
1468
1469	mask |= 0x1;
1470	sl << uint16 (pl->face);
1471
1472	socket.send_faces (pl);
1473	}
1474	}
1475	/* Top face */
1476	else if (update_space (sl, socket, ms, lastcell, 0))
1477	mask |= 0x1;
1478
1479
1480	/* Check to see if we are in fact sending anything for this
1481	* space by checking the mask. If so, update the mask.
1482	* if not, reset the len to that from before adding the mask
1483	* value, so we don't send those bits.
1484	*/
1485	if (mask & 0xf)
1486	sl[oldlen + 1] = mask & 0xff;
1487	else
1488	sl.reset (oldlen);
1489
1490	if (socket.ext_mapinfos)
1491	esl << uint16 (emask);
1492
1493	if (socket.EMI_smooth)
1494	{
1495	for (int layer = 2+1; layer--; )
1496	{
1497	object *ob = ms.faces_obj [layer];
1498
1499	// If there is no object for this space, or if the face for the object
1500	// is the blank face, set the smoothlevel to zero.
1501	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1502
1503	// We've gotten what face we want to use for the object. Now see if
1504	// if it has changed since we last sent it to the client.
1505	if (lastcell.smooth[layer] != smoothlevel)
1506	{
1507	lastcell.smooth[layer] = smoothlevel;
1508	esl << uint8 (smoothlevel);
1509	emask |= 1 << layer;
1510	}
1511	}
1512
1513	if (emask & 0xf)
1514	esl[eoldlen + 1] = emask & 0xff;
1515	else
1516	esl.reset (eoldlen);
1517	}
1518	} /* else this is a viewable space */
1519	} /* for x loop */
1520	} /* for y loop */
1521
1522	/* Verify that we in fact do need to send this */
1523	if (socket.ext_mapinfos)
1524	{
1525	if (!(sl.length () > startlen || socket.sent_scroll))
1526	{
1527	/* No map data will follow, so don't say the client
1528	* it doesn't need draw!
1529	*/
1530	ewhatflag &= ~EMI_NOREDRAW;
1531	esl[ewhatstart + 1] = ewhatflag & 0xff;
1532	}
1533
1534	if (esl.length () > estartlen)
1535	socket.send_packet (esl);
1536	}
1537
1538	if (sl.length () > startlen || socket.sent_scroll)
1539	{
1540	socket.send_packet (sl);
1541	socket.sent_scroll = 0;
1542	}
1543	}
1544
1545	/**
1546	* Draws client map.
1547	*/
1548	void
1549	draw_client_map (object *pl)
1550	{
1551	int i, j;
1552	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1553	int mflags;
1554	struct Map newmap;
1555	maptile *m, *pm;
1556
1557	if (pl->type != PLAYER)
1558	{
1559	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1560	return;
1561	}
1562
1563	pm = pl->map;
1564		964
1565	/* 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
1566	* 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
1567	* be OK once they really log in.	967	* be OK once they really log in.
1568	*/	968	*/
1569	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	969	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1570	return;	970	return;
1571		971
1572	memset (&newmap, 0, sizeof (struct Map));	972	int startlen, oldlen;
1573		973
1574	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)	974	check_map_change (pl);
1575	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)
1576	{	1028	{
1577	ax = i;	1029	/* space is out of map. Update space and clear values
1578	ay = j;	1030	* if this hasn't already been done. If the space is out
1579	m = pm;	1031	* of the map, it shouldn't have a head.
1580	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1581
1582	if (mflags & P_OUT_OF_MAP)
1583	continue;
1584
1585	/* If a map is visible to the player, we don't want to swap it out
1586	* just to reload it. This should really call something like
1587	* swap_map, but this is much more efficient and 'good enough'
1588	*/	1032	*/
1589	if (mflags & P_NEW_MAP)	1033	if (lastcell.count != -1)
1590	m->timeout = 50;	1034	{
		1035	sl << uint16 (mask);
		1036	map_clearcell (&lastcell, -1);
		1037	}
		1038
		1039	continue;
1591	}	1040	}
		1041
		1042	int d = pl->blocked_los_uc (dx, dy);
1592		1043
1593	/* do LOS after calls to update_position */	1044	if (d > 3)
1594	if (pl->contr->do_los)
1595	{	1045	{
1596	update_los (pl);	1046	/* This block deals with spaces that are not visible for whatever
1597	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);
1598	}	1060	}
		1061	else
		1062	{
		1063	/* In this block, the space is visible.
		1064	*/
1599		1065
1600	/* Big maps need a different drawing mechanism to work */	1066	/* Rather than try to figure out what everything that we might
1601	draw_client_map1 (pl);	1067	* need to send is, then form the packet after that,
1602	}	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 ();
1603		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	}
1604		1219
1605	/*****************************************************************************/	1220	/*****************************************************************************/
1606
1607	/* 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*/
1608
1609	/* 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 */
1610
1611	/* manage it ! */	1223	/* manage it ! */
1612
1613	/*****************************************************************************/	1224	/*****************************************************************************/
1614	void	1225	void
1615	send_plugin_custom_message (object *pl, char *buf)	1226	send_plugin_custom_message (object *pl, char *buf)
1616	{	1227	{
1617	pl->contr->ns->send_packet (buf);	1228	pl->contr->ns->send_packet (buf);
…		…
1626	{	1237	{
1627	packet sl;	1238	packet sl;
1628	sl << "replyinfo skill_info\n";	1239	sl << "replyinfo skill_info\n";
1629		1240
1630	for (int i = 1; i < NUM_SKILLS; i++)	1241	for (int i = 1; i < NUM_SKILLS; i++)
1631	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]);
1632		1243
1633	if (sl.length () >= MAXSOCKBUF)	1244	if (sl.length () > MAXSOCKBUF)
1634	{	1245	{
1635	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1246	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1636	fatal (0);	1247	fatal (0);
1637	}	1248	}
1638		1249
…		…
1651	sl << "replyinfo spell_paths\n";	1262	sl << "replyinfo spell_paths\n";
1652		1263
1653	for (int i = 0; i < NRSPELLPATHS; i++)	1264	for (int i = 0; i < NRSPELLPATHS; i++)
1654	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1265	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1655		1266
1656	if (sl.length () >= MAXSOCKBUF)	1267	if (sl.length () > MAXSOCKBUF)
1657	{	1268	{
1658	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1269	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1659	fatal (0);	1270	fatal (0);
1660	}	1271	}
1661		1272
…		…
1680	if (spell->type == SPELL)	1291	if (spell->type == SPELL)
1681	{	1292	{
1682	int flags = 0;	1293	int flags = 0;
1683		1294
1684	/* check if we need to update it */	1295	/* check if we need to update it */
1685	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))
1686	{	1297	{
1687	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);
1688	flags |= UPD_SP_MANA;	1299	flags |= UPD_SP_MANA;
1689	}	1300	}
1690		1301
1691	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))
1692	{	1303	{
1693	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);
1694	flags |= UPD_SP_GRACE;	1305	flags |= UPD_SP_GRACE;
1695	}	1306	}
1696		1307
1697	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))
1698	{	1309	{
1699	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);
1700	flags |= UPD_SP_DAMAGE;	1311	flags |= UPD_SP_DAMAGE;
1701	}	1312	}
1702		1313
1703	if (flags)	1314	if (flags)
1704	{	1315	{
…		…
1706		1317
1707	sl << "updspell "	1318	sl << "updspell "
1708	<< uint8 (flags)	1319	<< uint8 (flags)
1709	<< uint32 (spell->count);	1320	<< uint32 (spell->count);
1710		1321
1711	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1322	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1712	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1323	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1713	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1324	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1714		1325
1715	pl->ns->send_packet (sl);	1326	pl->ns->send_packet (sl);
1716	}	1327	}
1717	}	1328	}
1718	}	1329	}
…		…
1748	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);
1749	return;	1360	return;
1750	}	1361	}
1751		1362
1752	/* 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 */
1753	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);
1754	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);
1755	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);
1756		1367
1757	/* figure out which skill it uses, if it uses one */	1368	/* figure out which skill it uses, if it uses one */
1758	if (spell->skill)	1369	if (spell->skill)
1759	{	1370	if (object *tmp = pl->find_skill (spell->skill))
1760	for (i = 1; i < NUM_SKILLS; i++)
1761	if (!strcmp (spell->skill, skill_names[i]))
1762	{
1763	skill = i + CS_STAT_SKILLINFO;	1371	skill = tmp->subtype + CS_STAT_SKILLINFO;
1764	break;
1765	}
1766	}
1767		1372
1768	// spells better have a face	1373	// spells better have a face
1769	if (!spell->face)	1374	if (!spell->face)
1770	{	1375	{
1771	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);
1772	spell->face = face_find ("burnout.x11", blank_face);	1377	spell->face = face_find ("burnout.x11", blank_face);
1773	}	1378	}
		1379
		1380	pl->ns->send_face (spell->face);
1774		1381
1775	/* send the current values */	1382	/* send the current values */
1776	sl << uint32 (spell->count)	1383	sl << uint32 (spell->count)
1777	<< uint16 (spell->level)	1384	<< uint16 (spell->level)
1778	<< uint16 (spell->casting_time)	1385	<< uint16 (spell->casting_time)
1779	<< uint16 (spell->last_sp)	1386	<< uint16 (spell->cached_sp)
1780	<< uint16 (spell->last_grace)	1387	<< uint16 (spell->cached_grace)
1781	<< uint16 (spell->last_eat)	1388	<< uint16 (spell->cached_eat)
1782	<< uint8 (skill)	1389	<< uint8 (skill)
1783	<< uint32 (spell->path_attuned)	1390	<< uint32 (spell->path_attuned)
1784	<< uint32 (spell->face)	1391	<< uint32 (spell->face)
1785	<< data8 (spell->name)	1392	<< data8 (spell->name)
1786	<< data16 (spell->msg);	1393	<< data16 (spell->msg);
…		…
1814	* 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
1815	* 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,
1816	* 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,
1817	* 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
1818	*/	1425	*/
		1426	if (spell->type != SPELL)
		1427	continue;
		1428
1819	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1429	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1820	* 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
1821	* 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
1822	* like it will fix this	1432	* like it will fix this
1823	*/	1433	*/
1824	if (spell->type != SPELL)
1825	continue;
1826
1827	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))))
1828	{	1435	{
		1436	pl->ns->flush_fx ();
1829	pl->ns->send_packet (sl);	1437	pl->ns->send_packet (sl);
1830		1438
1831	sl.reset ();	1439	sl.reset ();
1832	sl << "addspell ";	1440	sl << "addspell ";
1833	}	1441	}
…		…
1841	return;	1449	return;
1842	}	1450	}
1843	else	1451	else
1844	append_spell (pl, sl, spell);	1452	append_spell (pl, sl, spell);
1845		1453
1846	if (sl.length () >= MAXSOCKBUF)	1454	if (sl.length () > MAXSOCKBUF)
1847	{	1455	{
1848	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1456	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1849	fatal (0);	1457	fatal (0);
1850	}	1458	}
1851		1459
1852	/* finally, we can send the packet */	1460	/* finally, we can send the packet */
		1461	pl->ns->flush_fx ();
1853	pl->ns->send_packet (sl);	1462	pl->ns->send_packet (sl);
1854	}	1463	}
1855		1464

Diff Legend

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