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.88 by root, Tue Apr 24 00:42:03 2007 UTC vs.
Revision 1.189 by root, Wed Oct 31 09:17:14 2012 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,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel	5	* Copyright (©) 2001 Mark Wedel
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992 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	*
18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	17	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	18	* You should have received a copy of the Affero GNU General Public License
		19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
23	*/	21	*
		22	* The authors can be reached via e-mail to <support@deliantra.net>
		23	*/
		24
		25	//+GPL
24		26
25	/**	27	/**
26	* \file	28	* \file
27	* Client handling.	29	* Client handling.
28	*	30	*
…		…
42		44
43	#include <global.h>	45	#include <global.h>
44	#include <sproto.h>	46	#include <sproto.h>
45		47
46	#include <living.h>	48	#include <living.h>
47	#include <commands.h>
48		49
49	/* This block is basically taken from socket.c - I assume if it works there,	50	/* This block is basically taken from socket.c - I assume if it works there,
50	* it should work here.	51	* it should work here.
51	*/	52	*/
52	#include <sys/types.h>	53	#include <sys/types.h>
…		…
64	* This table translates the attack numbers as used within the	65	* This table translates the attack numbers as used within the
65	* program to the value we use when sending STATS command to the	66	* program to the value we use when sending STATS command to the
66	* client. If a value is -1, then we don't send that to the	67	* client. If a value is -1, then we don't send that to the
67	* client.	68	* client.
68	*/	69	*/
69	short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,	70	static short atnr_cs_stat[NROFATTACKS] =
70	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,	71	{
71	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,	72	CS_STAT_RES_PHYS,
72	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	73	CS_STAT_RES_MAG,
73	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	74	CS_STAT_RES_FIRE,
74	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,	75	CS_STAT_RES_ELEC,
75	CS_STAT_RES_FEAR, -1 /* Cancellation */ ,	76	CS_STAT_RES_COLD,
76	CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,	77	CS_STAT_RES_CONF,
77	-1 /* Chaos */ , -1 /* Counterspell */ ,	78	CS_STAT_RES_ACID,
78	-1 /* Godpower */ , CS_STAT_RES_HOLYWORD,	79	CS_STAT_RES_DRAIN,
		80	-1 /* weaponmagic */,
		81	CS_STAT_RES_GHOSTHIT,
		82	CS_STAT_RES_POISON,
		83	CS_STAT_RES_SLOW,
		84	CS_STAT_RES_PARA,
		85	CS_STAT_TURN_UNDEAD,
		86	CS_STAT_RES_FEAR,
		87	-1 /* Cancellation */,
		88	CS_STAT_RES_DEPLETE,
		89	CS_STAT_RES_DEATH,
		90	-1 /* Chaos */,
		91	-1 /* Counterspell */,
		92	-1 /* Godpower */,
		93	CS_STAT_RES_HOLYWORD,
79	CS_STAT_RES_BLIND,	94	CS_STAT_RES_BLIND,
80	-1, /* Internal */	95	-1, /* Internal */
81	-1, /* life stealing */	96	-1, /* life stealing */
82	-1 /* Disease - not fully done yet */	97	-1 /* Disease - not fully done yet */
83	};	98	};
…		…
99	*/	114	*/
100	mx = ns->mapx;	115	mx = ns->mapx;
101	my = ns->mapy;	116	my = ns->mapy;
102		117
103	/* the x and y here are coordinates for the new map, i.e. if we moved	118	/* 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,	119	* (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	120	* if the destination x or y coordinate is outside the viewable
106	* area, we clear the values - otherwise, the old values	121	* area, we clear the values - otherwise, the old values
107	* are preserved, and the check_head thinks it needs to clear them.	122	* are preserved, and the check_head thinks it needs to clear them.
108	*/	123	*/
109	for (x = 0; x < mx; x++)	124	for (x = 0; x < mx; x++)
110	{
111	for (y = 0; y < my; y++)	125	for (y = 0; y < my; y++)
112	{
113	if (x >= ns->mapx || y >= ns->mapy)	126	if (x >= ns->mapx || y >= ns->mapy)
114	/* clear cells outside the viewable area */	127	/* clear cells outside the viewable area */
115	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	128	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)	129	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 */	130	/* clear newly visible tiles within the viewable area */
118	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	131	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119	else	132	else
120	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	133	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121	}
122	}
123		134
124	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	135	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125		136
126	/* Make sure that the next "map1" command will be sent (even if it is	137	/* Make sure that the next "map1" command will be sent (even if it is
127	* empty).	138	* empty).
…		…
130	}	141	}
131		142
132	static void	143	static void
133	clear_map (player *pl)	144	clear_map (player *pl)
134	{	145	{
		146	pl->ns->mapinfo_queue_clear ();
		147
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	148	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136		149
137	pl->ns->force_newmap = false;	150	pl->ns->force_newmap = false;
138
139	if (pl->ns->newmapcmd == 1)
140	pl->ns->send_packet ("newmap");	151	pl->ns->send_packet ("newmap");
141
142	pl->ns->floorbox_reset ();	152	pl->ns->floorbox_reset ();
		153	}
		154
		155	static void
		156	send_map_info (player *pl)
		157	{
		158	client &socket = *pl->ns;
		159	object *ob = pl->viewpoint;
		160
		161	if (socket.mapinfocmd)
		162	{
		163	if (ob->map && ob->map->path)
		164	{
		165	int flags = 0;
		166
		167	// due to historical glitches, the bit ordering and map index ordering differs
		168	if (ob->map->tile_path [TILE_NORTH]) flags |= 0x01;
		169	if (ob->map->tile_path [TILE_EAST ]) flags |= 0x02;
		170	if (ob->map->tile_path [TILE_SOUTH]) flags |= 0x04;
		171	if (ob->map->tile_path [TILE_WEST ]) flags |= 0x08;
		172	// these two are debatable
		173	if (ob->map->tile_path [TILE_UP ]) flags |= 0x10;
		174	if (ob->map->tile_path [TILE_DOWN ]) flags |= 0x20;
		175
		176	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		177	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		178	ob->map->width, ob->map->height, &ob->map->path);
		179	}
		180	else
		181	socket.send_packet ("mapinfo current");
		182	}
143	}	183	}
144		184
145	/** check for map/region change and send new map data */	185	/** check for map/region change and send new map data */
146	static void	186	static void
147	check_map_change (player *pl)	187	check_map_change (player *pl)
148	{	188	{
149	client &socket = *pl->ns;	189	client &socket = *pl->ns;
150	object *ob = pl->ob;	190	object *ob = pl->viewpoint;
151	char buf[MAX_BUF]; /* eauugggh */	191
		192	region *reg = ob->region ();
		193	if (socket.current_region != reg)
		194	{
		195	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		196	socket.current_region = reg;
		197	}
		198
		199	// first try to avoid a full newmap on tiled map scrolls
		200	if (socket.current_map != ob->map && !socket.force_newmap)
		201	{
		202	rv_vector rv;
		203
		204	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		205
		206	// manhattan distance is very handy here
		207	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		208	{
		209	socket.current_map = ob->map;
		210	socket.current_x = ob->x;
		211	socket.current_y = ob->y;
		212
		213	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		214	socket.floorbox_reset ();
		215	send_map_info (pl);
		216	}
		217	}
152		218
153	if (socket.current_map != ob->map || socket.force_newmap)	219	if (socket.current_map != ob->map || socket.force_newmap)
154	{	220	{
155	clear_map (pl);	221	clear_map (pl);
156	socket.current_map = ob->map;	222	socket.current_map = ob->map;
157		223	send_map_info (pl);
158	if (socket.mapinfocmd)
159	{
160	if (ob->map && ob->map->path[0])
161	{
162	int flags = 0;
163
164	if (ob->map->tile_path[0])
165	flags |= 1;
166	if (ob->map->tile_path[1])
167	flags |= 2;
168	if (ob->map->tile_path[2])
169	flags |= 4;
170	if (ob->map->tile_path[3])
171	flags |= 8;
172
173	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
174	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
175	}
176	else
177	snprintf (buf, MAX_BUF, "mapinfo current");
178
179	socket.send_packet (buf);
180	}
181	}	224	}
182	else if (socket.current_x != ob->x || socket.current_y != ob->y)	225	else if (socket.current_x != ob->x || socket.current_y != ob->y)
183	{	226	{
184	int dx = ob->x - socket.current_x;	227	int dx = ob->x - socket.current_x;
185	int dy = ob->y - socket.current_y;	228	int dy = ob->y - socket.current_y;
186		229
187	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
188	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
189	else
190	{
191	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	230	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
192	socket.floorbox_reset ();	231	socket.floorbox_reset ();
193	}
194	}	232	}
195		233
196	socket.current_x = ob->x;	234	socket.current_x = ob->x;
197	socket.current_y = ob->y;	235	socket.current_y = ob->y;
		236	}
198		237
199	region *reg = ob->region ();	238	/**
200	if (socket.current_region != reg)	239	* This sends the skill number to name mapping. We ignore
201	{	240	* the params - we always send the same info no matter what.
202	socket.current_region = reg;	241	*/
203	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);	242	static void
204	}	243	send_skill_info (client *ns, char *params)
		244	{
		245	packet sl;
		246	sl << "replyinfo skill_info\n";
		247
		248	for (int i = 0; i < skillvec.size (); ++i)
		249	sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
		250
		251	if (sl.length () > MAXSOCKBUF)
		252	cleanup ("buffer overflow in send_skill_info!");
		253
		254	ns->send_packet (sl);
		255	}
		256
		257	/**
		258	* This sends the spell path to name mapping. We ignore
		259	* the params - we always send the same info no matter what.
		260	*/
		261	static void
		262	send_spell_paths (client * ns, char *params)
		263	{
		264	packet sl;
		265
		266	sl << "replyinfo spell_paths\n";
		267
		268	for (int i = 0; i < NRSPELLPATHS; i++)
		269	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		270
		271	if (sl.length () > MAXSOCKBUF)
		272	cleanup ("buffer overflow in send_spell_paths!");
		273
		274	ns->send_packet (sl);
205	}	275	}
206		276
207	/**	277	/**
208	* RequestInfo is sort of a meta command. There is some specific	278	* RequestInfo is sort of a meta command. There is some specific
209	* request of information, but we call other functions to provide	279	* request of information, but we call other functions to provide
210	* that information.	280	* that information.
211	*/	281	*/
212	void	282	void
213	RequestInfo (char *buf, int len, client * ns)	283	RequestInfo (char *buf, int len, client *ns)
214	{	284	{
215	char *params = NULL, *cp;	285	char *params;
216
217	/* No match */
218	char bigbuf[MAX_BUF];
219	int slen;
220
221	/* Set up replyinfo before we modify any of the buffers - this is used
222	* if we don't find a match.
223	*/
224	strcpy (bigbuf, "replyinfo ");
225	slen = strlen (bigbuf);
226	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
227		286
228	/* find the first space, make it null, and update the	287	/* find the first space, make it null, and update the
229	* params pointer.	288	* params pointer.
230	*/	289	*/
231	for (cp = buf; *cp != '\0'; cp++)	290	for (params = buf; *params; params++)
232	if (*cp == ' ')	291	if (*params == ' ')
233	{	292	{
234	*cp = '\0';
235	params = cp + 1;	293	*params++ = 0;
236	break;	294	break;
237	}	295	}
238		296
239	if (!strcmp (buf, "image_info"))
240	send_image_info (ns, params);
241	else if (!strcmp (buf, "image_sums"))
242	send_image_sums (ns, params);
243	else if (!strcmp (buf, "skill_info"))	297	if (!strcmp (buf, "skill_info"))
244	send_skill_info (ns, params);	298	send_skill_info (ns, params);
245	else if (!strcmp (buf, "spell_paths"))	299	else if (!strcmp (buf, "spell_paths"))
246	send_spell_paths (ns, params);	300	send_spell_paths (ns, params);
247	else	301	else
248	ns->send_packet (bigbuf, len);	302	{
		303	// undo tokenisation above and send replyinfo with the request unchanged
		304	if (*params)
		305	*--params = ' ';
		306
		307	ns->send_packet_printf ("replyinfo %s", buf);
		308	}
249	}	309	}
250		310
251	void	311	void
252	ExtCmd (char *buf, int len, player *pl)	312	ExtCmd (char *buf, int len, player *pl)
253	{	313	{
…		…
256		316
257	void	317	void
258	ExtiCmd (char *buf, int len, client *ns)	318	ExtiCmd (char *buf, int len, client *ns)
259	{	319	{
260	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	320	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		321	}
		322
		323	//-GPL
		324
		325	void
		326	client::mapinfo_queue_clear ()
		327	{
		328	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		329	free (*i);
		330
		331	mapinfo_queue.clear ();
		332	}
		333
		334	bool
		335	client::mapinfo_try (char *buf)
		336	{
		337	char *token = buf;
		338	buf += strlen (buf) + 9;
		339
		340	// initial map and its origin
		341	maptile *map = pl->viewpoint->map;
		342	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
		343	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
		344	int max_distance = 8; // limit maximum path length to something generous
		345
		346	while (*buf && map && max_distance)
		347	{
		348	int dir = *buf++ - '1';
		349
		350	// due to historical glitches, the mapinfo index and tile index differs
		351	static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
		352
		353	// maybe we should only allow the four flat directions
		354	if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
		355	{
		356	dir = dirmap [dir];
		357
		358	if (!map->tile_path [dir])
		359	map = 0;
		360	else if (map->tile_available (dir, false))
		361	{
		362	maptile *neigh = map->tile_map [dir];
		363
		364	switch (dir)
		365	{
		366	case 0: mapy -= neigh->height; break;
		367	case 2: mapy += map ->height; break;
		368	case 3: mapx -= neigh->width ; break;
		369	case 1: mapx += map ->width ; break;
		370	}
		371
		372	map = neigh;
		373	--max_distance;
		374	}
		375	else
		376	return 0;
		377	}
		378	else
		379	max_distance = 0;
		380	}
		381
		382	if (!max_distance)
		383	send_packet_printf ("mapinfo %s error", token);
		384	else if (!map || !map->path)
		385	send_packet_printf ("mapinfo %s nomap", token);
		386	else
		387	{
		388	int flags = 0;
		389
		390	// due to historical glitches, the bit ordering and map index ordering differs
		391	if (map->tile_path [TILE_NORTH]) flags |= 0x01;
		392	if (map->tile_path [TILE_EAST ]) flags |= 0x02;
		393	if (map->tile_path [TILE_SOUTH]) flags |= 0x04;
		394	if (map->tile_path [TILE_WEST ]) flags |= 0x08;
		395	// these two are debatable
		396	if (map->tile_path [TILE_UP ]) flags |= 0x10;
		397	if (map->tile_path [TILE_DOWN ]) flags |= 0x20;
		398
		399	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		400	}
		401
		402	return 1;
		403	}
		404
		405	void
		406	client::mapinfo_queue_run ()
		407	{
		408	if (mapinfo_queue.empty () || !pl)
		409	return;
		410
		411	for (int i = 0; i < mapinfo_queue.size (); ++i)
		412	if (mapinfo_try (mapinfo_queue [i]))
		413	{
		414	free (mapinfo_queue [i]);
		415	mapinfo_queue.erase (i);
		416	}
		417	else
		418	++i;
261	}	419	}
262		420
263	void	421	void
264	MapInfoCmd (char *buf, int len, player *pl)	422	MapInfoCmd (char *buf, int len, player *pl)
265	{	423	{
266	// <mapinfo tag spatial tile-path	424	// <mapinfo tag spatial tile-path
267	// >mapinfo tag spatial flags x y w h hash	425	// >mapinfo tag spatial flags x y w h hash
268		426
269	char bigbuf[MAX_BUF], *token;
270
271	token = buf;	427	char *token = buf;
272	// copy token	428
273	if (!(buf = strchr (buf, ' ')))	429	if (!(buf = strchr (buf, ' ')))
274	return;	430	return;
275		431
276	*buf++ = 0;
277
278	if (!strncmp (buf, "spatial ", 8))	432	if (!strncmp (buf, " spatial ", 9))
279	{	433	{
280	buf += 8;	434	char *copy = strdup (token);
		435	copy [buf - token] = 0;
281		436
282	// initial map and its origin	437	#if 0
283	maptile *map = pl->ob->map;	438	// this makes only sense when we flush the buffer immediately
284	sint16 dx, dy;	439	if (pl->ns->mapinfo_try (copy))
285	int mapx = pl->ns->mapx / 2 - pl->ob->x;	440	free (copy);
286	int mapy = pl->ns->mapy / 2 - pl->ob->y;
287	int max_distance = 8; // limit maximum path length to something generous
288
289	while (*buf && map && max_distance)
290	{
291	int dir = *buf++;
292
293	switch (dir)
294	{
295	case '1':
296	dx = 0;
297	dy = -1;
298	map = map->xy_find (dx, dy);
299	map && (mapy -= map->height);
300	break;
301	case '2':
302	mapx += map->width;
303	dx = map->width;
304	dy = 0;
305	map = map->xy_find (dx, dy);
306	break;
307	case '3':
308	mapy += map->height;
309	dx = 0;
310	dy = map->height;
311	map = map->xy_find (dx, dy);
312	break;
313	case '4':
314	dx = -1;
315	dy = 0;
316	map = map->xy_find (dx, dy);
317	map && (mapx -= map->width);
318	break;
319	}
320
321	--max_distance;
322	}
323
324	if (!max_distance)
325	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
326	else if (map && map->path[0])
327	{
328	int flags = 0;
329
330	if (map->tile_path[0])
331	flags |= 1;
332	if (map->tile_path[1])
333	flags |= 2;
334	if (map->tile_path[2])
335	flags |= 4;
336	if (map->tile_path[3])
337	flags |= 8;
338
339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340	}
341	else	441	else
342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	442	#endif
		443	pl->ns->mapinfo_queue.push_back (copy);
343	}	444	}
344	else	445	else
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	446	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
346
347	pl->ns->send_packet (bigbuf);
348	}	447	}
349		448
350	/** This is the Setup cmd */	449	/** This is the Setup cmd */
351	void	450	void
352	SetUp (char *buf, int len, client * ns)	451	SetUp (char *buf, int len, client * ns)
…		…
364	AddMeCmd (char *buf, int len, client *ns)	463	AddMeCmd (char *buf, int len, client *ns)
365	{	464	{
366	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	465	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
367	}	466	}
368		467
369	/** Reply to ExtendedInfos command */	468	//+GPL
370	void
371	ToggleExtendedInfos (char *buf, int len, client * ns)
372	{
373	char cmdback[MAX_BUF];
374	char command[50];
375	int info, nextinfo;
376
377	cmdback[0] = '\0';
378	nextinfo = 0;
379
380	while (1)
381	{
382	/* 1. Extract an info */
383	info = nextinfo;
384
385	while ((info < len) && (buf[info] == ' '))
386	info++;
387
388	if (info >= len)
389	break;
390
391	nextinfo = info + 1;
392
393	while ((nextinfo < len) && (buf[nextinfo] != ' '))
394	nextinfo++;
395
396	if (nextinfo - info >= 49) /*Erroneous info asked */
397	continue;
398
399	strncpy (command, &(buf[info]), nextinfo - info);
400
401	/* 2. Interpret info */
402	if (!strcmp ("smooth", command))
403	/* Toggle smoothing */
404	ns->EMI_smooth = !ns->EMI_smooth;
405	else
406	/*bad value */;
407
408	/*3. Next info */
409	}
410
411	strcpy (cmdback, "ExtendedInfoSet");
412
413	if (ns->EMI_smooth)
414	{
415	strcat (cmdback, " ");
416	strcat (cmdback, "smoothing");
417	}
418
419	ns->send_packet (cmdback);
420	}
421
422	/*
423	#define MSG_TYPE_BOOK 1
424	#define MSG_TYPE_CARD 2
425	#define MSG_TYPE_PAPER 3
426	#define MSG_TYPE_SIGN 4
427	#define MSG_TYPE_MONUMENT 5
428	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
429
430	/** Reply to ExtendedInfos command */
431	void
432	ToggleExtendedText (char *buf, int len, client * ns)
433	{
434	char cmdback[MAX_BUF];
435	char temp[10];
436	char command[50];
437	int info, nextinfo, i, flag;
438
439	cmdback[0] = '\0';
440
441	nextinfo = 0;
442	while (1)
443	{
444	/* 1. Extract an info */
445	info = nextinfo;
446
447	while ((info < len) && (buf[info] == ' '))
448	info++;
449
450	if (info >= len)
451	break;
452
453	nextinfo = info + 1;
454
455	while ((nextinfo < len) && (buf[nextinfo] != ' '))
456	nextinfo++;
457
458	if (nextinfo - info >= 49) /*Erroneous info asked */
459	continue;
460
461	strncpy (command, &(buf[info]), nextinfo - info);
462	command[nextinfo - info] = '\0';
463	/* 2. Interpret info */
464	i = sscanf (command, "%d", &flag);
465
466	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
467	ns->supported_readables |= (1 << flag);
468	/*3. Next info */
469	}
470
471	/* Send resulting state */
472	strcpy (cmdback, "ExtendedTextSet");
473
474	for (i = 0; i <= MSG_TYPE_LAST; i++)
475	if (ns->supported_readables & (1 << i))
476	{
477	strcat (cmdback, " ");
478	snprintf (temp, sizeof (temp), "%d", i);
479	strcat (cmdback, temp);
480	}
481
482	ns->send_packet (cmdback);
483	}
484
485	/**
486	* client requested an image. send it rate-limited
487	* before flushing.
488	*/
489	void
490	AskFaceCmd (char *buf, int len, client *ns)
491	{
492	ns->askface.push_back (atoi (buf));
493	}
494
495	/**
496	* Tells client the picture it has to use
497	* to smooth a picture number given as argument.
498	*/
499	void
500	AskSmooth (char *buf, int len, client *ns)
501	{
502	ns->send_face (atoi (buf));
503	ns->flush_fx ();
504	}
505		469
506	/**	470	/**
507	* This handles the general commands from the client (ie, north, fire, cast,	471	* This handles the general commands from the client (ie, north, fire, cast,
508	* etc.)	472	* etc.)
509	*/	473	*/
…		…
522	return;	486	return;
523		487
524	buf++;	488	buf++;
525	}	489	}
526		490
527	execute_newserver_command (pl->ob, (char *) buf);	491	execute_newserver_command (pl->ob, (char *)buf);
528		492
529	/* Perhaps something better should be done with a left over count.	493	/* Perhaps something better should be done with a left over count.
530	* Cleaning up the input should probably be done first - all actions	494	* Cleaning up the input should probably be done first - all actions
531	* for the command that issued the count should be done before any other	495	* for the command that issued the count should be done before any other
532	* commands.	496	* commands.
533	*/	497	*/
534	pl->count = 0;	498	pl->count = 0;
535	}	499	}
536		500
537
538	/**	501	/**
539	* This handles the general commands from the client (ie, north, fire, cast,	502	* This handles the general commands from the client (ie, north, fire, cast,
540	* etc.). It is a lot like PlayerCmd above, but is called with the	503	* etc.). It is a lot like PlayerCmd above, but is called with the
541	* 'ncom' method which gives more information back to the client so it	504	* 'ncom' method which gives more information back to the client so it
542	* can throttle.	505	* can throttle.
…		…
544	void	507	void
545	NewPlayerCmd (char *buf, int len, player *pl)	508	NewPlayerCmd (char *buf, int len, player *pl)
546	{	509	{
547	if (len <= 6)	510	if (len <= 6)
548	{	511	{
549	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	512	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
550	return;	513	return;
551	}	514	}
552		515
553	uint16 cmdid = net_uint16 ((uint8 *)buf);	516	uint16 cmdid = net_uint16 ((uint8 *)buf);
554	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	517	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
567	* commands.	530	* commands.
568	*/	531	*/
569	pl->count = 0;	532	pl->count = 0;
570		533
571	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	534	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
572	int time = fabs (pl->ob->speed) < 0.001	535	int time = pl->ob->has_active_speed ()
573	? time = MAX_TIME * 100
574	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	536	? (int) (MAX_TIME / pl->ob->speed)
		537	: MAX_TIME * 100;
575		538
576	/* Send confirmation of command execution now */	539	/* Send confirmation of command execution now */
577	packet sl ("comc");	540	packet sl ("comc");
578	sl << uint16 (cmdid) << uint32 (time);	541	sl << uint16 (cmdid) << uint32 (time);
579	pl->ns->send_packet (sl);	542	pl->ns->send_packet (sl);
…		…
621	LOG (llevError, "Unknown input state: %d\n", ns->state);	584	LOG (llevError, "Unknown input state: %d\n", ns->state);
622	}	585	}
623	}	586	}
624		587
625	/**	588	/**
626	* Client tells its version. If there is a mismatch, we close the	589	* Client tells its version info.
627	* socket. In real life, all we should care about is the client having
628	* something older than the server. If we assume the client will be
629	* backwards compatible, having it be a later version should not be a
630	* problem.
631	*/	590	*/
632	void	591	void
633	VersionCmd (char *buf, int len, client * ns)	592	VersionCmd (char *buf, int len, client *ns)
634	{	593	{
635	if (!buf)	594	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
636	{
637	LOG (llevError, "CS: received corrupted version command\n");
638	return;
639	}
640
641	ns->cs_version = atoi (buf);
642	ns->sc_version = ns->cs_version;
643
644	LOG (llevDebug, "connection from client <%s>\n", buf);
645
646	//TODO: should log here just for statistics
647
648	//if (VERSION_CS != ns->cs_version)
649	// unchecked;
650
651	char *cp = strchr (buf + 1, ' ');
652	if (!cp)
653	return;
654
655	ns->sc_version = atoi (cp);
656
657	//if (VERSION_SC != ns->sc_version)
658	// unchecked;
659
660	cp = strchr (cp + 1, ' ');
661
662	if (cp)
663	{
664	assign (ns->version, cp + 1);
665
666	if (ns->sc_version < 1026)
667	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
668	"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
669	}
670	}	595	}
671		596
672	/** sound related functions. */	597	/** sound related functions. */
673	void	598	void
674	SetSound (char *buf, int len, client * ns)	599	SetSound (char *buf, int len, client * ns)
…		…
692	* syntax is: move (to) (tag) (nrof)	617	* syntax is: move (to) (tag) (nrof)
693	*/	618	*/
694	void	619	void
695	MoveCmd (char *buf, int len, player *pl)	620	MoveCmd (char *buf, int len, player *pl)
696	{	621	{
697	int vals[3], i;	622	int to, tag, nrof;
698		623
699	/* A little funky here. We only cycle for 2 records, because	624	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
700	* we obviously are not going to find a space after the third
701	* record. Perhaps we should just replace this with a
702	* sscanf?
703	*/
704	for (i = 0; i < 2; i++)
705	{	625	{
706	vals[i] = atoi (buf);
707
708	if (!(buf = strchr (buf, ' ')))
709	{
710	LOG (llevError, "Incomplete move command: %s\n", buf);	626	LOG (llevError, "Incomplete move command: %s\n", buf);
711	return;	627	return;
712	}
713
714	buf++;
715	}	628	}
716		629
717	vals[2] = atoi (buf);	630	esrv_move_object (pl->ob, to, tag, nrof);
718
719	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
720	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
721	}	631	}
722		632
723	/******************************************************************************	633	/******************************************************************************
724	*	634	*
725	* Start of commands the server sends to the client.	635	* Start of commands the server sends to the client.
…		…
734	send_query (client *ns, uint8 flags, const char *text)	644	send_query (client *ns, uint8 flags, const char *text)
735	{	645	{
736	ns->send_packet_printf ("query %d %s", flags, text ? text : "");	646	ns->send_packet_printf ("query %d %s", flags, text ? text : "");
737	}	647	}
738		648
		649	/**
		650	* Get player's current range attack in obuf.
		651	*/
		652	static void
		653	rangetostring (player *pl, char *obuf)
		654	{
		655	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		656
		657	#if 0
		658	// print ranged/chosen_skill etc. objects every call
		659	printf ("%s %s => %s (%s)\n",
		660	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		661	pl->combat_ob ? &pl->combat_ob->name : "-",
		662	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		663	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		664	);
		665	#endif
		666
		667	if (pl->ranged_ob)
		668	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
		669
		670	if (pl->combat_ob)
		671	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
		672
		673	#if 0
		674	//TODO: remove this when slot system is working, this is only for debugging
		675	if (pl->ob->chosen_skill)
		676	buf << " Skill*: " << pl->ob->chosen_skill->name;
		677	#endif
		678
		679	//TODO: maybe golem should become the current_weapon, quite simply?
		680	if (pl->golem)
		681	buf << " Golem*: " << pl->golem->name;
		682
		683	buf << '\0';
		684	buf.linearise (obuf);
		685	}
		686
739	#define AddIfInt64(Old,New,Type) if (Old != New) {\	687	#define AddIfInt64(Old,New,Type) if (Old != New) {\
740	Old = New; \	688	Old = New; \
741	sl << uint8 (Type) << uint64 (New); \	689	sl << uint8 (Type) << uint64 (New); \
742	}	690	}
743		691
…		…
749	#define AddIfShort(Old,New,Type) if (Old != New) {\	697	#define AddIfShort(Old,New,Type) if (Old != New) {\
750	Old = New; \	698	Old = New; \
751	sl << uint8 (Type) << uint16 (New); \	699	sl << uint8 (Type) << uint16 (New); \
752	}	700	}
753		701
754	#define AddIfFloat(Old,New,Type) if (Old != New) {\	702	#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
755	Old = New; \	703	Old = New; \
756	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \	704	sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
757	}	705	}
758		706
759	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\	707	#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
760	free(Old); Old = strdup (New);\	708	free(Old); Old = strdup (New);\
761	sl << uint8 (Type) << data8 (New); \	709	sl << uint8 (Type) << data8 (New); \
…		…
768	* commands for now.	716	* commands for now.
769	*/	717	*/
770	void	718	void
771	esrv_update_stats (player *pl)	719	esrv_update_stats (player *pl)
772	{	720	{
773	char buf[MAX_BUF];
774	uint16 flags;
775
776	client *ns = pl->ns;	721	client *ns = pl->ns;
777	if (!ns)	722	if (!ns)
778	return;	723	return;
779		724
780	object *ob = pl->ob;	725	object *ob = pl->observe;
781	if (!ob)	726	if (!ob)
782	return;	727	return;
		728
		729	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
783		730
784	packet sl ("stats");	731	packet sl ("stats");
785		732
786	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	733	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
787	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	734	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
795	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	742	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
796	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	743	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
797	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	744	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
798	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	745	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
799		746
800	for (int s = 0; s < NUM_SKILLS; s++)	747	for (int s = 0; s < CS_NUM_SKILLS; s++)
801	if (object *skill = pl->last_skill_ob[s])	748	if (object *skill = opl->last_skill_ob [s])
802	if (skill->stats.exp != ns->last_skill_exp [s])	749	if (skill->stats.exp != ns->last_skill_exp [s])
803	{	750	{
804	ns->last_skill_exp [s] = skill->stats.exp;	751	ns->last_skill_exp [s] = skill->stats.exp;
805		752
806	/* Always send along the level if exp changes. This is only	753	/* Always send along the level if exp changes. This is only
807	* 1 extra byte, but keeps processing simpler.	754	* 1 extra byte, but keeps processing simpler.
808	*/	755	*/
809	sl << uint8 (s + CS_STAT_SKILLINFO)	756	sl << uint8 (CS_STAT_SKILLINFO + s)
810	<< uint8 (skill->level)	757	<< uint8 (skill->level)
811	<< uint64 (skill->stats.exp);	758	<< uint64 (skill->stats.exp);
812	}	759	}
813		760
814	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	761	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
815	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	762	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
816	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	763	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
817	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	764	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
818	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	765	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
819	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);	766	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
820	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	767	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
821	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	768	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
822	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	769	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
823		770
824	flags = 0;	771	int flags = (opl->fire_on ? SF_FIREON : 0)
825		772	| (opl->run_on ? SF_RUNON : 0);
826	if (pl->fire_on)
827	flags |= SF_FIREON;
828
829	if (pl->run_on)
830	flags |= SF_RUNON;
831		773
832	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	774	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
833		775
834	if (ns->sc_version < 1025)
835	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
836	else
837	for (int i = 0; i < NROFATTACKS; i++)	776	for (int i = 0; i < NROFATTACKS; i++)
838	{
839	/* Skip ones we won't send */	777	/* Skip ones we won't send */
840	if (atnr_cs_stat[i] == -1)	778	if (atnr_cs_stat[i] >= 0)
841	continue;
842
843	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	779	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
844	}
845		780
846	if (pl->ns->monitor_spells)	781	if (pl->ns->monitor_spells)
847	{	782	{
848	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	783	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
849	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	784	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
850	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	785	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
851	}	786	}
852		787
		788	char buf[MAX_BUF];
853	rangetostring (ob, buf); /* we want use the new fire & run system in new client */	789	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
854	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	790	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
855	set_title (ob, buf);	791	set_title (ob, buf);
856	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	792	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
857		793
858	/* Only send it away if we have some actual data */	794	/* Only send it away if we have some actual data */
…		…
862		798
863	/**	799	/**
864	* Tells the client that here is a player it should start using.	800	* Tells the client that here is a player it should start using.
865	*/	801	*/
866	void	802	void
867	esrv_new_player (player *pl, uint32 weight)	803	esrv_new_player (player *pl)
868	{	804	{
		805	sint32 weight = pl->ob->client_weight ();
		806
869	packet sl ("player");	807	packet sl ("player");
870		808
871	sl << uint32 (pl->ob->count)	809	sl << uint32 (pl->ob->count)
872	<< uint32 (weight)	810	<< uint32 (weight)
873	<< uint32 (pl->ob->face)	811	<< uint32 (pl->ob->face)
874	<< data8 (pl->ob->name);	812	<< data8 (pl->ob->name);
875		813
876	pl->ns->last_weight = weight;	814	pl->ns->last_weight = weight;
877	pl->ns->send_packet (sl);	815	pl->ns->send_packet (sl);
878	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
879	}	816	}
880		817
881	/******************************************************************************	818	/******************************************************************************
882	*	819	*
883	* Start of map related commands.	820	* Start of map related commands.
…		…
940		877
941	if (!ns.faces_sent[face_num])	878	if (!ns.faces_sent[face_num])
942	if (ob)	879	if (ob)
943	ns.send_faces (ob);	880	ns.send_faces (ob);
944	else	881	else
945	ns.send_face (face_num);	882	ns.send_face (face_num, 10);
946		883
947	sl << uint16 (face_num);	884	sl << uint16 (face_num);
948	return 1;	885	return 1;
949	}	886	}
950		887
951	/* Nothing changed */	888	/* Nothing changed */
952	return 0;	889	return 0;
953	}	890	}
954		891
955	/**	892	/**
956	* Returns the size of a data for a map square as returned by	893	* Draws client map.
957	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
958	* available.
959	*/	894	*/
960	int
961	getExtendedMapInfoSize (client * ns)
962	{
963	int result = 0;
964
965	if (ns->ext_mapinfos)
966	{
967	if (ns->EMI_smooth)
968	result += 1; /*One byte for smoothlevel */
969	}
970
971	return result;
972	}
973
974	// prefetch (and touch) all maps within a specific distancd
975	static void
976	prefetch_surrounding_maps (maptile *map, int distance)
977	{
978	map->last_access = runtime;
979
980	if (--distance)
981	for (int dir = 4; --dir; )
982	if (const shstr &path = map->tile_path [dir])
983	if (maptile *&neigh = map->tile_map [dir])
984	prefetch_surrounding_maps (neigh, distance);
985	else
986	neigh = maptile::find_async (path, map);
987	}
988
989	// prefetch a generous area around the player
990	static void
991	prefetch_surrounding_maps (object *op)
992	{
993	prefetch_surrounding_maps (op->map, 3);
994	}
995
996	/**
997	* This function uses the new map1 protocol command to send the map
998	* to the client. It is necessary because the old map command supports
999	* a maximum map size of 15x15.
1000	* This function is much simpler than the old one. This is because
1001	* the old function optimized to send as few face identifiers as possible,
1002	* at the expense of sending more coordinate location (coordinates were
1003	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
1004	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1005	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1006	* and use the other 4 bits for other informatiion. For full documentation
1007	* of what we send, see the doc/Protocol file.
1008	* I will describe internally what we do:
1009	* the ns->lastmap shows how the map last looked when sent to the client.
1010	* in the lastmap structure, there is a cells array, which is set to the
1011	* maximum viewable size (As set in config.h).
1012	* in the cells, there are faces and a count value.
1013	* we use the count value to hold the darkness value. If -1, then this space
1014	* is not viewable.
1015	* we use faces[0] faces[1] faces[2] to hold what the three layers
1016	* look like.
1017	*/
1018	void	895	void
1019	draw_client_map1 (object *pl)	896	draw_client_map (player *pl)
1020	{	897	{
1021	int x, y, ax, ay, startlen, max_x, max_y, oldlen;	898	object *ob = pl->viewpoint;
1022	sint16 nx, ny;
1023	int estartlen, eoldlen;
1024	uint8 eentrysize;
1025	uint16 ewhatstart, ewhatflag;
1026	uint8 extendedinfos;
1027	maptile *m;
1028
1029	client &socket = *pl->contr->ns;
1030
1031	if (!pl->active)	899	if (!pl->observe->active)
1032	return;	900	return;
1033
1034	check_map_change (pl->contr);
1035	prefetch_surrounding_maps (pl);
1036
1037	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1038	packet esl;
1039
1040	startlen = sl.length ();
1041
1042	/*Extendedmapinfo structure initialisation */
1043	if (socket.ext_mapinfos)
1044	{
1045	extendedinfos = EMI_NOREDRAW;
1046
1047	if (socket.EMI_smooth)
1048	extendedinfos |= EMI_SMOOTH;
1049
1050	ewhatstart = esl.length ();
1051	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1052	could need to be taken away */
1053	eentrysize = getExtendedMapInfoSize (&socket);
1054	esl << "mapextended "
1055	<< uint8 (extendedinfos)
1056	<< uint8 (eentrysize);
1057
1058	estartlen = esl.length ();
1059	}
1060
1061	/* x,y are the real map locations. ax, ay are viewport relative
1062	* locations.
1063	*/
1064	ay = 0;
1065
1066	/* We could do this logic as conditionals in the if statement,
1067	* but that started to get a bit messy to look at.
1068	*/
1069	max_x = pl->x + (socket.mapx + 1) / 2;
1070	max_y = pl->y + (socket.mapy + 1) / 2;
1071
1072	maptile *plmap = pl->map;
1073
1074	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1075	{
1076	ax = 0;
1077	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1078	{
1079	int emask, mask;
1080	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1081
1082	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1083
1084	/* If the coordinates are not valid, or it is too dark to see,
1085	* we tell the client as such
1086	*/
1087	nx = x;
1088	ny = y;
1089	m = get_map_from_coord (plmap, &nx, &ny);
1090
1091	if (!m)
1092	{
1093	/* space is out of map. Update space and clear values
1094	* if this hasn't already been done. If the space is out
1095	* of the map, it shouldn't have a head
1096	*/
1097	if (lastcell.count != -1)
1098	{
1099	sl << uint16 (mask);
1100	map_clearcell (&lastcell, -1);
1101	}
1102
1103	continue;
1104	}
1105
1106	m->touch ();
1107
1108	int d = pl->contr->blocked_los[ax][ay];
1109
1110	if (d > 3)
1111	{
1112
1113	int need_send = 0, count;
1114
1115	/* This block deals with spaces that are not visible for whatever
1116	* reason. Still may need to send the head for this space.
1117	*/
1118
1119	oldlen = sl.length ();
1120
1121	sl << uint16 (mask);
1122
1123	if (lastcell.count != -1)
1124	need_send = 1;
1125
1126	count = -1;
1127
1128	/* properly clear a previously sent big face */
1129	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1130	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1131	need_send = 1;
1132
1133	map_clearcell (&lastcell, count);
1134
1135	if ((mask & 0xf) || need_send)
1136	sl[oldlen + 1] = mask & 0xff;
1137	else
1138	sl.reset (oldlen);
1139	}
1140	else
1141	{
1142	/* In this block, the space is visible.
1143	*/
1144
1145	/* Rather than try to figure out what everything that we might
1146	* need to send is, then form the packet after that,
1147	* we presume that we will in fact form a packet, and update
1148	* the bits by what we do actually send. If we send nothing,
1149	* we just back out sl.length () to the old value, and no harm
1150	* is done.
1151	* I think this is simpler than doing a bunch of checks to see
1152	* what if anything we need to send, setting the bits, then
1153	* doing those checks again to add the real data.
1154	*/
1155	oldlen = sl.length ();
1156	eoldlen = esl.length ();
1157
1158	sl << uint16 (mask);
1159
1160	unsigned char dummy;
1161	unsigned char *last_ext = &dummy;
1162
1163	/* Darkness changed */
1164	if (lastcell.count != d && socket.darkness)
1165	{
1166	mask |= 0x8;
1167
1168	if (socket.extmap)
1169	{
1170	*last_ext |= 0x80;
1171	last_ext = &sl[sl.length ()];
1172	sl << uint8 (d);
1173	}
1174	else
1175	sl << uint8 (255 - 64 * d);
1176	}
1177
1178	lastcell.count = d;
1179
1180	mapspace &ms = m->at (nx, ny);
1181
1182	if (socket.extmap)
1183	{
1184	uint8 stat_hp = 0;
1185	uint8 stat_width = 0;
1186	uint8 flags = 0;
1187	tag_t player = 0;
1188
1189	// send hp information, if applicable
1190	if (object *op = ms.faces_obj [0])
1191	{
1192	if (op->head || op->invisible)
1193	; // do not show
1194	else if (op->type == PLAYER
1195	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1196	{
1197	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1198	{
1199	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1200	stat_width = op->arch->tail_x;
1201	}
1202	}
1203
1204	if (op->msg && op->msg[0] == '@')
1205	flags |= 1;
1206
1207	if (op->type == PLAYER && op != pl)
1208	player = op->count;
1209	}
1210
1211	if (lastcell.stat_hp != stat_hp)
1212	{
1213	lastcell.stat_hp = stat_hp;
1214
1215	mask |= 0x8;
1216	*last_ext |= 0x80;
1217	last_ext = &sl[sl.length ()];
1218
1219	sl << uint8 (5) << uint8 (stat_hp);
1220
1221	if (stat_width > 1)
1222	{
1223	*last_ext |= 0x80;
1224	last_ext = &sl[sl.length ()];
1225
1226	sl << uint8 (6) << uint8 (stat_width);
1227	}
1228	}
1229
1230	if (lastcell.player != player)
1231	{
1232	lastcell.player = player;
1233
1234	mask |= 0x8;
1235	*last_ext |= 0x80;
1236	last_ext = &sl[sl.length ()];
1237
1238	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1239	}
1240
1241	if (lastcell.flags != flags)
1242	{
1243	lastcell.flags = flags;
1244
1245	mask |= 0x8;
1246	*last_ext |= 0x80;
1247	last_ext = &sl[sl.length ()];
1248
1249	sl << uint8 (8) << uint8 (flags);
1250	}
1251	}
1252
1253	/* Floor face */
1254	if (update_space (sl, socket, ms, lastcell, 2))
1255	mask |= 0x4;
1256
1257	/* Middle face */
1258	if (update_space (sl, socket, ms, lastcell, 1))
1259	mask |= 0x2;
1260
1261	if (ms.player () == pl
1262	&& (pl->invisible & (pl->invisible < 50 ? 1 : 7)))
1263	{
1264	// force player to be visible to himself if invisible
1265	if (lastcell.faces[0] != pl->face)
1266	{
1267	lastcell.faces[0] = pl->face;
1268
1269	mask |= 0x1;
1270	sl << uint16 (pl->face);
1271
1272	socket.send_faces (pl);
1273	}
1274	}
1275	/* Top face */
1276	else if (update_space (sl, socket, ms, lastcell, 0))
1277	mask |= 0x1;
1278
1279
1280	/* Check to see if we are in fact sending anything for this
1281	* space by checking the mask. If so, update the mask.
1282	* if not, reset the len to that from before adding the mask
1283	* value, so we don't send those bits.
1284	*/
1285	if (mask & 0xf)
1286	sl[oldlen + 1] = mask & 0xff;
1287	else
1288	sl.reset (oldlen);
1289
1290	if (socket.ext_mapinfos)
1291	esl << uint16 (emask);
1292
1293	if (socket.EMI_smooth)
1294	{
1295	for (int layer = 2+1; layer--; )
1296	{
1297	object *ob = ms.faces_obj [layer];
1298
1299	// If there is no object for this space, or if the face for the object
1300	// is the blank face, set the smoothlevel to zero.
1301	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1302
1303	// We've gotten what face we want to use for the object. Now see if
1304	// if it has changed since we last sent it to the client.
1305	if (lastcell.smooth[layer] != smoothlevel)
1306	{
1307	lastcell.smooth[layer] = smoothlevel;
1308	esl << uint8 (smoothlevel);
1309	emask |= 1 << layer;
1310	}
1311	}
1312
1313	if (emask & 0xf)
1314	esl[eoldlen + 1] = emask & 0xff;
1315	else
1316	esl.reset (eoldlen);
1317	}
1318	} /* else this is a viewable space */
1319	} /* for x loop */
1320	} /* for y loop */
1321
1322	socket.flush_fx ();
1323
1324	/* Verify that we in fact do need to send this */
1325	if (socket.ext_mapinfos)
1326	{
1327	if (!(sl.length () > startlen || socket.sent_scroll))
1328	{
1329	/* No map data will follow, so don't say the client
1330	* it doesn't need draw!
1331	*/
1332	ewhatflag &= ~EMI_NOREDRAW;
1333	esl[ewhatstart + 1] = ewhatflag & 0xff;
1334	}
1335
1336	if (esl.length () > estartlen)
1337	socket.send_packet (esl);
1338	}
1339
1340	if (sl.length () > startlen || socket.sent_scroll)
1341	{
1342	socket.send_packet (sl);
1343	socket.sent_scroll = 0;
1344	}
1345	}
1346
1347	/**
1348	* Draws client map.
1349	*/
1350	void
1351	draw_client_map (object *pl)
1352	{
1353	int i, j;
1354	sint16 ax, ay; /* ax and ay goes from 0 to max-size of arrays */
1355	int mflags;
1356	struct Map newmap;
1357	maptile *m, *pm;
1358
1359	if (pl->type != PLAYER)
1360	{
1361	LOG (llevError, "draw_client_map called with non player/non eric-server\n");
1362	return;
1363	}
1364
1365	pm = pl->map;
1366		901
1367	/* If player is just joining the game, he isn't here yet, so the map	902	/* If player is just joining the game, he isn't here yet, so the map
1368	* can get swapped out. If so, don't try to send them a map. All will	903	* can get swapped out. If so, don't try to send them a map. All will
1369	* be OK once they really log in.	904	* be OK once they really log in.
1370	*/	905	*/
1371	if (pm == NULL || pm->in_memory != MAP_IN_MEMORY)	906	if (!ob->map || ob->map->state != MAP_ACTIVE)
1372	return;	907	return;
1373		908
1374	memset (&newmap, 0, sizeof (struct Map));	909	int startlen, oldlen;
1375		910
1376	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)	911	check_map_change (pl);
1377	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)	912	pl->ob->prefetch_surrounding_maps ();
		913
		914	/* do LOS after calls to update_position */
		915	/* unfortunately, we need to udpate los when observing, currently */
		916	if (pl->do_los || pl->viewpoint != pl->ob)
		917	{
		918	pl->do_los = 0;
		919	pl->update_los ();
		920	}
		921
		922	/**
		923	* This function uses the new map1 protocol command to send the map
		924	* to the client. It is necessary because the old map command supports
		925	* a maximum map size of 15x15.
		926	* This function is much simpler than the old one. This is because
		927	* the old function optimized to send as few face identifiers as possible,
		928	* at the expense of sending more coordinate location (coordinates were
		929	* only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
		930	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
		931	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
		932	* and use the other 4 bits for other informatiion. For full documentation
		933	* of what we send, see the doc/Protocol file.
		934	* I will describe internally what we do:
		935	* the ns->lastmap shows how the map last looked when sent to the client.
		936	* in the lastmap structure, there is a cells array, which is set to the
		937	* maximum viewable size (As set in config.h).
		938	* in the cells, there are faces and a count value.
		939	* we use the count value to hold the darkness value. If -1, then this space
		940	* is not viewable.
		941	* we use faces[0] faces[1] faces[2] to hold what the three layers
		942	* look like.
		943	*/
		944
		945	client &socket = *pl->ns;
		946
		947	packet sl ("map1a");
		948
		949	startlen = sl.length ();
		950
		951	int hx = socket.mapx / 2;
		952	int hy = socket.mapy / 2;
		953
		954	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
		955	int ax = dx + hx;
		956	int ay = dy + hy;
		957
		958	int mask = (ax << 10) | (ay << 4);
		959	MapCell &lastcell = socket.lastmap.cells[ax][ay];
		960
		961	/* If the coordinates are not valid, or it is too dark to see,
		962	* we tell the client as such
		963	*/
		964	if (!m)
1378	{	965	{
1379	ax = i;	966	/* space is out of map. Update space and clear values
1380	ay = j;	967	* if this hasn't already been done. If the space is out
1381	m = pm;	968	* of the map, it shouldn't have a head.
1382	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
1383
1384	if (mflags & P_OUT_OF_MAP)
1385	continue;
1386
1387	/* If a map is visible to the player, we don't want to swap it out
1388	* just to reload it. This should really call something like
1389	* swap_map, but this is much more efficient and 'good enough'
1390	*/	969	*/
1391	if (mflags & P_NEW_MAP)	970	if (lastcell.count != -1)
1392	m->timeout = 50;	971	{
		972	sl << uint16 (mask);
		973	map_clearcell (&lastcell, -1);
		974	}
		975
		976	continue;
1393	}	977	}
1394		978
1395	/* do LOS after calls to update_position */	979	int d = pl->blocked_los_uc (dx, dy);
1396	if (pl->contr->do_los)	980
		981	if (d > 3)
1397	{	982	{
1398	update_los (pl);	983	/* This block deals with spaces that are not visible for whatever
1399	pl->contr->do_los = 0;	984	* reason. Still may need to send the head for this space.
		985	*/
		986	if (lastcell.count != -1
		987	|| lastcell.faces[0]
		988	|| lastcell.faces[1]
		989	|| lastcell.faces[2]
		990	|| lastcell.stat_hp
		991	|| lastcell.flags
		992	|| lastcell.player)
		993	sl << uint16 (mask);
		994
		995	/* properly clear a previously sent big face */
		996	map_clearcell (&lastcell, -1);
1400	}	997	}
1401		998	else
1402	/* Big maps need a different drawing mechanism to work */
1403	draw_client_map1 (pl);
1404	}
1405
1406
1407	/*****************************************************************************/
1408
1409	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1410
1411	/* a player. Of course, the client need to know the command to be able to */
1412
1413	/* manage it ! */
1414
1415	/*****************************************************************************/
1416	void
1417	send_plugin_custom_message (object *pl, char *buf)
1418	{
1419	pl->contr->ns->send_packet (buf);
1420	}
1421
1422	/**
1423	* This sends the skill number to name mapping. We ignore
1424	* the params - we always send the same info no matter what.
1425	*/
1426	void
1427	send_skill_info (client *ns, char *params)
1428	{
1429	packet sl;
1430	sl << "replyinfo skill_info\n";
1431
1432	for (int i = 1; i < NUM_SKILLS; i++)
1433	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1434
1435	if (sl.length () >= MAXSOCKBUF)
1436	{	999	{
1437	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1000	/* In this block, the space is visible.
1438	fatal (0);	1001	*/
		1002
		1003	/* Rather than try to figure out what everything that we might
		1004	* need to send is, then form the packet after that,
		1005	* we presume that we will in fact form a packet, and update
		1006	* the bits by what we do actually send. If we send nothing,
		1007	* we just back out sl.length () to the old value, and no harm
		1008	* is done.
		1009	* I think this is simpler than doing a bunch of checks to see
		1010	* what if anything we need to send, setting the bits, then
		1011	* doing those checks again to add the real data.
		1012	*/
		1013	oldlen = sl.length ();
		1014
		1015	sl << uint16 (mask);
		1016
		1017	unsigned char dummy;
		1018	unsigned char *last_ext = &dummy;
		1019
		1020	/* Darkness changed */
		1021	if (lastcell.count != d)
		1022	{
		1023	mask |= 0x8;
		1024
		1025	*last_ext |= 0x80;
		1026	last_ext = &sl[sl.length ()];
		1027	sl << uint8 (d);
		1028	}
		1029
		1030	lastcell.count = d;
		1031
		1032	mapspace &ms = m->at (nx, ny);
		1033	ms.update ();
		1034
		1035	// extmap handling
		1036	uint8 stat_hp = 0;
		1037	uint8 stat_width = 0;
		1038	uint8 flags = 0;
		1039	tag_t player = 0;
		1040
		1041	// send hp information, if applicable
		1042	if (object *op = ms.faces_obj [0])
		1043	if (op->is_head () && !op->invisible)
		1044	{
		1045	if (op->stats.maxhp > op->stats.hp
		1046	&& op->stats.maxhp > 0
		1047	&& (op->type == PLAYER
		1048	|| op->type == DOOR // does not work, have maxhp 0
		1049	|| op->flag [FLAG_MONSTER]
		1050	|| op->flag [FLAG_ALIVE]
		1051	|| op->flag [FLAG_GENERATOR]))
		1052	{
		1053	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1054	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1055	}
		1056
		1057	if (expect_false (op->has_dialogue ()))
		1058	flags |= 1;
		1059
		1060	if (expect_false (op->type == PLAYER))
		1061	player = op == ob ? pl->ob->count
		1062	: op == pl->ob ? ob->count
		1063	: op->count;
		1064	}
		1065
		1066	if (expect_false (lastcell.stat_hp != stat_hp))
		1067	{
		1068	lastcell.stat_hp = stat_hp;
		1069
		1070	mask |= 0x8;
		1071	*last_ext |= 0x80;
		1072	last_ext = &sl[sl.length ()];
		1073
		1074	sl << uint8 (5) << uint8 (stat_hp);
		1075
		1076	if (stat_width > 1)
		1077	{
		1078	*last_ext |= 0x80;
		1079	last_ext = &sl[sl.length ()];
		1080
		1081	sl << uint8 (6) << uint8 (stat_width);
		1082	}
		1083	}
		1084
		1085	if (expect_false (lastcell.player != player))
		1086	{
		1087	lastcell.player = player;
		1088
		1089	mask |= 0x8;
		1090	*last_ext |= 0x80;
		1091	last_ext = &sl[sl.length ()];
		1092
		1093	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
		1094	}
		1095
		1096	if (expect_false (lastcell.flags != flags))
		1097	{
		1098	lastcell.flags = flags;
		1099
		1100	mask |= 0x8;
		1101	*last_ext |= 0x80;
		1102	last_ext = &sl[sl.length ()];
		1103
		1104	sl << uint8 (8) << uint8 (flags);
		1105	}
		1106
		1107	// faces
		1108
		1109	/* Floor face */
		1110	if (update_space (sl, socket, ms, lastcell, 2))
		1111	mask |= 0x4;
		1112
		1113	/* Middle face */
		1114	if (update_space (sl, socket, ms, lastcell, 1))
		1115	mask |= 0x2;
		1116
		1117	if (expect_false (ob->invisible)
		1118	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
		1119	&& ms.player () == ob)
		1120	{
		1121	// force player to be visible to himself if invisible
		1122	if (lastcell.faces[0] != ob->face)
		1123	{
		1124	lastcell.faces[0] = ob->face;
		1125
		1126	mask |= 0x1;
		1127	sl << uint16 (ob->face);
		1128
		1129	socket.send_faces (ob);
		1130	}
		1131	}
		1132	/* Top face */
		1133	else if (update_space (sl, socket, ms, lastcell, 0))
		1134	mask |= 0x1;
		1135
		1136	/* Check to see if we are in fact sending anything for this
		1137	* space by checking the mask. If so, update the mask.
		1138	* if not, reset the len to that from before adding the mask
		1139	* value, so we don't send those bits.
		1140	*/
		1141	if (mask & 0xf)
		1142	sl[oldlen + 1] = mask & 0xff;
		1143	else
		1144	sl.reset (oldlen);
		1145	} /* else this is a viewable space */
		1146	ordered_mapwalk_end
		1147
		1148	socket.flush_fx ();
		1149
		1150	if (sl.length () > startlen || socket.sent_scroll)
1439	}	1151	{
1440
1441	ns->send_packet (sl);	1152	socket.send_packet (sl);
1442	}	1153	socket.sent_scroll = 0;
1443
1444	/**
1445	* This sends the spell path to name mapping. We ignore
1446	* the params - we always send the same info no matter what.
1447	*/
1448	void
1449	send_spell_paths (client * ns, char *params)
1450	{
1451	packet sl;
1452
1453	sl << "replyinfo spell_paths\n";
1454
1455	for (int i = 0; i < NRSPELLPATHS; i++)
1456	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1457
1458	if (sl.length () >= MAXSOCKBUF)
1459	{	1154	}
1460	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1461	fatal (0);
1462	}
1463
1464	ns->send_packet (sl);
1465	}	1155	}
1466		1156
1467	/**	1157	/**
1468	* This looks for any spells the player may have that have changed their stats.	1158	* This looks for any spells the player may have that have changed their stats.
1469	* it then sends an updspell packet for each spell that has changed in this way	1159	* it then sends an updspell packet for each spell that has changed in this way
…		…
1472	esrv_update_spells (player *pl)	1162	esrv_update_spells (player *pl)
1473	{	1163	{
1474	if (!pl->ns)	1164	if (!pl->ns)
1475	return;	1165	return;
1476		1166
		1167	pl->ns->update_spells = false;
		1168
1477	if (!pl->ns->monitor_spells)	1169	if (!pl->ns->monitor_spells)
1478	return;	1170	return;
1479		1171
1480	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1172	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1481	{
1482	if (spell->type == SPELL)	1173	if (spell->type == SPELL)
1483	{	1174	{
1484	int flags = 0;	1175	int flags = 0;
		1176	int val;
1485		1177
1486	/* check if we need to update it */	1178	/* check if we need to update it */
1487	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1179	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1180	if (spell->cached_sp != val)
1488	{	1181	{
1489	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1182	spell->cached_sp = val;
1490	flags |= UPD_SP_MANA;	1183	flags |= UPD_SP_MANA;
1491	}	1184	}
1492		1185
1493	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1186	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1187	if (spell->cached_grace != val)
1494	{	1188	{
1495	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1189	spell->cached_grace = val;
1496	flags |= UPD_SP_GRACE;	1190	flags |= UPD_SP_GRACE;
1497	}	1191	}
1498		1192
1499	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1193	val = casting_level (pl->ob, spell);
		1194	if (spell->cached_eat != val)
1500	{	1195	{
1501	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1196	spell->cached_eat = val;
1502	flags |= UPD_SP_DAMAGE;	1197	flags |= UPD_SP_LEVEL;
1503	}	1198	}
1504		1199
1505	if (flags)	1200	if (flags)
1506	{	1201	{
1507	packet sl;	1202	packet sl;
1508		1203
1509	sl << "updspell "	1204	sl << "updspell "
1510	<< uint8 (flags)	1205	<< uint8 (flags)
1511	<< uint32 (spell->count);	1206	<< uint32 (spell->count);
1512		1207
1513	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1208	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1514	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1209	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1515	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1210	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1516		1211
1517	pl->ns->send_packet (sl);	1212	pl->ns->send_packet (sl);
1518	}	1213	}
1519	}	1214	}
1520	}
1521	}	1215	}
1522		1216
1523	void	1217	void
1524	esrv_remove_spell (player *pl, object *spell)	1218	esrv_remove_spell (player *pl, object *spell)
1525	{	1219	{
…		…
1541		1235
1542	/* appends the spell *spell to the Socklist we will send the data to. */	1236	/* appends the spell *spell to the Socklist we will send the data to. */
1543	static void	1237	static void
1544	append_spell (player *pl, packet &sl, object *spell)	1238	append_spell (player *pl, packet &sl, object *spell)
1545	{	1239	{
1546	int i, skill = 0;	1240	int skill = 0;
1547		1241
1548	if (!(spell->name))	1242	if (!(spell->name))
1549	{	1243	{
1550	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1244	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1551	return;	1245	return;
1552	}	1246	}
1553		1247
1554	/* store costs and damage in the object struct, to compare to later */	1248	/* store costs and damage in the object struct, to compare to later */
1555	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1249	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1556	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1250	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1557	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1251	spell->cached_eat = casting_level (pl->ob, spell);
1558		1252
1559	/* figure out which skill it uses, if it uses one */	1253	/* figure out which skill it uses, if it uses one */
1560	if (spell->skill)	1254	if (spell->skill)
1561	{	1255	if (object *tmp = pl->find_skill (spell->skill))
1562	for (i = 1; i < NUM_SKILLS; i++)	1256	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1563	if (!strcmp (spell->skill, skill_names[i]))
1564	{
1565	skill = i + CS_STAT_SKILLINFO;
1566	break;
1567	}
1568	}
1569		1257
1570	// spells better have a face	1258	// spells better have a face
1571	if (!spell->face)	1259	if (!spell->face)
1572	{	1260	{
1573	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1261	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1574	spell->face = face_find ("burnout.x11", blank_face);	1262	spell->face = face_find ("burnout.x11", blank_face);
1575	}	1263	}
		1264
		1265	pl->ns->send_face (spell->face);
1576		1266
1577	/* send the current values */	1267	/* send the current values */
1578	sl << uint32 (spell->count)	1268	sl << uint32 (spell->count)
1579	<< uint16 (spell->level)	1269	<< uint16 (spell->level)
1580	<< uint16 (spell->casting_time)	1270	<< uint16 (spell->casting_time)
1581	<< uint16 (spell->last_sp)	1271	<< uint16 (spell->cached_sp)
1582	<< uint16 (spell->last_grace)	1272	<< uint16 (spell->cached_grace)
1583	<< uint16 (spell->last_eat)	1273	<< uint16 (spell->cached_eat)
1584	<< uint8 (skill)	1274	<< uint8 (skill)
1585	<< uint32 (spell->path_attuned)	1275	<< uint32 (spell->path_attuned)
1586	<< uint32 (spell->face)	1276	<< uint32 (spell->face)
1587	<< data8 (spell->name)	1277	<< data8 (spell->name)
1588	<< data16 (spell->msg);	1278	<< data16 (spell->msg);
…		…
1616	* bytes and 3 strings (because that is the spec) so we need to	1306	* bytes and 3 strings (because that is the spec) so we need to
1617	* check that the length of those 3 strings, plus the 23 bytes,	1307	* check that the length of those 3 strings, plus the 23 bytes,
1618	* won't take us over the length limit for the socket, if it does,	1308	* won't take us over the length limit for the socket, if it does,
1619	* we need to send what we already have, and restart packet formation	1309	* we need to send what we already have, and restart packet formation
1620	*/	1310	*/
		1311	if (spell->type != SPELL)
		1312	continue;
		1313
1621	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1314	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1622	* to show add_spell is 26 bytes + 2 strings. However, the overun	1315	* to show add_spell is 26 bytes + 2 strings. However, the overun
1623	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1316	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1624	* like it will fix this	1317	* like it will fix this
1625	*/	1318	*/
1626	if (spell->type != SPELL)
1627	continue;
1628
1629	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1319	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1630	{	1320	{
		1321	pl->ns->flush_fx ();
1631	pl->ns->send_packet (sl);	1322	pl->ns->send_packet (sl);
1632		1323
1633	sl.reset ();	1324	sl.reset ();
1634	sl << "addspell ";	1325	sl << "addspell ";
1635	}	1326	}
…		…
1643	return;	1334	return;
1644	}	1335	}
1645	else	1336	else
1646	append_spell (pl, sl, spell);	1337	append_spell (pl, sl, spell);
1647		1338
1648	if (sl.length () >= MAXSOCKBUF)	1339	if (sl.length () > MAXSOCKBUF)
1649	{
1650	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1340	cleanup ("buffer overflow in esrv_add_spells!");
1651	fatal (0);
1652	}
1653		1341
1654	/* finally, we can send the packet */	1342	/* finally, we can send the packet */
		1343	pl->ns->flush_fx ();
1655	pl->ns->send_packet (sl);	1344	pl->ns->send_packet (sl);
1656	}	1345	}
1657		1346
		1347	//-GPL
		1348

Diff Legend

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