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.105 by root, Wed Jun 6 17:22:55 2007 UTC vs.
Revision 1.164 by root, Fri Mar 26 00:59:22 2010 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 Mark Wedel
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 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;
		222	}
192		223
193	region *reg = ob->region ();	224	/**
194	if (socket.current_region != reg)	225	* This sends the skill number to name mapping. We ignore
195	{	226	* the params - we always send the same info no matter what.
196	socket.current_region = reg;	227	*/
197	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);	228	static 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)
198	}	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	static 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);
199	}	267	}
200		268
201	/**	269	/**
202	* RequestInfo is sort of a meta command. There is some specific	270	* RequestInfo is sort of a meta command. There is some specific
203	* request of information, but we call other functions to provide	271	* request of information, but we call other functions to provide
204	* that information.	272	* that information.
205	*/	273	*/
206	void	274	void
207	RequestInfo (char *buf, int len, client * ns)	275	RequestInfo (char *buf, int len, client *ns)
208	{	276	{
209	char *params = NULL, *cp;	277	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		278
222	/* find the first space, make it null, and update the	279	/* find the first space, make it null, and update the
223	* params pointer.	280	* params pointer.
224	*/	281	*/
225	for (cp = buf; *cp != '\0'; cp++)	282	for (params = buf; *params; params++)
226	if (*cp == ' ')	283	if (*params == ' ')
227	{	284	{
228	*cp = '\0';
229	params = cp + 1;	285	*params++ = 0;
230	break;	286	break;
231	}	287	}
232		288
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"))	289	if (!strcmp (buf, "skill_info"))
238	send_skill_info (ns, params);	290	send_skill_info (ns, params);
239	else if (!strcmp (buf, "spell_paths"))	291	else if (!strcmp (buf, "spell_paths"))
240	send_spell_paths (ns, params);	292	send_spell_paths (ns, params);
241	else	293	else
242	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	}
243	}	301	}
244		302
245	void	303	void
246	ExtCmd (char *buf, int len, player *pl)	304	ExtCmd (char *buf, int len, player *pl)
247	{	305	{
…		…
250		308
251	void	309	void
252	ExtiCmd (char *buf, int len, client *ns)	310	ExtiCmd (char *buf, int len, client *ns)
253	{	311	{
254	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;
255	}	401	}
256		402
257	void	403	void
258	MapInfoCmd (char *buf, int len, player *pl)	404	MapInfoCmd (char *buf, int len, player *pl)
259	{	405	{
260	// <mapinfo tag spatial tile-path	406	// <mapinfo tag spatial tile-path
261	// >mapinfo tag spatial flags x y w h hash	407	// >mapinfo tag spatial flags x y w h hash
262		408
263	char bigbuf[MAX_BUF], *token;
264
265	token = buf;	409	char *token = buf;
266	// copy token	410
267	if (!(buf = strchr (buf, ' ')))	411	if (!(buf = strchr (buf, ' ')))
268	return;	412	return;
269		413
270	*buf++ = 0;
271
272	if (!strncmp (buf, "spatial ", 8))	414	if (!strncmp (buf, " spatial ", 9))
273	{	415	{
274	buf += 8;	416	char *copy = strdup (token);
		417	copy [buf - token] = 0;
275		418
276	// initial map and its origin	419	#if 0
277	maptile *map = pl->ob->map;	420	// this makes only sense when we flush the buffer immediately
278	sint16 dx, dy;	421	if (pl->ns->mapinfo_try (copy))
279	int mapx = pl->ns->mapx / 2 - pl->ob->x;	422	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	423	else
332	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	424	#endif
		425	pl->ns->mapinfo_queue.push_back (copy);
333	}	426	}
334	else	427	else
335	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	428	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
336
337	pl->ns->send_packet (bigbuf);
338	}	429	}
339		430
340	/** This is the Setup cmd */	431	/** This is the Setup cmd */
341	void	432	void
342	SetUp (char *buf, int len, client * ns)	433	SetUp (char *buf, int len, client * ns)
…		…
354	AddMeCmd (char *buf, int len, client *ns)	445	AddMeCmd (char *buf, int len, client *ns)
355	{	446	{
356	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	447	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
357	}	448	}
358		449
359	/** Reply to ExtendedInfos command */	450	//+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		451
412	/*	452	/*
413	#define MSG_TYPE_BOOK 1	453	#define MSG_TYPE_BOOK 1
414	#define MSG_TYPE_CARD 2	454	#define MSG_TYPE_CARD 2
415	#define MSG_TYPE_PAPER 3	455	#define MSG_TYPE_PAPER 3
…		…
432	while (1)	472	while (1)
433	{	473	{
434	/* 1. Extract an info */	474	/* 1. Extract an info */
435	info = nextinfo;	475	info = nextinfo;
436		476
437	while ((info < len) && (buf[info] == ' '))	477	while ((info < len) && (buf [info] == ' '))
438	info++;	478	info++;
439		479
440	if (info >= len)	480	if (info >= len)
441	break;	481	break;
442		482
443	nextinfo = info + 1;	483	nextinfo = info + 1;
444		484
445	while ((nextinfo < len) && (buf[nextinfo] != ' '))	485	while ((nextinfo < len) && (buf [nextinfo] != ' '))
446	nextinfo++;	486	nextinfo++;
447		487
448	if (nextinfo - info >= 49) /*Erroneous info asked */	488	if (nextinfo - info >= 49) /*Erroneous info asked */
449	continue;	489	continue;
450		490
451	strncpy (command, &(buf[info]), nextinfo - info);	491	memcpy (command, buf + info, nextinfo - info);
452	command[nextinfo - info] = '\0';	492	command [nextinfo - info] = 0;
		493
453	/* 2. Interpret info */	494	/* 2. Interpret info */
454	i = sscanf (command, "%d", &flag);	495	i = sscanf (command, "%d", &flag);
455		496
456	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	497	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
457	ns->supported_readables |= (1 << flag);	498	ns->supported_readables |= (1 << flag);
…		…
471		512
472	ns->send_packet (cmdback);	513	ns->send_packet (cmdback);
473	}	514	}
474		515
475	/**	516	/**
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,	517	* This handles the general commands from the client (ie, north, fire, cast,
498	* etc.)	518	* etc.)
499	*/	519	*/
500	void	520	void
501	PlayerCmd (char *buf, int len, player *pl)	521	PlayerCmd (char *buf, int len, player *pl)
…		…
512	return;	532	return;
513		533
514	buf++;	534	buf++;
515	}	535	}
516		536
517	execute_newserver_command (pl->ob, (char *) buf);	537	execute_newserver_command (pl->ob, (char *)buf);
518		538
519	/* Perhaps something better should be done with a left over count.	539	/* Perhaps something better should be done with a left over count.
520	* Cleaning up the input should probably be done first - all actions	540	* 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	541	* for the command that issued the count should be done before any other
522	* commands.	542	* commands.
…		…
533	void	553	void
534	NewPlayerCmd (char *buf, int len, player *pl)	554	NewPlayerCmd (char *buf, int len, player *pl)
535	{	555	{
536	if (len <= 6)	556	if (len <= 6)
537	{	557	{
538	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);
539	return;	559	return;
540	}	560	}
541		561
542	uint16 cmdid = net_uint16 ((uint8 *)buf);	562	uint16 cmdid = net_uint16 ((uint8 *)buf);
543	sint32 repeat = net_sint32 ((uint8 *)buf + 2);	563	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
…		…
556	* commands.	576	* commands.
557	*/	577	*/
558	pl->count = 0;	578	pl->count = 0;
559		579
560	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	580	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
561	int time = fabs (pl->ob->speed) < 0.001	581	int time = pl->ob->has_active_speed ()
562	? time = MAX_TIME * 100
563	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	582	? (int) (MAX_TIME / pl->ob->speed)
		583	: MAX_TIME * 100;
564		584
565	/* Send confirmation of command execution now */	585	/* Send confirmation of command execution now */
566	packet sl ("comc");	586	packet sl ("comc");
567	sl << uint16 (cmdid) << uint32 (time);	587	sl << uint16 (cmdid) << uint32 (time);
568	pl->ns->send_packet (sl);	588	pl->ns->send_packet (sl);
…		…
681	* syntax is: move (to) (tag) (nrof)	701	* syntax is: move (to) (tag) (nrof)
682	*/	702	*/
683	void	703	void
684	MoveCmd (char *buf, int len, player *pl)	704	MoveCmd (char *buf, int len, player *pl)
685	{	705	{
686	int vals[3], i;	706	int to, tag, nrof;
687		707
688	/* A little funky here. We only cycle for 2 records, because	708	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
689	* we obviously are not going to find a space after the third
690	* record. Perhaps we should just replace this with a
691	* sscanf?
692	*/
693	for (i = 0; i < 2; i++)
694	{	709	{
695	vals[i] = atoi (buf);
696
697	if (!(buf = strchr (buf, ' ')))
698	{
699	LOG (llevError, "Incomplete move command: %s\n", buf);	710	LOG (llevError, "Incomplete move command: %s\n", buf);
700	return;	711	return;
701	}
702
703	buf++;
704	}	712	}
705		713
706	vals[2] = atoi (buf);	714	esrv_move_object (pl->ob, to, tag, nrof);
707
708	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
709	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
710	}	715	}
711		716
712	/******************************************************************************	717	/******************************************************************************
713	*	718	*
714	* Start of commands the server sends to the client.	719	* Start of commands the server sends to the client.
…		…
729	* Get player's current range attack in obuf.	734	* Get player's current range attack in obuf.
730	*/	735	*/
731	static void	736	static void
732	rangetostring (player *pl, char *obuf)	737	rangetostring (player *pl, char *obuf)
733	{	738	{
734	dynbuf_text buf;	739	dynbuf_text &buf = msg_dynbuf; buf.clear ();
735
736	if (pl->observe->contr)
737	pl = pl->observe->contr;
738		740
739	if (pl->ranged_ob)	741	if (pl->ranged_ob)
740	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;
741		743
742	if (pl->combat_ob)	744	if (pl->combat_ob)
…		…
750		752
751	//TODO: maybe golem should become the current_weapon, quite simply?	753	//TODO: maybe golem should become the current_weapon, quite simply?
752	if (pl->golem)	754	if (pl->golem)
753	buf << " Golem*: " << pl->golem->name;	755	buf << " Golem*: " << pl->golem->name;
754		756
		757	buf << '\0';
755	buf.linearise (obuf);	758	buf.linearise (obuf);
756	obuf [buf.size ()] = 0;
757	}	759	}
758		760
759	#define AddIfInt64(Old,New,Type) if (Old != New) {\	761	#define AddIfInt64(Old,New,Type) if (Old != New) {\
760	Old = New; \	762	Old = New; \
761	sl << uint8 (Type) << uint64 (New); \	763	sl << uint8 (Type) << uint64 (New); \
…		…
798	return;	800	return;
799		801
800	object *ob = pl->observe;	802	object *ob = pl->observe;
801	if (!ob)	803	if (!ob)
802	return;	804	return;
		805
		806	player *opl = ob->contr ? static_cast<player *>(ob->contr) : pl;
803		807
804	packet sl ("stats");	808	packet sl ("stats");
805		809
806	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);	810	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
807	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);	811	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
…		…
816	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
817	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
818	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
819		823
820	for (int s = 0; s < NUM_SKILLS; s++)	824	for (int s = 0; s < NUM_SKILLS; s++)
821	if (object *skill = pl->last_skill_ob[s])	825	if (object *skill = opl->last_skill_ob [s])
822	if (skill->stats.exp != ns->last_skill_exp [s])	826	if (skill->stats.exp != ns->last_skill_exp [s])
823	{	827	{
824	ns->last_skill_exp [s] = skill->stats.exp;	828	ns->last_skill_exp [s] = skill->stats.exp;
825		829
826	/* Always send along the level if exp changes. This is only	830	/* Always send along the level if exp changes. This is only
…		…
834	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	838	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
835	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	839	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
836	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	840	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
837	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	841	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
838	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	842	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
839	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	843	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
840	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	844	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
841	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	845	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
842	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	846	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
843		847
844	flags = 0;	848	flags = 0;
845		849
846	if (pl->fire_on)	850	if (opl->fire_on)
847	flags |= SF_FIREON;	851	flags |= SF_FIREON;
848		852
849	if (pl->run_on)	853	if (opl->run_on)
850	flags |= SF_RUNON;	854	flags |= SF_RUNON;
851		855
852	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	856	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
853		857
854	if (ns->sc_version < 1025)
855	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
856	else
857	for (int i = 0; i < NROFATTACKS; i++)	858	for (int i = 0; i < NROFATTACKS; i++)
858	{	859	{
859	/* Skip ones we won't send */	860	/* Skip ones we won't send */
860	if (atnr_cs_stat[i] == -1)	861	if (atnr_cs_stat[i] == -1)
861	continue;	862	continue;
862		863
863	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	864	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
864	}	865	}
865		866
866	if (pl->ns->monitor_spells)	867	if (pl->ns->monitor_spells)
867	{	868	{
868	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	869	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
869	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	870	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
870	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	871	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
871	}	872	}
872		873
873	rangetostring (pl, buf); /* we want use the new fire & run system in new client */	874	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
874	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	875	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
875	set_title (ob, buf);	876	set_title (ob, buf);
876	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	877	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
877		878
878	/* Only send it away if we have some actual data */	879	/* Only send it away if we have some actual data */
…		…
882		883
883	/**	884	/**
884	* Tells the client that here is a player it should start using.	885	* Tells the client that here is a player it should start using.
885	*/	886	*/
886	void	887	void
887	esrv_new_player (player *pl, uint32 weight)	888	esrv_new_player (player *pl)
888	{	889	{
		890	sint32 weight = pl->ob->client_weight ();
		891
889	packet sl ("player");	892	packet sl ("player");
890		893
891	sl << uint32 (pl->ob->count)	894	sl << uint32 (pl->ob->count)
892	<< uint32 (weight)	895	<< uint32 (weight)
893	<< uint32 (pl->ob->face)	896	<< uint32 (pl->ob->face)
894	<< data8 (pl->ob->name);	897	<< data8 (pl->ob->name);
895		898
896	pl->ns->last_weight = weight;	899	pl->ns->last_weight = weight;
897	pl->ns->send_packet (sl);	900	pl->ns->send_packet (sl);
898	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
899	}	901	}
900		902
901	/******************************************************************************	903	/******************************************************************************
902	*	904	*
903	* Start of map related commands.	905	* Start of map related commands.
…		…
960		962
961	if (!ns.faces_sent[face_num])	963	if (!ns.faces_sent[face_num])
962	if (ob)	964	if (ob)
963	ns.send_faces (ob);	965	ns.send_faces (ob);
964	else	966	else
965	ns.send_face (face_num);	967	ns.send_face (face_num, 10);
966		968
967	sl << uint16 (face_num);	969	sl << uint16 (face_num);
968	return 1;	970	return 1;
969	}	971	}
970		972
971	/* Nothing changed */	973	/* Nothing changed */
972	return 0;	974	return 0;
973	}	975	}
974		976
975	/**	977	//-GPL
976	* Returns the size of a data for a map square as returned by
977	* mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
978	* available.
979	*/
980	int
981	getExtendedMapInfoSize (client * ns)
982	{
983	int result = 0;
984
985	if (ns->ext_mapinfos)
986	{
987	if (ns->EMI_smooth)
988	result += 1; /*One byte for smoothlevel */
989	}
990
991	return result;
992	}
993		978
994	// prefetch (and touch) all maps within a specific distancd	979	// prefetch (and touch) all maps within a specific distancd
995	static void	980	static void
996	prefetch_surrounding_maps (maptile *map, int distance)	981	prefetch_surrounding_maps (maptile *map, int distance)
997	{	982	{
998	map->last_access = runtime;	983	map->touch ();
999		984
1000	if (--distance)	985	if (--distance)
1001	for (int dir = 4; --dir; )	986	for (int dir = 4; dir--; )
1002	if (const shstr &path = map->tile_path [dir])	987	if (const shstr &path = map->tile_path [dir])
1003	if (maptile *&neigh = map->tile_map [dir])	988	if (maptile *&neigh = map->tile_map [dir])
1004	prefetch_surrounding_maps (neigh, distance);	989	prefetch_surrounding_maps (neigh, distance);
1005	else	990	else
1006	neigh = maptile::find_async (path, map);	991	neigh = maptile::find_async (path, map);
…		…
1011	prefetch_surrounding_maps (object *op)	996	prefetch_surrounding_maps (object *op)
1012	{	997	{
1013	prefetch_surrounding_maps (op->map, 3);	998	prefetch_surrounding_maps (op->map, 3);
1014	}	999	}
1015		1000
		1001	//+GPL
		1002
1016	/**	1003	/**
1017	* Draws client map.	1004	* Draws client map.
1018	*/	1005	*/
1019	void	1006	void
1020	draw_client_map (player *pl)	1007	draw_client_map (player *pl)
1021	{	1008	{
1022	object *ob = pl->observe;	1009	object *ob = pl->viewpoint;
1023	if (!ob->active)	1010	if (!pl->observe->active)
1024	return;	1011	return;
1025
1026	maptile *plmap = ob->map;
1027		1012
1028	/* If player is just joining the game, he isn't here yet, so the map	1013	/* If player is just joining the game, he isn't here yet, so the map
1029	* can get swapped out. If so, don't try to send them a map. All will	1014	* can get swapped out. If so, don't try to send them a map. All will
1030	* be OK once they really log in.	1015	* be OK once they really log in.
1031	*/	1016	*/
1032	if (!plmap || plmap->in_memory != MAP_IN_MEMORY)	1017	if (!ob->map || ob->map->in_memory != MAP_ACTIVE)
1033	return;	1018	return;
1034		1019
1035	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1036	sint16 nx, ny;
1037	int estartlen, eoldlen;	1020	int startlen, oldlen;
1038	uint8 eentrysize;
1039	uint16 ewhatstart, ewhatflag;
1040	uint8 extendedinfos;
1041	maptile *m;
1042		1021
1043	check_map_change (pl);	1022	check_map_change (pl);
1044	prefetch_surrounding_maps (pl->ob);	1023	prefetch_surrounding_maps (pl->ob);
1045		1024
1046	/* do LOS after calls to update_position */	1025	/* do LOS after calls to update_position */
1047	if (ob != pl->ob)	1026	/* unfortunately, we need to udpate los when observing, currently */
1048	clear_los (pl);	1027	if (pl->do_los || pl->viewpoint != pl->ob)
1049	else if (pl->do_los)
1050	{	1028	{
1051	update_los (ob);
1052	pl->do_los = 0;	1029	pl->do_los = 0;
		1030	pl->update_los ();
1053	}	1031	}
1054		1032
1055	/**	1033	/**
1056	* This function uses the new map1 protocol command to send the map	1034	* This function uses the new map1 protocol command to send the map
1057	* to the client. It is necessary because the old map command supports	1035	* to the client. It is necessary because the old map command supports
…		…
1076	*/	1054	*/
1077		1055
1078	client &socket = *pl->ns;	1056	client &socket = *pl->ns;
1079		1057
1080	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1058	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1081	packet esl;
1082		1059
1083	startlen = sl.length ();	1060	startlen = sl.length ();
1084		1061
1085	/*Extendedmapinfo structure initialisation */	1062	int hx = socket.mapx / 2;
1086	if (socket.ext_mapinfos)	1063	int hy = socket.mapy / 2;
1087	{
1088	extendedinfos = EMI_NOREDRAW;
1089		1064
1090	if (socket.EMI_smooth)	1065	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1091	extendedinfos |= EMI_SMOOTH;	1066	int ax = dx + hx;
		1067	int ay = dy + hy;
1092		1068
1093	ewhatstart = esl.length ();	1069	int mask = (ax << 10) | (ay << 4);
1094	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1095	could need to be taken away */
1096	eentrysize = getExtendedMapInfoSize (&socket);
1097	esl << "mapextended "
1098	<< uint8 (extendedinfos)
1099	<< uint8 (eentrysize);
1100
1101	estartlen = esl.length ();
1102	}
1103
1104	/* x,y are the real map locations. ax, ay are viewport relative
1105	* locations.
1106	*/
1107	ay = 0;
1108
1109	/* We could do this logic as conditionals in the if statement,
1110	* but that started to get a bit messy to look at.
1111	*/
1112	max_x = ob->x + (socket.mapx + 1) / 2;
1113	max_y = ob->y + (socket.mapy + 1) / 2;
1114
1115	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1116	{
1117	ax = 0;
1118	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1119	{
1120	int emask, mask;
1121	emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
1122
1123	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1070	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1124		1071
1125	/* If the coordinates are not valid, or it is too dark to see,	1072	/* If the coordinates are not valid, or it is too dark to see,
1126	* we tell the client as such	1073	* we tell the client as such
		1074	*/
		1075	if (!m)
		1076	{
		1077	/* space is out of map. Update space and clear values
		1078	* if this hasn't already been done. If the space is out
		1079	* of the map, it shouldn't have a head.
1127	*/	1080	*/
1128	nx = x;	1081	if (lastcell.count != -1)
1129	ny = y;	1082	{
1130	m = get_map_from_coord (plmap, &nx, &ny);	1083	sl << uint16 (mask);
		1084	map_clearcell (&lastcell, -1);
		1085	}
1131		1086
1132	if (!m)	1087	continue;
		1088	}
		1089
		1090	int d = pl->blocked_los_uc (dx, dy);
		1091
		1092	if (d > 3)
		1093	{
		1094	/* This block deals with spaces that are not visible for whatever
		1095	* reason. Still may need to send the head for this space.
		1096	*/
		1097	if (lastcell.count != -1
		1098	|| lastcell.faces[0]
		1099	|| lastcell.faces[1]
		1100	|| lastcell.faces[2]
		1101	|| lastcell.stat_hp
		1102	|| lastcell.flags
		1103	|| lastcell.player)
		1104	sl << uint16 (mask);
		1105
		1106	/* properly clear a previously sent big face */
		1107	map_clearcell (&lastcell, -1);
		1108	}
		1109	else
		1110	{
		1111	/* In this block, the space is visible.
		1112	*/
		1113
		1114	/* Rather than try to figure out what everything that we might
		1115	* need to send is, then form the packet after that,
		1116	* we presume that we will in fact form a packet, and update
		1117	* the bits by what we do actually send. If we send nothing,
		1118	* we just back out sl.length () to the old value, and no harm
		1119	* is done.
		1120	* I think this is simpler than doing a bunch of checks to see
		1121	* what if anything we need to send, setting the bits, then
		1122	* doing those checks again to add the real data.
		1123	*/
		1124	oldlen = sl.length ();
		1125
		1126	sl << uint16 (mask);
		1127
		1128	unsigned char dummy;
		1129	unsigned char *last_ext = &dummy;
		1130
		1131	/* Darkness changed */
		1132	if (lastcell.count != d)
		1133	{
		1134	mask |= 0x8;
		1135
		1136	*last_ext |= 0x80;
		1137	last_ext = &sl[sl.length ()];
		1138	sl << uint8 (d);
		1139	}
		1140
		1141	lastcell.count = d;
		1142
		1143	mapspace &ms = m->at (nx, ny);
		1144	ms.update ();
		1145
		1146	// extmap handling
		1147	uint8 stat_hp = 0;
		1148	uint8 stat_width = 0;
		1149	uint8 flags = 0;
		1150	tag_t player = 0;
		1151
		1152	// send hp information, if applicable
		1153	if (object *op = ms.faces_obj [0])
		1154	if (op->is_head () && !op->invisible)
1133	{	1155	{
1134	/* space is out of map. Update space and clear values	1156	if (op->stats.maxhp > op->stats.hp
1135	* if this hasn't already been done. If the space is out	1157	&& op->stats.maxhp > 0
1136	* of the map, it shouldn't have a head	1158	&& (op->type == PLAYER
1137	*/	1159	|| op->type == DOOR // does not work, have maxhp 0
1138	if (lastcell.count != -1)	1160	|| QUERY_FLAG (op, FLAG_MONSTER)
		1161	|| QUERY_FLAG (op, FLAG_ALIVE)
		1162	|| QUERY_FLAG (op, FLAG_GENERATOR)))
1139	{	1163	{
1140	sl << uint16 (mask);	1164	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1141	map_clearcell (&lastcell, -1);	1165	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1142	}	1166	}
1143		1167
1144	continue;	1168	if (expect_false (op->has_dialogue ()))
		1169	flags |= 1;
		1170
		1171	if (expect_false (op->type == PLAYER))
		1172	player = op == ob ? pl->ob->count
		1173	: op == pl->ob ? ob->count
		1174	: op->count;
1145	}	1175	}
1146
1147	m->touch ();
1148		1176
1149	int d = pl->blocked_los[ax][ay];	1177	if (expect_false (lastcell.stat_hp != stat_hp))
1150
1151	if (d > 3)
1152	{	1178	{
		1179	lastcell.stat_hp = stat_hp;
1153		1180
1154	int need_send = 0, count;	1181	mask |= 0x8;
		1182	*last_ext |= 0x80;
		1183	last_ext = &sl[sl.length ()];
1155		1184
1156	/* This block deals with spaces that are not visible for whatever	1185	sl << uint8 (5) << uint8 (stat_hp);
1157	* reason. Still may need to send the head for this space.
1158	*/
1159		1186
1160	oldlen = sl.length ();	1187	if (stat_width > 1)
1161
1162	sl << uint16 (mask);
1163
1164	if (lastcell.count != -1)
1165	need_send = 1;
1166
1167	count = -1;
1168
1169	/* properly clear a previously sent big face */
1170	if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
1171	|| lastcell.stat_hp || lastcell.flags || lastcell.player)
1172	need_send = 1;
1173
1174	map_clearcell (&lastcell, count);
1175
1176	if ((mask & 0xf) || need_send)
1177	sl[oldlen + 1] = mask & 0xff;
1178	else
1179	sl.reset (oldlen);
1180	}
1181	else
1182	{
1183	/* In this block, the space is visible.
1184	*/
1185
1186	/* Rather than try to figure out what everything that we might
1187	* need to send is, then form the packet after that,
1188	* we presume that we will in fact form a packet, and update
1189	* the bits by what we do actually send. If we send nothing,
1190	* we just back out sl.length () to the old value, and no harm
1191	* is done.
1192	* I think this is simpler than doing a bunch of checks to see
1193	* what if anything we need to send, setting the bits, then
1194	* doing those checks again to add the real data.
1195	*/
1196	oldlen = sl.length ();
1197	eoldlen = esl.length ();
1198
1199	sl << uint16 (mask);
1200
1201	unsigned char dummy;
1202	unsigned char *last_ext = &dummy;
1203
1204	/* Darkness changed */
1205	if (lastcell.count != d && socket.darkness)
1206	{	1188	{
1207	mask |= 0x8;
1208
1209	if (socket.extmap)
1210	{
1211	*last_ext |= 0x80;	1189	*last_ext |= 0x80;
1212	last_ext = &sl[sl.length ()];	1190	last_ext = &sl[sl.length ()];
1213	sl << uint8 (d);	1191
1214	}	1192	sl << uint8 (6) << uint8 (stat_width);
1215	else
1216	sl << uint8 (255 - 64 * d);
1217	}	1193	}
		1194	}
1218		1195
1219	lastcell.count = d;	1196	if (expect_false (lastcell.player != player))
1220
1221	mapspace &ms = m->at (nx, ny);
1222
1223	if (socket.extmap)
1224	{	1197	{
1225	uint8 stat_hp = 0;	1198	lastcell.player = player;
1226	uint8 stat_width = 0;
1227	uint8 flags = 0;
1228	tag_t player = 0;
1229		1199
1230	// send hp information, if applicable
1231	if (object *op = ms.faces_obj [0])
1232	{
1233	if (op->head || op->invisible)
1234	; // do not show
1235	else if (op->type == PLAYER
1236	|| QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
1237	{
1238	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1239	{
1240	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1241	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1242	}
1243	}
1244
1245	if (op->msg && op->msg[0] == '@')
1246	flags |= 1;
1247
1248	if (op->type == PLAYER && op != ob)
1249	player = op->count;
1250	}
1251
1252	if (lastcell.stat_hp != stat_hp)
1253	{
1254	lastcell.stat_hp = stat_hp;
1255
1256	mask |= 0x8;	1200	mask |= 0x8;
1257	*last_ext |= 0x80;	1201	*last_ext |= 0x80;
1258	last_ext = &sl[sl.length ()];	1202	last_ext = &sl[sl.length ()];
1259		1203
1260	sl << uint8 (5) << uint8 (stat_hp);
1261
1262	if (stat_width > 1)
1263	{
1264	*last_ext |= 0x80;
1265	last_ext = &sl[sl.length ()];
1266
1267	sl << uint8 (6) << uint8 (stat_width);
1268	}
1269	}
1270
1271	if (lastcell.player != player)
1272	{
1273	lastcell.player = player;
1274
1275	mask |= 0x8;
1276	*last_ext |= 0x80;
1277	last_ext = &sl[sl.length ()];
1278
1279	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1204	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1280	}	1205	}
1281		1206
1282	if (lastcell.flags != flags)	1207	if (expect_false (lastcell.flags != flags))
1283	{	1208	{
1284	lastcell.flags = flags;	1209	lastcell.flags = flags;
1285		1210
1286	mask |= 0x8;	1211	mask |= 0x8;
1287	*last_ext |= 0x80;	1212	*last_ext |= 0x80;
1288	last_ext = &sl[sl.length ()];	1213	last_ext = &sl[sl.length ()];
1289		1214
1290	sl << uint8 (8) << uint8 (flags);	1215	sl << uint8 (8) << uint8 (flags);
1291	}
1292	}	1216	}
1293		1217
		1218	// faces
		1219
1294	/* Floor face */	1220	/* Floor face */
1295	if (update_space (sl, socket, ms, lastcell, 2))	1221	if (update_space (sl, socket, ms, lastcell, 2))
1296	mask |= 0x4;	1222	mask |= 0x4;
1297		1223
1298	/* Middle face */	1224	/* Middle face */
1299	if (update_space (sl, socket, ms, lastcell, 1))	1225	if (update_space (sl, socket, ms, lastcell, 1))
1300	mask |= 0x2;	1226	mask |= 0x2;
1301		1227
		1228	if (expect_false (ob->invisible)
		1229	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1302	if (ms.player () == ob	1230	&& ms.player () == ob)
1303	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1304	{	1231	{
1305	// force player to be visible to himself if invisible	1232	// force player to be visible to himself if invisible
1306	if (lastcell.faces[0] != ob->face)	1233	if (lastcell.faces[0] != ob->face)
1307	{	1234	{
1308	lastcell.faces[0] = ob->face;	1235	lastcell.faces[0] = ob->face;
1309		1236
1310	mask |= 0x1;
1311	sl << uint16 (ob->face);
1312
1313	socket.send_faces (ob);
1314	}
1315	}
1316	/* Top face */
1317	else if (update_space (sl, socket, ms, lastcell, 0))
1318	mask |= 0x1;	1237	mask |= 0x1;
		1238	sl << uint16 (ob->face);
1319		1239
		1240	socket.send_faces (ob);
		1241	}
		1242	}
		1243	/* Top face */
		1244	else if (update_space (sl, socket, ms, lastcell, 0))
		1245	mask |= 0x1;
		1246
1320	/* Check to see if we are in fact sending anything for this	1247	/* Check to see if we are in fact sending anything for this
1321	* space by checking the mask. If so, update the mask.	1248	* space by checking the mask. If so, update the mask.
1322	* if not, reset the len to that from before adding the mask	1249	* if not, reset the len to that from before adding the mask
1323	* value, so we don't send those bits.	1250	* value, so we don't send those bits.
1324	*/	1251	*/
1325	if (mask & 0xf)	1252	if (mask & 0xf)
1326	sl[oldlen + 1] = mask & 0xff;	1253	sl[oldlen + 1] = mask & 0xff;
1327	else	1254	else
1328	sl.reset (oldlen);	1255	sl.reset (oldlen);
1329
1330	if (socket.ext_mapinfos)
1331	esl << uint16 (emask);
1332
1333	if (socket.EMI_smooth)
1334	{
1335	for (int layer = 2+1; layer--; )
1336	{
1337	object *ob = ms.faces_obj [layer];
1338
1339	// If there is no object for this space, or if the face for the object
1340	// is the blank face, set the smoothlevel to zero.
1341	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1342
1343	// We've gotten what face we want to use for the object. Now see if
1344	// if it has changed since we last sent it to the client.
1345	if (lastcell.smooth[layer] != smoothlevel)
1346	{
1347	lastcell.smooth[layer] = smoothlevel;
1348	esl << uint8 (smoothlevel);
1349	emask |= 1 << layer;
1350	}
1351	}
1352
1353	if (emask & 0xf)
1354	esl[eoldlen + 1] = emask & 0xff;
1355	else
1356	esl.reset (eoldlen);
1357	}
1358	} /* else this is a viewable space */	1256	} /* else this is a viewable space */
1359	} /* for x loop */	1257	ordered_mapwalk_end
1360	} /* for y loop */
1361		1258
1362	socket.flush_fx ();	1259	socket.flush_fx ();
1363
1364	/* Verify that we in fact do need to send this */
1365	if (socket.ext_mapinfos)
1366	{
1367	if (!(sl.length () > startlen || socket.sent_scroll))
1368	{
1369	/* No map data will follow, so don't say the client
1370	* it doesn't need draw!
1371	*/
1372	ewhatflag &= ~EMI_NOREDRAW;
1373	esl[ewhatstart + 1] = ewhatflag & 0xff;
1374	}
1375
1376	if (esl.length () > estartlen)
1377	socket.send_packet (esl);
1378	}
1379		1260
1380	if (sl.length () > startlen || socket.sent_scroll)	1261	if (sl.length () > startlen || socket.sent_scroll)
1381	{	1262	{
1382	socket.send_packet (sl);	1263	socket.send_packet (sl);
1383	socket.sent_scroll = 0;	1264	socket.sent_scroll = 0;
1384	}	1265	}
1385	}	1266	}
1386		1267
1387	/*****************************************************************************/
1388	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1389	/* a player. Of course, the client need to know the command to be able to */
1390	/* manage it ! */
1391	/*****************************************************************************/
1392	void
1393	send_plugin_custom_message (object *pl, char *buf)
1394	{
1395	pl->contr->ns->send_packet (buf);
1396	}
1397
1398	/**
1399	* This sends the skill number to name mapping. We ignore
1400	* the params - we always send the same info no matter what.
1401	*/
1402	void
1403	send_skill_info (client *ns, char *params)
1404	{
1405	packet sl;
1406	sl << "replyinfo skill_info\n";
1407
1408	for (int i = 1; i < NUM_SKILLS; i++)
1409	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1410
1411	if (sl.length () >= MAXSOCKBUF)
1412	{
1413	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1414	fatal (0);
1415	}
1416
1417	ns->send_packet (sl);
1418	}
1419
1420	/**
1421	* This sends the spell path to name mapping. We ignore
1422	* the params - we always send the same info no matter what.
1423	*/
1424	void
1425	send_spell_paths (client * ns, char *params)
1426	{
1427	packet sl;
1428
1429	sl << "replyinfo spell_paths\n";
1430
1431	for (int i = 0; i < NRSPELLPATHS; i++)
1432	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1433
1434	if (sl.length () >= MAXSOCKBUF)
1435	{
1436	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1437	fatal (0);
1438	}
1439
1440	ns->send_packet (sl);
1441	}
1442
1443	/**	1268	/**
1444	* This looks for any spells the player may have that have changed their stats.	1269	* This looks for any spells the player may have that have changed their stats.
1445	* it then sends an updspell packet for each spell that has changed in this way	1270	* it then sends an updspell packet for each spell that has changed in this way
1446	*/	1271	*/
1447	void	1272	void
1448	esrv_update_spells (player *pl)	1273	esrv_update_spells (player *pl)
1449	{	1274	{
1450	if (!pl->ns)	1275	if (!pl->ns)
1451	return;	1276	return;
1452		1277
		1278	pl->ns->update_spells = false;
		1279
1453	if (!pl->ns->monitor_spells)	1280	if (!pl->ns->monitor_spells)
1454	return;	1281	return;
1455		1282
1456	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1283	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1457	{
1458	if (spell->type == SPELL)	1284	if (spell->type == SPELL)
1459	{	1285	{
1460	int flags = 0;	1286	int flags = 0;
		1287	int val;
1461		1288
1462	/* check if we need to update it */	1289	/* check if we need to update it */
1463	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1290	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1291	if (spell->cached_sp != val)
1464	{	1292	{
1465	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1293	spell->cached_sp = val;
1466	flags |= UPD_SP_MANA;	1294	flags |= UPD_SP_MANA;
1467	}	1295	}
1468		1296
1469	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1297	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1298	if (spell->cached_grace != val)
1470	{	1299	{
1471	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1300	spell->cached_grace = val;
1472	flags |= UPD_SP_GRACE;	1301	flags |= UPD_SP_GRACE;
1473	}	1302	}
1474		1303
1475	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1304	val = casting_level (pl->ob, spell);
		1305	if (spell->cached_eat != val)
1476	{	1306	{
1477	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1307	spell->cached_eat = val;
1478	flags |= UPD_SP_DAMAGE;	1308	flags |= UPD_SP_LEVEL;
1479	}	1309	}
1480		1310
1481	if (flags)	1311	if (flags)
1482	{	1312	{
1483	packet sl;	1313	packet sl;
1484		1314
1485	sl << "updspell "	1315	sl << "updspell "
1486	<< uint8 (flags)	1316	<< uint8 (flags)
1487	<< uint32 (spell->count);	1317	<< uint32 (spell->count);
1488		1318
1489	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1319	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1490	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1320	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1491	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1321	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1492		1322
1493	pl->ns->send_packet (sl);	1323	pl->ns->send_packet (sl);
1494	}	1324	}
1495	}	1325	}
1496	}
1497	}	1326	}
1498		1327
1499	void	1328	void
1500	esrv_remove_spell (player *pl, object *spell)	1329	esrv_remove_spell (player *pl, object *spell)
1501	{	1330	{
…		…
1526	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1355	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1527	return;	1356	return;
1528	}	1357	}
1529		1358
1530	/* store costs and damage in the object struct, to compare to later */	1359	/* store costs and damage in the object struct, to compare to later */
1531	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1360	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1532	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1361	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1533	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1362	spell->cached_eat = casting_level (pl->ob, spell);
1534		1363
1535	/* figure out which skill it uses, if it uses one */	1364	/* figure out which skill it uses, if it uses one */
1536	if (spell->skill)	1365	if (spell->skill)
1537	{	1366	if (object *tmp = pl->find_skill (spell->skill))
1538	for (i = 1; i < NUM_SKILLS; i++)
1539	if (!strcmp (spell->skill, skill_names[i]))
1540	{
1541	skill = i + CS_STAT_SKILLINFO;	1367	skill = tmp->subtype + CS_STAT_SKILLINFO;
1542	break;
1543	}
1544	}
1545		1368
1546	// spells better have a face	1369	// spells better have a face
1547	if (!spell->face)	1370	if (!spell->face)
1548	{	1371	{
1549	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1372	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1550	spell->face = face_find ("burnout.x11", blank_face);	1373	spell->face = face_find ("burnout.x11", blank_face);
1551	}	1374	}
		1375
		1376	pl->ns->send_face (spell->face);
1552		1377
1553	/* send the current values */	1378	/* send the current values */
1554	sl << uint32 (spell->count)	1379	sl << uint32 (spell->count)
1555	<< uint16 (spell->level)	1380	<< uint16 (spell->level)
1556	<< uint16 (spell->casting_time)	1381	<< uint16 (spell->casting_time)
1557	<< uint16 (spell->last_sp)	1382	<< uint16 (spell->cached_sp)
1558	<< uint16 (spell->last_grace)	1383	<< uint16 (spell->cached_grace)
1559	<< uint16 (spell->last_eat)	1384	<< uint16 (spell->cached_eat)
1560	<< uint8 (skill)	1385	<< uint8 (skill)
1561	<< uint32 (spell->path_attuned)	1386	<< uint32 (spell->path_attuned)
1562	<< uint32 (spell->face)	1387	<< uint32 (spell->face)
1563	<< data8 (spell->name)	1388	<< data8 (spell->name)
1564	<< data16 (spell->msg);	1389	<< data16 (spell->msg);
…		…
1592	* bytes and 3 strings (because that is the spec) so we need to	1417	* bytes and 3 strings (because that is the spec) so we need to
1593	* check that the length of those 3 strings, plus the 23 bytes,	1418	* check that the length of those 3 strings, plus the 23 bytes,
1594	* won't take us over the length limit for the socket, if it does,	1419	* won't take us over the length limit for the socket, if it does,
1595	* we need to send what we already have, and restart packet formation	1420	* we need to send what we already have, and restart packet formation
1596	*/	1421	*/
		1422	if (spell->type != SPELL)
		1423	continue;
		1424
1597	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1425	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1598	* to show add_spell is 26 bytes + 2 strings. However, the overun	1426	* to show add_spell is 26 bytes + 2 strings. However, the overun
1599	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem	1427	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1600	* like it will fix this	1428	* like it will fix this
1601	*/	1429	*/
1602	if (spell->type != SPELL)
1603	continue;
1604
1605	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1430	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1606	{	1431	{
		1432	pl->ns->flush_fx ();
1607	pl->ns->send_packet (sl);	1433	pl->ns->send_packet (sl);
1608		1434
1609	sl.reset ();	1435	sl.reset ();
1610	sl << "addspell ";	1436	sl << "addspell ";
1611	}	1437	}
…		…
1619	return;	1445	return;
1620	}	1446	}
1621	else	1447	else
1622	append_spell (pl, sl, spell);	1448	append_spell (pl, sl, spell);
1623		1449
1624	if (sl.length () >= MAXSOCKBUF)	1450	if (sl.length () > MAXSOCKBUF)
1625	{	1451	{
1626	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1452	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1627	fatal (0);	1453	fatal (0);
1628	}	1454	}
1629		1455
1630	/* finally, we can send the packet */	1456	/* finally, we can send the packet */
		1457	pl->ns->flush_fx ();
1631	pl->ns->send_packet (sl);	1458	pl->ns->send_packet (sl);
1632	}	1459	}
1633		1460
		1461	//-GPL
		1462

Diff Legend

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