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.102 by root, Sun Jun 3 17:42:39 2007 UTC vs.
Revision 1.156 by root, Fri Nov 6 12:49:19 2009 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel	5	* Copyright (©) 2001,2007 Mark Wedel
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software; you can redistribute it and/or modify it	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* under the terms of the GNU General Public License as published by the Free	9	* the terms of the Affero GNU General Public License as published by the
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* 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 along	18	* You should have received a copy of the Affero GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* and the GNU General Public License along with this program. If not, see
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors 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
		25	//+GPL
24		26
25	/**	27	/**
26	* \file	28	* \file
27	* Client handling.	29	* Client handling.
28	*	30	*
…		…
64	* This table translates the attack numbers as used within the	66	* This table translates the attack numbers as used within the
65	* program to the value we use when sending STATS command to the	67	* 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	68	* client. If a value is -1, then we don't send that to the
67	* client.	69	* client.
68	*/	70	*/
69	short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,	71	static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
70	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,	72	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
71	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,	73	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
72	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	74	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
73	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	75	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
74	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,	76	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,
…		…
99	*/	101	*/
100	mx = ns->mapx;	102	mx = ns->mapx;
101	my = ns->mapy;	103	my = ns->mapy;
102		104
103	/* the x and y here are coordinates for the new map, i.e. if we moved	105	/* 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,	106	* (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	107	* if the destination x or y coordinate is outside the viewable
106	* area, we clear the values - otherwise, the old values	108	* area, we clear the values - otherwise, the old values
107	* are preserved, and the check_head thinks it needs to clear them.	109	* are preserved, and the check_head thinks it needs to clear them.
108	*/	110	*/
109	for (x = 0; x < mx; x++)	111	for (x = 0; x < mx; x++)
110	{
111	for (y = 0; y < my; y++)	112	for (y = 0; y < my; y++)
112	{
113	if (x >= ns->mapx || y >= ns->mapy)	113	if (x >= ns->mapx || y >= ns->mapy)
114	/* clear cells outside the viewable area */	114	/* clear cells outside the viewable area */
115	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	115	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)	116	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 */	117	/* clear newly visible tiles within the viewable area */
118	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	118	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
119	else	119	else
120	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	120	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
121	}
122	}
123		121
124	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	122	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
125		123
126	/* Make sure that the next "map1" command will be sent (even if it is	124	/* Make sure that the next "map1" command will be sent (even if it is
127	* empty).	125	* empty).
…		…
130	}	128	}
131		129
132	static void	130	static void
133	clear_map (player *pl)	131	clear_map (player *pl)
134	{	132	{
		133	pl->ns->mapinfo_queue_clear ();
		134
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136		136
137	pl->ns->force_newmap = false;	137	pl->ns->force_newmap = false;
138		138
139	if (pl->ns->newmapcmd == 1)	139	if (pl->ns->newmapcmd == 1)
140	pl->ns->send_packet ("newmap");	140	pl->ns->send_packet ("newmap");
141		141
142	pl->ns->floorbox_reset ();	142	pl->ns->floorbox_reset ();
		143	}
		144
		145	static void
		146	send_map_info (player *pl)
		147	{
		148	client &socket = *pl->ns;
		149	object *ob = pl->viewpoint;
		150
		151	if (socket.mapinfocmd)
		152	{
		153	if (ob->map && ob->map->path[0])
		154	{
		155	int flags = 0;
		156
		157	if (ob->map->tile_path[0]) flags |= 1;
		158	if (ob->map->tile_path[1]) flags |= 2;
		159	if (ob->map->tile_path[2]) flags |= 4;
		160	if (ob->map->tile_path[3]) flags |= 8;
		161
		162	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		163	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		164	ob->map->width, ob->map->height, &ob->map->path);
		165	}
		166	else
		167	socket.send_packet ("mapinfo current");
		168	}
143	}	169	}
144		170
145	/** check for map/region change and send new map data */	171	/** check for map/region change and send new map data */
146	static void	172	static void
147	check_map_change (player *pl)	173	check_map_change (player *pl)
148	{	174	{
149	client &socket = *pl->ns;	175	client &socket = *pl->ns;
150	object *ob = pl->observe;	176	object *ob = pl->viewpoint;
		177
		178	region *reg = ob->region ();
		179	if (socket.current_region != reg)
		180	{
		181	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		182	socket.current_region = reg;
		183	}
		184
		185	// first try to aovid a full newmap on tiled map scrolls
		186	if (socket.current_map != ob->map && !socket.force_newmap)
		187	{
		188	rv_vector rv;
		189
		190	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		191
		192	// manhattan distance is very handy here
		193	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		194	{
		195	socket.current_map = ob->map;
		196	socket.current_x = ob->x;
		197	socket.current_y = ob->y;
		198
		199	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		200	socket.floorbox_reset ();
		201	send_map_info (pl);
		202	}
		203	}
151		204
152	if (socket.current_map != ob->map || socket.force_newmap)	205	if (socket.current_map != ob->map || socket.force_newmap)
153	{	206	{
154	clear_map (pl);	207	clear_map (pl);
155	socket.current_map = ob->map;	208	socket.current_map = ob->map;
156		209	send_map_info (pl);
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]) flags |= 1;
164	if (ob->map->tile_path[1]) flags |= 2;
165	if (ob->map->tile_path[2]) flags |= 4;
166	if (ob->map->tile_path[3]) flags |= 8;
167
168	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
169	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
170	ob->map->width, ob->map->height, &ob->map->path);
171	}
172	else
173	socket.send_packet ("mapinfo current");
174	}
175	}	210	}
176	else if (socket.current_x != ob->x || socket.current_y != ob->y)	211	else if (socket.current_x != ob->x || socket.current_y != ob->y)
177	{	212	{
178	int dx = ob->x - socket.current_x;	213	int dx = ob->x - socket.current_x;
179	int dy = ob->y - socket.current_y;	214	int dy = ob->y - socket.current_y;
180		215
181	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
182	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
183	else
184	{
185	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	216	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
186	socket.floorbox_reset ();	217	socket.floorbox_reset ();
187	}
188	}	218	}
189		219
190	socket.current_x = ob->x;	220	socket.current_x = ob->x;
191	socket.current_y = ob->y;	221	socket.current_y = ob->y;
192
193	region *reg = ob->region ();
194	if (socket.current_region != reg)
195	{
196	socket.current_region = reg;
197	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
198	}
199	}	222	}
200		223
201	/**	224	/**
202	* RequestInfo is sort of a meta command. There is some specific	225	* RequestInfo is sort of a meta command. There is some specific
203	* request of information, but we call other functions to provide	226	* request of information, but we call other functions to provide
204	* that information.	227	* that information.
205	*/	228	*/
206	void	229	void
207	RequestInfo (char *buf, int len, client * ns)	230	RequestInfo (char *buf, int len, client *ns)
208	{	231	{
209	char *params = NULL, *cp;	232	char *params;
210
211	/* No match */
212	char bigbuf[MAX_BUF];
213	int slen;
214
215	/* Set up replyinfo before we modify any of the buffers - this is used
216	* if we don't find a match.
217	*/
218	strcpy (bigbuf, "replyinfo ");
219	slen = strlen (bigbuf);
220	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
221		233
222	/* find the first space, make it null, and update the	234	/* find the first space, make it null, and update the
223	* params pointer.	235	* params pointer.
224	*/	236	*/
225	for (cp = buf; *cp != '\0'; cp++)	237	for (params = buf; *params; params++)
226	if (*cp == ' ')	238	if (*params == ' ')
227	{	239	{
228	*cp = '\0';
229	params = cp + 1;	240	*params++ = 0;
230	break;	241	break;
231	}	242	}
232		243
233	if (!strcmp (buf, "image_info"))
234	send_image_info (ns, params);
235	else if (!strcmp (buf, "image_sums"))
236	send_image_sums (ns, params);
237	else if (!strcmp (buf, "skill_info"))	244	if (!strcmp (buf, "skill_info"))
238	send_skill_info (ns, params);	245	send_skill_info (ns, params);
239	else if (!strcmp (buf, "spell_paths"))	246	else if (!strcmp (buf, "spell_paths"))
240	send_spell_paths (ns, params);	247	send_spell_paths (ns, params);
241	else	248	else
242	ns->send_packet (bigbuf, len);	249	{
		250	// undo tokenisation above and send replyinfo with the request unchanged
		251	if (*params)
		252	*--params = ' ';
		253
		254	ns->send_packet_printf ("replyinfo %s", buf);
		255	}
243	}	256	}
244		257
245	void	258	void
246	ExtCmd (char *buf, int len, player *pl)	259	ExtCmd (char *buf, int len, player *pl)
247	{	260	{
…		…
250		263
251	void	264	void
252	ExtiCmd (char *buf, int len, client *ns)	265	ExtiCmd (char *buf, int len, client *ns)
253	{	266	{
254	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	267	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		268	}
		269
		270	//-GPL
		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->viewpoint->map;
		289	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
		290	int mapy = pl->ns->mapy / 2 - pl->viewpoint->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;
255	}	356	}
256		357
257	void	358	void
258	MapInfoCmd (char *buf, int len, player *pl)	359	MapInfoCmd (char *buf, int len, player *pl)
259	{	360	{
260	// <mapinfo tag spatial tile-path	361	// <mapinfo tag spatial tile-path
261	// >mapinfo tag spatial flags x y w h hash	362	// >mapinfo tag spatial flags x y w h hash
262		363
263	char bigbuf[MAX_BUF], *token;
264
265	token = buf;	364	char *token = buf;
266	// copy token	365
267	if (!(buf = strchr (buf, ' ')))	366	if (!(buf = strchr (buf, ' ')))
268	return;	367	return;
269		368
270	*buf++ = 0;
271
272	if (!strncmp (buf, "spatial ", 8))	369	if (!strncmp (buf, " spatial ", 9))
273	{	370	{
274	buf += 8;	371	char *copy = strdup (token);
		372	copy [buf - token] = 0;
275		373
276	// initial map and its origin	374	#if 0
277	maptile *map = pl->ob->map;	375	// this makes only sense when we flush the buffer immediately
278	sint16 dx, dy;	376	if (pl->ns->mapinfo_try (copy))
279	int mapx = pl->ns->mapx / 2 - pl->ob->x;	377	free (copy);
280	int mapy = pl->ns->mapy / 2 - pl->ob->y;
281	int max_distance = 8; // limit maximum path length to something generous
282
283	while (*buf && map && max_distance)
284	{
285	int dir = *buf++;
286
287	switch (dir)
288	{
289	case '1':
290	dx = 0;
291	dy = -1;
292	map = map->xy_find (dx, dy);
293	map && (mapy -= map->height);
294	break;
295	case '2':
296	mapx += map->width;
297	dx = map->width;
298	dy = 0;
299	map = map->xy_find (dx, dy);
300	break;
301	case '3':
302	mapy += map->height;
303	dx = 0;
304	dy = map->height;
305	map = map->xy_find (dx, dy);
306	break;
307	case '4':
308	dx = -1;
309	dy = 0;
310	map = map->xy_find (dx, dy);
311	map && (mapx -= map->width);
312	break;
313	}
314
315	--max_distance;
316	}
317
318	if (!max_distance)
319	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
320	else if (map && map->path[0])
321	{
322	int flags = 0;
323
324	if (map->tile_path[0]) flags |= 1;
325	if (map->tile_path[1]) flags |= 2;
326	if (map->tile_path[2]) flags |= 4;
327	if (map->tile_path[3]) flags |= 8;
328
329	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
330	}
331	else	378	else
332	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	379	#endif
		380	pl->ns->mapinfo_queue.push_back (copy);
333	}	381	}
334	else	382	else
335	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	383	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337	pl->ns->send_packet (bigbuf);
338	}	384	}
339		385
340	/** This is the Setup cmd */	386	/** This is the Setup cmd */
341	void	387	void
342	SetUp (char *buf, int len, client * ns)	388	SetUp (char *buf, int len, client * ns)
…		…
354	AddMeCmd (char *buf, int len, client *ns)	400	AddMeCmd (char *buf, int len, client *ns)
355	{	401	{
356	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	402	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
357	}	403	}
358		404
359	/** Reply to ExtendedInfos command */	405	//+GPL
360	void
361	ToggleExtendedInfos (char *buf, int len, client * ns)
362	{
363	char cmdback[MAX_BUF];
364	char command[50];
365	int info, nextinfo;
366
367	cmdback[0] = '\0';
368	nextinfo = 0;
369
370	while (1)
371	{
372	/* 1. Extract an info */
373	info = nextinfo;
374
375	while ((info < len) && (buf[info] == ' '))
376	info++;
377
378	if (info >= len)
379	break;
380
381	nextinfo = info + 1;
382
383	while ((nextinfo < len) && (buf[nextinfo] != ' '))
384	nextinfo++;
385
386	if (nextinfo - info >= 49) /*Erroneous info asked */
387	continue;
388
389	strncpy (command, &(buf[info]), nextinfo - info);
390
391	/* 2. Interpret info */
392	if (!strcmp ("smooth", command))
393	/* Toggle smoothing */
394	ns->EMI_smooth = !ns->EMI_smooth;
395	else
396	/*bad value */;
397
398	/*3. Next info */
399	}
400
401	strcpy (cmdback, "ExtendedInfoSet");
402
403	if (ns->EMI_smooth)
404	{
405	strcat (cmdback, " ");
406	strcat (cmdback, "smoothing");
407	}
408
409	ns->send_packet (cmdback);
410	}
411		406
412	/*	407	/*
413	#define MSG_TYPE_BOOK 1	408	#define MSG_TYPE_BOOK 1
414	#define MSG_TYPE_CARD 2	409	#define MSG_TYPE_CARD 2
415	#define MSG_TYPE_PAPER 3	410	#define MSG_TYPE_PAPER 3
…		…
432	while (1)	427	while (1)
433	{	428	{
434	/* 1. Extract an info */	429	/* 1. Extract an info */
435	info = nextinfo;	430	info = nextinfo;
436		431
437	while ((info < len) && (buf[info] == ' '))	432	while ((info < len) && (buf [info] == ' '))
438	info++;	433	info++;
439		434
440	if (info >= len)	435	if (info >= len)
441	break;	436	break;
442		437
443	nextinfo = info + 1;	438	nextinfo = info + 1;
444		439
445	while ((nextinfo < len) && (buf[nextinfo] != ' '))	440	while ((nextinfo < len) && (buf [nextinfo] != ' '))
446	nextinfo++;	441	nextinfo++;
447		442
448	if (nextinfo - info >= 49) /*Erroneous info asked */	443	if (nextinfo - info >= 49) /*Erroneous info asked */
449	continue;	444	continue;
450		445
451	strncpy (command, &(buf[info]), nextinfo - info);	446	memcpy (command, buf + info, nextinfo - info);
452	command[nextinfo - info] = '\0';	447	command [nextinfo - info] = 0;
		448
453	/* 2. Interpret info */	449	/* 2. Interpret info */
454	i = sscanf (command, "%d", &flag);	450	i = sscanf (command, "%d", &flag);
455		451
456	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	452	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
457	ns->supported_readables |= (1 << flag);	453	ns->supported_readables |= (1 << flag);
…		…
471		467
472	ns->send_packet (cmdback);	468	ns->send_packet (cmdback);
473	}	469	}
474		470
475	/**	471	/**
476	* client requested an image. send it rate-limited
477	* before flushing.
478	*/
479	void
480	AskFaceCmd (char *buf, int len, client *ns)
481	{
482	ns->askface.push_back (atoi (buf));
483	}
484
485	/**
486	* Tells client the picture it has to use
487	* to smooth a picture number given as argument.
488	*/
489	void
490	AskSmooth (char *buf, int len, client *ns)
491	{
492	ns->send_face (atoi (buf));
493	ns->flush_fx ();
494	}
495
496	/**
497	* This handles the general commands from the client (ie, north, fire, cast,	472	* This handles the general commands from the client (ie, north, fire, cast,
498	* etc.)	473	* etc.)
499	*/	474	*/
500	void	475	void
501	PlayerCmd (char *buf, int len, player *pl)	476	PlayerCmd (char *buf, int len, player *pl)
…		…
512	return;	487	return;
513		488
514	buf++;	489	buf++;
515	}	490	}
516		491
517	execute_newserver_command (pl->ob, (char *) buf);	492	execute_newserver_command (pl->ob, (char *)buf);
518		493
519	/* Perhaps something better should be done with a left over count.	494	/* Perhaps something better should be done with a left over count.
520	* Cleaning up the input should probably be done first - all actions	495	* Cleaning up the input should probably be done first - all actions
521	* for the command that issued the count should be done before any other	496	* for the command that issued the count should be done before any other
522	* commands.	497	* commands.
523	*/	498	*/
524	pl->count = 0;	499	pl->count = 0;
525	}	500	}
526		501
527
528	/**	502	/**
529	* This handles the general commands from the client (ie, north, fire, cast,	503	* This handles the general commands from the client (ie, north, fire, cast,
530	* etc.). It is a lot like PlayerCmd above, but is called with the	504	* etc.). It is a lot like PlayerCmd above, but is called with the
531	* 'ncom' method which gives more information back to the client so it	505	* 'ncom' method which gives more information back to the client so it
532	* can throttle.	506	* can throttle.
…		…
534	void	508	void
535	NewPlayerCmd (char *buf, int len, player *pl)	509	NewPlayerCmd (char *buf, int len, player *pl)
536	{	510	{
537	if (len <= 6)	511	if (len <= 6)
538	{	512	{
539	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	513	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
540	return;	514	return;
541	}	515	}
542		516
543	uint16 cmdid = net_uint16 ((uint8 *)buf);	517	uint16 cmdid = net_uint16 ((uint8 *)buf);
544	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	518	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
682	* syntax is: move (to) (tag) (nrof)	656	* syntax is: move (to) (tag) (nrof)
683	*/	657	*/
684	void	658	void
685	MoveCmd (char *buf, int len, player *pl)	659	MoveCmd (char *buf, int len, player *pl)
686	{	660	{
687	int vals[3], i;	661	int to, tag, nrof;
688		662
689	/* A little funky here. We only cycle for 2 records, because	663	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
690	* we obviously are not going to find a space after the third
691	* record. Perhaps we should just replace this with a
692	* sscanf?
693	*/
694	for (i = 0; i < 2; i++)
695	{	664	{
696	vals[i] = atoi (buf);
697
698	if (!(buf = strchr (buf, ' ')))
699	{
700	LOG (llevError, "Incomplete move command: %s\n", buf);	665	LOG (llevError, "Incomplete move command: %s\n", buf);
701	return;	666	return;
702	}
703
704	buf++;
705	}	667	}
706		668
707	vals[2] = atoi (buf);	669	esrv_move_object (pl->ob, to, tag, nrof);
708
709	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
710	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
711	}	670	}
712		671
713	/******************************************************************************	672	/******************************************************************************
714	*	673	*
715	* Start of commands the server sends to the client.	674	* Start of commands the server sends to the client.
…		…
730	* Get player's current range attack in obuf.	689	* Get player's current range attack in obuf.
731	*/	690	*/
732	static void	691	static void
733	rangetostring (player *pl, char *obuf)	692	rangetostring (player *pl, char *obuf)
734	{	693	{
735	dynbuf_text buf;	694	dynbuf_text &buf = msg_dynbuf; buf.clear ();
736		695
737	if (pl->ranged_ob)	696	if (pl->ranged_ob)
738	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	697	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
739		698
740	if (pl->combat_ob)	699	if (pl->combat_ob)
741	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;	700	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
742		701
		702	#if 0
743	//TODO: remove this when slot system is working, this is only for debugging	703	//TODO: remove this when slot system is working, this is only for debugging
744	if (pl->ob->chosen_skill)	704	if (pl->ob->chosen_skill)
745	buf << " Skill*: " << pl->ob->chosen_skill->name;	705	buf << " Skill*: " << pl->ob->chosen_skill->name;
		706	#endif
746		707
747	//TODO: maybe golem should become the current_weapon, quite simply?	708	//TODO: maybe golem should become the current_weapon, quite simply?
748	if (pl->golem)	709	if (pl->golem)
749	buf << " Golem*: " << pl->golem->name;	710	buf << " Golem*: " << pl->golem->name;
750		711
		712	buf << '\0';
751	buf.linearise (obuf);	713	buf.linearise (obuf);
752	obuf [buf.size ()] = 0;
753	}	714	}
754		715
755	#define AddIfInt64(Old,New,Type) if (Old != New) {\	716	#define AddIfInt64(Old,New,Type) if (Old != New) {\
756	Old = New; \	717	Old = New; \
757	sl << uint8 (Type) << uint64 (New); \	718	sl << uint8 (Type) << uint64 (New); \
…		…
794	return;	755	return;
795		756
796	object *ob = pl->observe;	757	object *ob = pl->observe;
797	if (!ob)	758	if (!ob)
798	return;	759	return;
		760
		761	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
799		762
800	packet sl ("stats");	763	packet sl ("stats");
801		764
802	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	765	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
803	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	766	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
812	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	775	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
813	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	776	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
814	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	777	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
815		778
816	for (int s = 0; s < NUM_SKILLS; s++)	779	for (int s = 0; s < NUM_SKILLS; s++)
817	if (object *skill = pl->last_skill_ob[s])	780	if (object *skill = opl->last_skill_ob [s])
818	if (skill->stats.exp != ns->last_skill_exp [s])	781	if (skill->stats.exp != ns->last_skill_exp [s])
819	{	782	{
820	ns->last_skill_exp [s] = skill->stats.exp;	783	ns->last_skill_exp [s] = skill->stats.exp;
821		784
822	/* Always send along the level if exp changes. This is only	785	/* Always send along the level if exp changes. This is only
…		…
837	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	800	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);
838	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	801	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
839		802
840	flags = 0;	803	flags = 0;
841		804
842	if (pl->fire_on)	805	if (opl->fire_on)
843	flags |= SF_FIREON;	806	flags |= SF_FIREON;
844		807
845	if (pl->run_on)	808	if (opl->run_on)
846	flags |= SF_RUNON;	809	flags |= SF_RUNON;
847		810
848	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	811	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
849		812
850	if (ns->sc_version < 1025)	813	if (ns->sc_version < 1025)
…		…
864	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	827	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
865	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	828	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
866	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	829	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
867	}	830	}
868		831
869	rangetostring (pl, buf); /* we want use the new fire & run system in new client */	832	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
870	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	833	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
871	set_title (ob, buf);	834	set_title (ob, buf);
872	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	835	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
873		836
874	/* Only send it away if we have some actual data */	837	/* Only send it away if we have some actual data */
…		…
878		841
879	/**	842	/**
880	* Tells the client that here is a player it should start using.	843	* Tells the client that here is a player it should start using.
881	*/	844	*/
882	void	845	void
883	esrv_new_player (player *pl, uint32 weight)	846	esrv_new_player (player *pl)
884	{	847	{
		848	sint32 weight = pl->ob->client_weight ();
		849
885	packet sl ("player");	850	packet sl ("player");
886		851
887	sl << uint32 (pl->ob->count)	852	sl << uint32 (pl->ob->count)
888	<< uint32 (weight)	853	<< uint32 (weight)
889	<< uint32 (pl->ob->face)	854	<< uint32 (pl->ob->face)
890	<< data8 (pl->ob->name);	855	<< data8 (pl->ob->name);
891		856
892	pl->ns->last_weight = weight;	857	pl->ns->last_weight = weight;
893	pl->ns->send_packet (sl);	858	pl->ns->send_packet (sl);
894	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
895	}	859	}
896		860
897	/******************************************************************************	861	/******************************************************************************
898	*	862	*
899	* Start of map related commands.	863	* Start of map related commands.
…		…
956		920
957	if (!ns.faces_sent[face_num])	921	if (!ns.faces_sent[face_num])
958	if (ob)	922	if (ob)
959	ns.send_faces (ob);	923	ns.send_faces (ob);
960	else	924	else
961	ns.send_face (face_num);	925	ns.send_face (face_num, 10);
962		926
963	sl << uint16 (face_num);	927	sl << uint16 (face_num);
964	return 1;	928	return 1;
965	}	929	}
966		930
967	/* Nothing changed */	931	/* Nothing changed */
968	return 0;	932	return 0;
969	}	933	}
970		934
971	/**	935	//-GPL
972	* Returns the size of a data for a map square as returned by
973	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
974	* available.
975	*/
976	int
977	getExtendedMapInfoSize (client * ns)
978	{
979	int result = 0;
980
981	if (ns->ext_mapinfos)
982	{
983	if (ns->EMI_smooth)
984	result += 1; /*One byte for smoothlevel */
985	}
986
987	return result;
988	}
989		936
990	// prefetch (and touch) all maps within a specific distancd	937	// prefetch (and touch) all maps within a specific distancd
991	static void	938	static void
992	prefetch_surrounding_maps (maptile *map, int distance)	939	prefetch_surrounding_maps (maptile *map, int distance)
993	{	940	{
994	map->last_access = runtime;	941	map->touch ();
995		942
996	if (--distance)	943	if (--distance)
997	for (int dir = 4; --dir; )	944	for (int dir = 4; --dir; )
998	if (const shstr &path = map->tile_path [dir])	945	if (const shstr &path = map->tile_path [dir])
999	if (maptile *&neigh = map->tile_map [dir])	946	if (maptile *&neigh = map->tile_map [dir])
…		…
1007	prefetch_surrounding_maps (object *op)	954	prefetch_surrounding_maps (object *op)
1008	{	955	{
1009	prefetch_surrounding_maps (op->map, 3);	956	prefetch_surrounding_maps (op->map, 3);
1010	}	957	}
1011		958
		959	//+GPL
		960
1012	/**	961	/**
1013	* Draws client map.	962	* Draws client map.
1014	*/	963	*/
1015	void	964	void
1016	draw_client_map (player *pl)	965	draw_client_map (player *pl)
1017	{	966	{
1018	object *ob = pl->observe;	967	object *ob = pl->viewpoint;
1019	if (!ob->active)	968	if (!pl->observe->active)
1020	return;	969	return;
1021
1022	maptile *plmap = ob->map;
1023		970
1024	/* If player is just joining the game, he isn't here yet, so the map	971	/* If player is just joining the game, he isn't here yet, so the map
1025	* can get swapped out. If so, don't try to send them a map. All will	972	* can get swapped out. If so, don't try to send them a map. All will
1026	* be OK once they really log in.	973	* be OK once they really log in.
1027	*/	974	*/
1028	if (!plmap || plmap->in_memory != MAP_IN_MEMORY)	975	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1029	return;	976	return;
1030		977
1031	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1032	sint16 nx, ny;
1033	int estartlen, eoldlen;	978	int startlen, oldlen;
1034	uint8 eentrysize;
1035	uint16 ewhatstart, ewhatflag;
1036	uint8 extendedinfos;
1037	maptile *m;
1038		979
1039	check_map_change (pl);	980	check_map_change (pl);
1040	prefetch_surrounding_maps (pl->ob);	981	prefetch_surrounding_maps (pl->ob);
1041		982
1042	/* do LOS after calls to update_position */	983	/* do LOS after calls to update_position */
1043	if (ob != pl->ob)	984	/* unfortunately, we need to udpate los when observing, currently */
1044	clear_los (pl);	985	if (pl->do_los || pl->viewpoint != pl->ob)
1045	else if (pl->do_los)
1046	{	986	{
1047	update_los (ob);
1048	pl->do_los = 0;	987	pl->do_los = 0;
		988	pl->update_los ();
1049	}	989	}
1050		990
1051	/**	991	/**
1052	* This function uses the new map1 protocol command to send the map	992	* This function uses the new map1 protocol command to send the map
1053	* to the client. It is necessary because the old map command supports	993	* to the client. It is necessary because the old map command supports
…		…
1072	*/	1012	*/
1073		1013
1074	client &socket = *pl->ns;	1014	client &socket = *pl->ns;
1075		1015
1076	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1016	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1077	packet esl;
1078		1017
1079	startlen = sl.length ();	1018	startlen = sl.length ();
1080		1019
1081	/*Extendedmapinfo structure initialisation */	1020	int hx = socket.mapx / 2;
1082	if (socket.ext_mapinfos)	1021	int hy = socket.mapy / 2;
1083	{
1084	extendedinfos = EMI_NOREDRAW;
1085		1022
1086	if (socket.EMI_smooth)	1023	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1087	extendedinfos |= EMI_SMOOTH;	1024	int ax = dx + hx;
		1025	int ay = dy + hy;
1088		1026
1089	ewhatstart = esl.length ();	1027	int mask = (ax << 10) | (ay << 4);
1090	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1091	could need to be taken away */
1092	eentrysize = getExtendedMapInfoSize (&socket);
1093	esl << "mapextended "
1094	<< uint8 (extendedinfos)
1095	<< uint8 (eentrysize);
1096
1097	estartlen = esl.length ();
1098	}
1099
1100	/* x,y are the real map locations. ax, ay are viewport relative
1101	* locations.
1102	*/
1103	ay = 0;
1104
1105	/* We could do this logic as conditionals in the if statement,
1106	* but that started to get a bit messy to look at.
1107	*/
1108	max_x = ob->x + (socket.mapx + 1) / 2;
1109	max_y = ob->y + (socket.mapy + 1) / 2;
1110
1111	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1112	{
1113	ax = 0;
1114	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1115	{
1116	int emask, mask;
1117	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1118
1119	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1028	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1120		1029
1121	/* If the coordinates are not valid, or it is too dark to see,	1030	/* If the coordinates are not valid, or it is too dark to see,
1122	* we tell the client as such	1031	* we tell the client as such
		1032	*/
		1033	if (!m)
		1034	{
		1035	/* space is out of map. Update space and clear values
		1036	* if this hasn't already been done. If the space is out
		1037	* of the map, it shouldn't have a head.
1123	*/	1038	*/
1124	nx = x;	1039	if (lastcell.count != -1)
1125	ny = y;	1040	{
1126	m = get_map_from_coord (plmap, &nx, &ny);	1041	sl << uint16 (mask);
		1042	map_clearcell (&lastcell, -1);
		1043	}
1127		1044
1128	if (!m)	1045	continue;
		1046	}
		1047
		1048	int d = pl->blocked_los_uc (dx, dy);
		1049
		1050	if (d > 3)
		1051	{
		1052	/* This block deals with spaces that are not visible for whatever
		1053	* reason. Still may need to send the head for this space.
		1054	*/
		1055	if (lastcell.count != -1
		1056	|| lastcell.faces[0]
		1057	|| lastcell.faces[1]
		1058	|| lastcell.faces[2]
		1059	|| lastcell.stat_hp
		1060	|| lastcell.flags
		1061	|| lastcell.player)
		1062	sl << uint16 (mask);
		1063
		1064	/* properly clear a previously sent big face */
		1065	map_clearcell (&lastcell, -1);
		1066	}
		1067	else
		1068	{
		1069	/* In this block, the space is visible.
		1070	*/
		1071
		1072	/* Rather than try to figure out what everything that we might
		1073	* need to send is, then form the packet after that,
		1074	* we presume that we will in fact form a packet, and update
		1075	* the bits by what we do actually send. If we send nothing,
		1076	* we just back out sl.length () to the old value, and no harm
		1077	* is done.
		1078	* I think this is simpler than doing a bunch of checks to see
		1079	* what if anything we need to send, setting the bits, then
		1080	* doing those checks again to add the real data.
		1081	*/
		1082	oldlen = sl.length ();
		1083
		1084	sl << uint16 (mask);
		1085
		1086	unsigned char dummy;
		1087	unsigned char *last_ext = &dummy;
		1088
		1089	/* Darkness changed */
		1090	if (lastcell.count != d)
		1091	{
		1092	mask |= 0x8;
		1093
		1094	*last_ext |= 0x80;
		1095	last_ext = &sl[sl.length ()];
		1096	sl << uint8 (d);
		1097	}
		1098
		1099	lastcell.count = d;
		1100
		1101	mapspace &ms = m->at (nx, ny);
		1102	ms.update ();
		1103
		1104	// extmap handling
		1105	uint8 stat_hp = 0;
		1106	uint8 stat_width = 0;
		1107	uint8 flags = 0;
		1108	tag_t player = 0;
		1109
		1110	// send hp information, if applicable
		1111	if (object *op = ms.faces_obj [0])
		1112	if (op->is_head () && !op->invisible)
1129	{	1113	{
1130	/* space is out of map. Update space and clear values	1114	if (op->stats.maxhp > op->stats.hp
1131	* if this hasn't already been done. If the space is out	1115	&& op->stats.maxhp > 0
1132	* of the map, it shouldn't have a head	1116	&& (op->type == PLAYER
1133	*/	1117	|| op->type == DOOR // does not work, have maxhp 0
1134	if (lastcell.count != -1)	1118	|| QUERY_FLAG (op, FLAG_MONSTER)
		1119	|| QUERY_FLAG (op, FLAG_ALIVE)
		1120	|| QUERY_FLAG (op, FLAG_GENERATOR)))
1135	{	1121	{
1136	sl << uint16 (mask);	1122	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1137	map_clearcell (&lastcell, -1);	1123	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1138	}	1124	}
1139		1125
1140	continue;	1126	if (expect_false (op->has_dialogue ()))
		1127	flags |= 1;
		1128
		1129	if (expect_false (op->type == PLAYER))
		1130	player = op == ob ? pl->ob->count
		1131	: op == pl->ob ? ob->count
		1132	: op->count;
1141	}	1133	}
1142
1143	m->touch ();
1144		1134
1145	int d = pl->blocked_los[ax][ay];	1135	if (expect_false (lastcell.stat_hp != stat_hp))
1146
1147	if (d > 3)
1148	{	1136	{
		1137	lastcell.stat_hp = stat_hp;
1149		1138
1150	int need_send = 0, count;	1139	mask |= 0x8;
		1140	*last_ext |= 0x80;
		1141	last_ext = &sl[sl.length ()];
1151		1142
1152	/* This block deals with spaces that are not visible for whatever	1143	sl << uint8 (5) << uint8 (stat_hp);
1153	* reason. Still may need to send the head for this space.
1154	*/
1155		1144
1156	oldlen = sl.length ();	1145	if (stat_width > 1)
1157
1158	sl << uint16 (mask);
1159
1160	if (lastcell.count != -1)
1161	need_send = 1;
1162
1163	count = -1;
1164
1165	/* properly clear a previously sent big face */
1166	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1167	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1168	need_send = 1;
1169
1170	map_clearcell (&lastcell, count);
1171
1172	if ((mask & 0xf) || need_send)
1173	sl[oldlen + 1] = mask & 0xff;
1174	else
1175	sl.reset (oldlen);
1176	}
1177	else
1178	{
1179	/* In this block, the space is visible.
1180	*/
1181
1182	/* Rather than try to figure out what everything that we might
1183	* need to send is, then form the packet after that,
1184	* we presume that we will in fact form a packet, and update
1185	* the bits by what we do actually send. If we send nothing,
1186	* we just back out sl.length () to the old value, and no harm
1187	* is done.
1188	* I think this is simpler than doing a bunch of checks to see
1189	* what if anything we need to send, setting the bits, then
1190	* doing those checks again to add the real data.
1191	*/
1192	oldlen = sl.length ();
1193	eoldlen = esl.length ();
1194
1195	sl << uint16 (mask);
1196
1197	unsigned char dummy;
1198	unsigned char *last_ext = &dummy;
1199
1200	/* Darkness changed */
1201	if (lastcell.count != d && socket.darkness)
1202	{	1146	{
1203	mask |= 0x8;
1204
1205	if (socket.extmap)
1206	{
1207	*last_ext |= 0x80;	1147	*last_ext |= 0x80;
1208	last_ext = &sl[sl.length ()];	1148	last_ext = &sl[sl.length ()];
1209	sl << uint8 (d);	1149
1210	}	1150	sl << uint8 (6) << uint8 (stat_width);
1211	else
1212	sl << uint8 (255 - 64 * d);
1213	}	1151	}
		1152	}
1214		1153
1215	lastcell.count = d;	1154	if (expect_false (lastcell.player != player))
1216
1217	mapspace &ms = m->at (nx, ny);
1218
1219	if (socket.extmap)
1220	{	1155	{
1221	uint8 stat_hp = 0;	1156	lastcell.player = player;
1222	uint8 stat_width = 0;
1223	uint8 flags = 0;
1224	tag_t player = 0;
1225		1157
1226	// send hp information, if applicable
1227	if (object *op = ms.faces_obj [0])
1228	{
1229	if (op->head || op->invisible)
1230	; // do not show
1231	else if (op->type == PLAYER
1232	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1233	{
1234	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1235	{
1236	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1237	stat_width = op->arch->tail_x;
1238	}
1239	}
1240
1241	if (op->msg && op->msg[0] == '@')
1242	flags |= 1;
1243
1244	if (op->type == PLAYER && op != ob)
1245	player = op->count;
1246	}
1247
1248	if (lastcell.stat_hp != stat_hp)
1249	{
1250	lastcell.stat_hp = stat_hp;
1251
1252	mask |= 0x8;	1158	mask |= 0x8;
1253	*last_ext |= 0x80;	1159	*last_ext |= 0x80;
1254	last_ext = &sl[sl.length ()];	1160	last_ext = &sl[sl.length ()];
1255		1161
1256	sl << uint8 (5) << uint8 (stat_hp);
1257
1258	if (stat_width > 1)
1259	{
1260	*last_ext |= 0x80;
1261	last_ext = &sl[sl.length ()];
1262
1263	sl << uint8 (6) << uint8 (stat_width);
1264	}
1265	}
1266
1267	if (lastcell.player != player)
1268	{
1269	lastcell.player = player;
1270
1271	mask |= 0x8;
1272	*last_ext |= 0x80;
1273	last_ext = &sl[sl.length ()];
1274
1275	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1162	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1276	}	1163	}
1277		1164
1278	if (lastcell.flags != flags)	1165	if (expect_false (lastcell.flags != flags))
1279	{	1166	{
1280	lastcell.flags = flags;	1167	lastcell.flags = flags;
1281		1168
1282	mask |= 0x8;	1169	mask |= 0x8;
1283	*last_ext |= 0x80;	1170	*last_ext |= 0x80;
1284	last_ext = &sl[sl.length ()];	1171	last_ext = &sl[sl.length ()];
1285		1172
1286	sl << uint8 (8) << uint8 (flags);	1173	sl << uint8 (8) << uint8 (flags);
1287	}
1288	}	1174	}
1289		1175
		1176	// faces
		1177
1290	/* Floor face */	1178	/* Floor face */
1291	if (update_space (sl, socket, ms, lastcell, 2))	1179	if (update_space (sl, socket, ms, lastcell, 2))
1292	mask |= 0x4;	1180	mask |= 0x4;
1293		1181
1294	/* Middle face */	1182	/* Middle face */
1295	if (update_space (sl, socket, ms, lastcell, 1))	1183	if (update_space (sl, socket, ms, lastcell, 1))
1296	mask |= 0x2;	1184	mask |= 0x2;
1297		1185
		1186	if (expect_false (ob->invisible)
		1187	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1298	if (ms.player () == ob	1188	&& ms.player () == ob)
1299	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1300	{	1189	{
1301	// force player to be visible to himself if invisible	1190	// force player to be visible to himself if invisible
1302	if (lastcell.faces[0] != ob->face)	1191	if (lastcell.faces[0] != ob->face)
1303	{	1192	{
1304	lastcell.faces[0] = ob->face;	1193	lastcell.faces[0] = ob->face;
1305		1194
1306	mask |= 0x1;
1307	sl << uint16 (ob->face);
1308
1309	socket.send_faces (ob);
1310	}
1311	}
1312	/* Top face */
1313	else if (update_space (sl, socket, ms, lastcell, 0))
1314	mask |= 0x1;	1195	mask |= 0x1;
		1196	sl << uint16 (ob->face);
1315		1197
		1198	socket.send_faces (ob);
		1199	}
		1200	}
		1201	/* Top face */
		1202	else if (update_space (sl, socket, ms, lastcell, 0))
		1203	mask |= 0x1;
		1204
1316	/* Check to see if we are in fact sending anything for this	1205	/* Check to see if we are in fact sending anything for this
1317	* space by checking the mask. If so, update the mask.	1206	* space by checking the mask. If so, update the mask.
1318	* if not, reset the len to that from before adding the mask	1207	* if not, reset the len to that from before adding the mask
1319	* value, so we don't send those bits.	1208	* value, so we don't send those bits.
1320	*/	1209	*/
1321	if (mask & 0xf)	1210	if (mask & 0xf)
1322	sl[oldlen + 1] = mask & 0xff;	1211	sl[oldlen + 1] = mask & 0xff;
1323	else	1212	else
1324	sl.reset (oldlen);	1213	sl.reset (oldlen);
1325
1326	if (socket.ext_mapinfos)
1327	esl << uint16 (emask);
1328
1329	if (socket.EMI_smooth)
1330	{
1331	for (int layer = 2+1; layer--; )
1332	{
1333	object *ob = ms.faces_obj [layer];
1334
1335	// If there is no object for this space, or if the face for the object
1336	// is the blank face, set the smoothlevel to zero.
1337	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1338
1339	// We've gotten what face we want to use for the object. Now see if
1340	// if it has changed since we last sent it to the client.
1341	if (lastcell.smooth[layer] != smoothlevel)
1342	{
1343	lastcell.smooth[layer] = smoothlevel;
1344	esl << uint8 (smoothlevel);
1345	emask |= 1 << layer;
1346	}
1347	}
1348
1349	if (emask & 0xf)
1350	esl[eoldlen + 1] = emask & 0xff;
1351	else
1352	esl.reset (eoldlen);
1353	}
1354	} /* else this is a viewable space */	1214	} /* else this is a viewable space */
1355	} /* for x loop */	1215	ordered_mapwalk_end
1356	} /* for y loop */
1357		1216
1358	socket.flush_fx ();	1217	socket.flush_fx ();
1359
1360	/* Verify that we in fact do need to send this */
1361	if (socket.ext_mapinfos)
1362	{
1363	if (!(sl.length () > startlen || socket.sent_scroll))
1364	{
1365	/* No map data will follow, so don't say the client
1366	* it doesn't need draw!
1367	*/
1368	ewhatflag &= ~EMI_NOREDRAW;
1369	esl[ewhatstart + 1] = ewhatflag & 0xff;
1370	}
1371
1372	if (esl.length () > estartlen)
1373	socket.send_packet (esl);
1374	}
1375		1218
1376	if (sl.length () > startlen || socket.sent_scroll)	1219	if (sl.length () > startlen || socket.sent_scroll)
1377	{	1220	{
1378	socket.send_packet (sl);	1221	socket.send_packet (sl);
1379	socket.sent_scroll = 0;	1222	socket.sent_scroll = 0;
…		…
1400	{	1243	{
1401	packet sl;	1244	packet sl;
1402	sl << "replyinfo skill_info\n";	1245	sl << "replyinfo skill_info\n";
1403		1246
1404	for (int i = 1; i < NUM_SKILLS; i++)	1247	for (int i = 1; i < NUM_SKILLS; i++)
1405	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1248	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1406		1249
1407	if (sl.length () >= MAXSOCKBUF)	1250	if (sl.length () > MAXSOCKBUF)
1408	{	1251	{
1409	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1252	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1410	fatal (0);	1253	fatal (0);
1411	}	1254	}
1412		1255
…		…
1425	sl << "replyinfo spell_paths\n";	1268	sl << "replyinfo spell_paths\n";
1426		1269
1427	for (int i = 0; i < NRSPELLPATHS; i++)	1270	for (int i = 0; i < NRSPELLPATHS; i++)
1428	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1271	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1429		1272
1430	if (sl.length () >= MAXSOCKBUF)	1273	if (sl.length () > MAXSOCKBUF)
1431	{	1274	{
1432	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1275	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1433	fatal (0);	1276	fatal (0);
1434	}	1277	}
1435		1278
…		…
1454	if (spell->type == SPELL)	1297	if (spell->type == SPELL)
1455	{	1298	{
1456	int flags = 0;	1299	int flags = 0;
1457		1300
1458	/* check if we need to update it */	1301	/* check if we need to update it */
1459	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1302	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1460	{	1303	{
1461	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1304	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1462	flags |= UPD_SP_MANA;	1305	flags |= UPD_SP_MANA;
1463	}	1306	}
1464		1307
1465	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1308	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1466	{	1309	{
1467	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1310	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1468	flags |= UPD_SP_GRACE;	1311	flags |= UPD_SP_GRACE;
1469	}	1312	}
1470		1313
1471	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1314	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1472	{	1315	{
1473	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1316	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1474	flags |= UPD_SP_DAMAGE;	1317	flags |= UPD_SP_DAMAGE;
1475	}	1318	}
1476		1319
1477	if (flags)	1320	if (flags)
1478	{	1321	{
…		…
1480		1323
1481	sl << "updspell "	1324	sl << "updspell "
1482	<< uint8 (flags)	1325	<< uint8 (flags)
1483	<< uint32 (spell->count);	1326	<< uint32 (spell->count);
1484		1327
1485	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1328	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1486	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1329	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1487	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1330	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1488		1331
1489	pl->ns->send_packet (sl);	1332	pl->ns->send_packet (sl);
1490	}	1333	}
1491	}	1334	}
1492	}	1335	}
…		…
1522	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1365	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1523	return;	1366	return;
1524	}	1367	}
1525		1368
1526	/* store costs and damage in the object struct, to compare to later */	1369	/* store costs and damage in the object struct, to compare to later */
1527	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1370	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1528	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1371	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1529	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1372	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1530		1373
1531	/* figure out which skill it uses, if it uses one */	1374	/* figure out which skill it uses, if it uses one */
1532	if (spell->skill)	1375	if (spell->skill)
1533	{	1376	if (object *tmp = pl->find_skill (spell->skill))
1534	for (i = 1; i < NUM_SKILLS; i++)
1535	if (!strcmp (spell->skill, skill_names[i]))
1536	{
1537	skill = i + CS_STAT_SKILLINFO;	1377	skill = tmp->subtype + CS_STAT_SKILLINFO;
1538	break;
1539	}
1540	}
1541		1378
1542	// spells better have a face	1379	// spells better have a face
1543	if (!spell->face)	1380	if (!spell->face)
1544	{	1381	{
1545	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1382	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1546	spell->face = face_find ("burnout.x11", blank_face);	1383	spell->face = face_find ("burnout.x11", blank_face);
1547	}	1384	}
		1385
		1386	pl->ns->send_face (spell->face);
1548		1387
1549	/* send the current values */	1388	/* send the current values */
1550	sl << uint32 (spell->count)	1389	sl << uint32 (spell->count)
1551	<< uint16 (spell->level)	1390	<< uint16 (spell->level)
1552	<< uint16 (spell->casting_time)	1391	<< uint16 (spell->casting_time)
1553	<< uint16 (spell->last_sp)	1392	<< uint16 (spell->cached_sp)
1554	<< uint16 (spell->last_grace)	1393	<< uint16 (spell->cached_grace)
1555	<< uint16 (spell->last_eat)	1394	<< uint16 (spell->cached_eat)
1556	<< uint8 (skill)	1395	<< uint8 (skill)
1557	<< uint32 (spell->path_attuned)	1396	<< uint32 (spell->path_attuned)
1558	<< uint32 (spell->face)	1397	<< uint32 (spell->face)
1559	<< data8 (spell->name)	1398	<< data8 (spell->name)
1560	<< data16 (spell->msg);	1399	<< data16 (spell->msg);
…		…
1588	* bytes and 3 strings (because that is the spec) so we need to	1427	* bytes and 3 strings (because that is the spec) so we need to
1589	* check that the length of those 3 strings, plus the 23 bytes,	1428	* check that the length of those 3 strings, plus the 23 bytes,
1590	* won't take us over the length limit for the socket, if it does,	1429	* won't take us over the length limit for the socket, if it does,
1591	* we need to send what we already have, and restart packet formation	1430	* we need to send what we already have, and restart packet formation
1592	*/	1431	*/
		1432	if (spell->type != SPELL)
		1433	continue;
		1434
1593	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1435	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1594	* to show add_spell is 26 bytes + 2 strings. However, the overun	1436	* to show add_spell is 26 bytes + 2 strings. However, the overun
1595	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1437	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1596	* like it will fix this	1438	* like it will fix this
1597	*/	1439	*/
1598	if (spell->type != SPELL)
1599	continue;
1600
1601	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1440	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1602	{	1441	{
		1442	pl->ns->flush_fx ();
1603	pl->ns->send_packet (sl);	1443	pl->ns->send_packet (sl);
1604		1444
1605	sl.reset ();	1445	sl.reset ();
1606	sl << "addspell ";	1446	sl << "addspell ";
1607	}	1447	}
…		…
1615	return;	1455	return;
1616	}	1456	}
1617	else	1457	else
1618	append_spell (pl, sl, spell);	1458	append_spell (pl, sl, spell);
1619		1459
1620	if (sl.length () >= MAXSOCKBUF)	1460	if (sl.length () > MAXSOCKBUF)
1621	{	1461	{
1622	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1462	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1623	fatal (0);	1463	fatal (0);
1624	}	1464	}
1625		1465
1626	/* finally, we can send the packet */	1466	/* finally, we can send the packet */
		1467	pl->ns->flush_fx ();
1627	pl->ns->send_packet (sl);	1468	pl->ns->send_packet (sl);
1628	}	1469	}
1629		1470
		1471	//-GPL
		1472

Diff Legend

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