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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.115 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.147 by root, Sat Dec 27 08:41:44 2008 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
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your 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,
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 GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/**	24	/**
25	* \file	25	* \file
26	* Client handling.	26	* Client handling.
…		…
98	*/	98	*/
99	mx = ns->mapx;	99	mx = ns->mapx;
100	my = ns->mapy;	100	my = ns->mapy;
101		101
102	/* the x and y here are coordinates for the new map, i.e. if we moved	102	/* 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,	103	* (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	104	* if the destination x or y coordinate is outside the viewable
105	* area, we clear the values - otherwise, the old values	105	* area, we clear the values - otherwise, the old values
106	* are preserved, and the check_head thinks it needs to clear them.	106	* are preserved, and the check_head thinks it needs to clear them.
107	*/	107	*/
108	for (x = 0; x < mx; x++)	108	for (x = 0; x < mx; x++)
109	{
110	for (y = 0; y < my; y++)	109	for (y = 0; y < my; y++)
111	{
112	if (x >= ns->mapx \|\| y >= ns->mapy)	110	if (x >= ns->mapx \|\| y >= ns->mapy)
113	/* clear cells outside the viewable area */	111	/* clear cells outside the viewable area */
114	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	112	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)	113	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 */	114	/* clear newly visible tiles within the viewable area */
117	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	115	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118	else	116	else
119	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	117	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120	}
121	}
122		118
123	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	119	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124		120
125	/* Make sure that the next "map1" command will be sent (even if it is	121	/* Make sure that the next "map1" command will be sent (even if it is
126	* empty).	122	* empty).
…		…
129	}	125	}
130		126
131	static void	127	static void
132	clear_map (player *pl)	128	clear_map (player *pl)
133	{	129	{
		130	pl->ns->mapinfo_queue_clear ();
		131
134	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	132	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
135		133
136	pl->ns->force_newmap = false;	134	pl->ns->force_newmap = false;
137		135
138	if (pl->ns->newmapcmd == 1)	136	if (pl->ns->newmapcmd == 1)
139	pl->ns->send_packet ("newmap");	137	pl->ns->send_packet ("newmap");
140		138
141	pl->ns->floorbox_reset ();	139	pl->ns->floorbox_reset ();
		140	}
		141
		142	static void
		143	send_map_info (player *pl)
		144	{
		145	client &socket = *pl->ns;
		146	object *ob = pl->observe;
		147
		148	if (socket.mapinfocmd)
		149	{
		150	if (ob->map && ob->map->path[0])
		151	{
		152	int flags = 0;
		153
		154	if (ob->map->tile_path[0]) flags \|= 1;
		155	if (ob->map->tile_path[1]) flags \|= 2;
		156	if (ob->map->tile_path[2]) flags \|= 4;
		157	if (ob->map->tile_path[3]) flags \|= 8;
		158
		159	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		160	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		161	ob->map->width, ob->map->height, &ob->map->path);
		162	}
		163	else
		164	socket.send_packet ("mapinfo current");
		165	}
142	}	166	}
143		167
144	/** check for map/region change and send new map data */	168	/** check for map/region change and send new map data */
145	static void	169	static void
146	check_map_change (player *pl)	170	check_map_change (player *pl)
147	{	171	{
148	client &socket = *pl->ns;	172	client &socket = *pl->ns;
149	object *ob = pl->observe;	173	object *ob = pl->observe;
150		174
		175	region *reg = ob->region ();
		176	if (socket.current_region != reg)
		177	{
		178	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		179	socket.current_region = reg;
		180	}
		181
		182	// first try to aovid a full newmap on tiled map scrolls
		183	if (socket.current_map != ob->map && !socket.force_newmap)
		184	{
		185	rv_vector rv;
		186
		187	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
		188
		189	// manhattan distance is very handy here
		190	if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
		191	{
		192	socket.current_map = ob->map;
		193	socket.current_x = ob->x;
		194	socket.current_y = ob->y;
		195
		196	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
		197	socket.floorbox_reset ();
		198	send_map_info (pl);
		199	}
		200	}
		201
151	if (socket.current_map != ob->map \|\| socket.force_newmap)	202	if (socket.current_map != ob->map \|\| socket.force_newmap)
152	{	203	{
153	clear_map (pl);	204	clear_map (pl);
154	socket.current_map = ob->map;	205	socket.current_map = ob->map;
155		206	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	}	207	}
175	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)	208	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)
176	{	209	{
177	int dx = ob->x - socket.current_x;	210	int dx = ob->x - socket.current_x;
178	int dy = ob->y - socket.current_y;	211	int dy = ob->y - socket.current_y;
179		212
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);	213	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
185	socket.floorbox_reset ();	214	socket.floorbox_reset ();
186	}
187	}	215	}
188		216
189	socket.current_x = ob->x;	217	socket.current_x = ob->x;
190	socket.current_y = ob->y;	218	socket.current_y = ob->y;
191
192	region *reg = ob->region ();
193	if (socket.current_region != reg)
194	{
195	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
196	socket.current_region = reg;
197	}
198	}	219	}
199		220
200	/**	221	/**
201	* RequestInfo is sort of a meta command. There is some specific	222	* RequestInfo is sort of a meta command. There is some specific
202	* request of information, but we call other functions to provide	223	* request of information, but we call other functions to provide
…		…
246	{	267	{
247	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	268	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
248	}	269	}
249		270
250	void	271	void
		272	client::mapinfo_queue_clear ()
		273	{
		274	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
		275	free (*i);
		276
		277	mapinfo_queue.clear ();
		278	}
		279
		280	bool
		281	client::mapinfo_try (char *buf)
		282	{
		283	char *token = buf;
		284	buf += strlen (buf) + 9;
		285
		286	// initial map and its origin
		287	maptile *map = pl->observe->map;
		288	int mapx = pl->ns->mapx / 2 - pl->observe->x;
		289	int mapy = pl->ns->mapy / 2 - pl->observe->y;
		290	int max_distance = 8; // limit maximum path length to something generous
		291
		292	while (*buf && map && max_distance)
		293	{
		294	int dir = *buf++ - '1';
		295
		296	if (dir >= 0 && dir <= 3)
		297	{
		298	if (!map->tile_path [dir])
		299	map = 0;
		300	else if (map->tile_available (dir, false))
		301	{
		302	maptile *neigh = map->tile_map [dir];
		303
		304	switch (dir)
		305	{
		306	case 0: mapy -= neigh->height; break;
		307	case 2: mapy += map ->height; break;
		308	case 3: mapx -= neigh->width ; break;
		309	case 1: mapx += map ->width ; break;
		310	}
		311
		312	map = neigh;
		313	--max_distance;
		314	}
		315	else
		316	return 0;
		317	}
		318	else
		319	max_distance = 0;
		320	}
		321
		322	if (!max_distance)
		323	send_packet_printf ("mapinfo %s error", token);
		324	else if (!map \|\| !map->path)
		325	send_packet_printf ("mapinfo %s nomap", token);
		326	else
		327	{
		328	int flags = 0;
		329
		330	if (map->tile_path[0]) flags \|= 1;
		331	if (map->tile_path[1]) flags \|= 2;
		332	if (map->tile_path[2]) flags \|= 4;
		333	if (map->tile_path[3]) flags \|= 8;
		334
		335	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
		336	}
		337
		338	return 1;
		339	}
		340
		341	void
		342	client::mapinfo_queue_run ()
		343	{
		344	if (mapinfo_queue.empty () \|\| !pl)
		345	return;
		346
		347	for (int i = 0; i < mapinfo_queue.size (); ++i)
		348	if (mapinfo_try (mapinfo_queue [i]))
		349	{
		350	free (mapinfo_queue [i]);
		351	mapinfo_queue.erase (i);
		352	}
		353	else
		354	++i;
		355	}
		356
		357	void
251	MapInfoCmd (char buf, int len, player pl)	358	MapInfoCmd (char buf, int len, player pl)
252	{	359	{
253	// <mapinfo tag spatial tile-path	360	// <mapinfo tag spatial tile-path
254	// >mapinfo tag spatial flags x y w h hash	361	// >mapinfo tag spatial flags x y w h hash
255		362
256	char bigbuf[MAX_BUF], *token;
257
258	token = buf;	363	char *token = buf;
259	// copy token	364
260	if (!(buf = strchr (buf, ' ')))	365	if (!(buf = strchr (buf, ' ')))
261	return;	366	return;
262		367
263	*buf++ = 0;
264
265	if (!strncmp (buf, "spatial ", 8))	368	if (!strncmp (buf, " spatial ", 9))
266	{	369	{
267	buf += 8;	370	char *copy = strdup (token);
		371	copy [buf - token] = 0;
268		372
269	// initial map and its origin	373	#if 0
270	maptile *map = pl->ob->map;	374	// this makes only sense when we flush the buffer immediately
271	sint16 dx, dy;	375	if (pl->ns->mapinfo_try (copy))
272	int mapx = pl->ns->mapx / 2 - pl->ob->x;	376	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	377	else
325	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	378	#endif
		379	pl->ns->mapinfo_queue.push_back (copy);
326	}	380	}
327	else	381	else
328	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	382	pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
329
330	pl->ns->send_packet (bigbuf);
331	}	383	}
332		384
333	/** This is the Setup cmd */	385	/** This is the Setup cmd */
334	void	386	void
335	SetUp (char buf, int len, client ns)	387	SetUp (char buf, int len, client ns)
…		…
345	*/	397	*/
346	void	398	void
347	AddMeCmd (char buf, int len, client ns)	399	AddMeCmd (char buf, int len, client ns)
348	{	400	{
349	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	401	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
350	}
351
352	/** Reply to ExtendedInfos command */
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	}	402	}
404		403
405	/*	404	/*
406	#define MSG_TYPE_BOOK 1	405	#define MSG_TYPE_BOOK 1
407	#define MSG_TYPE_CARD 2	406	#define MSG_TYPE_CARD 2
…		…
653	* syntax is: move (to) (tag) (nrof)	652	* syntax is: move (to) (tag) (nrof)
654	*/	653	*/
655	void	654	void
656	MoveCmd (char buf, int len, player pl)	655	MoveCmd (char buf, int len, player pl)
657	{	656	{
658	int vals[3], i;	657	int to, tag, nrof;
659		658
660	/* A little funky here. We only cycle for 2 records, because	659	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	{	660	{
667	vals[i] = atoi (buf);
668
669	if (!(buf = strchr (buf, ' ')))
670	{
671	LOG (llevError, "Incomplete move command: %s\n", buf);	661	LOG (llevError, "Incomplete move command: %s\n", buf);
672	return;	662	return;
673	}
674
675	buf++;
676	}	663	}
677		664
678	vals[2] = atoi (buf);	665	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	}	666	}
683		667
684	/******************************************************************************	668	/******************************************************************************
685	*	669	*
686	* Start of commands the server sends to the client.	670	* Start of commands the server sends to the client.
…		…
787	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	771	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
788	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	772	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
789	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	773	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
790		774
791	for (int s = 0; s < NUM_SKILLS; s++)	775	for (int s = 0; s < NUM_SKILLS; s++)
792	if (object *skill = opl->last_skill_ob[s])	776	if (object *skill = opl->last_skill_ob [s])
793	if (skill->stats.exp != ns->last_skill_exp [s])	777	if (skill->stats.exp != ns->last_skill_exp [s])
794	{	778	{
795	ns->last_skill_exp [s] = skill->stats.exp;	779	ns->last_skill_exp [s] = skill->stats.exp;
796		780
797	/* Always send along the level if exp changes. This is only	781	/* Always send along the level if exp changes. This is only
…		…
853		837
854	/**	838	/**
855	* Tells the client that here is a player it should start using.	839	* Tells the client that here is a player it should start using.
856	*/	840	*/
857	void	841	void
858	esrv_new_player (player *pl, uint32 weight)	842	esrv_new_player (player *pl)
859	{	843	{
		844	sint32 weight = pl->ob->client_weight ();
		845
860	packet sl ("player");	846	packet sl ("player");
861		847
862	sl << uint32 (pl->ob->count)	848	sl << uint32 (pl->ob->count)
863	<< uint32 (weight)	849	<< uint32 (weight)
864	<< uint32 (pl->ob->face)	850	<< uint32 (pl->ob->face)
865	<< data8 (pl->ob->name);	851	<< data8 (pl->ob->name);
866		852
867	pl->ns->last_weight = weight;	853	pl->ns->last_weight = weight;
868	pl->ns->send_packet (sl);	854	pl->ns->send_packet (sl);
869	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
870	}	855	}
871		856
872	/******************************************************************************	857	/******************************************************************************
873	*	858	*
874	* Start of map related commands.	859	* Start of map related commands.
…		…
931		916
932	if (!ns.faces_sent[face_num])	917	if (!ns.faces_sent[face_num])
933	if (ob)	918	if (ob)
934	ns.send_faces (ob);	919	ns.send_faces (ob);
935	else	920	else
936	ns.send_face (face_num);	921	ns.send_face (face_num, 10);
937		922
938	sl << uint16 (face_num);	923	sl << uint16 (face_num);
939	return 1;	924	return 1;
940	}	925	}
941		926
942	/* Nothing changed */	927	/* Nothing changed */
943	return 0;	928	return 0;
944	}
945
946	/**
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	}	929	}
964		930
965	// prefetch (and touch) all maps within a specific distancd	931	// prefetch (and touch) all maps within a specific distancd
966	static void	932	static void
967	prefetch_surrounding_maps (maptile *map, int distance)	933	prefetch_surrounding_maps (maptile *map, int distance)
968	{	934	{
969	map->last_access = runtime;	935	map->touch ();
970		936
971	if (--distance)	937	if (--distance)
972	for (int dir = 4; --dir; )	938	for (int dir = 4; --dir; )
973	if (const shstr &path = map->tile_path [dir])	939	if (const shstr &path = map->tile_path [dir])
974	if (maptile *&neigh = map->tile_map [dir])	940	if (maptile *&neigh = map->tile_map [dir])
…		…
992	{	958	{
993	object *ob = pl->observe;	959	object *ob = pl->observe;
994	if (!ob->active)	960	if (!ob->active)
995	return;	961	return;
996		962
997	maptile *plmap = ob->map;
998
999	/* If player is just joining the game, he isn't here yet, so the map	963	/* 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	964	* can get swapped out. If so, don't try to send them a map. All will
1001	* be OK once they really log in.	965	* be OK once they really log in.
1002	*/	966	*/
1003	if (!plmap \|\| plmap->in_memory != MAP_IN_MEMORY)	967	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1004	return;	968	return;
1005		969
1006	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1007	int estartlen, eoldlen;	970	int startlen, oldlen;
1008	uint8 eentrysize;
1009	uint16 ewhatstart, ewhatflag;
1010	uint8 extendedinfos;
1011		971
1012	check_map_change (pl);	972	check_map_change (pl);
1013	prefetch_surrounding_maps (pl->ob);	973	prefetch_surrounding_maps (pl->ob);
1014		974
1015	/* do LOS after calls to update_position */	975	/* do LOS after calls to update_position */
1016	if (ob != pl->ob)	976	/* unfortunately, we need to udpate los when observing, currently */
1017	clear_los (pl);	977	if (pl->do_los \|\| pl->observe != pl->ob)
1018	else if (pl->do_los)
1019	{	978	{
1020	update_los (ob);
1021	pl->do_los = 0;	979	pl->do_los = 0;
		980	pl->update_los ();
1022	}	981	}
1023		982
1024	/**	983	/**
1025	* This function uses the new map1 protocol command to send the map	984	* 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	985	* to the client. It is necessary because the old map command supports
…		…
1045	*/	1004	*/
1046		1005
1047	client &socket = *pl->ns;	1006	client &socket = *pl->ns;
1048		1007
1049	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1008	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1050	packet esl;
1051		1009
1052	startlen = sl.length ();	1010	startlen = sl.length ();
1053		1011
1054	/Extendedmapinfo structure initialisation /	1012	int hx = socket.mapx / 2;
1055	if (socket.ext_mapinfos)	1013	int hy = socket.mapy / 2;
1056	{
1057	extendedinfos = EMI_NOREDRAW;
1058		1014
1059	if (socket.EMI_smooth)	1015	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1060	extendedinfos \|= EMI_SMOOTH;	1016	int ax = dx + hx;
		1017	int ay = dy + hy;
1061		1018
1062	ewhatstart = esl.length ();	1019	int mask = (ax << 10) \| (ay << 4);
1063	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1064	could need to be taken away */
1065	eentrysize = getExtendedMapInfoSize (&socket);
1066	esl << "mapextended "
1067	<< uint8 (extendedinfos)
1068	<< uint8 (eentrysize);
1069
1070	estartlen = esl.length ();
1071	}
1072
1073	/* x,y are the real map locations. ax, ay are viewport relative
1074	* locations.
1075	*/
1076	ay = 0;
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	{
1086	sint16 nx, ny;
1087	maptile *m = 0;
1088
1089	ax = 0;
1090	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)
1091	{
1092	// check to see if we can simply go one right quickly
1093	++nx;
1094	if (m && nx >= m->width)
1095	m = 0;
1096
1097	if (!m)
1098	{
1099	nx = x; ny = y; m = plmap;
1100
1101	if (!xy_normalise (m, nx, ny))
1102	m = 0;
1103	}
1104
1105	int emask, mask;
1106	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1107
1108	MapCell &lastcell = socket.lastmap.cells[ax][ay];	1020	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1109		1021
1110	/* If the coordinates are not valid, or it is too dark to see,	1022	/* If the coordinates are not valid, or it is too dark to see,
1111	* we tell the client as such	1023	* we tell the client as such
1112	*/	1024	*/
1113	if (!m)	1025	if (!m)
1114	{	1026	{
1115	/* space is out of map. Update space and clear values	1027	/* space is out of map. Update space and clear values
1116	* if this hasn't already been done. If the space is out	1028	* if this hasn't already been done. If the space is out
1117	* of the map, it shouldn't have a head	1029	* of the map, it shouldn't have a head.
1118	*/	1030	*/
1119	if (lastcell.count != -1)	1031	if (lastcell.count != -1)
		1032	{
		1033	sl << uint16 (mask);
		1034	map_clearcell (&lastcell, -1);
		1035	}
		1036
		1037	continue;
		1038	}
		1039
		1040	int d = pl->blocked_los_uc (dx, dy);
		1041
		1042	if (d > 3)
		1043	{
		1044	/* This block deals with spaces that are not visible for whatever
		1045	* reason. Still may need to send the head for this space.
		1046	*/
		1047	if (lastcell.count != -1
		1048	\|\| lastcell.faces[0]
		1049	\|\| lastcell.faces[1]
		1050	\|\| lastcell.faces[2]
		1051	\|\| lastcell.stat_hp
		1052	\|\| lastcell.flags
		1053	\|\| lastcell.player)
		1054	sl << uint16 (mask);
		1055
		1056	/* properly clear a previously sent big face */
		1057	map_clearcell (&lastcell, -1);
		1058	}
		1059	else
		1060	{
		1061	/* In this block, the space is visible.
		1062	*/
		1063
		1064	/* Rather than try to figure out what everything that we might
		1065	* need to send is, then form the packet after that,
		1066	* we presume that we will in fact form a packet, and update
		1067	* the bits by what we do actually send. If we send nothing,
		1068	* we just back out sl.length () to the old value, and no harm
		1069	* is done.
		1070	* I think this is simpler than doing a bunch of checks to see
		1071	* what if anything we need to send, setting the bits, then
		1072	* doing those checks again to add the real data.
		1073	*/
		1074	oldlen = sl.length ();
		1075
		1076	sl << uint16 (mask);
		1077
		1078	unsigned char dummy;
		1079	unsigned char *last_ext = &dummy;
		1080
		1081	/* Darkness changed */
		1082	if (lastcell.count != d)
		1083	{
		1084	mask \|= 0x8;
		1085
		1086	if (socket.extmap)
		1087	{
		1088	*last_ext \|= 0x80;
		1089	last_ext = &sl[sl.length ()];
		1090	sl << uint8 (d);
		1091	}
		1092	else
		1093	sl << uint8 (255 - 64 * d);
		1094	}
		1095
		1096	lastcell.count = d;
		1097
		1098	mapspace &ms = m->at (nx, ny);
		1099	ms.update ();
		1100
		1101	if (expect_true (socket.extmap))
		1102	{
		1103	uint8 stat_hp = 0;
		1104	uint8 stat_width = 0;
		1105	uint8 flags = 0;
		1106	tag_t player = 0;
		1107
		1108	// send hp information, if applicable
		1109	if (object *op = ms.faces_obj [0])
		1110	if (op->is_head () && !op->invisible)
1120	{	1111	{
1121	sl << uint16 (mask);	1112	if (op->stats.maxhp > op->stats.hp
1122	map_clearcell (&lastcell, -1);	1113	&& op->stats.maxhp > 0
		1114	&& (op->type == PLAYER
		1115	\|\| op->type == DOOR // does not work, have maxhp 0
		1116	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1117	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1118	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
		1119	{
		1120	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1121	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1122	}
		1123
		1124	if (expect_false (op->has_dialogue ()))
		1125	flags \|= 1;
		1126
		1127	if (expect_false (op->type == PLAYER))
		1128	player = op == ob ? pl->ob->count
		1129	: op == pl->ob ? ob->count
		1130	: op->count;
1123	}	1131	}
1124		1132
1125	continue;	1133	if (expect_false (lastcell.stat_hp != stat_hp))
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	{	1134	{
		1135	lastcell.stat_hp = stat_hp;
		1136
1188	mask \|= 0x8;	1137	mask \|= 0x8;
		1138	*last_ext \|= 0x80;
		1139	last_ext = &sl[sl.length ()];
1189		1140
1190	if (socket.extmap)	1141	sl << uint8 (5) << uint8 (stat_hp);
		1142
		1143	if (stat_width > 1)
1191	{	1144	{
1192	*last_ext \|= 0x80;	1145	*last_ext \|= 0x80;
1193	last_ext = &sl[sl.length ()];	1146	last_ext = &sl[sl.length ()];
1194	sl << uint8 (d);
1195	}
1196	else
1197	sl << uint8 (255 - 64 * d);
1198	}
1199		1147
1200	lastcell.count = d;
1201
1202	mapspace &ms = m->at (nx, ny);
1203	ms.update ();
1204
1205	if (socket.extmap)
1206	{
1207	uint8 stat_hp = 0;
1208	uint8 stat_width = 0;
1209	uint8 flags = 0;
1210	tag_t player = 0;
1211
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;
1239	*last_ext \|= 0x80;
1240	last_ext = &sl[sl.length ()];
1241
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);	1148	sl << uint8 (6) << uint8 (stat_width);
1250	}
1251	}	1149	}
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;
1262	}
1263
1264	if (lastcell.flags != flags)
1265	{
1266	lastcell.flags = flags;
1267
1268	mask \|= 0x8;
1269	*last_ext \|= 0x80;
1270	last_ext = &sl[sl.length ()];
1271
1272	sl << uint8 (8) << uint8 (flags);
1273	}
1274	}	1150	}
1275		1151
1276	/* Floor face */	1152	if (expect_false (lastcell.player != player))
1277	if (update_space (sl, socket, ms, lastcell, 2))	1153	{
		1154	lastcell.player = player;
		1155
1278	mask \|= 0x4;	1156	mask \|= 0x8;
		1157	*last_ext \|= 0x80;
		1158	last_ext = &sl[sl.length ()];
1279		1159
1280	/* Middle face */	1160	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1281	if (update_space (sl, socket, ms, lastcell, 1))	1161	}
		1162
		1163	if (expect_false (lastcell.flags != flags))
		1164	{
		1165	lastcell.flags = flags;
		1166
1282	mask \|= 0x2;	1167	mask \|= 0x8;
		1168	*last_ext \|= 0x80;
		1169	last_ext = &sl[sl.length ()];
1283		1170
1284	if (ms.player () == ob	1171	sl << uint8 (8) << uint8 (flags);
1285	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1286	{	1172	}
		1173	}
		1174
		1175	/* Floor face */
		1176	if (update_space (sl, socket, ms, lastcell, 2))
		1177	mask \|= 0x4;
		1178
		1179	/* Middle face */
		1180	if (update_space (sl, socket, ms, lastcell, 1))
		1181	mask \|= 0x2;
		1182
		1183	if (expect_false (ob->invisible)
		1184	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
		1185	&& ms.player () == ob)
		1186	{
1287	// force player to be visible to himself if invisible	1187	// force player to be visible to himself if invisible
1288	if (lastcell.faces[0] != ob->face)	1188	if (lastcell.faces[0] != ob->face)
1289	{	1189	{
1290	lastcell.faces[0] = ob->face;	1190	lastcell.faces[0] = ob->face;
1291		1191
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;	1192	mask \|= 0x1;
		1193	sl << uint16 (ob->face);
1301		1194
		1195	socket.send_faces (ob);
		1196	}
		1197	}
		1198	/* Top face */
		1199	else if (update_space (sl, socket, ms, lastcell, 0))
		1200	mask \|= 0x1;
		1201
1302	/* Check to see if we are in fact sending anything for this	1202	/* Check to see if we are in fact sending anything for this
1303	* space by checking the mask. If so, update the mask.	1203	* space by checking the mask. If so, update the mask.
1304	* if not, reset the len to that from before adding the mask	1204	* if not, reset the len to that from before adding the mask
1305	* value, so we don't send those bits.	1205	* value, so we don't send those bits.
1306	*/	1206	*/
1307	if (mask & 0xf)	1207	if (mask & 0xf)
1308	sl[oldlen + 1] = mask & 0xff;	1208	sl[oldlen + 1] = mask & 0xff;
1309	else	1209	else
1310	sl.reset (oldlen);	1210	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 */	1211	} /* else this is a viewable space */
1341	} /* for x loop */	1212	ordered_mapwalk_end
1342	} /* for y loop */
1343		1213
1344	socket.flush_fx ();	1214	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		1215
1362	if (sl.length () > startlen \|\| socket.sent_scroll)	1216	if (sl.length () > startlen \|\| socket.sent_scroll)
1363	{	1217	{
1364	socket.send_packet (sl);	1218	socket.send_packet (sl);
1365	socket.sent_scroll = 0;	1219	socket.sent_scroll = 0;
…		…
1386	{	1240	{
1387	packet sl;	1241	packet sl;
1388	sl << "replyinfo skill_info\n";	1242	sl << "replyinfo skill_info\n";
1389		1243
1390	for (int i = 1; i < NUM_SKILLS; i++)	1244	for (int i = 1; i < NUM_SKILLS; i++)
1391	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1245	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1392		1246
1393	if (sl.length () >= MAXSOCKBUF)	1247	if (sl.length () > MAXSOCKBUF)
1394	{	1248	{
1395	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1249	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1396	fatal (0);	1250	fatal (0);
1397	}	1251	}
1398		1252
…		…
1411	sl << "replyinfo spell_paths\n";	1265	sl << "replyinfo spell_paths\n";
1412		1266
1413	for (int i = 0; i < NRSPELLPATHS; i++)	1267	for (int i = 0; i < NRSPELLPATHS; i++)
1414	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);	1268	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1415		1269
1416	if (sl.length () >= MAXSOCKBUF)	1270	if (sl.length () > MAXSOCKBUF)
1417	{	1271	{
1418	LOG (llevError, "Buffer overflow in send_spell_paths!\n");	1272	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1419	fatal (0);	1273	fatal (0);
1420	}	1274	}
1421		1275
…		…
1440	if (spell->type == SPELL)	1294	if (spell->type == SPELL)
1441	{	1295	{
1442	int flags = 0;	1296	int flags = 0;
1443		1297
1444	/* check if we need to update it */	1298	/* check if we need to update it */
1445	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1299	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1446	{	1300	{
1447	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1301	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1448	flags \|= UPD_SP_MANA;	1302	flags \|= UPD_SP_MANA;
1449	}	1303	}
1450		1304
1451	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1305	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1452	{	1306	{
1453	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1307	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1454	flags \|= UPD_SP_GRACE;	1308	flags \|= UPD_SP_GRACE;
1455	}	1309	}
1456		1310
1457	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1311	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1458	{	1312	{
1459	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1313	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1460	flags \|= UPD_SP_DAMAGE;	1314	flags \|= UPD_SP_DAMAGE;
1461	}	1315	}
1462		1316
1463	if (flags)	1317	if (flags)
1464	{	1318	{
…		…
1466		1320
1467	sl << "updspell "	1321	sl << "updspell "
1468	<< uint8 (flags)	1322	<< uint8 (flags)
1469	<< uint32 (spell->count);	1323	<< uint32 (spell->count);
1470		1324
1471	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1325	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1472	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1326	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1473	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1327	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1474		1328
1475	pl->ns->send_packet (sl);	1329	pl->ns->send_packet (sl);
1476	}	1330	}
1477	}	1331	}
1478	}	1332	}
…		…
1508	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1362	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1509	return;	1363	return;
1510	}	1364	}
1511		1365
1512	/* store costs and damage in the object struct, to compare to later */	1366	/* 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);	1367	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);	1368	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);	1369	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1516		1370
1517	/* figure out which skill it uses, if it uses one */	1371	/* figure out which skill it uses, if it uses one */
1518	if (spell->skill)	1372	if (spell->skill)
1519	{	1373	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;	1374	skill = tmp->subtype + CS_STAT_SKILLINFO;
1524	break;
1525	}
1526	}
1527		1375
1528	// spells better have a face	1376	// spells better have a face
1529	if (!spell->face)	1377	if (!spell->face)
1530	{	1378	{
1531	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1379	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
1532	spell->face = face_find ("burnout.x11", blank_face);	1380	spell->face = face_find ("burnout.x11", blank_face);
1533	}	1381	}
		1382
		1383	pl->ns->send_face (spell->face);
1534		1384
1535	/* send the current values */	1385	/* send the current values */
1536	sl << uint32 (spell->count)	1386	sl << uint32 (spell->count)
1537	<< uint16 (spell->level)	1387	<< uint16 (spell->level)
1538	<< uint16 (spell->casting_time)	1388	<< uint16 (spell->casting_time)
1539	<< uint16 (spell->last_sp)	1389	<< uint16 (spell->cached_sp)
1540	<< uint16 (spell->last_grace)	1390	<< uint16 (spell->cached_grace)
1541	<< uint16 (spell->last_eat)	1391	<< uint16 (spell->cached_eat)
1542	<< uint8 (skill)	1392	<< uint8 (skill)
1543	<< uint32 (spell->path_attuned)	1393	<< uint32 (spell->path_attuned)
1544	<< uint32 (spell->face)	1394	<< uint32 (spell->face)
1545	<< data8 (spell->name)	1395	<< data8 (spell->name)
1546	<< data16 (spell->msg);	1396	<< data16 (spell->msg);
…		…
1574	* bytes and 3 strings (because that is the spec) so we need to	1424	* 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,	1425	* 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,	1426	* 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	1427	* we need to send what we already have, and restart packet formation
1578	*/	1428	*/
		1429	if (spell->type != SPELL)
		1430	continue;
		1431
1579	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1432	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
1580	* to show add_spell is 26 bytes + 2 strings. However, the overun	1433	* 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	1434	* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
1582	* like it will fix this	1435	* like it will fix this
1583	*/	1436	*/
1584	if (spell->type != SPELL)
1585	continue;
1586
1587	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	1437	if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
1588	{	1438	{
		1439	pl->ns->flush_fx ();
1589	pl->ns->send_packet (sl);	1440	pl->ns->send_packet (sl);
1590		1441
1591	sl.reset ();	1442	sl.reset ();
1592	sl << "addspell ";	1443	sl << "addspell ";
1593	}	1444	}
…		…
1601	return;	1452	return;
1602	}	1453	}
1603	else	1454	else
1604	append_spell (pl, sl, spell);	1455	append_spell (pl, sl, spell);
1605		1456
1606	if (sl.length () >= MAXSOCKBUF)	1457	if (sl.length () > MAXSOCKBUF)
1607	{	1458	{
1608	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1459	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
1609	fatal (0);	1460	fatal (0);
1610	}	1461	}
1611		1462
1612	/* finally, we can send the packet */	1463	/* finally, we can send the packet */
		1464	pl->ns->flush_fx ();
1613	pl->ns->send_packet (sl);	1465	pl->ns->send_packet (sl);
1614	}	1466	}
1615		1467

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.115 by root, Wed Jul 11 15:57:31 2007 UTC vs. Revision 1.147 by root, Sat Dec 27 08:41:44 2008 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.115 by root, Wed Jul 11 15:57:31 2007 UTC vs.
Revision 1.147 by root, Sat Dec 27 08:41:44 2008 UTC