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.112 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.157 by root, Fri Nov 6 13:05:57 2009 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	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	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 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* 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>
22	*/	23	*/
		24
		25	//+GPL
23		26
24	/**	27	/**
25	* \file	28	* \file
26	* Client handling.	29	* Client handling.
27	*	30	*
…		…
63	* This table translates the attack numbers as used within the	66	* This table translates the attack numbers as used within the
64	* 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
65	* 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
66	* client.	69	* client.
67	*/	70	*/
68	short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,	71	static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
69	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,
70	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,
71	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	74	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
72	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	75	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,
73	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,
…		…
98	*/	101	*/
99	mx = ns->mapx;	102	mx = ns->mapx;
100	my = ns->mapy;	103	my = ns->mapy;
101		104
102	/* 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
103	* (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,
104	* if the destination x or y coordinate is outside the viewable	107	* if the destination x or y coordinate is outside the viewable
105	* area, we clear the values - otherwise, the old values	108	* area, we clear the values - otherwise, the old values
106	* 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.
107	*/	110	*/
108	for (x = 0; x < mx; x++)	111	for (x = 0; x < mx; x++)
109	{
110	for (y = 0; y < my; y++)	112	for (y = 0; y < my; y++)
111	{
112	if (x >= ns->mapx || y >= ns->mapy)	113	if (x >= ns->mapx || y >= ns->mapy)
113	/* clear cells outside the viewable area */	114	/* clear cells outside the viewable area */
114	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	115	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115	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)
116	/* clear newly visible tiles within the viewable area */	117	/* clear newly visible tiles within the viewable area */
117	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	118	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118	else	119	else
119	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));
120	}
121	}
122		121
123	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	122	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124		123
125	/* 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
126	* empty).	125	* empty).
…		…
129	}	128	}
130		129
131	static void	130	static void
132	clear_map (player *pl)	131	clear_map (player *pl)
133	{	132	{
		133	pl->ns->mapinfo_queue_clear ();
		134
134	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135		136
136	pl->ns->force_newmap = false;	137	pl->ns->force_newmap = false;
137		138
138	if (pl->ns->newmapcmd == 1)	139	if (pl->ns->newmapcmd == 1)
139	pl->ns->send_packet ("newmap");	140	pl->ns->send_packet ("newmap");
140		141
141	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	}
142	}	169	}
143		170
144	/** check for map/region change and send new map data */	171	/** check for map/region change and send new map data */
145	static void	172	static void
146	check_map_change (player *pl)	173	check_map_change (player *pl)
147	{	174	{
148	client &socket = *pl->ns;	175	client &socket = *pl->ns;
149	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	}
150		204
151	if (socket.current_map != ob->map || socket.force_newmap)	205	if (socket.current_map != ob->map || socket.force_newmap)
152	{	206	{
153	clear_map (pl);	207	clear_map (pl);
154	socket.current_map = ob->map;	208	socket.current_map = ob->map;
155		209	send_map_info (pl);
156	if (socket.mapinfocmd)
157	{
158	if (ob->map && ob->map->path[0])
159	{
160	int flags = 0;
161
162	if (ob->map->tile_path[0]) flags |= 1;
163	if (ob->map->tile_path[1]) flags |= 2;
164	if (ob->map->tile_path[2]) flags |= 4;
165	if (ob->map->tile_path[3]) flags |= 8;
166
167	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
168	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
169	ob->map->width, ob->map->height, &ob->map->path);
170	}
171	else
172	socket.send_packet ("mapinfo current");
173	}
174	}	210	}
175	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)
176	{	212	{
177	int dx = ob->x - socket.current_x;	213	int dx = ob->x - socket.current_x;
178	int dy = ob->y - socket.current_y;	214	int dy = ob->y - socket.current_y;
179		215
180	if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
181	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
182	else
183	{
184	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);
185	socket.floorbox_reset ();	217	socket.floorbox_reset ();
186	}
187	}	218	}
188		219
189	socket.current_x = ob->x;	220	socket.current_x = ob->x;
190	socket.current_y = ob->y;	221	socket.current_y = ob->y;
		222	}
191		223
192	region *reg = ob->region ();	224	/**
193	if (socket.current_region != reg)	225	* This sends the skill number to name mapping. We ignore
194	{	226	* the params - we always send the same info no matter what.
195	socket.current_region = reg;	227	*/
196	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);	228	void
		229	send_skill_info (client *ns, char *params)
		230	{
		231	packet sl;
		232	sl << "replyinfo skill_info\n";
		233
		234	for (int i = 1; i < NUM_SKILLS; i++)
		235	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
		236
		237	if (sl.length () > MAXSOCKBUF)
197	}	238	{
		239	LOG (llevError, "Buffer overflow in send_skill_info!\n");
		240	fatal (0);
		241	}
		242
		243	ns->send_packet (sl);
		244	}
		245
		246	/**
		247	* This sends the spell path to name mapping. We ignore
		248	* the params - we always send the same info no matter what.
		249	*/
		250	void
		251	send_spell_paths (client * ns, char *params)
		252	{
		253	packet sl;
		254
		255	sl << "replyinfo spell_paths\n";
		256
		257	for (int i = 0; i < NRSPELLPATHS; i++)
		258	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		259
		260	if (sl.length () > MAXSOCKBUF)
		261	{
		262	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
		263	fatal (0);
		264	}
		265
		266	ns->send_packet (sl);
198	}	267	}
199		268
200	/**	269	/**
201	* RequestInfo is sort of a meta command. There is some specific	270	* RequestInfo is sort of a meta command. There is some specific
202	* request of information, but we call other functions to provide	271	* request of information, but we call other functions to provide
203	* that information.	272	* that information.
204	*/	273	*/
205	void	274	void
206	RequestInfo (char *buf, int len, client * ns)	275	RequestInfo (char *buf, int len, client *ns)
207	{	276	{
208	char *params = NULL, *cp;	277	char *params;
209
210	/* No match */
211	char bigbuf[MAX_BUF];
212	int slen;
213
214	/* Set up replyinfo before we modify any of the buffers - this is used
215	* if we don't find a match.
216	*/
217	strcpy (bigbuf, "replyinfo ");
218	slen = strlen (bigbuf);
219	safe_strcat (bigbuf, buf, &slen, MAX_BUF);
220		278
221	/* find the first space, make it null, and update the	279	/* find the first space, make it null, and update the
222	* params pointer.	280	* params pointer.
223	*/	281	*/
224	for (cp = buf; *cp != '\0'; cp++)	282	for (params = buf; *params; params++)
225	if (*cp == ' ')	283	if (*params == ' ')
226	{	284	{
227	*cp = '\0';
228	params = cp + 1;	285	*params++ = 0;
229	break;	286	break;
230	}	287	}
231		288
232	if (!strcmp (buf, "image_info"))
233	send_image_info (ns, params);
234	else if (!strcmp (buf, "image_sums"))
235	send_image_sums (ns, params);
236	else if (!strcmp (buf, "skill_info"))	289	if (!strcmp (buf, "skill_info"))
237	send_skill_info (ns, params);	290	send_skill_info (ns, params);
238	else if (!strcmp (buf, "spell_paths"))	291	else if (!strcmp (buf, "spell_paths"))
239	send_spell_paths (ns, params);	292	send_spell_paths (ns, params);
240	else	293	else
241	ns->send_packet (bigbuf, len);	294	{
		295	// undo tokenisation above and send replyinfo with the request unchanged
		296	if (*params)
		297	*--params = ' ';
		298
		299	ns->send_packet_printf ("replyinfo %s", buf);
		300	}
242	}	301	}
243		302
244	void	303	void
245	ExtCmd (char *buf, int len, player *pl)	304	ExtCmd (char *buf, int len, player *pl)
246	{	305	{
…		…
249		308
250	void	309	void
251	ExtiCmd (char *buf, int len, client *ns)	310	ExtiCmd (char *buf, int len, client *ns)
252	{	311	{
253	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	312	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
		313	}
		314
		315	//-GPL
		316
		317	void
		318	client::mapinfo_queue_clear ()
		319	{
		320	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		321	free (*i);
		322
		323	mapinfo_queue.clear ();
		324	}
		325
		326	bool
		327	client::mapinfo_try (char *buf)
		328	{
		329	char *token = buf;
		330	buf += strlen (buf) + 9;
		331
		332	// initial map and its origin
		333	maptile *map = pl->viewpoint->map;
		334	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
		335	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
		336	int max_distance = 8; // limit maximum path length to something generous
		337
		338	while (*buf && map && max_distance)
		339	{
		340	int dir = *buf++ - '1';
		341
		342	if (dir >= 0 && dir <= 3)
		343	{
		344	if (!map->tile_path [dir])
		345	map = 0;
		346	else if (map->tile_available (dir, false))
		347	{
		348	maptile *neigh = map->tile_map [dir];
		349
		350	switch (dir)
		351	{
		352	case 0: mapy -= neigh->height; break;
		353	case 2: mapy += map ->height; break;
		354	case 3: mapx -= neigh->width ; break;
		355	case 1: mapx += map ->width ; break;
		356	}
		357
		358	map = neigh;
		359	--max_distance;
		360	}
		361	else
		362	return 0;
		363	}
		364	else
		365	max_distance = 0;
		366	}
		367
		368	if (!max_distance)
		369	send_packet_printf ("mapinfo %s error", token);
		370	else if (!map || !map->path)
		371	send_packet_printf ("mapinfo %s nomap", token);
		372	else
		373	{
		374	int flags = 0;
		375
		376	if (map->tile_path[0]) flags |= 1;
		377	if (map->tile_path[1]) flags |= 2;
		378	if (map->tile_path[2]) flags |= 4;
		379	if (map->tile_path[3]) flags |= 8;
		380
		381	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		382	}
		383
		384	return 1;
		385	}
		386
		387	void
		388	client::mapinfo_queue_run ()
		389	{
		390	if (mapinfo_queue.empty () || !pl)
		391	return;
		392
		393	for (int i = 0; i < mapinfo_queue.size (); ++i)
		394	if (mapinfo_try (mapinfo_queue [i]))
		395	{
		396	free (mapinfo_queue [i]);
		397	mapinfo_queue.erase (i);
		398	}
		399	else
		400	++i;
254	}	401	}
255		402
256	void	403	void
257	MapInfoCmd (char *buf, int len, player *pl)	404	MapInfoCmd (char *buf, int len, player *pl)
258	{	405	{
259	// <mapinfo tag spatial tile-path	406	// <mapinfo tag spatial tile-path
260	// >mapinfo tag spatial flags x y w h hash	407	// >mapinfo tag spatial flags x y w h hash
261		408
262	char bigbuf[MAX_BUF], *token;
263
264	token = buf;	409	char *token = buf;
265	// copy token	410
266	if (!(buf = strchr (buf, ' ')))	411	if (!(buf = strchr (buf, ' ')))
267	return;	412	return;
268		413
269	*buf++ = 0;
270
271	if (!strncmp (buf, "spatial ", 8))	414	if (!strncmp (buf, " spatial ", 9))
272	{	415	{
273	buf += 8;	416	char *copy = strdup (token);
		417	copy [buf - token] = 0;
274		418
275	// initial map and its origin	419	#if 0
276	maptile *map = pl->ob->map;	420	// this makes only sense when we flush the buffer immediately
277	sint16 dx, dy;	421	if (pl->ns->mapinfo_try (copy))
278	int mapx = pl->ns->mapx / 2 - pl->ob->x;	422	free (copy);
279	int mapy = pl->ns->mapy / 2 - pl->ob->y;
280	int max_distance = 8; // limit maximum path length to something generous
281
282	while (*buf && map && max_distance)
283	{
284	int dir = *buf++;
285
286	switch (dir)
287	{
288	case '1':
289	dx = 0;
290	dy = -1;
291	map = map->xy_find (dx, dy);
292	map && (mapy -= map->height);
293	break;
294	case '2':
295	mapx += map->width;
296	dx = map->width;
297	dy = 0;
298	map = map->xy_find (dx, dy);
299	break;
300	case '3':
301	mapy += map->height;
302	dx = 0;
303	dy = map->height;
304	map = map->xy_find (dx, dy);
305	break;
306	case '4':
307	dx = -1;
308	dy = 0;
309	map = map->xy_find (dx, dy);
310	map && (mapx -= map->width);
311	break;
312	}
313
314	--max_distance;
315	}
316
317	if (!max_distance)
318	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
319	else if (map && map->path[0])
320	{
321	int flags = 0;
322
323	if (map->tile_path[0]) flags |= 1;
324	if (map->tile_path[1]) flags |= 2;
325	if (map->tile_path[2]) flags |= 4;
326	if (map->tile_path[3]) flags |= 8;
327
328	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
329	}
330	else	423	else
331	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	424	#endif
		425	pl->ns->mapinfo_queue.push_back (copy);
332	}	426	}
333	else	427	else
334	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	428	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
335
336	pl->ns->send_packet (bigbuf);
337	}	429	}
338		430
339	/** This is the Setup cmd */	431	/** This is the Setup cmd */
340	void	432	void
341	SetUp (char *buf, int len, client * ns)	433	SetUp (char *buf, int len, client * ns)
…		…
353	AddMeCmd (char *buf, int len, client *ns)	445	AddMeCmd (char *buf, int len, client *ns)
354	{	446	{
355	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	447	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
356	}	448	}
357		449
358	/** Reply to ExtendedInfos command */	450	//+GPL
359	void
360	ToggleExtendedInfos (char *buf, int len, client * ns)
361	{
362	char cmdback[MAX_BUF];
363	char command[50];
364	int info, nextinfo;
365
366	cmdback[0] = '\0';
367	nextinfo = 0;
368
369	while (1)
370	{
371	/* 1. Extract an info */
372	info = nextinfo;
373
374	while ((info < len) && (buf[info] == ' '))
375	info++;
376
377	if (info >= len)
378	break;
379
380	nextinfo = info + 1;
381
382	while ((nextinfo < len) && (buf[nextinfo] != ' '))
383	nextinfo++;
384
385	if (nextinfo - info >= 49) /*Erroneous info asked */
386	continue;
387
388	strncpy (command, &(buf[info]), nextinfo - info);
389
390	/* 2. Interpret info */
391	if (!strcmp ("smooth", command))
392	/* Toggle smoothing */
393	ns->EMI_smooth = !ns->EMI_smooth;
394	else
395	/*bad value */;
396
397	/*3. Next info */
398	}
399
400	strcpy (cmdback, "ExtendedInfoSet");
401
402	if (ns->EMI_smooth)
403	{
404	strcat (cmdback, " ");
405	strcat (cmdback, "smoothing");
406	}
407
408	ns->send_packet (cmdback);
409	}
410		451
411	/*	452	/*
412	#define MSG_TYPE_BOOK 1	453	#define MSG_TYPE_BOOK 1
413	#define MSG_TYPE_CARD 2	454	#define MSG_TYPE_CARD 2
414	#define MSG_TYPE_PAPER 3	455	#define MSG_TYPE_PAPER 3
…		…
431	while (1)	472	while (1)
432	{	473	{
433	/* 1. Extract an info */	474	/* 1. Extract an info */
434	info = nextinfo;	475	info = nextinfo;
435		476
436	while ((info < len) && (buf[info] == ' '))	477	while ((info < len) && (buf [info] == ' '))
437	info++;	478	info++;
438		479
439	if (info >= len)	480	if (info >= len)
440	break;	481	break;
441		482
442	nextinfo = info + 1;	483	nextinfo = info + 1;
443		484
444	while ((nextinfo < len) && (buf[nextinfo] != ' '))	485	while ((nextinfo < len) && (buf [nextinfo] != ' '))
445	nextinfo++;	486	nextinfo++;
446		487
447	if (nextinfo - info >= 49) /*Erroneous info asked */	488	if (nextinfo - info >= 49) /*Erroneous info asked */
448	continue;	489	continue;
449		490
450	strncpy (command, &(buf[info]), nextinfo - info);	491	memcpy (command, buf + info, nextinfo - info);
451	command[nextinfo - info] = '\0';	492	command [nextinfo - info] = 0;
		493
452	/* 2. Interpret info */	494	/* 2. Interpret info */
453	i = sscanf (command, "%d", &flag);	495	i = sscanf (command, "%d", &flag);
454		496
455	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	497	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
456	ns->supported_readables |= (1 << flag);	498	ns->supported_readables |= (1 << flag);
…		…
490	return;	532	return;
491		533
492	buf++;	534	buf++;
493	}	535	}
494		536
495	execute_newserver_command (pl->ob, (char *) buf);	537	execute_newserver_command (pl->ob, (char *)buf);
496		538
497	/* Perhaps something better should be done with a left over count.	539	/* Perhaps something better should be done with a left over count.
498	* Cleaning up the input should probably be done first - all actions	540	* Cleaning up the input should probably be done first - all actions
499	* for the command that issued the count should be done before any other	541	* for the command that issued the count should be done before any other
500	* commands.	542	* commands.
…		…
511	void	553	void
512	NewPlayerCmd (char *buf, int len, player *pl)	554	NewPlayerCmd (char *buf, int len, player *pl)
513	{	555	{
514	if (len <= 6)	556	if (len <= 6)
515	{	557	{
516	LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);	558	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
517	return;	559	return;
518	}	560	}
519		561
520	uint16 cmdid = net_uint16 ((uint8 *)buf);	562	uint16 cmdid = net_uint16 ((uint8 *)buf);
521	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	563	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
659	* syntax is: move (to) (tag) (nrof)	701	* syntax is: move (to) (tag) (nrof)
660	*/	702	*/
661	void	703	void
662	MoveCmd (char *buf, int len, player *pl)	704	MoveCmd (char *buf, int len, player *pl)
663	{	705	{
664	int vals[3], i;	706	int to, tag, nrof;
665		707
666	/* A little funky here. We only cycle for 2 records, because	708	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
667	* we obviously are not going to find a space after the third
668	* record. Perhaps we should just replace this with a
669	* sscanf?
670	*/
671	for (i = 0; i < 2; i++)
672	{	709	{
673	vals[i] = atoi (buf);
674
675	if (!(buf = strchr (buf, ' ')))
676	{
677	LOG (llevError, "Incomplete move command: %s\n", buf);	710	LOG (llevError, "Incomplete move command: %s\n", buf);
678	return;	711	return;
679	}
680
681	buf++;
682	}	712	}
683		713
684	vals[2] = atoi (buf);	714	esrv_move_object (pl->ob, to, tag, nrof);
685
686	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
687	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
688	}	715	}
689		716
690	/******************************************************************************	717	/******************************************************************************
691	*	718	*
692	* Start of commands the server sends to the client.	719	* Start of commands the server sends to the client.
…		…
707	* Get player's current range attack in obuf.	734	* Get player's current range attack in obuf.
708	*/	735	*/
709	static void	736	static void
710	rangetostring (player *pl, char *obuf)	737	rangetostring (player *pl, char *obuf)
711	{	738	{
712	dynbuf_text buf;	739	dynbuf_text &buf = msg_dynbuf; buf.clear ();
713		740
714	if (pl->ranged_ob)	741	if (pl->ranged_ob)
715	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	742	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
716		743
717	if (pl->combat_ob)	744	if (pl->combat_ob)
…		…
793	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
794	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
795	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
796		823
797	for (int s = 0; s < NUM_SKILLS; s++)	824	for (int s = 0; s < NUM_SKILLS; s++)
798	if (object *skill = opl->last_skill_ob[s])	825	if (object *skill = opl->last_skill_ob [s])
799	if (skill->stats.exp != ns->last_skill_exp [s])	826	if (skill->stats.exp != ns->last_skill_exp [s])
800	{	827	{
801	ns->last_skill_exp [s] = skill->stats.exp;	828	ns->last_skill_exp [s] = skill->stats.exp;
802		829
803	/* Always send along the level if exp changes. This is only	830	/* Always send along the level if exp changes. This is only
…		…
859		886
860	/**	887	/**
861	* Tells the client that here is a player it should start using.	888	* Tells the client that here is a player it should start using.
862	*/	889	*/
863	void	890	void
864	esrv_new_player (player *pl, uint32 weight)	891	esrv_new_player (player *pl)
865	{	892	{
		893	sint32 weight = pl->ob->client_weight ();
		894
866	packet sl ("player");	895	packet sl ("player");
867		896
868	sl << uint32 (pl->ob->count)	897	sl << uint32 (pl->ob->count)
869	<< uint32 (weight)	898	<< uint32 (weight)
870	<< uint32 (pl->ob->face)	899	<< uint32 (pl->ob->face)
871	<< data8 (pl->ob->name);	900	<< data8 (pl->ob->name);
872		901
873	pl->ns->last_weight = weight;	902	pl->ns->last_weight = weight;
874	pl->ns->send_packet (sl);	903	pl->ns->send_packet (sl);
875	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
876	}	904	}
877		905
878	/******************************************************************************	906	/******************************************************************************
879	*	907	*
880	* Start of map related commands.	908	* Start of map related commands.
…		…
937		965
938	if (!ns.faces_sent[face_num])	966	if (!ns.faces_sent[face_num])
939	if (ob)	967	if (ob)
940	ns.send_faces (ob);	968	ns.send_faces (ob);
941	else	969	else
942	ns.send_face (face_num);	970	ns.send_face (face_num, 10);
943		971
944	sl << uint16 (face_num);	972	sl << uint16 (face_num);
945	return 1;	973	return 1;
946	}	974	}
947		975
948	/* Nothing changed */	976	/* Nothing changed */
949	return 0;	977	return 0;
950	}	978	}
951		979
952	/**	980	//-GPL
953	* Returns the size of a data for a map square as returned by
954	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
955	* available.
956	*/
957	int
958	getExtendedMapInfoSize (client * ns)
959	{
960	int result = 0;
961
962	if (ns->ext_mapinfos)
963	{
964	if (ns->EMI_smooth)
965	result += 1; /*One byte for smoothlevel */
966	}
967
968	return result;
969	}
970		981
971	// prefetch (and touch) all maps within a specific distancd	982	// prefetch (and touch) all maps within a specific distancd
972	static void	983	static void
973	prefetch_surrounding_maps (maptile *map, int distance)	984	prefetch_surrounding_maps (maptile *map, int distance)
974	{	985	{
975	map->last_access = runtime;	986	map->touch ();
976		987
977	if (--distance)	988	if (--distance)
978	for (int dir = 4; --dir; )	989	for (int dir = 4; --dir; )
979	if (const shstr &path = map->tile_path [dir])	990	if (const shstr &path = map->tile_path [dir])
980	if (maptile *&neigh = map->tile_map [dir])	991	if (maptile *&neigh = map->tile_map [dir])
…		…
988	prefetch_surrounding_maps (object *op)	999	prefetch_surrounding_maps (object *op)
989	{	1000	{
990	prefetch_surrounding_maps (op->map, 3);	1001	prefetch_surrounding_maps (op->map, 3);
991	}	1002	}
992		1003
		1004	//+GPL
		1005
993	/**	1006	/**
994	* Draws client map.	1007	* Draws client map.
995	*/	1008	*/
996	void	1009	void
997	draw_client_map (player *pl)	1010	draw_client_map (player *pl)
998	{	1011	{
999	object *ob = pl->observe;	1012	object *ob = pl->viewpoint;
1000	if (!ob->active)	1013	if (!pl->observe->active)
1001	return;	1014	return;
1002
1003	maptile *plmap = ob->map;
1004		1015
1005	/* If player is just joining the game, he isn't here yet, so the map	1016	/* If player is just joining the game, he isn't here yet, so the map
1006	* can get swapped out. If so, don't try to send them a map. All will	1017	* can get swapped out. If so, don't try to send them a map. All will
1007	* be OK once they really log in.	1018	* be OK once they really log in.
1008	*/	1019	*/
1009	if (!plmap || plmap->in_memory != MAP_IN_MEMORY)	1020	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1010	return;	1021	return;
1011		1022
1012	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1013	int estartlen, eoldlen;	1023	int startlen, oldlen;
1014	uint8 eentrysize;
1015	uint16 ewhatstart, ewhatflag;
1016	uint8 extendedinfos;
1017		1024
1018	check_map_change (pl);	1025	check_map_change (pl);
1019	prefetch_surrounding_maps (pl->ob);	1026	prefetch_surrounding_maps (pl->ob);
1020		1027
1021	/* do LOS after calls to update_position */	1028	/* do LOS after calls to update_position */
1022	if (ob != pl->ob)	1029	/* unfortunately, we need to udpate los when observing, currently */
1023	clear_los (pl);	1030	if (pl->do_los || pl->viewpoint != pl->ob)
1024	else if (pl->do_los)
1025	{	1031	{
1026	update_los (ob);
1027	pl->do_los = 0;	1032	pl->do_los = 0;
		1033	pl->update_los ();
1028	}	1034	}
1029		1035
1030	/**	1036	/**
1031	* This function uses the new map1 protocol command to send the map	1037	* This function uses the new map1 protocol command to send the map
1032	* to the client. It is necessary because the old map command supports	1038	* to the client. It is necessary because the old map command supports
…		…
1051	*/	1057	*/
1052		1058
1053	client &socket = *pl->ns;	1059	client &socket = *pl->ns;
1054		1060
1055	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1061	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1056	packet esl;
1057		1062
1058	startlen = sl.length ();	1063	startlen = sl.length ();
1059		1064
1060	/*Extendedmapinfo structure initialisation */	1065	int hx = socket.mapx / 2;
1061	if (socket.ext_mapinfos)	1066	int hy = socket.mapy / 2;
1062	{
1063	extendedinfos = EMI_NOREDRAW;
1064		1067
1065	if (socket.EMI_smooth)	1068	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1066	extendedinfos |= EMI_SMOOTH;	1069	int ax = dx + hx;
		1070	int ay = dy + hy;
1067		1071
1068	ewhatstart = esl.length ();	1072	int mask = (ax << 10) | (ay << 4);
1069	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	1073	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1070	could need to be taken away */
1071	eentrysize = getExtendedMapInfoSize (&socket);
1072	esl << "mapextended "
1073	<< uint8 (extendedinfos)
1074	<< uint8 (eentrysize);
1075		1074
1076	estartlen = esl.length ();	1075	/* If the coordinates are not valid, or it is too dark to see,
1077	}	1076	* we tell the client as such
1078
1079	/* x,y are the real map locations. ax, ay are viewport relative
1080	* locations.
1081	*/	1077	*/
1082	ay = 0;	1078	if (!m)
1083
1084	/* We could do this logic as conditionals in the if statement,
1085	* but that started to get a bit messy to look at.
1086	*/
1087	max_x = ob->x + (socket.mapx + 1) / 2;
1088	max_y = ob->y + (socket.mapy + 1) / 2;
1089
1090	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1091	{	1079	{
1092	sint16 nx, ny;	1080	/* space is out of map. Update space and clear values
1093	maptile *m = 0;	1081	* if this hasn't already been done. If the space is out
1094		1082	* of the map, it shouldn't have a head.
1095	ax = 0;	1083	*/
1096	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	1084	if (lastcell.count != -1)
1097	{	1085	{
1098	// check to see if we can simply go one right quickly	1086	sl << uint16 (mask);
		1087	map_clearcell (&lastcell, -1);
1099	++nx;	1088	}
1100	if (m && nx >= m->width)	1089
		1090	continue;
		1091	}
		1092
		1093	int d = pl->blocked_los_uc (dx, dy);
		1094
		1095	if (d > 3)
		1096	{
		1097	/* This block deals with spaces that are not visible for whatever
		1098	* reason. Still may need to send the head for this space.
		1099	*/
		1100	if (lastcell.count != -1
		1101	|| lastcell.faces[0]
		1102	|| lastcell.faces[1]
		1103	|| lastcell.faces[2]
		1104	|| lastcell.stat_hp
		1105	|| lastcell.flags
		1106	|| lastcell.player)
		1107	sl << uint16 (mask);
		1108
		1109	/* properly clear a previously sent big face */
		1110	map_clearcell (&lastcell, -1);
		1111	}
		1112	else
		1113	{
		1114	/* In this block, the space is visible.
		1115	*/
		1116
		1117	/* Rather than try to figure out what everything that we might
		1118	* need to send is, then form the packet after that,
		1119	* we presume that we will in fact form a packet, and update
		1120	* the bits by what we do actually send. If we send nothing,
		1121	* we just back out sl.length () to the old value, and no harm
		1122	* is done.
		1123	* I think this is simpler than doing a bunch of checks to see
		1124	* what if anything we need to send, setting the bits, then
		1125	* doing those checks again to add the real data.
		1126	*/
		1127	oldlen = sl.length ();
		1128
		1129	sl << uint16 (mask);
		1130
		1131	unsigned char dummy;
		1132	unsigned char *last_ext = &dummy;
		1133
		1134	/* Darkness changed */
		1135	if (lastcell.count != d)
		1136	{
1101	m = 0;	1137	mask |= 0x8;
1102		1138
1103	if (!m)	1139	*last_ext |= 0x80;
		1140	last_ext = &sl[sl.length ()];
		1141	sl << uint8 (d);
		1142	}
		1143
		1144	lastcell.count = d;
		1145
		1146	mapspace &ms = m->at (nx, ny);
		1147	ms.update ();
		1148
		1149	// extmap handling
		1150	uint8 stat_hp = 0;
		1151	uint8 stat_width = 0;
		1152	uint8 flags = 0;
		1153	tag_t player = 0;
		1154
		1155	// send hp information, if applicable
		1156	if (object *op = ms.faces_obj [0])
		1157	if (op->is_head () && !op->invisible)
1104	{	1158	{
1105	nx = x; ny = y; m = plmap;	1159	if (op->stats.maxhp > op->stats.hp
1106		1160	&& op->stats.maxhp > 0
1107	if (!xy_normalise (m, nx, ny))	1161	&& (op->type == PLAYER
		1162	|| op->type == DOOR // does not work, have maxhp 0
		1163	|| QUERY_FLAG (op, FLAG_MONSTER)
		1164	|| QUERY_FLAG (op, FLAG_ALIVE)
		1165	|| QUERY_FLAG (op, FLAG_GENERATOR)))
1108	m = 0;	1166	{
		1167	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1168	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1169	}
		1170
		1171	if (expect_false (op->has_dialogue ()))
		1172	flags |= 1;
		1173
		1174	if (expect_false (op->type == PLAYER))
		1175	player = op == ob ? pl->ob->count
		1176	: op == pl->ob ? ob->count
		1177	: op->count;
1109	}	1178	}
1110		1179
1111	int emask, mask;	1180	if (expect_false (lastcell.stat_hp != stat_hp))
1112	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1113
1114	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1115
1116	/* If the coordinates are not valid, or it is too dark to see,
1117	* we tell the client as such
1118	*/
1119	if (!m)
1120	{	1181	{
1121	/* space is out of map. Update space and clear values	1182	lastcell.stat_hp = stat_hp;
1122	* if this hasn't already been done. If the space is out	1183
1123	* of the map, it shouldn't have a head	1184	mask |= 0x8;
1124	*/	1185	*last_ext |= 0x80;
1125	if (lastcell.count != -1)	1186	last_ext = &sl[sl.length ()];
		1187
		1188	sl << uint8 (5) << uint8 (stat_hp);
		1189
		1190	if (stat_width > 1)
1126	{	1191	{
1127	sl << uint16 (mask);
1128	map_clearcell (&lastcell, -1);
1129	}
1130
1131	continue;
1132	}
1133
1134	m->touch ();
1135
1136	int d = pl->blocked_los[ax][ay];
1137
1138	if (d > 3)
1139	{
1140
1141	int need_send = 0, count;
1142
1143	/* This block deals with spaces that are not visible for whatever
1144	* reason. Still may need to send the head for this space.
1145	*/
1146
1147	oldlen = sl.length ();
1148
1149	sl << uint16 (mask);
1150
1151	if (lastcell.count != -1)
1152	need_send = 1;
1153
1154	count = -1;
1155
1156	/* properly clear a previously sent big face */
1157	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1158	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1159	need_send = 1;
1160
1161	map_clearcell (&lastcell, count);
1162
1163	if ((mask & 0xf) || need_send)
1164	sl[oldlen + 1] = mask & 0xff;
1165	else
1166	sl.reset (oldlen);
1167	}
1168	else
1169	{
1170	/* In this block, the space is visible.
1171	*/
1172
1173	/* Rather than try to figure out what everything that we might
1174	* need to send is, then form the packet after that,
1175	* we presume that we will in fact form a packet, and update
1176	* the bits by what we do actually send. If we send nothing,
1177	* we just back out sl.length () to the old value, and no harm
1178	* is done.
1179	* I think this is simpler than doing a bunch of checks to see
1180	* what if anything we need to send, setting the bits, then
1181	* doing those checks again to add the real data.
1182	*/
1183	oldlen = sl.length ();
1184	eoldlen = esl.length ();
1185
1186	sl << uint16 (mask);
1187
1188	unsigned char dummy;
1189	unsigned char *last_ext = &dummy;
1190
1191	/* Darkness changed */
1192	if (lastcell.count != d && socket.darkness)
1193	{
1194	mask |= 0x8;
1195
1196	if (socket.extmap)
1197	{
1198	*last_ext |= 0x80;	1192	*last_ext |= 0x80;
1199	last_ext = &sl[sl.length ()];	1193	last_ext = &sl[sl.length ()];
1200	sl << uint8 (d);	1194
1201	}	1195	sl << uint8 (6) << uint8 (stat_width);
1202	else
1203	sl << uint8 (255 - 64 * d);
1204	}	1196	}
		1197	}
1205		1198
1206	lastcell.count = d;	1199	if (expect_false (lastcell.player != player))
1207
1208	mapspace &ms = m->at (nx, ny);
1209	ms.update ();
1210
1211	if (socket.extmap)
1212	{	1200	{
1213	uint8 stat_hp = 0;	1201	lastcell.player = player;
1214	uint8 stat_width = 0;
1215	uint8 flags = 0;
1216	tag_t player = 0;
1217		1202
1218	// send hp information, if applicable
1219	if (object *op = ms.faces_obj [0])
1220	{
1221	if (op->head || op->invisible)
1222	; // do not show
1223	else if (op->type == PLAYER
1224	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1225	{
1226	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1227	{
1228	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1229	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1230	}
1231	}
1232
1233	if (op->msg && op->msg[0] == '@')
1234	flags |= 1;
1235
1236	if (op->type == PLAYER && op != ob)
1237	player = op->count;
1238	}
1239
1240	if (lastcell.stat_hp != stat_hp)
1241	{
1242	lastcell.stat_hp = stat_hp;
1243
1244	mask |= 0x8;	1203	mask |= 0x8;
1245	*last_ext |= 0x80;	1204	*last_ext |= 0x80;
1246	last_ext = &sl[sl.length ()];	1205	last_ext = &sl[sl.length ()];
1247		1206
1248	sl << uint8 (5) << uint8 (stat_hp);
1249
1250	if (stat_width > 1)
1251	{
1252	*last_ext |= 0x80;
1253	last_ext = &sl[sl.length ()];
1254
1255	sl << uint8 (6) << uint8 (stat_width);
1256	}
1257	}
1258
1259	if (lastcell.player != player)
1260	{
1261	lastcell.player = player;
1262
1263	mask |= 0x8;
1264	*last_ext |= 0x80;
1265	last_ext = &sl[sl.length ()];
1266
1267	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1207	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1268	}	1208	}
1269		1209
1270	if (lastcell.flags != flags)	1210	if (expect_false (lastcell.flags != flags))
1271	{	1211	{
1272	lastcell.flags = flags;	1212	lastcell.flags = flags;
1273		1213
1274	mask |= 0x8;	1214	mask |= 0x8;
1275	*last_ext |= 0x80;	1215	*last_ext |= 0x80;
1276	last_ext = &sl[sl.length ()];	1216	last_ext = &sl[sl.length ()];
1277		1217
1278	sl << uint8 (8) << uint8 (flags);	1218	sl << uint8 (8) << uint8 (flags);
1279	}
1280	}	1219	}
1281		1220
		1221	// faces
		1222
1282	/* Floor face */	1223	/* Floor face */
1283	if (update_space (sl, socket, ms, lastcell, 2))	1224	if (update_space (sl, socket, ms, lastcell, 2))
1284	mask |= 0x4;	1225	mask |= 0x4;
1285		1226
1286	/* Middle face */	1227	/* Middle face */
1287	if (update_space (sl, socket, ms, lastcell, 1))	1228	if (update_space (sl, socket, ms, lastcell, 1))
1288	mask |= 0x2;	1229	mask |= 0x2;
1289		1230
		1231	if (expect_false (ob->invisible)
		1232	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1290	if (ms.player () == ob	1233	&& ms.player () == ob)
1291	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1292	{	1234	{
1293	// force player to be visible to himself if invisible	1235	// force player to be visible to himself if invisible
1294	if (lastcell.faces[0] != ob->face)	1236	if (lastcell.faces[0] != ob->face)
1295	{	1237	{
1296	lastcell.faces[0] = ob->face;	1238	lastcell.faces[0] = ob->face;
1297		1239
1298	mask |= 0x1;
1299	sl << uint16 (ob->face);
1300
1301	socket.send_faces (ob);
1302	}
1303	}
1304	/* Top face */
1305	else if (update_space (sl, socket, ms, lastcell, 0))
1306	mask |= 0x1;	1240	mask |= 0x1;
		1241	sl << uint16 (ob->face);
1307		1242
		1243	socket.send_faces (ob);
		1244	}
		1245	}
		1246	/* Top face */
		1247	else if (update_space (sl, socket, ms, lastcell, 0))
		1248	mask |= 0x1;
		1249
1308	/* Check to see if we are in fact sending anything for this	1250	/* Check to see if we are in fact sending anything for this
1309	* space by checking the mask. If so, update the mask.	1251	* space by checking the mask. If so, update the mask.
1310	* if not, reset the len to that from before adding the mask	1252	* if not, reset the len to that from before adding the mask
1311	* value, so we don't send those bits.	1253	* value, so we don't send those bits.
1312	*/	1254	*/
1313	if (mask & 0xf)	1255	if (mask & 0xf)
1314	sl[oldlen + 1] = mask & 0xff;	1256	sl[oldlen + 1] = mask & 0xff;
1315	else	1257	else
1316	sl.reset (oldlen);	1258	sl.reset (oldlen);
1317
1318	if (socket.ext_mapinfos)
1319	esl << uint16 (emask);
1320
1321	if (socket.EMI_smooth)
1322	{
1323	for (int layer = 2+1; layer--; )
1324	{
1325	object *ob = ms.faces_obj [layer];
1326
1327	// If there is no object for this space, or if the face for the object
1328	// is the blank face, set the smoothlevel to zero.
1329	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1330
1331	// We've gotten what face we want to use for the object. Now see if
1332	// if it has changed since we last sent it to the client.
1333	if (lastcell.smooth[layer] != smoothlevel)
1334	{
1335	lastcell.smooth[layer] = smoothlevel;
1336	esl << uint8 (smoothlevel);
1337	emask |= 1 << layer;
1338	}
1339	}
1340
1341	if (emask & 0xf)
1342	esl[eoldlen + 1] = emask & 0xff;
1343	else
1344	esl.reset (eoldlen);
1345	}
1346	} /* else this is a viewable space */	1259	} /* else this is a viewable space */
1347	} /* for x loop */	1260	ordered_mapwalk_end
1348	} /* for y loop */
1349		1261
1350	socket.flush_fx ();	1262	socket.flush_fx ();
1351
1352	/* Verify that we in fact do need to send this */
1353	if (socket.ext_mapinfos)
1354	{
1355	if (!(sl.length () > startlen || socket.sent_scroll))
1356	{
1357	/* No map data will follow, so don't say the client
1358	* it doesn't need draw!
1359	*/
1360	ewhatflag &= ~EMI_NOREDRAW;
1361	esl[ewhatstart + 1] = ewhatflag & 0xff;
1362	}
1363
1364	if (esl.length () > estartlen)
1365	socket.send_packet (esl);
1366	}
1367		1263
1368	if (sl.length () > startlen || socket.sent_scroll)	1264	if (sl.length () > startlen || socket.sent_scroll)
1369	{	1265	{
1370	socket.send_packet (sl);	1266	socket.send_packet (sl);
1371	socket.sent_scroll = 0;	1267	socket.sent_scroll = 0;
…		…
1382	{	1278	{
1383	pl->contr->ns->send_packet (buf);	1279	pl->contr->ns->send_packet (buf);
1384	}	1280	}
1385		1281
1386	/**	1282	/**
1387	* This sends the skill number to name mapping. We ignore
1388	* the params - we always send the same info no matter what.
1389	*/
1390	void
1391	send_skill_info (client *ns, char *params)
1392	{
1393	packet sl;
1394	sl << "replyinfo skill_info\n";
1395
1396	for (int i = 1; i < NUM_SKILLS; i++)
1397	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1398
1399	if (sl.length () >= MAXSOCKBUF)
1400	{
1401	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1402	fatal (0);
1403	}
1404
1405	ns->send_packet (sl);
1406	}
1407
1408	/**
1409	* This sends the spell path to name mapping. We ignore
1410	* the params - we always send the same info no matter what.
1411	*/
1412	void
1413	send_spell_paths (client * ns, char *params)
1414	{
1415	packet sl;
1416
1417	sl << "replyinfo spell_paths\n";
1418
1419	for (int i = 0; i < NRSPELLPATHS; i++)
1420	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1421
1422	if (sl.length () >= MAXSOCKBUF)
1423	{
1424	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1425	fatal (0);
1426	}
1427
1428	ns->send_packet (sl);
1429	}
1430
1431	/**
1432	* This looks for any spells the player may have that have changed their stats.	1283	* This looks for any spells the player may have that have changed their stats.
1433	* it then sends an updspell packet for each spell that has changed in this way	1284	* it then sends an updspell packet for each spell that has changed in this way
1434	*/	1285	*/
1435	void	1286	void
1436	esrv_update_spells (player *pl)	1287	esrv_update_spells (player *pl)
…		…
1446	if (spell->type == SPELL)	1297	if (spell->type == SPELL)
1447	{	1298	{
1448	int flags = 0;	1299	int flags = 0;
1449		1300
1450	/* check if we need to update it */	1301	/* check if we need to update it */
1451	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))
1452	{	1303	{
1453	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);
1454	flags |= UPD_SP_MANA;	1305	flags |= UPD_SP_MANA;
1455	}	1306	}
1456		1307
1457	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))
1458	{	1309	{
1459	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);
1460	flags |= UPD_SP_GRACE;	1311	flags |= UPD_SP_GRACE;
1461	}	1312	}
1462		1313
1463	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))
1464	{	1315	{
1465	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);
1466	flags |= UPD_SP_DAMAGE;	1317	flags |= UPD_SP_DAMAGE;
1467	}	1318	}
1468		1319
1469	if (flags)	1320	if (flags)
1470	{	1321	{
…		…
1472		1323
1473	sl << "updspell "	1324	sl << "updspell "
1474	<< uint8 (flags)	1325	<< uint8 (flags)
1475	<< uint32 (spell->count);	1326	<< uint32 (spell->count);
1476		1327
1477	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1328	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1478	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1329	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1479	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1330	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1480		1331
1481	pl->ns->send_packet (sl);	1332	pl->ns->send_packet (sl);
1482	}	1333	}
1483	}	1334	}
1484	}	1335	}
…		…
1514	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);
1515	return;	1366	return;
1516	}	1367	}
1517		1368
1518	/* 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 */
1519	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);
1520	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);
1521	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);
1522		1373
1523	/* figure out which skill it uses, if it uses one */	1374	/* figure out which skill it uses, if it uses one */
1524	if (spell->skill)	1375	if (spell->skill)
1525	{	1376	if (object *tmp = pl->find_skill (spell->skill))
1526	for (i = 1; i < NUM_SKILLS; i++)
1527	if (!strcmp (spell->skill, skill_names[i]))
1528	{
1529	skill = i + CS_STAT_SKILLINFO;	1377	skill = tmp->subtype + CS_STAT_SKILLINFO;
1530	break;
1531	}
1532	}
1533		1378
1534	// spells better have a face	1379	// spells better have a face
1535	if (!spell->face)	1380	if (!spell->face)
1536	{	1381	{
1537	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);
1538	spell->face = face_find ("burnout.x11", blank_face);	1383	spell->face = face_find ("burnout.x11", blank_face);
1539	}	1384	}
		1385
		1386	pl->ns->send_face (spell->face);
1540		1387
1541	/* send the current values */	1388	/* send the current values */
1542	sl << uint32 (spell->count)	1389	sl << uint32 (spell->count)
1543	<< uint16 (spell->level)	1390	<< uint16 (spell->level)
1544	<< uint16 (spell->casting_time)	1391	<< uint16 (spell->casting_time)
1545	<< uint16 (spell->last_sp)	1392	<< uint16 (spell->cached_sp)
1546	<< uint16 (spell->last_grace)	1393	<< uint16 (spell->cached_grace)
1547	<< uint16 (spell->last_eat)	1394	<< uint16 (spell->cached_eat)
1548	<< uint8 (skill)	1395	<< uint8 (skill)
1549	<< uint32 (spell->path_attuned)	1396	<< uint32 (spell->path_attuned)
1550	<< uint32 (spell->face)	1397	<< uint32 (spell->face)
1551	<< data8 (spell->name)	1398	<< data8 (spell->name)
1552	<< data16 (spell->msg);	1399	<< data16 (spell->msg);
…		…
1580	* 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
1581	* 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,
1582	* 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,
1583	* 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
1584	*/	1431	*/
		1432	if (spell->type != SPELL)
		1433	continue;
		1434
1585	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1435	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1586	* 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
1587	* 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
1588	* like it will fix this	1438	* like it will fix this
1589	*/	1439	*/
1590	if (spell->type != SPELL)
1591	continue;
1592
1593	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))))
1594	{	1441	{
		1442	pl->ns->flush_fx ();
1595	pl->ns->send_packet (sl);	1443	pl->ns->send_packet (sl);
1596		1444
1597	sl.reset ();	1445	sl.reset ();
1598	sl << "addspell ";	1446	sl << "addspell ";
1599	}	1447	}
…		…
1607	return;	1455	return;
1608	}	1456	}
1609	else	1457	else
1610	append_spell (pl, sl, spell);	1458	append_spell (pl, sl, spell);
1611		1459
1612	if (sl.length () >= MAXSOCKBUF)	1460	if (sl.length () > MAXSOCKBUF)
1613	{	1461	{
1614	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1462	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1615	fatal (0);	1463	fatal (0);
1616	}	1464	}
1617		1465
1618	/* finally, we can send the packet */	1466	/* finally, we can send the packet */
		1467	pl->ns->flush_fx ();
1619	pl->ns->send_packet (sl);	1468	pl->ns->send_packet (sl);
1620	}	1469	}
1621		1470
		1471	//-GPL
		1472

Diff Legend

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