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.76 by root, Wed Mar 14 13:05:30 2007 UTC vs.
Revision 1.150 by root, Mon Oct 12 14:00:59 2009 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	/**	25	/**
26	* \file	26	* \file
27	* Client handling.	27	* Client handling.
…		…
99	*/	99	*/
100	mx = ns->mapx;	100	mx = ns->mapx;
101	my = ns->mapy;	101	my = ns->mapy;
102		102
103	/* the x and y here are coordinates for the new map, i.e. if we moved	103	/* the x and y here are coordinates for the new map, i.e. if we moved
104	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	104	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
105	* if the destination x or y coordinate is outside the viewable	105	* if the destination x or y coordinate is outside the viewable
106	* area, we clear the values - otherwise, the old values	106	* area, we clear the values - otherwise, the old values
107	* are preserved, and the check_head thinks it needs to clear them.	107	* are preserved, and the check_head thinks it needs to clear them.
108	*/	108	*/
109	for (x = 0; x < mx; x++)	109	for (x = 0; x < mx; x++)
110	{
111	for (y = 0; y < my; y++)	110	for (y = 0; y < my; y++)
112	{
113	if (x >= ns->mapx || y >= ns->mapy)	111	if (x >= ns->mapx || y >= ns->mapy)
114	/* clear cells outside the viewable area */	112	/* clear cells outside the viewable area */
115	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	113	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
116	else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)	114	else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
117	/* clear newly visible tiles within the viewable area */	115	/* clear newly visible tiles within the viewable area */
118	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	116	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119	else	117	else
120	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	118	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121	}
122	}
123		119
124	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	120	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125		121
126	/* Make sure that the next "map1" command will be sent (even if it is	122	/* Make sure that the next "map1" command will be sent (even if it is
127	* empty).	123	* empty).
…		…
130	}	126	}
131		127
132	static void	128	static void
133	clear_map (player *pl)	129	clear_map (player *pl)
134	{	130	{
		131	pl->ns->mapinfo_queue_clear ();
		132
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	133	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
		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
465	sprintf (tmpbuf, "%d", ns->faceset);
466	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
467	/* if the client is using faceset, it knows about image2 command */
468	ns->image2 = 1;
469	}
470	else if (!strcmp (cmd, "itemcmd"))
471	{
472	/* Version of the item protocol command to use. Currently,
473	* only supported versions are 1 and 2. Using a numeric
474	* value will make it very easy to extend this in the future.
475	*/
476	char tmpbuf[20];
477	int q = atoi (param);
478
479	if (q < 1 || q > 2)
480	{
481	strcpy (tmpbuf, "FALSE");
482	}
483	else
484	{
485	ns->itemcmd = q;
486	sprintf (tmpbuf, "%d", ns->itemcmd);
487	}
488	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
489	}
490	else if (!strcmp (cmd, "mapsize"))
491	{
492	int x, y = 0;
493	char tmpbuf[MAX_BUF], *cp;
494
495	x = atoi (param);
496	for (cp = param; *cp != 0; cp++)
497	if (*cp == 'x' || *cp == 'X')
498	{
499	y = atoi (cp + 1);
500	break;
501	}
502
503	if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
504	{
505	sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
506	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
507	}
508	else
509	{
510	ns->mapx = x;
511	ns->mapy = y;
512	/* better to send back what we are really using and not the
513	* param as given to us in case it gets parsed differently.
514	*/
515	sprintf (tmpbuf, "%dx%d", x, y);
516	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
517	/* If beyond this size and still using orig map command, need to
518	* go to map1cmd.
519	*/
520	if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
521	ns->mapmode = Map1Cmd;
522	}
523	}
524	else if (!strcmp (cmd, "extendedMapInfos"))
525	{
526	/* Added by tchize
527	* prepare to use the mapextended command
528	*/
529	char tmpbuf[20];
530
531	ns->ext_mapinfos = (atoi (param));
532	sprintf (tmpbuf, "%d", ns->ext_mapinfos);
533	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
534	}
535	else if (!strcmp (cmd, "extendedTextInfos"))
536	{
537	/* Added by tchize
538	* prepare to use the extended text commands
539	* Client toggle this to non zero to get exttext
540	*/
541	char tmpbuf[20];
542
543	ns->has_readable_type = (atoi (param));
544	sprintf (tmpbuf, "%d", ns->has_readable_type);
545	safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
546	}
547	else
548	{
549	/* Didn't get a setup command we understood -
550	* report a failure to the client.
551	*/
552	safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
553	}
554	} /* for processing all the setup commands */
555
556	LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
557	ns->send_packet (cmdback);
558	}	391	}
559		392
560	/**	393	/**
561	* The client has requested to be added to the game.	394	* The client has requested to be added to the game.
562	* This is what takes care of it. We tell the client how things worked out.	395	* This is what takes care of it. We tell the client how things worked out.
563	* 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,
564	* 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.
565	*/	398	*/
566	void	399	void
567	AddMeCmd (char *buf, int len, client * ns)	400	AddMeCmd (char *buf, int len, client *ns)
568	{	401	{
569	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	402	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
570	}
571
572	/** Reply to ExtendedInfos command */
573	void
574	ToggleExtendedInfos (char *buf, int len, client * ns)
575	{
576	char cmdback[MAX_BUF];
577	char command[50];
578	int info, nextinfo;
579
580	cmdback[0] = '\0';
581	nextinfo = 0;
582
583	while (1)
584	{
585	/* 1. Extract an info */
586	info = nextinfo;
587
588	while ((info < len) && (buf[info] == ' '))
589	info++;
590
591	if (info >= len)
592	break;
593
594	nextinfo = info + 1;
595
596	while ((nextinfo < len) && (buf[nextinfo] != ' '))
597	nextinfo++;
598
599	if (nextinfo - info >= 49) /*Erroneous info asked */
600	continue;
601
602	strncpy (command, &(buf[info]), nextinfo - info);
603
604	/* 2. Interpret info */
605	if (!strcmp ("smooth", command))
606	/* Toggle smoothing */
607	ns->EMI_smooth = !ns->EMI_smooth;
608	else
609	/*bad value */;
610
611	/*3. Next info */
612	}
613
614	strcpy (cmdback, "ExtendedInfoSet");
615
616	if (ns->EMI_smooth)
617	{
618	strcat (cmdback, " ");
619	strcat (cmdback, "smoothing");
620	}
621
622	ns->send_packet (cmdback);
623	}	403	}
624		404
625	/*	405	/*
626	#define MSG_TYPE_BOOK 1	406	#define MSG_TYPE_BOOK 1
627	#define MSG_TYPE_CARD 2	407	#define MSG_TYPE_CARD 2
…		…
684		464
685	ns->send_packet (cmdback);	465	ns->send_packet (cmdback);
686	}	466	}
687		467
688	/**	468	/**
689	* Tells client the picture it has to use
690	* to smooth a picture number given as argument.
691	*/
692	void
693	AskSmooth (char *buf, int len, client *ns)
694	{
695	ns->send_face (atoi (buf));
696	}
697
698	/**
699	* This handles the general commands from the client (ie, north, fire, cast,	469	* This handles the general commands from the client (ie, north, fire, cast,
700	* etc.)	470	* etc.)
701	*/	471	*/
702	void	472	void
703	PlayerCmd (char *buf, int len, player *pl)	473	PlayerCmd (char *buf, int len, player *pl)
…		…
724	* commands.	494	* commands.
725	*/	495	*/
726	pl->count = 0;	496	pl->count = 0;
727	}	497	}
728		498
729
730	/**	499	/**
731	* This handles the general commands from the client (ie, north, fire, cast,	500	* This handles the general commands from the client (ie, north, fire, cast,
732	* etc.). It is a lot like PlayerCmd above, but is called with the	501	* etc.). It is a lot like PlayerCmd above, but is called with the
733	* 'ncom' method which gives more information back to the client so it	502	* 'ncom' method which gives more information back to the client so it
734	* can throttle.	503	* can throttle.
…		…
736	void	505	void
737	NewPlayerCmd (char *buf, int len, player *pl)	506	NewPlayerCmd (char *buf, int len, player *pl)
738	{	507	{
739	if (len <= 6)	508	if (len <= 6)
740	{	509	{
741	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	510	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
742	return;	511	return;
743	}	512	}
744		513
745	uint16 cmdid = net_uint16 ((uint8 *)buf);	514	uint16 cmdid = net_uint16 ((uint8 *)buf);
746	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	515	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
803	{	572	{
804	case ST_PLAYING:	573	case ST_PLAYING:
805	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	574	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
806	break;	575	break;
807		576
808	case ST_CHANGE_CLASS:
809	key_change_class (pl->ob, buf[0]);
810	break;
811
812	case ST_GET_PARTY_PASSWORD: /* Get password for party */	577	case ST_GET_PARTY_PASSWORD: /* Get password for party */
813	receive_party_password (pl->ob, 13);	578	receive_party_password (pl->ob, 13);
814	break;	579	break;
815		580
816	default:	581	default:
…		…
855		620
856	cp = strchr (cp + 1, ' ');	621	cp = strchr (cp + 1, ' ');
857		622
858	if (cp)	623	if (cp)
859	{	624	{
860	assign (ns->version, cp + 1);	625	ns->version = cp + 1;
861		626
862	if (ns->sc_version < 1026)	627	if (ns->sc_version < 1026)
863	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,	628	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
864	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");	629	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
865	}	630	}
…		…
888	* syntax is: move (to) (tag) (nrof)	653	* syntax is: move (to) (tag) (nrof)
889	*/	654	*/
890	void	655	void
891	MoveCmd (char *buf, int len, player *pl)	656	MoveCmd (char *buf, int len, player *pl)
892	{	657	{
893	int vals[3], i;	658	int to, tag, nrof;
894		659
895	/* A little funky here. We only cycle for 2 records, because	660	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
896	* we obviously are not going to find a space after the third
897	* record. Perhaps we should just replace this with a
898	* sscanf?
899	*/
900	for (i = 0; i < 2; i++)
901	{	661	{
902	vals[i] = atoi (buf);
903
904	if (!(buf = strchr (buf, ' ')))
905	{
906	LOG (llevError, "Incomplete move command: %s\n", buf);	662	LOG (llevError, "Incomplete move command: %s\n", buf);
907	return;	663	return;
908	}
909
910	buf++;
911	}	664	}
912		665
913	vals[2] = atoi (buf);	666	esrv_move_object (pl->ob, to, tag, nrof);
914
915	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
916	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
917	}	667	}
918		668
919	/******************************************************************************	669	/******************************************************************************
920	*	670	*
921	* Start of commands the server sends to the client.	671	* Start of commands the server sends to the client.
…		…
925	/**	675	/**
926	* Asks the client to query the user. This way, the client knows	676	* Asks the client to query the user. This way, the client knows
927	* it needs to send something back (vs just printing out a message)	677	* it needs to send something back (vs just printing out a message)
928	*/	678	*/
929	void	679	void
930	send_query (client *ns, uint8 flags, char *text)	680	send_query (client *ns, uint8 flags, const char *text)
931	{	681	{
932	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	682	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
		683	}
		684
		685	/**
		686	* Get player's current range attack in obuf.
		687	*/
		688	static void
		689	rangetostring (player *pl, char *obuf)
		690	{
		691	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		692
		693	if (pl->ranged_ob)
		694	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		695
		696	if (pl->combat_ob)
		697	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		698
		699	#if 0
		700	//TODO: remove this when slot system is working, this is only for debugging
		701	if (pl->ob->chosen_skill)
		702	buf << " Skill*: " << pl->ob->chosen_skill->name;
		703	#endif
		704
		705	//TODO: maybe golem should become the current_weapon, quite simply?
		706	if (pl->golem)
		707	buf << " Golem*: " << pl->golem->name;
		708
		709	buf << '\0';
		710	buf.linearise (obuf);
933	}	711	}
934		712
935	#define AddIfInt64(Old,New,Type) if (Old != New) {\	713	#define AddIfInt64(Old,New,Type) if (Old != New) {\
936	Old = New; \	714	Old = New; \
937	sl << uint8 (Type) << uint64 (New); \	715	sl << uint8 (Type) << uint64 (New); \
…		…
945	#define AddIfShort(Old,New,Type) if (Old != New) {\	723	#define AddIfShort(Old,New,Type) if (Old != New) {\
946	Old = New; \	724	Old = New; \
947	sl << uint8 (Type) << uint16 (New); \	725	sl << uint8 (Type) << uint16 (New); \
948	}	726	}
949		727
950	#define AddIfFloat(Old,New,Type) if (Old != New) {\	728	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
951	Old = New; \	729	Old = New; \
952	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	730	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
953	}	731	}
954		732
955	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	733	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
956	free(Old); Old = strdup (New);\	734	free(Old); Old = strdup (New);\
957	sl << uint8 (Type) << data8 (New); \	735	sl << uint8 (Type) << data8 (New); \
…		…
971		749
972	client *ns = pl->ns;	750	client *ns = pl->ns;
973	if (!ns)	751	if (!ns)
974	return;	752	return;
975		753
976	object *ob = pl->ob;	754	object *ob = pl->observe;
977	if (!ob)	755	if (!ob)
978	return;	756	return;
		757
		758	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
979		759
980	packet sl ("stats");	760	packet sl ("stats");
981		761
982	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	762	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
983	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	763	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
992	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	772	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
993	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	773	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
994	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	774	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
995		775
996	for (int s = 0; s < NUM_SKILLS; s++)	776	for (int s = 0; s < NUM_SKILLS; s++)
997	if (object *skill = pl->last_skill_ob[s])	777	if (object *skill = opl->last_skill_ob [s])
998	if (skill->stats.exp != ns->last_skill_exp [s])	778	if (skill->stats.exp != ns->last_skill_exp [s])
999	{	779	{
1000	ns->last_skill_exp [s] = skill->stats.exp;	780	ns->last_skill_exp [s] = skill->stats.exp;
1001		781
1002	/* Always send along the level if exp changes. This is only	782	/* Always send along the level if exp changes. This is only
…		…
1010	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	790	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1011	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	791	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1012	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	792	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1013	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	793	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1014	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	794	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1015	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	795	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);
1016	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	796	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1017	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	797	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
1018	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	798	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
1019		799
1020	flags = 0;	800	flags = 0;
1021		801
1022	if (pl->fire_on)	802	if (opl->fire_on)
1023	flags |= SF_FIREON;	803	flags |= SF_FIREON;
1024		804
1025	if (pl->run_on)	805	if (opl->run_on)
1026	flags |= SF_RUNON;	806	flags |= SF_RUNON;
1027		807
1028	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	808	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1029		809
1030	if (ns->sc_version < 1025)	810	if (ns->sc_version < 1025)
…		…
1044	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	824	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1045	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	825	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1046	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	826	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1047	}	827	}
1048		828
1049	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	829	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
1050	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	830	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1051	set_title (ob, buf);	831	set_title (ob, buf);
1052	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	832	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1053		833
1054	/* Only send it away if we have some actual data */	834	/* Only send it away if we have some actual data */
…		…
1058		838
1059	/**	839	/**
1060	* Tells the client that here is a player it should start using.	840	* Tells the client that here is a player it should start using.
1061	*/	841	*/
1062	void	842	void
1063	esrv_new_player (player *pl, uint32 weight)	843	esrv_new_player (player *pl)
1064	{	844	{
		845	sint32 weight = pl->ob->client_weight ();
		846
1065	packet sl ("player");	847	packet sl ("player");
1066		848
1067	sl << uint32 (pl->ob->count)	849	sl << uint32 (pl->ob->count)
1068	<< uint32 (weight)	850	<< uint32 (weight)
1069	<< uint32 (pl->ob->face)	851	<< uint32 (pl->ob->face)
1070	<< data8 (pl->ob->name);	852	<< data8 (pl->ob->name);
1071		853
1072	pl->ns->last_weight = weight;	854	pl->ns->last_weight = weight;
1073	pl->ns->send_packet (sl);	855	pl->ns->send_packet (sl);
1074	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1075	}	856	}
1076		857
1077	/******************************************************************************	858	/******************************************************************************
1078	*	859	*
1079	* Start of map related commands.	860	* Start of map related commands.
…		…
1136		917
1137	if (!ns.faces_sent[face_num])	918	if (!ns.faces_sent[face_num])
1138	if (ob)	919	if (ob)
1139	ns.send_faces (ob);	920	ns.send_faces (ob);
1140	else	921	else
1141	ns.send_face (face_num);	922	ns.send_face (face_num, 10);
1142		923
1143	sl << uint16 (face_num);	924	sl << uint16 (face_num);
1144	return 1;	925	return 1;
1145	}	926	}
1146		927
1147	/* Nothing changed */	928	/* Nothing changed */
1148	return 0;	929	return 0;
1149	}
1150
1151	/**
1152	* Returns the size of a data for a map square as returned by
1153	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
1154	* available.
1155	*/
1156	int
1157	getExtendedMapInfoSize (client * ns)
1158	{
1159	int result = 0;
1160
1161	if (ns->ext_mapinfos)
1162	{
1163	if (ns->EMI_smooth)
1164	result += 1; /*One byte for smoothlevel */
1165	}
1166
1167	return result;
1168	}	930	}
1169		931
1170	// prefetch (and touch) all maps within a specific distancd	932	// prefetch (and touch) all maps within a specific distancd
1171	static void	933	static void
1172	prefetch_surrounding_maps (maptile *map, int distance)	934	prefetch_surrounding_maps (maptile *map, int distance)
1173	{	935	{
1174	map->last_access = runtime;	936	map->touch ();
1175		937
1176	if (--distance)	938	if (--distance)
1177	for (int dir = 4; --dir; )	939	for (int dir = 4; --dir; )
1178	if (const shstr &path = map->tile_path [dir])	940	if (const shstr &path = map->tile_path [dir])
1179	if (maptile *&neigh = map->tile_map [dir])	941	if (maptile *&neigh = map->tile_map [dir])
…		…
1188	{	950	{
1189	prefetch_surrounding_maps (op->map, 3);	951	prefetch_surrounding_maps (op->map, 3);
1190	}	952	}
1191		953
1192	/**	954	/**
1193	* This function uses the new map1 protocol command to send the map	955	* Draws client map.
1194	* to the client. It is necessary because the old map command supports
1195	* a maximum map size of 15x15.
1196	* This function is much simpler than the old one. This is because
1197	* the old function optimized to send as few face identifiers as possible,
1198	* at the expense of sending more coordinate location (coordinates were
1199	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1200	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1201	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1202	* and use the other 4 bits for other informatiion. For full documentation
1203	* of what we send, see the doc/Protocol file.
1204	* I will describe internally what we do:
1205	* the ns->lastmap shows how the map last looked when sent to the client.
1206	* in the lastmap structure, there is a cells array, which is set to the
1207	* maximum viewable size (As set in config.h).
1208	* in the cells, there are faces and a count value.
1209	* we use the count value to hold the darkness value. If -1, then this space
1210	* is not viewable.
1211	* we use faces[0] faces[1] faces[2] to hold what the three layers
1212	* look like.
1213	*/	956	*/
1214	void	957	void
1215	draw_client_map1 (object *pl)	958	draw_client_map (player *pl)
1216	{	959	{
1217	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	960	object *ob = pl->observe;
1218	sint16 nx, ny;
1219	int estartlen, eoldlen;
1220	uint8 eentrysize;
1221	uint16 ewhatstart, ewhatflag;
1222	uint8 extendedinfos;
1223	maptile *m;
1224
1225	client &socket = *pl->contr->ns;
1226
1227	if (!pl->active)	961	if (!ob->active)
1228	return;	962	return;
1229
1230	check_map_change (pl->contr);
1231	prefetch_surrounding_maps (pl);
1232
1233	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1234	packet esl;
1235
1236	startlen = sl.length ();
1237
1238	/*Extendedmapinfo structure initialisation */
1239	if (socket.ext_mapinfos)
1240	{
1241	extendedinfos = EMI_NOREDRAW;
1242
1243	if (socket.EMI_smooth)
1244	extendedinfos |= EMI_SMOOTH;
1245
1246	ewhatstart = esl.length ();
1247	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1248	could need to be taken away */
1249	eentrysize = getExtendedMapInfoSize (&socket);
1250	esl << "mapextended "
1251	<< uint8 (extendedinfos)
1252	<< uint8 (eentrysize);
1253
1254	estartlen = esl.length ();
1255	}
1256	else
1257	{
1258	/* suppress compiler warnings */
1259	ewhatstart = 0;
1260	ewhatflag = 0;
1261	estartlen = 0;
1262	}
1263
1264	/* x,y are the real map locations. ax, ay are viewport relative
1265	* locations.
1266	*/
1267	ay = 0;
1268
1269	/* We could do this logic as conditionals in the if statement,
1270	* but that started to get a bit messy to look at.
1271	*/
1272	max_x = pl->x + (socket.mapx + 1) / 2;
1273	max_y = pl->y + (socket.mapy + 1) / 2;
1274
1275	maptile *plmap = pl->map;
1276
1277	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1278	{
1279	ax = 0;
1280	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1281	{
1282	int emask, mask;
1283	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1284
1285	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1286
1287	/* If the coordinates are not valid, or it is too dark to see,
1288	* we tell the client as such
1289	*/
1290	nx = x;
1291	ny = y;
1292	m = get_map_from_coord (plmap, &nx, &ny);
1293
1294	if (!m)
1295	{
1296	/* space is out of map. Update space and clear values
1297	* if this hasn't already been done. If the space is out
1298	* of the map, it shouldn't have a head
1299	*/
1300	if (lastcell.count != -1)
1301	{
1302	sl << uint16 (mask);
1303	map_clearcell (&lastcell, -1);
1304	}
1305
1306	continue;
1307	}
1308
1309	m->touch ();
1310
1311	int d = pl->contr->blocked_los[ax][ay];
1312
1313	if (d > 3)
1314	{
1315
1316	int need_send = 0, count;
1317
1318	/* This block deals with spaces that are not visible for whatever
1319	* reason. Still may need to send the head for this space.
1320	*/
1321
1322	oldlen = sl.length ();
1323
1324	sl << uint16 (mask);
1325
1326	if (lastcell.count != -1)
1327	need_send = 1;
1328
1329	count = -1;
1330
1331	/* properly clear a previously sent big face */
1332	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1333	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1334	need_send = 1;
1335
1336	map_clearcell (&lastcell, count);
1337
1338	if ((mask & 0xf) || need_send)
1339	sl[oldlen + 1] = mask & 0xff;
1340	else
1341	sl.reset (oldlen);
1342	}
1343	else
1344	{
1345	/* In this block, the space is visible.
1346	*/
1347
1348	/* Rather than try to figure out what everything that we might
1349	* need to send is, then form the packet after that,
1350	* we presume that we will in fact form a packet, and update
1351	* the bits by what we do actually send. If we send nothing,
1352	* we just back out sl.length () to the old value, and no harm
1353	* is done.
1354	* I think this is simpler than doing a bunch of checks to see
1355	* what if anything we need to send, setting the bits, then
1356	* doing those checks again to add the real data.
1357	*/
1358	oldlen = sl.length ();
1359	eoldlen = esl.length ();
1360
1361	sl << uint16 (mask);
1362
1363	unsigned char dummy;
1364	unsigned char *last_ext = &dummy;
1365
1366	/* Darkness changed */
1367	if (lastcell.count != d && socket.darkness)
1368	{
1369	mask |= 0x8;
1370
1371	if (socket.extmap)
1372	{
1373	*last_ext |= 0x80;
1374	last_ext = &sl[sl.length ()];
1375	sl << uint8 (d);
1376	}
1377	else
1378	sl << uint8 (255 - 64 * d);
1379	}
1380
1381	lastcell.count = d;
1382
1383	mapspace &ms = m->at (nx, ny);
1384
1385	if (socket.extmap)
1386	{
1387	uint8 stat_hp = 0;
1388	uint8 stat_width = 0;
1389	uint8 flags = 0;
1390	UUID player = 0;
1391
1392	// send hp information, if applicable
1393	if (object *op = ms.faces_obj [0])
1394	{
1395	if (op->head || op->invisible)
1396	; // do not show
1397	else if (op->type == PLAYER
1398	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1399	{
1400	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1401	{
1402	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1403	stat_width = op->arch->tail_x;
1404	}
1405	}
1406
1407	if (op->msg && op->msg[0] == '@')
1408	flags |= 1;
1409
1410	if (op->type == PLAYER && op != pl)
1411	player = op->count;
1412	}
1413
1414	if (lastcell.stat_hp != stat_hp)
1415	{
1416	lastcell.stat_hp = stat_hp;
1417
1418	mask |= 0x8;
1419	*last_ext |= 0x80;
1420	last_ext = &sl[sl.length ()];
1421
1422	sl << uint8 (5) << uint8 (stat_hp);
1423
1424	if (stat_width > 1)
1425	{
1426	*last_ext |= 0x80;
1427	last_ext = &sl[sl.length ()];
1428
1429	sl << uint8 (6) << uint8 (stat_width);
1430	}
1431	}
1432
1433	if (lastcell.player != player)
1434	{
1435	lastcell.player = player;
1436
1437	mask |= 0x8;
1438	*last_ext |= 0x80;
1439	last_ext = &sl[sl.length ()];
1440
1441	sl << uint8 (0x47) << uint8 (8) << (uint64)player;
1442	}
1443
1444	if (lastcell.flags != flags)
1445	{
1446	lastcell.flags = flags;
1447
1448	mask |= 0x8;
1449	*last_ext |= 0x80;
1450	last_ext = &sl[sl.length ()];
1451
1452	sl << uint8 (8) << uint8 (flags);
1453	}
1454	}
1455
1456	/* Floor face */
1457	if (update_space (sl, socket, ms, lastcell, 2))
1458	mask |= 0x4;
1459
1460	/* Middle face */
1461	if (update_space (sl, socket, ms, lastcell, 1))
1462	mask |= 0x2;
1463
1464	if (ms.player () == pl
1465	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1466	{
1467	// force player to be visible to himself if invisible
1468	if (lastcell.faces[0] != pl->face)
1469	{
1470	lastcell.faces[0] = pl->face;
1471
1472	mask |= 0x1;
1473	sl << uint16 (pl->face);
1474
1475	socket.send_faces (pl);
1476	}
1477	}
1478	/* Top face */
1479	else if (update_space (sl, socket, ms, lastcell, 0))
1480	mask |= 0x1;
1481
1482
1483	/* Check to see if we are in fact sending anything for this
1484	* space by checking the mask. If so, update the mask.
1485	* if not, reset the len to that from before adding the mask
1486	* value, so we don't send those bits.
1487	*/
1488	if (mask & 0xf)
1489	sl[oldlen + 1] = mask & 0xff;
1490	else
1491	sl.reset (oldlen);
1492
1493	if (socket.ext_mapinfos)
1494	esl << uint16 (emask);
1495
1496	if (socket.EMI_smooth)
1497	{
1498	for (int layer = 2+1; layer--; )
1499	{
1500	object *ob = ms.faces_obj [layer];
1501
1502	// If there is no object for this space, or if the face for the object
1503	// is the blank face, set the smoothlevel to zero.
1504	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1505
1506	// We've gotten what face we want to use for the object. Now see if
1507	// if it has changed since we last sent it to the client.
1508	if (lastcell.smooth[layer] != smoothlevel)
1509	{
1510	lastcell.smooth[layer] = smoothlevel;
1511	esl << uint8 (smoothlevel);
1512	emask |= 1 << layer;
1513	}
1514	}
1515
1516	if (emask & 0xf)
1517	esl[eoldlen + 1] = emask & 0xff;
1518	else
1519	esl.reset (eoldlen);
1520	}
1521	} /* else this is a viewable space */
1522	} /* for x loop */
1523	} /* for y loop */
1524
1525	/* Verify that we in fact do need to send this */
1526	if (socket.ext_mapinfos)
1527	{
1528	if (!(sl.length () > startlen || socket.sent_scroll))
1529	{
1530	/* No map data will follow, so don't say the client
1531	* it doesn't need draw!
1532	*/
1533	ewhatflag &= ~EMI_NOREDRAW;
1534	esl[ewhatstart + 1] = ewhatflag & 0xff;
1535	}
1536
1537	if (esl.length () > estartlen)
1538	socket.send_packet (esl);
1539	}
1540
1541	if (sl.length () > startlen || socket.sent_scroll)
1542	{
1543	socket.send_packet (sl);
1544	socket.sent_scroll = 0;
1545	}
1546	}
1547
1548	/**
1549	* Draws client map.
1550	*/
1551	void
1552	draw_client_map (object *pl)
1553	{
1554	int i, j;
1555	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1556	int mflags;
1557	struct Map newmap;
1558	maptile *m, *pm;
1559
1560	if (pl->type != PLAYER)
1561	{
1562	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1563	return;
1564	}
1565
1566	pm = pl->map;
1567		963
1568	/* If player is just joining the game, he isn't here yet, so the map	964	/* If player is just joining the game, he isn't here yet, so the map
1569	* can get swapped out. If so, don't try to send them a map. All will	965	* can get swapped out. If so, don't try to send them a map. All will
1570	* be OK once they really log in.	966	* be OK once they really log in.
1571	*/	967	*/
1572	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	968	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1573	return;	969	return;
1574		970
1575	memset (&newmap, 0, sizeof (struct Map));	971	int startlen, oldlen;
1576		972
1577	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)	973	check_map_change (pl);
1578	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)	974	prefetch_surrounding_maps (pl->ob);
		975
		976	/* do LOS after calls to update_position */
		977	/* unfortunately, we need to udpate los when observing, currently */
		978	if (pl->do_los || pl->observe != pl->ob)
		979	{
		980	pl->do_los = 0;
		981	pl->update_los ();
		982	}
		983
		984	/**
		985	* This function uses the new map1 protocol command to send the map
		986	* to the client. It is necessary because the old map command supports
		987	* a maximum map size of 15x15.
		988	* This function is much simpler than the old one. This is because
		989	* the old function optimized to send as few face identifiers as possible,
		990	* at the expense of sending more coordinate location (coordinates were
		991	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		992	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		993	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		994	* and use the other 4 bits for other informatiion. For full documentation
		995	* of what we send, see the doc/Protocol file.
		996	* I will describe internally what we do:
		997	* the ns->lastmap shows how the map last looked when sent to the client.
		998	* in the lastmap structure, there is a cells array, which is set to the
		999	* maximum viewable size (As set in config.h).
		1000	* in the cells, there are faces and a count value.
		1001	* we use the count value to hold the darkness value. If -1, then this space
		1002	* is not viewable.
		1003	* we use faces[0] faces[1] faces[2] to hold what the three layers
		1004	* look like.
		1005	*/
		1006
		1007	client &socket = *pl->ns;
		1008
		1009	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
		1010
		1011	startlen = sl.length ();
		1012
		1013	int hx = socket.mapx / 2;
		1014	int hy = socket.mapy / 2;
		1015
		1016	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
		1017	int ax = dx + hx;
		1018	int ay = dy + hy;
		1019
		1020	int mask = (ax << 10) | (ay << 4);
		1021	MapCell &lastcell = socket.lastmap.cells[ax][ay];
		1022
		1023	/* If the coordinates are not valid, or it is too dark to see,
		1024	* we tell the client as such
		1025	*/
		1026	if (!m)
1579	{	1027	{
1580	ax = i;	1028	/* space is out of map. Update space and clear values
1581	ay = j;	1029	* if this hasn't already been done. If the space is out
1582	m = pm;	1030	* of the map, it shouldn't have a head.
1583	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1584
1585	if (mflags & P_OUT_OF_MAP)
1586	continue;
1587
1588	/* If a map is visible to the player, we don't want to swap it out
1589	* just to reload it. This should really call something like
1590	* swap_map, but this is much more efficient and 'good enough'
1591	*/	1031	*/
1592	if (mflags & P_NEW_MAP)	1032	if (lastcell.count != -1)
1593	m->timeout = 50;	1033	{
		1034	sl << uint16 (mask);
		1035	map_clearcell (&lastcell, -1);
		1036	}
		1037
		1038	continue;
1594	}	1039	}
		1040
		1041	int d = pl->blocked_los_uc (dx, dy);
1595		1042
1596	/* do LOS after calls to update_position */	1043	if (d > 3)
1597	if (pl->contr->do_los)
1598	{	1044	{
1599	update_los (pl);	1045	/* This block deals with spaces that are not visible for whatever
1600	pl->contr->do_los = 0;	1046	* reason. Still may need to send the head for this space.
		1047	*/
		1048	if (lastcell.count != -1
		1049	|| lastcell.faces[0]
		1050	|| lastcell.faces[1]
		1051	|| lastcell.faces[2]
		1052	|| lastcell.stat_hp
		1053	|| lastcell.flags
		1054	|| lastcell.player)
		1055	sl << uint16 (mask);
		1056
		1057	/* properly clear a previously sent big face */
		1058	map_clearcell (&lastcell, -1);
1601	}	1059	}
		1060	else
		1061	{
		1062	/* In this block, the space is visible.
		1063	*/
1602		1064
1603	/* Big maps need a different drawing mechanism to work */	1065	/* Rather than try to figure out what everything that we might
1604	draw_client_map1 (pl);	1066	* need to send is, then form the packet after that,
1605	}	1067	* we presume that we will in fact form a packet, and update
		1068	* the bits by what we do actually send. If we send nothing,
		1069	* we just back out sl.length () to the old value, and no harm
		1070	* is done.
		1071	* I think this is simpler than doing a bunch of checks to see
		1072	* what if anything we need to send, setting the bits, then
		1073	* doing those checks again to add the real data.
		1074	*/
		1075	oldlen = sl.length ();
1606		1076
		1077	sl << uint16 (mask);
		1078
		1079	unsigned char dummy;
		1080	unsigned char *last_ext = &dummy;
		1081
		1082	/* Darkness changed */
		1083	if (lastcell.count != d)
		1084	{
		1085	mask |= 0x8;
		1086
		1087	*last_ext |= 0x80;
		1088	last_ext = &sl[sl.length ()];
		1089	sl << uint8 (d);
		1090	}
		1091
		1092	lastcell.count = d;
		1093
		1094	mapspace &ms = m->at (nx, ny);
		1095	ms.update ();
		1096
		1097	// extmap handling
		1098	uint8 stat_hp = 0;
		1099	uint8 stat_width = 0;
		1100	uint8 flags = 0;
		1101	tag_t player = 0;
		1102
		1103	// send hp information, if applicable
		1104	if (object *op = ms.faces_obj [0])
		1105	if (op->is_head () && !op->invisible)
		1106	{
		1107	if (op->stats.maxhp > op->stats.hp
		1108	&& op->stats.maxhp > 0
		1109	&& (op->type == PLAYER
		1110	|| op->type == DOOR // does not work, have maxhp 0
		1111	|| QUERY_FLAG (op, FLAG_MONSTER)
		1112	|| QUERY_FLAG (op, FLAG_ALIVE)
		1113	|| QUERY_FLAG (op, FLAG_GENERATOR)))
		1114	{
		1115	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1116	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1117	}
		1118
		1119	if (expect_false (op->has_dialogue ()))
		1120	flags |= 1;
		1121
		1122	if (expect_false (op->type == PLAYER))
		1123	player = op == ob ? pl->ob->count
		1124	: op == pl->ob ? ob->count
		1125	: op->count;
		1126	}
		1127
		1128	if (expect_false (lastcell.stat_hp != stat_hp))
		1129	{
		1130	lastcell.stat_hp = stat_hp;
		1131
		1132	mask |= 0x8;
		1133	*last_ext |= 0x80;
		1134	last_ext = &sl[sl.length ()];
		1135
		1136	sl << uint8 (5) << uint8 (stat_hp);
		1137
		1138	if (stat_width > 1)
		1139	{
		1140	*last_ext |= 0x80;
		1141	last_ext = &sl[sl.length ()];
		1142
		1143	sl << uint8 (6) << uint8 (stat_width);
		1144	}
		1145	}
		1146
		1147	if (expect_false (lastcell.player != player))
		1148	{
		1149	lastcell.player = player;
		1150
		1151	mask |= 0x8;
		1152	*last_ext |= 0x80;
		1153	last_ext = &sl[sl.length ()];
		1154
		1155	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
		1156	}
		1157
		1158	if (expect_false (lastcell.flags != flags))
		1159	{
		1160	lastcell.flags = flags;
		1161
		1162	mask |= 0x8;
		1163	*last_ext |= 0x80;
		1164	last_ext = &sl[sl.length ()];
		1165
		1166	sl << uint8 (8) << uint8 (flags);
		1167	}
		1168
		1169	// faces
		1170
		1171	/* Floor face */
		1172	if (update_space (sl, socket, ms, lastcell, 2))
		1173	mask |= 0x4;
		1174
		1175	/* Middle face */
		1176	if (update_space (sl, socket, ms, lastcell, 1))
		1177	mask |= 0x2;
		1178
		1179	if (expect_false (ob->invisible)
		1180	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
		1181	&& ms.player () == ob)
		1182	{
		1183	// force player to be visible to himself if invisible
		1184	if (lastcell.faces[0] != ob->face)
		1185	{
		1186	lastcell.faces[0] = ob->face;
		1187
		1188	mask |= 0x1;
		1189	sl << uint16 (ob->face);
		1190
		1191	socket.send_faces (ob);
		1192	}
		1193	}
		1194	/* Top face */
		1195	else if (update_space (sl, socket, ms, lastcell, 0))
		1196	mask |= 0x1;
		1197
		1198	/* Check to see if we are in fact sending anything for this
		1199	* space by checking the mask. If so, update the mask.
		1200	* if not, reset the len to that from before adding the mask
		1201	* value, so we don't send those bits.
		1202	*/
		1203	if (mask & 0xf)
		1204	sl[oldlen + 1] = mask & 0xff;
		1205	else
		1206	sl.reset (oldlen);
		1207	} /* else this is a viewable space */
		1208	ordered_mapwalk_end
		1209
		1210	socket.flush_fx ();
		1211
		1212	if (sl.length () > startlen || socket.sent_scroll)
		1213	{
		1214	socket.send_packet (sl);
		1215	socket.sent_scroll = 0;
		1216	}
		1217	}
1607		1218
1608	/*****************************************************************************/	1219	/*****************************************************************************/
1609
1610	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/	1220	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1611
1612	/* a player. Of course, the client need to know the command to be able to */	1221	/* a player. Of course, the client need to know the command to be able to */
1613
1614	/* manage it ! */	1222	/* manage it ! */
1615
1616	/*****************************************************************************/	1223	/*****************************************************************************/
1617	void	1224	void
1618	send_plugin_custom_message (object *pl, char *buf)	1225	send_plugin_custom_message (object *pl, char *buf)
1619	{	1226	{
1620	pl->contr->ns->send_packet (buf);	1227	pl->contr->ns->send_packet (buf);
…		…
1629	{	1236	{
1630	packet sl;	1237	packet sl;
1631	sl << "replyinfo skill_info\n";	1238	sl << "replyinfo skill_info\n";
1632		1239
1633	for (int i = 1; i < NUM_SKILLS; i++)	1240	for (int i = 1; i < NUM_SKILLS; i++)
1634	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1241	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1635		1242
1636	if (sl.length () >= MAXSOCKBUF)	1243	if (sl.length () > MAXSOCKBUF)
1637	{	1244	{
1638	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1245	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1639	fatal (0);	1246	fatal (0);
1640	}	1247	}
1641		1248
…		…
1654	sl << "replyinfo spell_paths\n";	1261	sl << "replyinfo spell_paths\n";
1655		1262
1656	for (int i = 0; i < NRSPELLPATHS; i++)	1263	for (int i = 0; i < NRSPELLPATHS; i++)
1657	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1264	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1658		1265
1659	if (sl.length () >= MAXSOCKBUF)	1266	if (sl.length () > MAXSOCKBUF)
1660	{	1267	{
1661	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1268	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1662	fatal (0);	1269	fatal (0);
1663	}	1270	}
1664		1271
…		…
1683	if (spell->type == SPELL)	1290	if (spell->type == SPELL)
1684	{	1291	{
1685	int flags = 0;	1292	int flags = 0;
1686		1293
1687	/* check if we need to update it */	1294	/* check if we need to update it */
1688	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1295	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1689	{	1296	{
1690	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1297	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1691	flags |= UPD_SP_MANA;	1298	flags |= UPD_SP_MANA;
1692	}	1299	}
1693		1300
1694	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1301	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1695	{	1302	{
1696	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1303	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1697	flags |= UPD_SP_GRACE;	1304	flags |= UPD_SP_GRACE;
1698	}	1305	}
1699		1306
1700	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1307	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1701	{	1308	{
1702	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1309	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1703	flags |= UPD_SP_DAMAGE;	1310	flags |= UPD_SP_DAMAGE;
1704	}	1311	}
1705		1312
1706	if (flags)	1313	if (flags)
1707	{	1314	{
…		…
1709		1316
1710	sl << "updspell "	1317	sl << "updspell "
1711	<< uint8 (flags)	1318	<< uint8 (flags)
1712	<< uint32 (spell->count);	1319	<< uint32 (spell->count);
1713		1320
1714	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1321	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1715	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1322	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1716	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1323	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1717		1324
1718	pl->ns->send_packet (sl);	1325	pl->ns->send_packet (sl);
1719	}	1326	}
1720	}	1327	}
1721	}	1328	}
…		…
1751	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1358	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1752	return;	1359	return;
1753	}	1360	}
1754		1361
1755	/* store costs and damage in the object struct, to compare to later */	1362	/* store costs and damage in the object struct, to compare to later */
1756	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1363	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1757	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1364	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1758	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1365	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1759		1366
1760	/* figure out which skill it uses, if it uses one */	1367	/* figure out which skill it uses, if it uses one */
1761	if (spell->skill)	1368	if (spell->skill)
1762	{	1369	if (object *tmp = pl->find_skill (spell->skill))
1763	for (i = 1; i < NUM_SKILLS; i++)
1764	if (!strcmp (spell->skill, skill_names[i]))
1765	{
1766	skill = i + CS_STAT_SKILLINFO;	1370	skill = tmp->subtype + CS_STAT_SKILLINFO;
1767	break;
1768	}
1769	}
1770		1371
1771	// spells better have a face	1372	// spells better have a face
1772	if (!spell->face)	1373	if (!spell->face)
1773	{	1374	{
1774	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1375	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1775	spell->face = face_find ("burnout.x11", blank_face);	1376	spell->face = face_find ("burnout.x11", blank_face);
1776	}	1377	}
		1378
		1379	pl->ns->send_face (spell->face);
1777		1380
1778	/* send the current values */	1381	/* send the current values */
1779	sl << uint32 (spell->count)	1382	sl << uint32 (spell->count)
1780	<< uint16 (spell->level)	1383	<< uint16 (spell->level)
1781	<< uint16 (spell->casting_time)	1384	<< uint16 (spell->casting_time)
1782	<< uint16 (spell->last_sp)	1385	<< uint16 (spell->cached_sp)
1783	<< uint16 (spell->last_grace)	1386	<< uint16 (spell->cached_grace)
1784	<< uint16 (spell->last_eat)	1387	<< uint16 (spell->cached_eat)
1785	<< uint8 (skill)	1388	<< uint8 (skill)
1786	<< uint32 (spell->path_attuned)	1389	<< uint32 (spell->path_attuned)
1787	<< uint32 (spell->face)	1390	<< uint32 (spell->face)
1788	<< data8 (spell->name)	1391	<< data8 (spell->name)
1789	<< data16 (spell->msg);	1392	<< data16 (spell->msg);
…		…
1817	* bytes and 3 strings (because that is the spec) so we need to	1420	* bytes and 3 strings (because that is the spec) so we need to
1818	* check that the length of those 3 strings, plus the 23 bytes,	1421	* check that the length of those 3 strings, plus the 23 bytes,
1819	* won't take us over the length limit for the socket, if it does,	1422	* won't take us over the length limit for the socket, if it does,
1820	* we need to send what we already have, and restart packet formation	1423	* we need to send what we already have, and restart packet formation
1821	*/	1424	*/
		1425	if (spell->type != SPELL)
		1426	continue;
		1427
1822	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1428	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1823	* to show add_spell is 26 bytes + 2 strings. However, the overun	1429	* to show add_spell is 26 bytes + 2 strings. However, the overun
1824	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1430	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1825	* like it will fix this	1431	* like it will fix this
1826	*/	1432	*/
1827	if (spell->type != SPELL)
1828	continue;
1829
1830	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1433	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1831	{	1434	{
		1435	pl->ns->flush_fx ();
1832	pl->ns->send_packet (sl);	1436	pl->ns->send_packet (sl);
1833		1437
1834	sl.reset ();	1438	sl.reset ();
1835	sl << "addspell ";	1439	sl << "addspell ";
1836	}	1440	}
…		…
1844	return;	1448	return;
1845	}	1449	}
1846	else	1450	else
1847	append_spell (pl, sl, spell);	1451	append_spell (pl, sl, spell);
1848		1452
1849	if (sl.length () >= MAXSOCKBUF)	1453	if (sl.length () > MAXSOCKBUF)
1850	{	1454	{
1851	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1455	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1852	fatal (0);	1456	fatal (0);
1853	}	1457	}
1854		1458
1855	/* finally, we can send the packet */	1459	/* finally, we can send the packet */
		1460	pl->ns->flush_fx ();
1856	pl->ns->send_packet (sl);	1461	pl->ns->send_packet (sl);
1857	}	1462	}
1858		1463

Diff Legend

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