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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.121 by root, Fri Aug 24 01:03:09 2007 UTC vs.
Revision 1.158 by root, Fri Nov 6 13:11:28 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).
…		…
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	static void
		229	send_skill_info (client ns, char params)
		230	{
		231	packet sl;
		232	sl << "replyinfo skill_info\n";
		233
		234	for (int i = 1; i < NUM_SKILLS; i++)
		235	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
		236
		237	if (sl.length () > MAXSOCKBUF)
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	static void
		251	send_spell_paths (client * ns, char *params)
		252	{
		253	packet sl;
		254
		255	sl << "replyinfo spell_paths\n";
		256
		257	for (int i = 0; i < NRSPELLPATHS; i++)
		258	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		259
		260	if (sl.length () > MAXSOCKBUF)
		261	{
		262	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
		263	fatal (0);
		264	}
		265
		266	ns->send_packet (sl);
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->ob->map;	333	maptile *map = pl->viewpoint->map;
269	int mapx = pl->ns->mapx / 2 - pl->ob->x;	334	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
270	int mapy = pl->ns->mapy / 2 - pl->ob->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.
…		…
686	* syntax is: move (to) (tag) (nrof)	701	* syntax is: move (to) (tag) (nrof)
687	*/	702	*/
688	void	703	void
689	MoveCmd (char buf, int len, player pl)	704	MoveCmd (char buf, int len, player pl)
690	{	705	{
691	int vals[3], i;	706	int to, tag, nrof;
692		707
693	/* A little funky here. We only cycle for 2 records, because	708	if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
694	* we obviously are not going to find a space after the third
695	* record. Perhaps we should just replace this with a
696	* sscanf?
697	*/
698	for (i = 0; i < 2; i++)
699	{	709	{
700	vals[i] = atoi (buf);
701
702	if (!(buf = strchr (buf, ' ')))
703	{
704	LOG (llevError, "Incomplete move command: %s\n", buf);	710	LOG (llevError, "Incomplete move command: %s\n", buf);
705	return;	711	return;
706	}
707
708	buf++;
709	}	712	}
710		713
711	vals[2] = atoi (buf);	714	esrv_move_object (pl->ob, to, tag, nrof);
712
713	/* LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
714	esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
715	}	715	}
716		716
717	/******************************************************************************	717	/******************************************************************************
718	*	718	*
719	* Start of commands the server sends to the client.	719	* Start of commands the server sends to the client.
…		…
734	* Get player's current range attack in obuf.	734	* Get player's current range attack in obuf.
735	*/	735	*/
736	static void	736	static void
737	rangetostring (player pl, char obuf)	737	rangetostring (player pl, char obuf)
738	{	738	{
739	dynbuf_text buf;	739	dynbuf_text &buf = msg_dynbuf; buf.clear ();
740		740
741	if (pl->ranged_ob)	741	if (pl->ranged_ob)
742	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;
743		743
744	if (pl->combat_ob)	744	if (pl->combat_ob)
…		…
820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823		823
824	for (int s = 0; s < NUM_SKILLS; s++)	824	for (int s = 0; s < NUM_SKILLS; s++)
825	if (object *skill = opl->last_skill_ob[s])	825	if (object *skill = opl->last_skill_ob [s])
826	if (skill->stats.exp != ns->last_skill_exp [s])	826	if (skill->stats.exp != ns->last_skill_exp [s])
827	{	827	{
828	ns->last_skill_exp [s] = skill->stats.exp;	828	ns->last_skill_exp [s] = skill->stats.exp;
829		829
830	/* Always send along the level if exp changes. This is only	830	/* Always send along the level if exp changes. This is only
…		…
886		886
887	/**	887	/**
888	* 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.
889	*/	889	*/
890	void	890	void
891	esrv_new_player (player *pl, uint32 weight)	891	esrv_new_player (player *pl)
892	{	892	{
		893	sint32 weight = pl->ob->client_weight ();
		894
893	packet sl ("player");	895	packet sl ("player");
894		896
895	sl << uint32 (pl->ob->count)	897	sl << uint32 (pl->ob->count)
896	<< uint32 (weight)	898	<< uint32 (weight)
897	<< uint32 (pl->ob->face)	899	<< uint32 (pl->ob->face)
898	<< data8 (pl->ob->name);	900	<< data8 (pl->ob->name);
899		901
900	pl->ns->last_weight = weight;	902	pl->ns->last_weight = weight;
901	pl->ns->send_packet (sl);	903	pl->ns->send_packet (sl);
902	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
903	}	904	}
904		905
905	/******************************************************************************	906	/******************************************************************************
906	*	907	*
907	* Start of map related commands.	908	* Start of map related commands.
…		…
974		975
975	/* Nothing changed */	976	/* Nothing changed */
976	return 0;	977	return 0;
977	}	978	}
978		979
979	/**	980	//-GPL
980	* Returns the size of a data for a map square as returned by
981	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
982	* available.
983	*/
984	int
985	getExtendedMapInfoSize (client * ns)
986	{
987	int result = 0;
988
989	if (ns->ext_mapinfos)
990	{
991	if (ns->EMI_smooth)
992	result += 1; /One byte for smoothlevel /
993	}
994
995	return result;
996	}
997		981
998	// prefetch (and touch) all maps within a specific distancd	982	// prefetch (and touch) all maps within a specific distancd
999	static void	983	static void
1000	prefetch_surrounding_maps (maptile *map, int distance)	984	prefetch_surrounding_maps (maptile *map, int distance)
1001	{	985	{
1002	map->last_access = runtime;	986	map->touch ();
1003		987
1004	if (--distance)	988	if (--distance)
1005	for (int dir = 4; --dir; )	989	for (int dir = 4; --dir; )
1006	if (const shstr &path = map->tile_path [dir])	990	if (const shstr &path = map->tile_path [dir])
1007	if (maptile *&neigh = map->tile_map [dir])	991	if (maptile *&neigh = map->tile_map [dir])
…		…
1015	prefetch_surrounding_maps (object *op)	999	prefetch_surrounding_maps (object *op)
1016	{	1000	{
1017	prefetch_surrounding_maps (op->map, 3);	1001	prefetch_surrounding_maps (op->map, 3);
1018	}	1002	}
1019		1003
		1004	//+GPL
		1005
1020	/**	1006	/**
1021	* Draws client map.	1007	* Draws client map.
1022	*/	1008	*/
1023	void	1009	void
1024	draw_client_map (player *pl)	1010	draw_client_map (player *pl)
1025	{	1011	{
1026	object *ob = pl->observe;	1012	object *ob = pl->viewpoint;
1027	if (!ob->active)	1013	if (!pl->observe->active)
1028	return;	1014	return;
1029
1030	maptile *plmap = ob->map;
1031		1015
1032	/* 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
1033	* 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
1034	* be OK once they really log in.	1018	* be OK once they really log in.
1035	*/	1019	*/
1036	if (!plmap \|\| plmap->in_memory != MAP_IN_MEMORY)	1020	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1037	return;	1021	return;
1038		1022
1039	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1040	int estartlen, eoldlen;	1023	int startlen, oldlen;
1041	uint8 eentrysize;
1042	uint16 ewhatstart, ewhatflag;
1043	uint8 extendedinfos;
1044		1024
1045	check_map_change (pl);	1025	check_map_change (pl);
1046	prefetch_surrounding_maps (pl->ob);	1026	prefetch_surrounding_maps (pl->ob);
1047		1027
1048	/* do LOS after calls to update_position */	1028	/* do LOS after calls to update_position */
1049	if (ob != pl->ob)	1029	/* unfortunately, we need to udpate los when observing, currently */
1050	clear_los (pl);	1030	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1051	else if (pl->do_los)
1052	{	1031	{
1053	update_los (ob);
1054	pl->do_los = 0;	1032	pl->do_los = 0;
		1033	pl->update_los ();
1055	}	1034	}
1056		1035
1057	/**	1036	/**
1058	* 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
1059	* 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
…		…
1078	*/	1057	*/
1079		1058
1080	client &socket = *pl->ns;	1059	client &socket = *pl->ns;
1081		1060
1082	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1061	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1083	packet esl;
1084		1062
1085	startlen = sl.length ();	1063	startlen = sl.length ();
1086		1064
1087	/Extendedmapinfo structure initialisation /	1065	int hx = socket.mapx / 2;
1088	if (socket.ext_mapinfos)	1066	int hy = socket.mapy / 2;
1089	{
1090	extendedinfos = EMI_NOREDRAW;
1091		1067
1092	if (socket.EMI_smooth)	1068	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1093	extendedinfos \|= EMI_SMOOTH;	1069	int ax = dx + hx;
		1070	int ay = dy + hy;
1094		1071
1095	ewhatstart = esl.length ();	1072	int mask = (ax << 10) \| (ay << 4);
1096	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	1073	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1097	could need to be taken away */
1098	eentrysize = getExtendedMapInfoSize (&socket);
1099	esl << "mapextended "
1100	<< uint8 (extendedinfos)
1101	<< uint8 (eentrysize);
1102		1074
1103	estartlen = esl.length ();	1075	/* If the coordinates are not valid, or it is too dark to see,
1104	}	1076	* we tell the client as such
1105
1106	/* x,y are the real map locations. ax, ay are viewport relative
1107	* locations.
1108	*/	1077	*/
1109	ay = 0;	1078	if (!m)
1110
1111	/* We could do this logic as conditionals in the if statement,
1112	* but that started to get a bit messy to look at.
1113	*/
1114	max_x = ob->x + (socket.mapx + 1) / 2;
1115	max_y = ob->y + (socket.mapy + 1) / 2;
1116
1117	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1118	{	1079	{
1119	sint16 nx, ny;	1080	/* space is out of map. Update space and clear values
1120	maptile *m = 0;	1081	* if this hasn't already been done. If the space is out
1121		1082	* of the map, it shouldn't have a head.
1122	ax = 0;	1083	*/
1123	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	1084	if (lastcell.count != -1)
1124	{	1085	{
1125	// check to see if we can simply go one right quickly	1086	sl << uint16 (mask);
		1087	map_clearcell (&lastcell, -1);
1126	++nx;	1088	}
1127	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	{
1128	m = 0;	1137	mask \|= 0x8;
1129		1138
1130	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)
1131	{	1158	{
1132	nx = x; ny = y; m = plmap;	1159	if (op->stats.maxhp > op->stats.hp
1133		1160	&& op->stats.maxhp > 0
1134	if (xy_normalise (m, nx, ny))	1161	&& (op->type == PLAYER
1135	m->touch ();	1162	\|\| op->type == DOOR // does not work, have maxhp 0
1136	else	1163	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1164	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1165	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1137	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;
1138	}	1178	}
1139		1179
1140	int emask, mask;	1180	if (expect_false (lastcell.stat_hp != stat_hp))
1141	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1142
1143	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1144
1145	/* If the coordinates are not valid, or it is too dark to see,
1146	* we tell the client as such
1147	*/
1148	if (!m)
1149	{	1181	{
1150	/* space is out of map. Update space and clear values	1182	lastcell.stat_hp = stat_hp;
1151	* if this hasn't already been done. If the space is out	1183
1152	* of the map, it shouldn't have a head	1184	mask \|= 0x8;
1153	*/	1185	*last_ext \|= 0x80;
1154	if (lastcell.count != -1)	1186	last_ext = &sl[sl.length ()];
		1187
		1188	sl << uint8 (5) << uint8 (stat_hp);
		1189
		1190	if (stat_width > 1)
1155	{	1191	{
1156	sl << uint16 (mask);
1157	map_clearcell (&lastcell, -1);
1158	}
1159
1160	continue;
1161	}
1162
1163	int d = pl->blocked_los[ax][ay];
1164
1165	if (d > 3)
1166	{
1167
1168	int need_send = 0, count;
1169
1170	/* This block deals with spaces that are not visible for whatever
1171	* reason. Still may need to send the head for this space.
1172	*/
1173
1174	oldlen = sl.length ();
1175
1176	sl << uint16 (mask);
1177
1178	if (lastcell.count != -1)
1179	need_send = 1;
1180
1181	count = -1;
1182
1183	/* properly clear a previously sent big face */
1184	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1185	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1186	need_send = 1;
1187
1188	map_clearcell (&lastcell, count);
1189
1190	if ((mask & 0xf) \|\| need_send)
1191	sl[oldlen + 1] = mask & 0xff;
1192	else
1193	sl.reset (oldlen);
1194	}
1195	else
1196	{
1197	/* In this block, the space is visible.
1198	*/
1199
1200	/* Rather than try to figure out what everything that we might
1201	* need to send is, then form the packet after that,
1202	* we presume that we will in fact form a packet, and update
1203	* the bits by what we do actually send. If we send nothing,
1204	* we just back out sl.length () to the old value, and no harm
1205	* is done.
1206	* I think this is simpler than doing a bunch of checks to see
1207	* what if anything we need to send, setting the bits, then
1208	* doing those checks again to add the real data.
1209	*/
1210	oldlen = sl.length ();
1211	eoldlen = esl.length ();
1212
1213	sl << uint16 (mask);
1214
1215	unsigned char dummy;
1216	unsigned char *last_ext = &dummy;
1217
1218	/* Darkness changed */
1219	if (lastcell.count != d && socket.darkness)
1220	{
1221	mask \|= 0x8;
1222
1223	if (socket.extmap)
1224	{
1225	*last_ext \|= 0x80;	1192	*last_ext \|= 0x80;
1226	last_ext = &sl[sl.length ()];	1193	last_ext = &sl[sl.length ()];
1227	sl << uint8 (d);	1194
1228	}	1195	sl << uint8 (6) << uint8 (stat_width);
1229	else
1230	sl << uint8 (255 - 64 * d);
1231	}	1196	}
		1197	}
1232		1198
1233	lastcell.count = d;	1199	if (expect_false (lastcell.player != player))
1234
1235	mapspace &ms = m->at (nx, ny);
1236	ms.update ();
1237
1238	if (socket.extmap)
1239	{	1200	{
1240	uint8 stat_hp = 0;	1201	lastcell.player = player;
1241	uint8 stat_width = 0;
1242	uint8 flags = 0;
1243	tag_t player = 0;
1244		1202
1245	// send hp information, if applicable
1246	if (object *op = ms.faces_obj [0])
1247	{
1248	if (op->head \|\| op->invisible)
1249	; // do not show
1250	else if (op->type == PLAYER
1251	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR))
1252	{
1253	if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
1254	{
1255	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1256	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1257	}
1258	}
1259
1260	if (op->msg && op->msg[0] == '@')
1261	flags \|= 1;
1262
1263	if (op->type == PLAYER && op != ob)
1264	player = op->count;
1265	}
1266
1267	if (lastcell.stat_hp != stat_hp)
1268	{
1269	lastcell.stat_hp = stat_hp;
1270
1271	mask \|= 0x8;	1203	mask \|= 0x8;
1272	*last_ext \|= 0x80;	1204	*last_ext \|= 0x80;
1273	last_ext = &sl[sl.length ()];	1205	last_ext = &sl[sl.length ()];
1274		1206
1275	sl << uint8 (5) << uint8 (stat_hp);
1276
1277	if (stat_width > 1)
1278	{
1279	*last_ext \|= 0x80;
1280	last_ext = &sl[sl.length ()];
1281
1282	sl << uint8 (6) << uint8 (stat_width);
1283	}
1284	}
1285
1286	if (lastcell.player != player)
1287	{
1288	lastcell.player = player;
1289
1290	mask \|= 0x8;
1291	*last_ext \|= 0x80;
1292	last_ext = &sl[sl.length ()];
1293
1294	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1207	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1295	}	1208	}
1296		1209
1297	if (lastcell.flags != flags)	1210	if (expect_false (lastcell.flags != flags))
1298	{	1211	{
1299	lastcell.flags = flags;	1212	lastcell.flags = flags;
1300		1213
1301	mask \|= 0x8;	1214	mask \|= 0x8;
1302	*last_ext \|= 0x80;	1215	*last_ext \|= 0x80;
1303	last_ext = &sl[sl.length ()];	1216	last_ext = &sl[sl.length ()];
1304		1217
1305	sl << uint8 (8) << uint8 (flags);	1218	sl << uint8 (8) << uint8 (flags);
1306	}
1307	}	1219	}
1308		1220
		1221	// faces
		1222
1309	/* Floor face */	1223	/* Floor face */
1310	if (update_space (sl, socket, ms, lastcell, 2))	1224	if (update_space (sl, socket, ms, lastcell, 2))
1311	mask \|= 0x4;	1225	mask \|= 0x4;
1312		1226
1313	/* Middle face */	1227	/* Middle face */
1314	if (update_space (sl, socket, ms, lastcell, 1))	1228	if (update_space (sl, socket, ms, lastcell, 1))
1315	mask \|= 0x2;	1229	mask \|= 0x2;
1316		1230
		1231	if (expect_false (ob->invisible)
		1232	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1317	if (ms.player () == ob	1233	&& ms.player () == ob)
1318	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1319	{	1234	{
1320	// force player to be visible to himself if invisible	1235	// force player to be visible to himself if invisible
1321	if (lastcell.faces[0] != ob->face)	1236	if (lastcell.faces[0] != ob->face)
1322	{	1237	{
1323	lastcell.faces[0] = ob->face;	1238	lastcell.faces[0] = ob->face;
1324		1239
1325	mask \|= 0x1;
1326	sl << uint16 (ob->face);
1327
1328	socket.send_faces (ob);
1329	}
1330	}
1331	/* Top face */
1332	else if (update_space (sl, socket, ms, lastcell, 0))
1333	mask \|= 0x1;	1240	mask \|= 0x1;
		1241	sl << uint16 (ob->face);
1334		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
1335	/* 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
1336	* space by checking the mask. If so, update the mask.	1251	* space by checking the mask. If so, update the mask.
1337	* 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
1338	* value, so we don't send those bits.	1253	* value, so we don't send those bits.
1339	*/	1254	*/
1340	if (mask & 0xf)	1255	if (mask & 0xf)
1341	sl[oldlen + 1] = mask & 0xff;	1256	sl[oldlen + 1] = mask & 0xff;
1342	else	1257	else
1343	sl.reset (oldlen);	1258	sl.reset (oldlen);
1344
1345	if (socket.ext_mapinfos)
1346	esl << uint16 (emask);
1347
1348	if (socket.EMI_smooth)
1349	{
1350	for (int layer = 2+1; layer--; )
1351	{
1352	object *ob = ms.faces_obj [layer];
1353
1354	// If there is no object for this space, or if the face for the object
1355	// is the blank face, set the smoothlevel to zero.
1356	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1357
1358	// We've gotten what face we want to use for the object. Now see if
1359	// if it has changed since we last sent it to the client.
1360	if (lastcell.smooth[layer] != smoothlevel)
1361	{
1362	lastcell.smooth[layer] = smoothlevel;
1363	esl << uint8 (smoothlevel);
1364	emask \|= 1 << layer;
1365	}
1366	}
1367
1368	if (emask & 0xf)
1369	esl[eoldlen + 1] = emask & 0xff;
1370	else
1371	esl.reset (eoldlen);
1372	}
1373	} /* else this is a viewable space */	1259	} /* else this is a viewable space */
1374	} /* for x loop */	1260	ordered_mapwalk_end
1375	} /* for y loop */
1376		1261
1377	socket.flush_fx ();	1262	socket.flush_fx ();
1378
1379	/* Verify that we in fact do need to send this */
1380	if (socket.ext_mapinfos)
1381	{
1382	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1383	{
1384	/* No map data will follow, so don't say the client
1385	* it doesn't need draw!
1386	*/
1387	ewhatflag &= ~EMI_NOREDRAW;
1388	esl[ewhatstart + 1] = ewhatflag & 0xff;
1389	}
1390
1391	if (esl.length () > estartlen)
1392	socket.send_packet (esl);
1393	}
1394		1263
1395	if (sl.length () > startlen \|\| socket.sent_scroll)	1264	if (sl.length () > startlen \|\| socket.sent_scroll)
1396	{	1265	{
1397	socket.send_packet (sl);	1266	socket.send_packet (sl);
1398	socket.sent_scroll = 0;	1267	socket.sent_scroll = 0;
1399	}	1268	}
1400	}
1401
1402	/*****************************************************************************/
1403	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1404	/* a player. Of course, the client need to know the command to be able to */
1405	/* manage it ! */
1406	/*****************************************************************************/
1407	void
1408	send_plugin_custom_message (object pl, char buf)
1409	{
1410	pl->contr->ns->send_packet (buf);
1411	}
1412
1413	/**
1414	* This sends the skill number to name mapping. We ignore
1415	* the params - we always send the same info no matter what.
1416	*/
1417	void
1418	send_skill_info (client ns, char params)
1419	{
1420	packet sl;
1421	sl << "replyinfo skill_info\n";
1422
1423	for (int i = 1; i < NUM_SKILLS; i++)
1424	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1425
1426	if (sl.length () > MAXSOCKBUF)
1427	{
1428	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1429	fatal (0);
1430	}
1431
1432	ns->send_packet (sl);
1433	}
1434
1435	/**
1436	* This sends the spell path to name mapping. We ignore
1437	* the params - we always send the same info no matter what.
1438	*/
1439	void
1440	send_spell_paths (client * ns, char *params)
1441	{
1442	packet sl;
1443
1444	sl << "replyinfo spell_paths\n";
1445
1446	for (int i = 0; i < NRSPELLPATHS; i++)
1447	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1448
1449	if (sl.length () > MAXSOCKBUF)
1450	{
1451	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1452	fatal (0);
1453	}
1454
1455	ns->send_packet (sl);
1456	}	1269	}
1457		1270
1458	/**	1271	/**
1459	* This looks for any spells the player may have that have changed their stats.	1272	* This looks for any spells the player may have that have changed their stats.
1460	* it then sends an updspell packet for each spell that has changed in this way	1273	* it then sends an updspell packet for each spell that has changed in this way
…		…
1473	if (spell->type == SPELL)	1286	if (spell->type == SPELL)
1474	{	1287	{
1475	int flags = 0;	1288	int flags = 0;
1476		1289
1477	/* check if we need to update it */	1290	/* check if we need to update it */
1478	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1291	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
1479	{	1292	{
1480	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1293	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1481	flags \|= UPD_SP_MANA;	1294	flags \|= UPD_SP_MANA;
1482	}	1295	}
1483		1296
1484	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1297	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
1485	{	1298	{
1486	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1299	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1487	flags \|= UPD_SP_GRACE;	1300	flags \|= UPD_SP_GRACE;
1488	}	1301	}
1489		1302
1490	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1303	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
1491	{	1304	{
1492	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1305	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1493	flags \|= UPD_SP_DAMAGE;	1306	flags \|= UPD_SP_DAMAGE;
1494	}	1307	}
1495		1308
1496	if (flags)	1309	if (flags)
1497	{	1310	{
…		…
1499		1312
1500	sl << "updspell "	1313	sl << "updspell "
1501	<< uint8 (flags)	1314	<< uint8 (flags)
1502	<< uint32 (spell->count);	1315	<< uint32 (spell->count);
1503		1316
1504	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1317	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1505	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1318	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1506	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1319	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1507		1320
1508	pl->ns->send_packet (sl);	1321	pl->ns->send_packet (sl);
1509	}	1322	}
1510	}	1323	}
1511	}	1324	}
…		…
1541	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1354	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1542	return;	1355	return;
1543	}	1356	}
1544		1357
1545	/* store costs and damage in the object struct, to compare to later */	1358	/* store costs and damage in the object struct, to compare to later */
1546	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1359	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1547	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1360	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1548	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1361	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
1549		1362
1550	/* figure out which skill it uses, if it uses one */	1363	/* figure out which skill it uses, if it uses one */
1551	if (spell->skill)	1364	if (spell->skill)
1552	{	1365	if (object *tmp = pl->find_skill (spell->skill))
1553	for (i = 1; i < NUM_SKILLS; i++)
1554	if (!strcmp (spell->skill, skill_names[i]))
1555	{
1556	skill = i + CS_STAT_SKILLINFO;	1366	skill = tmp->subtype + CS_STAT_SKILLINFO;
1557	break;
1558	}
1559	}
1560		1367
1561	// spells better have a face	1368	// spells better have a face
1562	if (!spell->face)	1369	if (!spell->face)
1563	{	1370	{
1564	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1371	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1569		1376
1570	/* send the current values */	1377	/* send the current values */
1571	sl << uint32 (spell->count)	1378	sl << uint32 (spell->count)
1572	<< uint16 (spell->level)	1379	<< uint16 (spell->level)
1573	<< uint16 (spell->casting_time)	1380	<< uint16 (spell->casting_time)
1574	<< uint16 (spell->last_sp)	1381	<< uint16 (spell->cached_sp)
1575	<< uint16 (spell->last_grace)	1382	<< uint16 (spell->cached_grace)
1576	<< uint16 (spell->last_eat)	1383	<< uint16 (spell->cached_eat)
1577	<< uint8 (skill)	1384	<< uint8 (skill)
1578	<< uint32 (spell->path_attuned)	1385	<< uint32 (spell->path_attuned)
1579	<< uint32 (spell->face)	1386	<< uint32 (spell->face)
1580	<< data8 (spell->name)	1387	<< data8 (spell->name)
1581	<< data16 (spell->msg);	1388	<< data16 (spell->msg);
…		…
1648	/* finally, we can send the packet */	1455	/* finally, we can send the packet */
1649	pl->ns->flush_fx ();	1456	pl->ns->flush_fx ();
1650	pl->ns->send_packet (sl);	1457	pl->ns->send_packet (sl);
1651	}	1458	}
1652		1459
		1460	//-GPL
		1461

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.121 by root, Fri Aug 24 01:03:09 2007 UTC vs. Revision 1.158 by root, Fri Nov 6 13:11:28 2009 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.121 by root, Fri Aug 24 01:03:09 2007 UTC vs.
Revision 1.158 by root, Fri Nov 6 13:11:28 2009 UTC