[ViewVC] Diff of: cvs/deliantra/server/socket/request.C

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.116 by root, Tue Jul 24 04:55:35 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	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	227	*/
196	socket.current_region = reg;	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
…		…
215	{	284	{
216	*params++ = 0;	285	*params++ = 0;
217	break;	286	break;
218	}	287	}
219		288
220	if (!strcmp (buf, "image_info"))
221	send_image_info (ns, params);
222	else if (!strcmp (buf, "image_sums"))
223	send_image_sums (ns, params);
224	else if (!strcmp (buf, "skill_info"))	289	if (!strcmp (buf, "skill_info"))
225	send_skill_info (ns, params);	290	send_skill_info (ns, params);
226	else if (!strcmp (buf, "spell_paths"))	291	else if (!strcmp (buf, "spell_paths"))
227	send_spell_paths (ns, params);	292	send_spell_paths (ns, params);
228	else	293	else
229	{	294	{
…		…
245	ExtiCmd (char buf, int len, client ns)	310	ExtiCmd (char buf, int len, client ns)
246	{	311	{
247	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	312	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
248	}	313	}
249		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;
		401	}
		402
250	void	403	void
251	MapInfoCmd (char buf, int len, player pl)	404	MapInfoCmd (char buf, int len, player pl)
252	{	405	{
253	// <mapinfo tag spatial tile-path	406	// <mapinfo tag spatial tile-path
254	// >mapinfo tag spatial flags x y w h hash	407	// >mapinfo tag spatial flags x y w h hash
255		408
256	char bigbuf[MAX_BUF], *token;
257
258	token = buf;	409	char *token = buf;
259	// copy token	410
260	if (!(buf = strchr (buf, ' ')))	411	if (!(buf = strchr (buf, ' ')))
261	return;	412	return;
262		413
263	*buf++ = 0;
264
265	if (!strncmp (buf, "spatial ", 8))	414	if (!strncmp (buf, " spatial ", 9))
266	{	415	{
267	buf += 8;	416	char *copy = strdup (token);
		417	copy [buf - token] = 0;
268		418
269	// initial map and its origin	419	#if 0
270	maptile *map = pl->ob->map;	420	// this makes only sense when we flush the buffer immediately
271	sint16 dx, dy;	421	if (pl->ns->mapinfo_try (copy))
272	int mapx = pl->ns->mapx / 2 - pl->ob->x;	422	free (copy);
273	int mapy = pl->ns->mapy / 2 - pl->ob->y;
274	int max_distance = 8; // limit maximum path length to something generous
275
276	while (*buf && map && max_distance)
277	{
278	int dir = *buf++;
279
280	switch (dir)
281	{
282	case '1':
283	dx = 0;
284	dy = -1;
285	map = map->xy_find (dx, dy);
286	map && (mapy -= map->height);
287	break;
288	case '2':
289	mapx += map->width;
290	dx = map->width;
291	dy = 0;
292	map = map->xy_find (dx, dy);
293	break;
294	case '3':
295	mapy += map->height;
296	dx = 0;
297	dy = map->height;
298	map = map->xy_find (dx, dy);
299	break;
300	case '4':
301	dx = -1;
302	dy = 0;
303	map = map->xy_find (dx, dy);
304	map && (mapx -= map->width);
305	break;
306	}
307
308	--max_distance;
309	}
310
311	if (!max_distance)
312	snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
313	else if (map && map->path[0])
314	{
315	int flags = 0;
316
317	if (map->tile_path[0]) flags \|= 1;
318	if (map->tile_path[1]) flags \|= 2;
319	if (map->tile_path[2]) flags \|= 4;
320	if (map->tile_path[3]) flags \|= 8;
321
322	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
323	}
324	else	423	else
325	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	424	#endif
		425	pl->ns->mapinfo_queue.push_back (copy);
326	}	426	}
327	else	427	else
328	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	428	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
329
330	pl->ns->send_packet (bigbuf);
331	}	429	}
332		430
333	/** This is the Setup cmd */	431	/** This is the Setup cmd */
334	void	432	void
335	SetUp (char buf, int len, client ns)	433	SetUp (char buf, int len, client ns)
…		…
347	AddMeCmd (char buf, int len, client ns)	445	AddMeCmd (char buf, int len, client ns)
348	{	446	{
349	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	447	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
350	}	448	}
351		449
352	/** Reply to ExtendedInfos command */	450	//+GPL
353	void
354	ToggleExtendedInfos (char buf, int len, client ns)
355	{
356	char cmdback[MAX_BUF];
357	char command[50];
358	int info, nextinfo;
359
360	cmdback[0] = '\0';
361	nextinfo = 0;
362
363	while (1)
364	{
365	/* 1. Extract an info */
366	info = nextinfo;
367
368	while ((info < len) && (buf[info] == ' '))
369	info++;
370
371	if (info >= len)
372	break;
373
374	nextinfo = info + 1;
375
376	while ((nextinfo < len) && (buf[nextinfo] != ' '))
377	nextinfo++;
378
379	if (nextinfo - info >= 49) /Erroneous info asked /
380	continue;
381
382	strncpy (command, &(buf[info]), nextinfo - info);
383
384	/* 2. Interpret info */
385	if (!strcmp ("smooth", command))
386	/* Toggle smoothing */
387	ns->EMI_smooth = !ns->EMI_smooth;
388	else
389	/bad value /;
390
391	/3. Next info /
392	}
393
394	strcpy (cmdback, "ExtendedInfoSet");
395
396	if (ns->EMI_smooth)
397	{
398	strcat (cmdback, " ");
399	strcat (cmdback, "smoothing");
400	}
401
402	ns->send_packet (cmdback);
403	}
404		451
405	/*	452	/*
406	#define MSG_TYPE_BOOK 1	453	#define MSG_TYPE_BOOK 1
407	#define MSG_TYPE_CARD 2	454	#define MSG_TYPE_CARD 2
408	#define MSG_TYPE_PAPER 3	455	#define MSG_TYPE_PAPER 3
…		…
425	while (1)	472	while (1)
426	{	473	{
427	/* 1. Extract an info */	474	/* 1. Extract an info */
428	info = nextinfo;	475	info = nextinfo;
429		476
430	while ((info < len) && (buf[info] == ' '))	477	while ((info < len) && (buf [info] == ' '))
431	info++;	478	info++;
432		479
433	if (info >= len)	480	if (info >= len)
434	break;	481	break;
435		482
436	nextinfo = info + 1;	483	nextinfo = info + 1;
437		484
438	while ((nextinfo < len) && (buf[nextinfo] != ' '))	485	while ((nextinfo < len) && (buf [nextinfo] != ' '))
439	nextinfo++;	486	nextinfo++;
440		487
441	if (nextinfo - info >= 49) /Erroneous info asked /	488	if (nextinfo - info >= 49) /Erroneous info asked /
442	continue;	489	continue;
443		490
444	strncpy (command, &(buf[info]), nextinfo - info);	491	memcpy (command, buf + info, nextinfo - info);
445	command[nextinfo - info] = '\0';	492	command [nextinfo - info] = 0;
		493
446	/* 2. Interpret info */	494	/* 2. Interpret info */
447	i = sscanf (command, "%d", &flag);	495	i = sscanf (command, "%d", &flag);
448		496
449	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	497	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
450	ns->supported_readables \|= (1 << flag);	498	ns->supported_readables \|= (1 << flag);
…		…
484	return;	532	return;
485		533
486	buf++;	534	buf++;
487	}	535	}
488		536
489	execute_newserver_command (pl->ob, (char *) buf);	537	execute_newserver_command (pl->ob, (char *)buf);
490		538
491	/* Perhaps something better should be done with a left over count.	539	/* Perhaps something better should be done with a left over count.
492	* Cleaning up the input should probably be done first - all actions	540	* Cleaning up the input should probably be done first - all actions
493	* 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
494	* commands.	542	* commands.
…		…
653	* syntax is: move (to) (tag) (nrof)	701	* syntax is: move (to) (tag) (nrof)
654	*/	702	*/
655	void	703	void
656	MoveCmd (char buf, int len, player pl)	704	MoveCmd (char buf, int len, player pl)
657	{	705	{
658	int vals[3], i;	706	int to, tag, nrof;
659		707
660	/* A little funky here. We only cycle for 2 records, because	708	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
661	* we obviously are not going to find a space after the third
662	* record. Perhaps we should just replace this with a
663	* sscanf?
664	*/
665	for (i = 0; i < 2; i++)
666	{	709	{
667	vals[i] = atoi (buf);
668
669	if (!(buf = strchr (buf, ' ')))
670	{
671	LOG (llevError, "Incomplete move command: %s\n", buf);	710	LOG (llevError, "Incomplete move command: %s\n", buf);
672	return;	711	return;
673	}
674
675	buf++;
676	}	712	}
677		713
678	vals[2] = atoi (buf);	714	esrv_move_object (pl->ob, to, tag, nrof);
679
680	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
681	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
682	}	715	}
683		716
684	/******************************************************************************	717	/******************************************************************************
685	*	718	*
686	* Start of commands the server sends to the client.	719	* Start of commands the server sends to the client.
…		…
701	* Get player's current range attack in obuf.	734	* Get player's current range attack in obuf.
702	*/	735	*/
703	static void	736	static void
704	rangetostring (player pl, char obuf)	737	rangetostring (player pl, char obuf)
705	{	738	{
706	dynbuf_text buf;	739	dynbuf_text &buf = msg_dynbuf; buf.clear ();
707		740
708	if (pl->ranged_ob)	741	if (pl->ranged_ob)
709	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;
710		743
711	if (pl->combat_ob)	744	if (pl->combat_ob)
…		…
787	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
788	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
789	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
790		823
791	for (int s = 0; s < NUM_SKILLS; s++)	824	for (int s = 0; s < NUM_SKILLS; s++)
792	if (object *skill = opl->last_skill_ob[s])	825	if (object *skill = opl->last_skill_ob [s])
793	if (skill->stats.exp != ns->last_skill_exp [s])	826	if (skill->stats.exp != ns->last_skill_exp [s])
794	{	827	{
795	ns->last_skill_exp [s] = skill->stats.exp;	828	ns->last_skill_exp [s] = skill->stats.exp;
796		829
797	/* Always send along the level if exp changes. This is only	830	/* Always send along the level if exp changes. This is only
…		…
853		886
854	/**	887	/**
855	* 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.
856	*/	889	*/
857	void	890	void
858	esrv_new_player (player *pl, uint32 weight)	891	esrv_new_player (player *pl)
859	{	892	{
		893	sint32 weight = pl->ob->client_weight ();
		894
860	packet sl ("player");	895	packet sl ("player");
861		896
862	sl << uint32 (pl->ob->count)	897	sl << uint32 (pl->ob->count)
863	<< uint32 (weight)	898	<< uint32 (weight)
864	<< uint32 (pl->ob->face)	899	<< uint32 (pl->ob->face)
865	<< data8 (pl->ob->name);	900	<< data8 (pl->ob->name);
866		901
867	pl->ns->last_weight = weight;	902	pl->ns->last_weight = weight;
868	pl->ns->send_packet (sl);	903	pl->ns->send_packet (sl);
869	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
870	}	904	}
871		905
872	/******************************************************************************	906	/******************************************************************************
873	*	907	*
874	* Start of map related commands.	908	* Start of map related commands.
…		…
941		975
942	/* Nothing changed */	976	/* Nothing changed */
943	return 0;	977	return 0;
944	}	978	}
945		979
946	/**	980	//-GPL
947	* Returns the size of a data for a map square as returned by
948	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
949	* available.
950	*/
951	int
952	getExtendedMapInfoSize (client * ns)
953	{
954	int result = 0;
955
956	if (ns->ext_mapinfos)
957	{
958	if (ns->EMI_smooth)
959	result += 1; /One byte for smoothlevel /
960	}
961
962	return result;
963	}
964		981
965	// prefetch (and touch) all maps within a specific distancd	982	// prefetch (and touch) all maps within a specific distancd
966	static void	983	static void
967	prefetch_surrounding_maps (maptile *map, int distance)	984	prefetch_surrounding_maps (maptile *map, int distance)
968	{	985	{
969	map->last_access = runtime;	986	map->touch ();
970		987
971	if (--distance)	988	if (--distance)
972	for (int dir = 4; --dir; )	989	for (int dir = 4; --dir; )
973	if (const shstr &path = map->tile_path [dir])	990	if (const shstr &path = map->tile_path [dir])
974	if (maptile *&neigh = map->tile_map [dir])	991	if (maptile *&neigh = map->tile_map [dir])
…		…
982	prefetch_surrounding_maps (object *op)	999	prefetch_surrounding_maps (object *op)
983	{	1000	{
984	prefetch_surrounding_maps (op->map, 3);	1001	prefetch_surrounding_maps (op->map, 3);
985	}	1002	}
986		1003
		1004	//+GPL
		1005
987	/**	1006	/**
988	* Draws client map.	1007	* Draws client map.
989	*/	1008	*/
990	void	1009	void
991	draw_client_map (player *pl)	1010	draw_client_map (player *pl)
992	{	1011	{
993	object *ob = pl->observe;	1012	object *ob = pl->viewpoint;
994	if (!ob->active)	1013	if (!pl->observe->active)
995	return;	1014	return;
996
997	maptile *plmap = ob->map;
998		1015
999	/* 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
1000	* 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
1001	* be OK once they really log in.	1018	* be OK once they really log in.
1002	*/	1019	*/
1003	if (!plmap \|\| plmap->in_memory != MAP_IN_MEMORY)	1020	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1004	return;	1021	return;
1005		1022
1006	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1007	int estartlen, eoldlen;	1023	int startlen, oldlen;
1008	uint8 eentrysize;
1009	uint16 ewhatstart, ewhatflag;
1010	uint8 extendedinfos;
1011		1024
1012	check_map_change (pl);	1025	check_map_change (pl);
1013	prefetch_surrounding_maps (pl->ob);	1026	prefetch_surrounding_maps (pl->ob);
1014		1027
1015	/* do LOS after calls to update_position */	1028	/* do LOS after calls to update_position */
1016	if (ob != pl->ob)	1029	/* unfortunately, we need to udpate los when observing, currently */
1017	clear_los (pl);	1030	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1018	else if (pl->do_los)
1019	{	1031	{
1020	update_los (ob);
1021	pl->do_los = 0;	1032	pl->do_los = 0;
		1033	pl->update_los ();
1022	}	1034	}
1023		1035
1024	/**	1036	/**
1025	* 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
1026	* 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
…		…
1045	*/	1057	*/
1046		1058
1047	client &socket = *pl->ns;	1059	client &socket = *pl->ns;
1048		1060
1049	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1061	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1050	packet esl;
1051		1062
1052	startlen = sl.length ();	1063	startlen = sl.length ();
1053		1064
1054	/Extendedmapinfo structure initialisation /	1065	int hx = socket.mapx / 2;
1055	if (socket.ext_mapinfos)	1066	int hy = socket.mapy / 2;
1056	{
1057	extendedinfos = EMI_NOREDRAW;
1058		1067
1059	if (socket.EMI_smooth)	1068	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1060	extendedinfos \|= EMI_SMOOTH;	1069	int ax = dx + hx;
		1070	int ay = dy + hy;
1061		1071
1062	ewhatstart = esl.length ();	1072	int mask = (ax << 10) \| (ay << 4);
1063	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	1073	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1064	could need to be taken away */
1065	eentrysize = getExtendedMapInfoSize (&socket);
1066	esl << "mapextended "
1067	<< uint8 (extendedinfos)
1068	<< uint8 (eentrysize);
1069		1074
1070	estartlen = esl.length ();	1075	/* If the coordinates are not valid, or it is too dark to see,
1071	}	1076	* we tell the client as such
1072
1073	/* x,y are the real map locations. ax, ay are viewport relative
1074	* locations.
1075	*/	1077	*/
1076	ay = 0;	1078	if (!m)
1077
1078	/* We could do this logic as conditionals in the if statement,
1079	* but that started to get a bit messy to look at.
1080	*/
1081	max_x = ob->x + (socket.mapx + 1) / 2;
1082	max_y = ob->y + (socket.mapy + 1) / 2;
1083
1084	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1085	{	1079	{
1086	sint16 nx, ny;	1080	/* space is out of map. Update space and clear values
1087	maptile *m = 0;	1081	* if this hasn't already been done. If the space is out
1088		1082	* of the map, it shouldn't have a head.
1089	ax = 0;	1083	*/
1090	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	1084	if (lastcell.count != -1)
1091	{	1085	{
1092	// check to see if we can simply go one right quickly	1086	sl << uint16 (mask);
		1087	map_clearcell (&lastcell, -1);
1093	++nx;	1088	}
1094	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	{
1095	m = 0;	1137	mask \|= 0x8;
1096		1138
1097	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)
1098	{	1158	{
1099	nx = x; ny = y; m = plmap;	1159	if (op->stats.maxhp > op->stats.hp
1100		1160	&& op->stats.maxhp > 0
1101	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)))
1102	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;
1103	}	1178	}
1104		1179
1105	int emask, mask;	1180	if (expect_false (lastcell.stat_hp != stat_hp))
1106	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1107
1108	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1109
1110	/* If the coordinates are not valid, or it is too dark to see,
1111	* we tell the client as such
1112	*/
1113	if (!m)
1114	{	1181	{
1115	/* space is out of map. Update space and clear values	1182	lastcell.stat_hp = stat_hp;
1116	* if this hasn't already been done. If the space is out	1183
1117	* of the map, it shouldn't have a head	1184	mask \|= 0x8;
1118	*/	1185	*last_ext \|= 0x80;
1119	if (lastcell.count != -1)	1186	last_ext = &sl[sl.length ()];
		1187
		1188	sl << uint8 (5) << uint8 (stat_hp);
		1189
		1190	if (stat_width > 1)
1120	{	1191	{
1121	sl << uint16 (mask);
1122	map_clearcell (&lastcell, -1);
1123	}
1124
1125	continue;
1126	}
1127
1128	m->touch ();
1129
1130	int d = pl->blocked_los[ax][ay];
1131
1132	if (d > 3)
1133	{
1134
1135	int need_send = 0, count;
1136
1137	/* This block deals with spaces that are not visible for whatever
1138	* reason. Still may need to send the head for this space.
1139	*/
1140
1141	oldlen = sl.length ();
1142
1143	sl << uint16 (mask);
1144
1145	if (lastcell.count != -1)
1146	need_send = 1;
1147
1148	count = -1;
1149
1150	/* properly clear a previously sent big face */
1151	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1152	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1153	need_send = 1;
1154
1155	map_clearcell (&lastcell, count);
1156
1157	if ((mask & 0xf) \|\| need_send)
1158	sl[oldlen + 1] = mask & 0xff;
1159	else
1160	sl.reset (oldlen);
1161	}
1162	else
1163	{
1164	/* In this block, the space is visible.
1165	*/
1166
1167	/* Rather than try to figure out what everything that we might
1168	* need to send is, then form the packet after that,
1169	* we presume that we will in fact form a packet, and update
1170	* the bits by what we do actually send. If we send nothing,
1171	* we just back out sl.length () to the old value, and no harm
1172	* is done.
1173	* I think this is simpler than doing a bunch of checks to see
1174	* what if anything we need to send, setting the bits, then
1175	* doing those checks again to add the real data.
1176	*/
1177	oldlen = sl.length ();
1178	eoldlen = esl.length ();
1179
1180	sl << uint16 (mask);
1181
1182	unsigned char dummy;
1183	unsigned char *last_ext = &dummy;
1184
1185	/* Darkness changed */
1186	if (lastcell.count != d && socket.darkness)
1187	{
1188	mask \|= 0x8;
1189
1190	if (socket.extmap)
1191	{
1192	*last_ext \|= 0x80;	1192	*last_ext \|= 0x80;
1193	last_ext = &sl[sl.length ()];	1193	last_ext = &sl[sl.length ()];
1194	sl << uint8 (d);	1194
1195	}	1195	sl << uint8 (6) << uint8 (stat_width);
1196	else
1197	sl << uint8 (255 - 64 * d);
1198	}	1196	}
		1197	}
1199		1198
1200	lastcell.count = d;	1199	if (expect_false (lastcell.player != player))
1201
1202	mapspace &ms = m->at (nx, ny);
1203	ms.update ();
1204
1205	if (socket.extmap)
1206	{	1200	{
1207	uint8 stat_hp = 0;	1201	lastcell.player = player;
1208	uint8 stat_width = 0;
1209	uint8 flags = 0;
1210	tag_t player = 0;
1211		1202
1212	// send hp information, if applicable
1213	if (object *op = ms.faces_obj [0])
1214	{
1215	if (op->head \|\| op->invisible)
1216	; // do not show
1217	else if (op->type == PLAYER
1218	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR))
1219	{
1220	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1221	{
1222	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1223	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1224	}
1225	}
1226
1227	if (op->msg && op->msg[0] == '@')
1228	flags \|= 1;
1229
1230	if (op->type == PLAYER && op != ob)
1231	player = op->count;
1232	}
1233
1234	if (lastcell.stat_hp != stat_hp)
1235	{
1236	lastcell.stat_hp = stat_hp;
1237
1238	mask \|= 0x8;	1203	mask \|= 0x8;
1239	*last_ext \|= 0x80;	1204	*last_ext \|= 0x80;
1240	last_ext = &sl[sl.length ()];	1205	last_ext = &sl[sl.length ()];
1241		1206
1242	sl << uint8 (5) << uint8 (stat_hp);
1243
1244	if (stat_width > 1)
1245	{
1246	*last_ext \|= 0x80;
1247	last_ext = &sl[sl.length ()];
1248
1249	sl << uint8 (6) << uint8 (stat_width);
1250	}
1251	}
1252
1253	if (lastcell.player != player)
1254	{
1255	lastcell.player = player;
1256
1257	mask \|= 0x8;
1258	*last_ext \|= 0x80;
1259	last_ext = &sl[sl.length ()];
1260
1261	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1207	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1262	}	1208	}
1263		1209
1264	if (lastcell.flags != flags)	1210	if (expect_false (lastcell.flags != flags))
1265	{	1211	{
1266	lastcell.flags = flags;	1212	lastcell.flags = flags;
1267		1213
1268	mask \|= 0x8;	1214	mask \|= 0x8;
1269	*last_ext \|= 0x80;	1215	*last_ext \|= 0x80;
1270	last_ext = &sl[sl.length ()];	1216	last_ext = &sl[sl.length ()];
1271		1217
1272	sl << uint8 (8) << uint8 (flags);	1218	sl << uint8 (8) << uint8 (flags);
1273	}
1274	}	1219	}
1275		1220
		1221	// faces
		1222
1276	/* Floor face */	1223	/* Floor face */
1277	if (update_space (sl, socket, ms, lastcell, 2))	1224	if (update_space (sl, socket, ms, lastcell, 2))
1278	mask \|= 0x4;	1225	mask \|= 0x4;
1279		1226
1280	/* Middle face */	1227	/* Middle face */
1281	if (update_space (sl, socket, ms, lastcell, 1))	1228	if (update_space (sl, socket, ms, lastcell, 1))
1282	mask \|= 0x2;	1229	mask \|= 0x2;
1283		1230
		1231	if (expect_false (ob->invisible)
		1232	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1284	if (ms.player () == ob	1233	&& ms.player () == ob)
1285	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1286	{	1234	{
1287	// force player to be visible to himself if invisible	1235	// force player to be visible to himself if invisible
1288	if (lastcell.faces[0] != ob->face)	1236	if (lastcell.faces[0] != ob->face)
1289	{	1237	{
1290	lastcell.faces[0] = ob->face;	1238	lastcell.faces[0] = ob->face;
1291		1239
1292	mask \|= 0x1;
1293	sl << uint16 (ob->face);
1294
1295	socket.send_faces (ob);
1296	}
1297	}
1298	/* Top face */
1299	else if (update_space (sl, socket, ms, lastcell, 0))
1300	mask \|= 0x1;	1240	mask \|= 0x1;
		1241	sl << uint16 (ob->face);
1301		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
1302	/* 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
1303	* space by checking the mask. If so, update the mask.	1251	* space by checking the mask. If so, update the mask.
1304	* 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
1305	* value, so we don't send those bits.	1253	* value, so we don't send those bits.
1306	*/	1254	*/
1307	if (mask & 0xf)	1255	if (mask & 0xf)
1308	sl[oldlen + 1] = mask & 0xff;	1256	sl[oldlen + 1] = mask & 0xff;
1309	else	1257	else
1310	sl.reset (oldlen);	1258	sl.reset (oldlen);
1311
1312	if (socket.ext_mapinfos)
1313	esl << uint16 (emask);
1314
1315	if (socket.EMI_smooth)
1316	{
1317	for (int layer = 2+1; layer--; )
1318	{
1319	object *ob = ms.faces_obj [layer];
1320
1321	// If there is no object for this space, or if the face for the object
1322	// is the blank face, set the smoothlevel to zero.
1323	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1324
1325	// We've gotten what face we want to use for the object. Now see if
1326	// if it has changed since we last sent it to the client.
1327	if (lastcell.smooth[layer] != smoothlevel)
1328	{
1329	lastcell.smooth[layer] = smoothlevel;
1330	esl << uint8 (smoothlevel);
1331	emask \|= 1 << layer;
1332	}
1333	}
1334
1335	if (emask & 0xf)
1336	esl[eoldlen + 1] = emask & 0xff;
1337	else
1338	esl.reset (eoldlen);
1339	}
1340	} /* else this is a viewable space */	1259	} /* else this is a viewable space */
1341	} /* for x loop */	1260	ordered_mapwalk_end
1342	} /* for y loop */
1343		1261
1344	socket.flush_fx ();	1262	socket.flush_fx ();
1345
1346	/* Verify that we in fact do need to send this */
1347	if (socket.ext_mapinfos)
1348	{
1349	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1350	{
1351	/* No map data will follow, so don't say the client
1352	* it doesn't need draw!
1353	*/
1354	ewhatflag &= ~EMI_NOREDRAW;
1355	esl[ewhatstart + 1] = ewhatflag & 0xff;
1356	}
1357
1358	if (esl.length () > estartlen)
1359	socket.send_packet (esl);
1360	}
1361		1263
1362	if (sl.length () > startlen \|\| socket.sent_scroll)	1264	if (sl.length () > startlen \|\| socket.sent_scroll)
1363	{	1265	{
1364	socket.send_packet (sl);	1266	socket.send_packet (sl);
1365	socket.sent_scroll = 0;	1267	socket.sent_scroll = 0;
…		…
1376	{	1278	{
1377	pl->contr->ns->send_packet (buf);	1279	pl->contr->ns->send_packet (buf);
1378	}	1280	}
1379		1281
1380	/**	1282	/**
1381	* This sends the skill number to name mapping. We ignore
1382	* the params - we always send the same info no matter what.
1383	*/
1384	void
1385	send_skill_info (client ns, char params)
1386	{
1387	packet sl;
1388	sl << "replyinfo skill_info\n";
1389
1390	for (int i = 1; i < NUM_SKILLS; i++)
1391	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1392
1393	if (sl.length () >= MAXSOCKBUF)
1394	{
1395	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1396	fatal (0);
1397	}
1398
1399	ns->send_packet (sl);
1400	}
1401
1402	/**
1403	* This sends the spell path to name mapping. We ignore
1404	* the params - we always send the same info no matter what.
1405	*/
1406	void
1407	send_spell_paths (client * ns, char *params)
1408	{
1409	packet sl;
1410
1411	sl << "replyinfo spell_paths\n";
1412
1413	for (int i = 0; i < NRSPELLPATHS; i++)
1414	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1415
1416	if (sl.length () >= MAXSOCKBUF)
1417	{
1418	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1419	fatal (0);
1420	}
1421
1422	ns->send_packet (sl);
1423	}
1424
1425	/**
1426	* 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.
1427	* 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
1428	*/	1285	*/
1429	void	1286	void
1430	esrv_update_spells (player *pl)	1287	esrv_update_spells (player *pl)
…		…
1440	if (spell->type == SPELL)	1297	if (spell->type == SPELL)
1441	{	1298	{
1442	int flags = 0;	1299	int flags = 0;
1443		1300
1444	/* check if we need to update it */	1301	/* check if we need to update it */
1445	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))
1446	{	1303	{
1447	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);
1448	flags \|= UPD_SP_MANA;	1305	flags \|= UPD_SP_MANA;
1449	}	1306	}
1450		1307
1451	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))
1452	{	1309	{
1453	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);
1454	flags \|= UPD_SP_GRACE;	1311	flags \|= UPD_SP_GRACE;
1455	}	1312	}
1456		1313
1457	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))
1458	{	1315	{
1459	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);
1460	flags \|= UPD_SP_DAMAGE;	1317	flags \|= UPD_SP_DAMAGE;
1461	}	1318	}
1462		1319
1463	if (flags)	1320	if (flags)
1464	{	1321	{
…		…
1466		1323
1467	sl << "updspell "	1324	sl << "updspell "
1468	<< uint8 (flags)	1325	<< uint8 (flags)
1469	<< uint32 (spell->count);	1326	<< uint32 (spell->count);
1470		1327
1471	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1328	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1472	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1329	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1473	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1330	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1474		1331
1475	pl->ns->send_packet (sl);	1332	pl->ns->send_packet (sl);
1476	}	1333	}
1477	}	1334	}
1478	}	1335	}
…		…
1508	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);
1509	return;	1366	return;
1510	}	1367	}
1511		1368
1512	/* 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 */
1513	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);
1514	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);
1515	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);
1516		1373
1517	/* figure out which skill it uses, if it uses one */	1374	/* figure out which skill it uses, if it uses one */
1518	if (spell->skill)	1375	if (spell->skill)
1519	{	1376	if (object *tmp = pl->find_skill (spell->skill))
1520	for (i = 1; i < NUM_SKILLS; i++)
1521	if (!strcmp (spell->skill, skill_names[i]))
1522	{
1523	skill = i + CS_STAT_SKILLINFO;	1377	skill = tmp->subtype + CS_STAT_SKILLINFO;
1524	break;
1525	}
1526	}
1527		1378
1528	// spells better have a face	1379	// spells better have a face
1529	if (!spell->face)	1380	if (!spell->face)
1530	{	1381	{
1531	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);
1532	spell->face = face_find ("burnout.x11", blank_face);	1383	spell->face = face_find ("burnout.x11", blank_face);
1533	}	1384	}
		1385
		1386	pl->ns->send_face (spell->face);
1534		1387
1535	/* send the current values */	1388	/* send the current values */
1536	sl << uint32 (spell->count)	1389	sl << uint32 (spell->count)
1537	<< uint16 (spell->level)	1390	<< uint16 (spell->level)
1538	<< uint16 (spell->casting_time)	1391	<< uint16 (spell->casting_time)
1539	<< uint16 (spell->last_sp)	1392	<< uint16 (spell->cached_sp)
1540	<< uint16 (spell->last_grace)	1393	<< uint16 (spell->cached_grace)
1541	<< uint16 (spell->last_eat)	1394	<< uint16 (spell->cached_eat)
1542	<< uint8 (skill)	1395	<< uint8 (skill)
1543	<< uint32 (spell->path_attuned)	1396	<< uint32 (spell->path_attuned)
1544	<< uint32 (spell->face)	1397	<< uint32 (spell->face)
1545	<< data8 (spell->name)	1398	<< data8 (spell->name)
1546	<< data16 (spell->msg);	1399	<< data16 (spell->msg);
…		…
1574	* 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
1575	* 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,
1576	* 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,
1577	* 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
1578	*/	1431	*/
		1432	if (spell->type != SPELL)
		1433	continue;
		1434
1579	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1435	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1580	* 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
1581	* 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
1582	* like it will fix this	1438	* like it will fix this
1583	*/	1439	*/
1584	if (spell->type != SPELL)
1585	continue;
1586
1587	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))))
1588	{	1441	{
		1442	pl->ns->flush_fx ();
1589	pl->ns->send_packet (sl);	1443	pl->ns->send_packet (sl);
1590		1444
1591	sl.reset ();	1445	sl.reset ();
1592	sl << "addspell ";	1446	sl << "addspell ";
1593	}	1447	}
…		…
1601	return;	1455	return;
1602	}	1456	}
1603	else	1457	else
1604	append_spell (pl, sl, spell);	1458	append_spell (pl, sl, spell);
1605		1459
1606	if (sl.length () >= MAXSOCKBUF)	1460	if (sl.length () > MAXSOCKBUF)
1607	{	1461	{
1608	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1462	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1609	fatal (0);	1463	fatal (0);
1610	}	1464	}
1611		1465
1612	/* finally, we can send the packet */	1466	/* finally, we can send the packet */
		1467	pl->ns->flush_fx ();
1613	pl->ns->send_packet (sl);	1468	pl->ns->send_packet (sl);
1614	}	1469	}
1615		1470
		1471	//-GPL
		1472

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.116 by root, Tue Jul 24 04:55:35 2007 UTC vs. Revision 1.157 by root, Fri Nov 6 13:05:57 2009 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.116 by root, Tue Jul 24 04:55:35 2007 UTC vs.
Revision 1.157 by root, Fri Nov 6 13:05:57 2009 UTC