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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.129 by root, Tue May 6 19:37:01 2008 UTC vs.
Revision 1.157 by root, Fri Nov 6 13:05:57 2009 UTC

…		…
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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	* Deliantra 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 <support@deliantra.net>	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).
…		…
141	pl->ns->send_packet ("newmap");	140	pl->ns->send_packet ("newmap");
142		141
143	pl->ns->floorbox_reset ();	142	pl->ns->floorbox_reset ();
144	}	143	}
145		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	}
		169	}
		170
146	/** check for map/region change and send new map data */	171	/** check for map/region change and send new map data */
147	static void	172	static void
148	check_map_change (player *pl)	173	check_map_change (player *pl)
149	{	174	{
150	client &socket = *pl->ns;	175	client &socket = *pl->ns;
151	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	}
152		204
153	if (socket.current_map != ob->map \|\| socket.force_newmap)	205	if (socket.current_map != ob->map \|\| socket.force_newmap)
154	{	206	{
155	clear_map (pl);	207	clear_map (pl);
156	socket.current_map = ob->map;	208	socket.current_map = ob->map;
157		209	send_map_info (pl);
158	if (socket.mapinfocmd)
159	{
160	if (ob->map && ob->map->path[0])
161	{
162	int flags = 0;
163
164	if (ob->map->tile_path[0]) flags \|= 1;
165	if (ob->map->tile_path[1]) flags \|= 2;
166	if (ob->map->tile_path[2]) flags \|= 4;
167	if (ob->map->tile_path[3]) flags \|= 8;
168
169	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
170	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
171	ob->map->width, ob->map->height, &ob->map->path);
172	}
173	else
174	socket.send_packet ("mapinfo current");
175	}
176	}	210	}
177	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)
178	{	212	{
179	int dx = ob->x - socket.current_x;	213	int dx = ob->x - socket.current_x;
180	int dy = ob->y - socket.current_y;	214	int dy = ob->y - socket.current_y;
181		215
182	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))
183	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
184	else
185	{
186	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);
187	socket.floorbox_reset ();	217	socket.floorbox_reset ();
188	}
189	}	218	}
190		219
191	socket.current_x = ob->x;	220	socket.current_x = ob->x;
192	socket.current_y = ob->y;	221	socket.current_y = ob->y;
		222	}
193		223
194	region *reg = ob->region ();	224	/**
195	if (socket.current_region != reg)	225	* This sends the skill number to name mapping. We ignore
196	{	226	* the params - we always send the same info no matter what.
197	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	227	*/
198	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)
199	}	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);
200	}	267	}
201		268
202	/**	269	/**
203	* RequestInfo is sort of a meta command. There is some specific	270	* RequestInfo is sort of a meta command. There is some specific
204	* request of information, but we call other functions to provide	271	* request of information, but we call other functions to provide
…		…
217	{	284	{
218	*params++ = 0;	285	*params++ = 0;
219	break;	286	break;
220	}	287	}
221		288
222	if (!strcmp (buf, "image_info"))
223	send_image_info (ns, params);
224	else if (!strcmp (buf, "image_sums"))
225	send_image_sums (ns, params);
226	else if (!strcmp (buf, "skill_info"))	289	if (!strcmp (buf, "skill_info"))
227	send_skill_info (ns, params);	290	send_skill_info (ns, params);
228	else if (!strcmp (buf, "spell_paths"))	291	else if (!strcmp (buf, "spell_paths"))
229	send_spell_paths (ns, params);	292	send_spell_paths (ns, params);
230	else	293	else
231	{	294	{
…		…
247	ExtiCmd (char buf, int len, client ns)	310	ExtiCmd (char buf, int len, client ns)
248	{	311	{
249	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	312	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250	}	313	}
251		314
		315	//-GPL
		316
252	void	317	void
253	client::mapinfo_queue_clear ()	318	client::mapinfo_queue_clear ()
254	{	319	{
255	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	320	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256	free (*i);	321	free (*i);
…		…
263	{	328	{
264	char *token = buf;	329	char *token = buf;
265	buf += strlen (buf) + 9;	330	buf += strlen (buf) + 9;
266		331
267	// initial map and its origin	332	// initial map and its origin
268	maptile *map = pl->observe->map;	333	maptile *map = pl->viewpoint->map;
269	int mapx = pl->ns->mapx / 2 - pl->observe->x;	334	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
270	int mapy = pl->ns->mapy / 2 - pl->observe->y;	335	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
271	int max_distance = 8; // limit maximum path length to something generous	336	int max_distance = 8; // limit maximum path length to something generous
272		337
273	while (*buf && map && max_distance)	338	while (*buf && map && max_distance)
274	{	339	{
275	int dir = *buf++ - '1';	340	int dir = *buf++ - '1';
…		…
380	AddMeCmd (char buf, int len, client ns)	445	AddMeCmd (char buf, int len, client ns)
381	{	446	{
382	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	447	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383	}	448	}
384		449
385	/** Reply to ExtendedInfos command */	450	//+GPL
386	void
387	ToggleExtendedInfos (char buf, int len, client ns)
388	{
389	char cmdback[MAX_BUF];
390	char command[50];
391	int info, nextinfo;
392
393	cmdback[0] = '\0';
394	nextinfo = 0;
395
396	while (1)
397	{
398	/* 1. Extract an info */
399	info = nextinfo;
400
401	while ((info < len) && (buf[info] == ' '))
402	info++;
403
404	if (info >= len)
405	break;
406
407	nextinfo = info + 1;
408
409	while ((nextinfo < len) && (buf[nextinfo] != ' '))
410	nextinfo++;
411
412	if (nextinfo - info >= 49) /Erroneous info asked /
413	continue;
414
415	strncpy (command, &(buf[info]), nextinfo - info);
416
417	/* 2. Interpret info */
418	if (!strcmp ("smooth", command))
419	/* Toggle smoothing */
420	ns->EMI_smooth = !ns->EMI_smooth;
421	else
422	/bad value /;
423
424	/3. Next info /
425	}
426
427	strcpy (cmdback, "ExtendedInfoSet");
428
429	if (ns->EMI_smooth)
430	{
431	strcat (cmdback, " ");
432	strcat (cmdback, "smoothing");
433	}
434
435	ns->send_packet (cmdback);
436	}
437		451
438	/*	452	/*
439	#define MSG_TYPE_BOOK 1	453	#define MSG_TYPE_BOOK 1
440	#define MSG_TYPE_CARD 2	454	#define MSG_TYPE_CARD 2
441	#define MSG_TYPE_PAPER 3	455	#define MSG_TYPE_PAPER 3
…		…
458	while (1)	472	while (1)
459	{	473	{
460	/* 1. Extract an info */	474	/* 1. Extract an info */
461	info = nextinfo;	475	info = nextinfo;
462		476
463	while ((info < len) && (buf[info] == ' '))	477	while ((info < len) && (buf [info] == ' '))
464	info++;	478	info++;
465		479
466	if (info >= len)	480	if (info >= len)
467	break;	481	break;
468		482
469	nextinfo = info + 1;	483	nextinfo = info + 1;
470		484
471	while ((nextinfo < len) && (buf[nextinfo] != ' '))	485	while ((nextinfo < len) && (buf [nextinfo] != ' '))
472	nextinfo++;	486	nextinfo++;
473		487
474	if (nextinfo - info >= 49) /Erroneous info asked /	488	if (nextinfo - info >= 49) /Erroneous info asked /
475	continue;	489	continue;
476		490
477	strncpy (command, &(buf[info]), nextinfo - info);	491	memcpy (command, buf + info, nextinfo - info);
478	command[nextinfo - info] = '\0';	492	command [nextinfo - info] = 0;
		493
479	/* 2. Interpret info */	494	/* 2. Interpret info */
480	i = sscanf (command, "%d", &flag);	495	i = sscanf (command, "%d", &flag);
481		496
482	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	497	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
483	ns->supported_readables \|= (1 << flag);	498	ns->supported_readables \|= (1 << flag);
…		…
517	return;	532	return;
518		533
519	buf++;	534	buf++;
520	}	535	}
521		536
522	execute_newserver_command (pl->ob, (char *) buf);	537	execute_newserver_command (pl->ob, (char *)buf);
523		538
524	/* Perhaps something better should be done with a left over count.	539	/* Perhaps something better should be done with a left over count.
525	* Cleaning up the input should probably be done first - all actions	540	* Cleaning up the input should probably be done first - all actions
526	* 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
527	* commands.	542	* commands.
…		…
719	* Get player's current range attack in obuf.	734	* Get player's current range attack in obuf.
720	*/	735	*/
721	static void	736	static void
722	rangetostring (player pl, char obuf)	737	rangetostring (player pl, char obuf)
723	{	738	{
724	dynbuf_text buf;	739	dynbuf_text &buf = msg_dynbuf; buf.clear ();
725		740
726	if (pl->ranged_ob)	741	if (pl->ranged_ob)
727	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;
728		743
729	if (pl->combat_ob)	744	if (pl->combat_ob)
…		…
805	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
806	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
807	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
808		823
809	for (int s = 0; s < NUM_SKILLS; s++)	824	for (int s = 0; s < NUM_SKILLS; s++)
810	if (object *skill = opl->last_skill_ob[s])	825	if (object *skill = opl->last_skill_ob [s])
811	if (skill->stats.exp != ns->last_skill_exp [s])	826	if (skill->stats.exp != ns->last_skill_exp [s])
812	{	827	{
813	ns->last_skill_exp [s] = skill->stats.exp;	828	ns->last_skill_exp [s] = skill->stats.exp;
814		829
815	/* Always send along the level if exp changes. This is only	830	/* Always send along the level if exp changes. This is only
…		…
884	<< uint32 (pl->ob->face)	899	<< uint32 (pl->ob->face)
885	<< data8 (pl->ob->name);	900	<< data8 (pl->ob->name);
886		901
887	pl->ns->last_weight = weight;	902	pl->ns->last_weight = weight;
888	pl->ns->send_packet (sl);	903	pl->ns->send_packet (sl);
889	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
890	}	904	}
891		905
892	/******************************************************************************	906	/******************************************************************************
893	*	907	*
894	* Start of map related commands.	908	* Start of map related commands.
…		…
961		975
962	/* Nothing changed */	976	/* Nothing changed */
963	return 0;	977	return 0;
964	}	978	}
965		979
966	/**	980	//-GPL
967	* Returns the size of a data for a map square as returned by
968	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
969	* available.
970	*/
971	int
972	getExtendedMapInfoSize (client * ns)
973	{
974	int result = 0;
975
976	if (ns->ext_mapinfos)
977	{
978	if (ns->EMI_smooth)
979	result += 1; /One byte for smoothlevel /
980	}
981
982	return result;
983	}
984		981
985	// prefetch (and touch) all maps within a specific distancd	982	// prefetch (and touch) all maps within a specific distancd
986	static void	983	static void
987	prefetch_surrounding_maps (maptile *map, int distance)	984	prefetch_surrounding_maps (maptile *map, int distance)
988	{	985	{
989	map->last_access = runtime;	986	map->touch ();
990		987
991	if (--distance)	988	if (--distance)
992	for (int dir = 4; --dir; )	989	for (int dir = 4; --dir; )
993	if (const shstr &path = map->tile_path [dir])	990	if (const shstr &path = map->tile_path [dir])
994	if (maptile *&neigh = map->tile_map [dir])	991	if (maptile *&neigh = map->tile_map [dir])
…		…
1002	prefetch_surrounding_maps (object *op)	999	prefetch_surrounding_maps (object *op)
1003	{	1000	{
1004	prefetch_surrounding_maps (op->map, 3);	1001	prefetch_surrounding_maps (op->map, 3);
1005	}	1002	}
1006		1003
		1004	//+GPL
		1005
1007	/**	1006	/**
1008	* Draws client map.	1007	* Draws client map.
1009	*/	1008	*/
1010	void	1009	void
1011	draw_client_map (player *pl)	1010	draw_client_map (player *pl)
1012	{	1011	{
1013	object *ob = pl->observe;	1012	object *ob = pl->viewpoint;
1014	if (!ob->active)	1013	if (!pl->observe->active)
1015	return;	1014	return;
1016
1017	maptile *plmap = ob->map;
1018		1015
1019	/* 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
1020	* 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
1021	* be OK once they really log in.	1018	* be OK once they really log in.
1022	*/	1019	*/
1023	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)	1020	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1024	return;	1021	return;
1025		1022
1026	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1027	int estartlen, eoldlen;	1023	int startlen, oldlen;
1028	uint8 eentrysize;
1029	uint16 ewhatstart, ewhatflag;
1030	uint8 extendedinfos;
1031		1024
1032	check_map_change (pl);	1025	check_map_change (pl);
1033	prefetch_surrounding_maps (pl->ob);	1026	prefetch_surrounding_maps (pl->ob);
1034		1027
1035	/* do LOS after calls to update_position */	1028	/* do LOS after calls to update_position */
1036	if (ob != pl->ob)	1029	/* unfortunately, we need to udpate los when observing, currently */
1037	clear_los (pl);	1030	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1038	else if (pl->do_los)
1039	{	1031	{
1040	update_los (ob);
1041	pl->do_los = 0;	1032	pl->do_los = 0;
		1033	pl->update_los ();
1042	}	1034	}
1043		1035
1044	/**	1036	/**
1045	* 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
1046	* 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
…		…
1065	*/	1057	*/
1066		1058
1067	client &socket = *pl->ns;	1059	client &socket = *pl->ns;
1068		1060
1069	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1061	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1070	packet esl;
1071		1062
1072	startlen = sl.length ();	1063	startlen = sl.length ();
1073		1064
1074	/Extendedmapinfo structure initialisation /	1065	int hx = socket.mapx / 2;
1075	if (socket.ext_mapinfos)	1066	int hy = socket.mapy / 2;
1076	{
1077	extendedinfos = EMI_NOREDRAW;
1078		1067
1079	if (socket.EMI_smooth)	1068	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1080	extendedinfos \|= EMI_SMOOTH;	1069	int ax = dx + hx;
		1070	int ay = dy + hy;
1081		1071
1082	ewhatstart = esl.length ();	1072	int mask = (ax << 10) \| (ay << 4);
1083	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	1073	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1084	could need to be taken away */
1085	eentrysize = getExtendedMapInfoSize (&socket);
1086	esl << "mapextended "
1087	<< uint8 (extendedinfos)
1088	<< uint8 (eentrysize);
1089		1074
1090	estartlen = esl.length ();	1075	/* If the coordinates are not valid, or it is too dark to see,
1091	}	1076	* we tell the client as such
1092
1093	/* x,y are the real map locations. ax, ay are viewport relative
1094	* locations.
1095	*/	1077	*/
1096	ay = 0;	1078	if (!m)
1097
1098	/* We could do this logic as conditionals in the if statement,
1099	* but that started to get a bit messy to look at.
1100	*/
1101	max_x = ob->x + (socket.mapx + 1) / 2;
1102	max_y = ob->y + (socket.mapy + 1) / 2;
1103
1104	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1105	{	1079	{
1106	sint16 nx, ny;	1080	/* space is out of map. Update space and clear values
1107	maptile *m = 0;	1081	* if this hasn't already been done. If the space is out
1108		1082	* of the map, it shouldn't have a head.
1109	ax = 0;	1083	*/
1110	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	1084	if (lastcell.count != -1)
1111	{	1085	{
1112	// check to see if we can simply go one right quickly	1086	sl << uint16 (mask);
		1087	map_clearcell (&lastcell, -1);
1113	++nx;	1088	}
1114	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	{
1115	m = 0;	1137	mask \|= 0x8;
1116		1138
1117	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)
1118	{	1158	{
1119	nx = x; ny = y; m = plmap;	1159	if (op->stats.maxhp > op->stats.hp
1120		1160	&& op->stats.maxhp > 0
1121	if (xy_normalise (m, nx, ny))	1161	&& (op->type == PLAYER
1122	m->touch ();	1162	\|\| op->type == DOOR // does not work, have maxhp 0
1123	else	1163	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1164	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1165	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1124	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;
1125	}	1178	}
1126		1179
1127	int emask, mask;	1180	if (expect_false (lastcell.stat_hp != stat_hp))
1128	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1129
1130	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1131
1132	/* If the coordinates are not valid, or it is too dark to see,
1133	* we tell the client as such
1134	*/
1135	if (!m)
1136	{	1181	{
1137	/* space is out of map. Update space and clear values	1182	lastcell.stat_hp = stat_hp;
1138	* if this hasn't already been done. If the space is out	1183
1139	* of the map, it shouldn't have a head	1184	mask \|= 0x8;
1140	*/	1185	*last_ext \|= 0x80;
1141	if (lastcell.count != -1)	1186	last_ext = &sl[sl.length ()];
		1187
		1188	sl << uint8 (5) << uint8 (stat_hp);
		1189
		1190	if (stat_width > 1)
1142	{	1191	{
1143	sl << uint16 (mask);
1144	map_clearcell (&lastcell, -1);
1145	}
1146
1147	continue;
1148	}
1149
1150	int d = pl->blocked_los[ax][ay];
1151
1152	if (d > 3)
1153	{
1154
1155	int need_send = 0, count;
1156
1157	/* This block deals with spaces that are not visible for whatever
1158	* reason. Still may need to send the head for this space.
1159	*/
1160
1161	oldlen = sl.length ();
1162
1163	sl << uint16 (mask);
1164
1165	if (lastcell.count != -1)
1166	need_send = 1;
1167
1168	count = -1;
1169
1170	/* properly clear a previously sent big face */
1171	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1172	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1173	need_send = 1;
1174
1175	map_clearcell (&lastcell, count);
1176
1177	if ((mask & 0xf) \|\| need_send)
1178	sl[oldlen + 1] = mask & 0xff;
1179	else
1180	sl.reset (oldlen);
1181	}
1182	else
1183	{
1184	/* In this block, the space is visible.
1185	*/
1186
1187	/* Rather than try to figure out what everything that we might
1188	* need to send is, then form the packet after that,
1189	* we presume that we will in fact form a packet, and update
1190	* the bits by what we do actually send. If we send nothing,
1191	* we just back out sl.length () to the old value, and no harm
1192	* is done.
1193	* I think this is simpler than doing a bunch of checks to see
1194	* what if anything we need to send, setting the bits, then
1195	* doing those checks again to add the real data.
1196	*/
1197	oldlen = sl.length ();
1198	eoldlen = esl.length ();
1199
1200	sl << uint16 (mask);
1201
1202	unsigned char dummy;
1203	unsigned char *last_ext = &dummy;
1204
1205	/* Darkness changed */
1206	if (lastcell.count != d && socket.darkness)
1207	{
1208	mask \|= 0x8;
1209
1210	if (socket.extmap)
1211	{
1212	*last_ext \|= 0x80;	1192	*last_ext \|= 0x80;
1213	last_ext = &sl[sl.length ()];	1193	last_ext = &sl[sl.length ()];
1214	sl << uint8 (d);	1194
1215	}	1195	sl << uint8 (6) << uint8 (stat_width);
1216	else
1217	sl << uint8 (255 - 64 * d);
1218	}	1196	}
		1197	}
1219		1198
1220	lastcell.count = d;	1199	if (expect_false (lastcell.player != player))
1221
1222	mapspace &ms = m->at (nx, ny);
1223	ms.update ();
1224
1225	if (socket.extmap)
1226	{	1200	{
1227	uint8 stat_hp = 0;	1201	lastcell.player = player;
1228	uint8 stat_width = 0;
1229	uint8 flags = 0;
1230	tag_t player = 0;
1231		1202
1232	// send hp information, if applicable
1233	if (object *op = ms.faces_obj [0])
1234	if (op->is_head () && !op->invisible)
1235	{
1236	if (op->stats.maxhp > op->stats.hp
1237	&& op->stats.maxhp > 0
1238	&& (op->type == PLAYER
1239	\|\| op->type == DOOR // does not work, have maxhp 0
1240	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1241	{
1242	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1243	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1244	}
1245
1246	if (op->msg && op->msg[0] == '@')
1247	flags \|= 1;
1248
1249	if (op->type == PLAYER && op != ob)
1250	player = op->count;
1251	}
1252
1253	if (lastcell.stat_hp != stat_hp)
1254	{
1255	lastcell.stat_hp = stat_hp;
1256
1257	mask \|= 0x8;	1203	mask \|= 0x8;
1258	*last_ext \|= 0x80;	1204	*last_ext \|= 0x80;
1259	last_ext = &sl[sl.length ()];	1205	last_ext = &sl[sl.length ()];
1260		1206
1261	sl << uint8 (5) << uint8 (stat_hp);
1262
1263	if (stat_width > 1)
1264	{
1265	*last_ext \|= 0x80;
1266	last_ext = &sl[sl.length ()];
1267
1268	sl << uint8 (6) << uint8 (stat_width);
1269	}
1270	}
1271
1272	if (lastcell.player != player)
1273	{
1274	lastcell.player = player;
1275
1276	mask \|= 0x8;
1277	*last_ext \|= 0x80;
1278	last_ext = &sl[sl.length ()];
1279
1280	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1207	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1281	}	1208	}
1282		1209
1283	if (lastcell.flags != flags)	1210	if (expect_false (lastcell.flags != flags))
1284	{	1211	{
1285	lastcell.flags = flags;	1212	lastcell.flags = flags;
1286		1213
1287	mask \|= 0x8;	1214	mask \|= 0x8;
1288	*last_ext \|= 0x80;	1215	*last_ext \|= 0x80;
1289	last_ext = &sl[sl.length ()];	1216	last_ext = &sl[sl.length ()];
1290		1217
1291	sl << uint8 (8) << uint8 (flags);	1218	sl << uint8 (8) << uint8 (flags);
1292	}
1293	}	1219	}
1294		1220
		1221	// faces
		1222
1295	/* Floor face */	1223	/* Floor face */
1296	if (update_space (sl, socket, ms, lastcell, 2))	1224	if (update_space (sl, socket, ms, lastcell, 2))
1297	mask \|= 0x4;	1225	mask \|= 0x4;
1298		1226
1299	/* Middle face */	1227	/* Middle face */
1300	if (update_space (sl, socket, ms, lastcell, 1))	1228	if (update_space (sl, socket, ms, lastcell, 1))
1301	mask \|= 0x2;	1229	mask \|= 0x2;
1302		1230
		1231	if (expect_false (ob->invisible)
		1232	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1303	if (ms.player () == ob	1233	&& ms.player () == ob)
1304	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1305	{	1234	{
1306	// force player to be visible to himself if invisible	1235	// force player to be visible to himself if invisible
1307	if (lastcell.faces[0] != ob->face)	1236	if (lastcell.faces[0] != ob->face)
1308	{	1237	{
1309	lastcell.faces[0] = ob->face;	1238	lastcell.faces[0] = ob->face;
1310		1239
1311	mask \|= 0x1;
1312	sl << uint16 (ob->face);
1313
1314	socket.send_faces (ob);
1315	}
1316	}
1317	/* Top face */
1318	else if (update_space (sl, socket, ms, lastcell, 0))
1319	mask \|= 0x1;	1240	mask \|= 0x1;
		1241	sl << uint16 (ob->face);
1320		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
1321	/* 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
1322	* space by checking the mask. If so, update the mask.	1251	* space by checking the mask. If so, update the mask.
1323	* 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
1324	* value, so we don't send those bits.	1253	* value, so we don't send those bits.
1325	*/	1254	*/
1326	if (mask & 0xf)	1255	if (mask & 0xf)
1327	sl[oldlen + 1] = mask & 0xff;	1256	sl[oldlen + 1] = mask & 0xff;
1328	else	1257	else
1329	sl.reset (oldlen);	1258	sl.reset (oldlen);
1330
1331	if (socket.ext_mapinfos)
1332	esl << uint16 (emask);
1333
1334	if (socket.EMI_smooth)
1335	{
1336	for (int layer = 2+1; layer--; )
1337	{
1338	object *ob = ms.faces_obj [layer];
1339
1340	// If there is no object for this space, or if the face for the object
1341	// is the blank face, set the smoothlevel to zero.
1342	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1343
1344	// We've gotten what face we want to use for the object. Now see if
1345	// if it has changed since we last sent it to the client.
1346	if (lastcell.smooth[layer] != smoothlevel)
1347	{
1348	lastcell.smooth[layer] = smoothlevel;
1349	esl << uint8 (smoothlevel);
1350	emask \|= 1 << layer;
1351	}
1352	}
1353
1354	if (emask & 0xf)
1355	esl[eoldlen + 1] = emask & 0xff;
1356	else
1357	esl.reset (eoldlen);
1358	}
1359	} /* else this is a viewable space */	1259	} /* else this is a viewable space */
1360	} /* for x loop */	1260	ordered_mapwalk_end
1361	} /* for y loop */
1362		1261
1363	socket.flush_fx ();	1262	socket.flush_fx ();
1364
1365	/* Verify that we in fact do need to send this */
1366	if (socket.ext_mapinfos)
1367	{
1368	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1369	{
1370	/* No map data will follow, so don't say the client
1371	* it doesn't need draw!
1372	*/
1373	ewhatflag &= ~EMI_NOREDRAW;
1374	esl[ewhatstart + 1] = ewhatflag & 0xff;
1375	}
1376
1377	if (esl.length () > estartlen)
1378	socket.send_packet (esl);
1379	}
1380		1263
1381	if (sl.length () > startlen \|\| socket.sent_scroll)	1264	if (sl.length () > startlen \|\| socket.sent_scroll)
1382	{	1265	{
1383	socket.send_packet (sl);	1266	socket.send_packet (sl);
1384	socket.sent_scroll = 0;	1267	socket.sent_scroll = 0;
…		…
1395	{	1278	{
1396	pl->contr->ns->send_packet (buf);	1279	pl->contr->ns->send_packet (buf);
1397	}	1280	}
1398		1281
1399	/**	1282	/**
1400	* This sends the skill number to name mapping. We ignore
1401	* the params - we always send the same info no matter what.
1402	*/
1403	void
1404	send_skill_info (client ns, char params)
1405	{
1406	packet sl;
1407	sl << "replyinfo skill_info\n";
1408
1409	for (int i = 1; i < NUM_SKILLS; i++)
1410	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1411
1412	if (sl.length () > MAXSOCKBUF)
1413	{
1414	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1415	fatal (0);
1416	}
1417
1418	ns->send_packet (sl);
1419	}
1420
1421	/**
1422	* This sends the spell path to name mapping. We ignore
1423	* the params - we always send the same info no matter what.
1424	*/
1425	void
1426	send_spell_paths (client * ns, char *params)
1427	{
1428	packet sl;
1429
1430	sl << "replyinfo spell_paths\n";
1431
1432	for (int i = 0; i < NRSPELLPATHS; i++)
1433	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1434
1435	if (sl.length () > MAXSOCKBUF)
1436	{
1437	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1438	fatal (0);
1439	}
1440
1441	ns->send_packet (sl);
1442	}
1443
1444	/**
1445	* 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.
1446	* 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
1447	*/	1285	*/
1448	void	1286	void
1449	esrv_update_spells (player *pl)	1287	esrv_update_spells (player *pl)
…		…
1459	if (spell->type == SPELL)	1297	if (spell->type == SPELL)
1460	{	1298	{
1461	int flags = 0;	1299	int flags = 0;
1462		1300
1463	/* check if we need to update it */	1301	/* check if we need to update it */
1464	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))
1465	{	1303	{
1466	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);
1467	flags \|= UPD_SP_MANA;	1305	flags \|= UPD_SP_MANA;
1468	}	1306	}
1469		1307
1470	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))
1471	{	1309	{
1472	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);
1473	flags \|= UPD_SP_GRACE;	1311	flags \|= UPD_SP_GRACE;
1474	}	1312	}
1475		1313
1476	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))
1477	{	1315	{
1478	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);
1479	flags \|= UPD_SP_DAMAGE;	1317	flags \|= UPD_SP_DAMAGE;
1480	}	1318	}
1481		1319
1482	if (flags)	1320	if (flags)
1483	{	1321	{
…		…
1485		1323
1486	sl << "updspell "	1324	sl << "updspell "
1487	<< uint8 (flags)	1325	<< uint8 (flags)
1488	<< uint32 (spell->count);	1326	<< uint32 (spell->count);
1489		1327
1490	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1328	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1491	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1329	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1492	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1330	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1493		1331
1494	pl->ns->send_packet (sl);	1332	pl->ns->send_packet (sl);
1495	}	1333	}
1496	}	1334	}
1497	}	1335	}
…		…
1527	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);
1528	return;	1366	return;
1529	}	1367	}
1530		1368
1531	/* 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 */
1532	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);
1533	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);
1534	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);
1535		1373
1536	/* figure out which skill it uses, if it uses one */	1374	/* figure out which skill it uses, if it uses one */
1537	if (spell->skill)	1375	if (spell->skill)
1538	{	1376	if (object *tmp = pl->find_skill (spell->skill))
1539	for (i = 1; i < NUM_SKILLS; i++)
1540	if (!strcmp (spell->skill, skill_names[i]))
1541	{
1542	skill = i + CS_STAT_SKILLINFO;	1377	skill = tmp->subtype + CS_STAT_SKILLINFO;
1543	break;
1544	}
1545	}
1546		1378
1547	// spells better have a face	1379	// spells better have a face
1548	if (!spell->face)	1380	if (!spell->face)
1549	{	1381	{
1550	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);
…		…
1555		1387
1556	/* send the current values */	1388	/* send the current values */
1557	sl << uint32 (spell->count)	1389	sl << uint32 (spell->count)
1558	<< uint16 (spell->level)	1390	<< uint16 (spell->level)
1559	<< uint16 (spell->casting_time)	1391	<< uint16 (spell->casting_time)
1560	<< uint16 (spell->last_sp)	1392	<< uint16 (spell->cached_sp)
1561	<< uint16 (spell->last_grace)	1393	<< uint16 (spell->cached_grace)
1562	<< uint16 (spell->last_eat)	1394	<< uint16 (spell->cached_eat)
1563	<< uint8 (skill)	1395	<< uint8 (skill)
1564	<< uint32 (spell->path_attuned)	1396	<< uint32 (spell->path_attuned)
1565	<< uint32 (spell->face)	1397	<< uint32 (spell->face)
1566	<< data8 (spell->name)	1398	<< data8 (spell->name)
1567	<< data16 (spell->msg);	1399	<< data16 (spell->msg);
…		…
1634	/* finally, we can send the packet */	1466	/* finally, we can send the packet */
1635	pl->ns->flush_fx ();	1467	pl->ns->flush_fx ();
1636	pl->ns->send_packet (sl);	1468	pl->ns->send_packet (sl);
1637	}	1469	}
1638		1470
		1471	//-GPL
		1472

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.129 by root, Tue May 6 19:37:01 2008 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.129 by root, Tue May 6 19:37:01 2008 UTC vs.
Revision 1.157 by root, Fri Nov 6 13:05:57 2009 UTC