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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.138 by root, Thu Sep 25 04:09:57 2008 UTC vs.
Revision 1.164 by root, Fri Mar 26 00:59:22 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
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 Mark Wedel
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 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).
…		…
145		144
146	static void	145	static void
147	send_map_info (player *pl)	146	send_map_info (player *pl)
148	{	147	{
149	client &socket = *pl->ns;	148	client &socket = *pl->ns;
150	object *ob = pl->observe;	149	object *ob = pl->viewpoint;
151		150
152	if (socket.mapinfocmd)	151	if (socket.mapinfocmd)
153	{	152	{
154	if (ob->map && ob->map->path[0])	153	if (ob->map && ob->map->path[0])
155	{	154	{
…		…
172	/** check for map/region change and send new map data */	171	/** check for map/region change and send new map data */
173	static void	172	static void
174	check_map_change (player *pl)	173	check_map_change (player *pl)
175	{	174	{
176	client &socket = *pl->ns;	175	client &socket = *pl->ns;
177	object *ob = pl->observe;	176	object *ob = pl->viewpoint;
178		177
179	region *reg = ob->region ();	178	region *reg = ob->region ();
180	if (socket.current_region != reg)	179	if (socket.current_region != reg)
181	{	180	{
182	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	181	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
…		…
212	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)
213	{	212	{
214	int dx = ob->x - socket.current_x;	213	int dx = ob->x - socket.current_x;
215	int dy = ob->y - socket.current_y;	214	int dy = ob->y - socket.current_y;
216		215
217	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))
218	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
219	else
220	{
221	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);
222	socket.floorbox_reset ();	217	socket.floorbox_reset ();
223	}
224	}	218	}
225		219
226	socket.current_x = ob->x;	220	socket.current_x = ob->x;
227	socket.current_y = ob->y;	221	socket.current_y = ob->y;
		222	}
		223
		224	/**
		225	* This sends the skill number to name mapping. We ignore
		226	* the params - we always send the same info no matter what.
		227	*/
		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)
		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);
228	}	267	}
229		268
230	/**	269	/**
231	* RequestInfo is sort of a meta command. There is some specific	270	* RequestInfo is sort of a meta command. There is some specific
232	* request of information, but we call other functions to provide	271	* request of information, but we call other functions to provide
…		…
245	{	284	{
246	*params++ = 0;	285	*params++ = 0;
247	break;	286	break;
248	}	287	}
249		288
250	if (!strcmp (buf, "image_info"))
251	send_image_info (ns, params);
252	else if (!strcmp (buf, "image_sums"))
253	send_image_sums (ns, params);
254	else if (!strcmp (buf, "skill_info"))	289	if (!strcmp (buf, "skill_info"))
255	send_skill_info (ns, params);	290	send_skill_info (ns, params);
256	else if (!strcmp (buf, "spell_paths"))	291	else if (!strcmp (buf, "spell_paths"))
257	send_spell_paths (ns, params);	292	send_spell_paths (ns, params);
258	else	293	else
259	{	294	{
…		…
275	ExtiCmd (char buf, int len, client ns)	310	ExtiCmd (char buf, int len, client ns)
276	{	311	{
277	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	312	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278	}	313	}
279		314
		315	//-GPL
		316
280	void	317	void
281	client::mapinfo_queue_clear ()	318	client::mapinfo_queue_clear ()
282	{	319	{
283	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	320	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284	free (*i);	321	free (*i);
…		…
291	{	328	{
292	char *token = buf;	329	char *token = buf;
293	buf += strlen (buf) + 9;	330	buf += strlen (buf) + 9;
294		331
295	// initial map and its origin	332	// initial map and its origin
296	maptile *map = pl->observe->map;	333	maptile *map = pl->viewpoint->map;
297	int mapx = pl->ns->mapx / 2 - pl->observe->x;	334	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
298	int mapy = pl->ns->mapy / 2 - pl->observe->y;	335	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
299	int max_distance = 8; // limit maximum path length to something generous	336	int max_distance = 8; // limit maximum path length to something generous
300		337
301	while (*buf && map && max_distance)	338	while (*buf && map && max_distance)
302	{	339	{
303	int dir = *buf++ - '1';	340	int dir = *buf++ - '1';
…		…
408	AddMeCmd (char buf, int len, client ns)	445	AddMeCmd (char buf, int len, client ns)
409	{	446	{
410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	447	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
411	}	448	}
412		449
413	/** Reply to ExtendedInfos command */	450	//+GPL
414	void
415	ToggleExtendedInfos (char buf, int len, client ns)
416	{
417	char cmdback[MAX_BUF];
418	char command[50];
419	int info, nextinfo;
420
421	cmdback[0] = '\0';
422	nextinfo = 0;
423
424	while (1)
425	{
426	/* 1. Extract an info */
427	info = nextinfo;
428
429	while ((info < len) && (buf[info] == ' '))
430	info++;
431
432	if (info >= len)
433	break;
434
435	nextinfo = info + 1;
436
437	while ((nextinfo < len) && (buf[nextinfo] != ' '))
438	nextinfo++;
439
440	if (nextinfo - info >= 49) /Erroneous info asked /
441	continue;
442
443	strncpy (command, &(buf[info]), nextinfo - info);
444
445	/* 2. Interpret info */
446	if (!strcmp ("smooth", command))
447	/* Toggle smoothing */
448	ns->EMI_smooth = !ns->EMI_smooth;
449	else
450	/bad value /;
451
452	/3. Next info /
453	}
454
455	strcpy (cmdback, "ExtendedInfoSet");
456
457	if (ns->EMI_smooth)
458	{
459	strcat (cmdback, " ");
460	strcat (cmdback, "smoothing");
461	}
462
463	ns->send_packet (cmdback);
464	}
465		451
466	/*	452	/*
467	#define MSG_TYPE_BOOK 1	453	#define MSG_TYPE_BOOK 1
468	#define MSG_TYPE_CARD 2	454	#define MSG_TYPE_CARD 2
469	#define MSG_TYPE_PAPER 3	455	#define MSG_TYPE_PAPER 3
…		…
486	while (1)	472	while (1)
487	{	473	{
488	/* 1. Extract an info */	474	/* 1. Extract an info */
489	info = nextinfo;	475	info = nextinfo;
490		476
491	while ((info < len) && (buf[info] == ' '))	477	while ((info < len) && (buf [info] == ' '))
492	info++;	478	info++;
493		479
494	if (info >= len)	480	if (info >= len)
495	break;	481	break;
496		482
497	nextinfo = info + 1;	483	nextinfo = info + 1;
498		484
499	while ((nextinfo < len) && (buf[nextinfo] != ' '))	485	while ((nextinfo < len) && (buf [nextinfo] != ' '))
500	nextinfo++;	486	nextinfo++;
501		487
502	if (nextinfo - info >= 49) /Erroneous info asked /	488	if (nextinfo - info >= 49) /Erroneous info asked /
503	continue;	489	continue;
504		490
505	strncpy (command, &(buf[info]), nextinfo - info);	491	memcpy (command, buf + info, nextinfo - info);
506	command[nextinfo - info] = '\0';	492	command [nextinfo - info] = 0;
		493
507	/* 2. Interpret info */	494	/* 2. Interpret info */
508	i = sscanf (command, "%d", &flag);	495	i = sscanf (command, "%d", &flag);
509		496
510	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	497	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
511	ns->supported_readables \|= (1 << flag);	498	ns->supported_readables \|= (1 << flag);
…		…
545	return;	532	return;
546		533
547	buf++;	534	buf++;
548	}	535	}
549		536
550	execute_newserver_command (pl->ob, (char *) buf);	537	execute_newserver_command (pl->ob, (char *)buf);
551		538
552	/* Perhaps something better should be done with a left over count.	539	/* Perhaps something better should be done with a left over count.
553	* Cleaning up the input should probably be done first - all actions	540	* Cleaning up the input should probably be done first - all actions
554	* 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
555	* commands.	542	* commands.
…		…
589	* commands.	576	* commands.
590	*/	577	*/
591	pl->count = 0;	578	pl->count = 0;
592		579
593	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	580	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
594	int time = fabs (pl->ob->speed) < 0.001	581	int time = pl->ob->has_active_speed ()
595	? time = MAX_TIME * 100
596	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	582	? (int) (MAX_TIME / pl->ob->speed)
		583	: MAX_TIME * 100;
597		584
598	/* Send confirmation of command execution now */	585	/* Send confirmation of command execution now */
599	packet sl ("comc");	586	packet sl ("comc");
600	sl << uint16 (cmdid) << uint32 (time);	587	sl << uint16 (cmdid) << uint32 (time);
601	pl->ns->send_packet (sl);	588	pl->ns->send_packet (sl);
…		…
747	* Get player's current range attack in obuf.	734	* Get player's current range attack in obuf.
748	*/	735	*/
749	static void	736	static void
750	rangetostring (player pl, char obuf)	737	rangetostring (player pl, char obuf)
751	{	738	{
752	dynbuf_text buf;	739	dynbuf_text &buf = msg_dynbuf; buf.clear ();
753		740
754	if (pl->ranged_ob)	741	if (pl->ranged_ob)
755	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;
756		743
757	if (pl->combat_ob)	744	if (pl->combat_ob)
…		…
851	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	838	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
852	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	839	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
853	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	840	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
854	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	841	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
855	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	842	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
856	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	843	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
857	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	844	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
858	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	845	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
859	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	846	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
860		847
861	flags = 0;	848	flags = 0;
862		849
863	if (opl->fire_on)	850	if (opl->fire_on)
…		…
866	if (opl->run_on)	853	if (opl->run_on)
867	flags \|= SF_RUNON;	854	flags \|= SF_RUNON;
868		855
869	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	856	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
870		857
871	if (ns->sc_version < 1025)
872	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
873	else
874	for (int i = 0; i < NROFATTACKS; i++)	858	for (int i = 0; i < NROFATTACKS; i++)
875	{	859	{
876	/* Skip ones we won't send */	860	/* Skip ones we won't send */
877	if (atnr_cs_stat[i] == -1)	861	if (atnr_cs_stat[i] == -1)
878	continue;	862	continue;
879		863
880	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	864	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
881	}	865	}
882		866
883	if (pl->ns->monitor_spells)	867	if (pl->ns->monitor_spells)
884	{	868	{
885	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	869	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
886	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	870	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
…		…
988		972
989	/* Nothing changed */	973	/* Nothing changed */
990	return 0;	974	return 0;
991	}	975	}
992		976
993	/**	977	//-GPL
994	* Returns the size of a data for a map square as returned by
995	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
996	* available.
997	*/
998	int
999	getExtendedMapInfoSize (client * ns)
1000	{
1001	int result = 0;
1002
1003	if (ns->ext_mapinfos)
1004	{
1005	if (ns->EMI_smooth)
1006	result += 1; /One byte for smoothlevel /
1007	}
1008
1009	return result;
1010	}
1011		978
1012	// prefetch (and touch) all maps within a specific distancd	979	// prefetch (and touch) all maps within a specific distancd
1013	static void	980	static void
1014	prefetch_surrounding_maps (maptile *map, int distance)	981	prefetch_surrounding_maps (maptile *map, int distance)
1015	{	982	{
1016	map->last_access = runtime;	983	map->touch ();
1017		984
1018	if (--distance)	985	if (--distance)
1019	for (int dir = 4; --dir; )	986	for (int dir = 4; dir--; )
1020	if (const shstr &path = map->tile_path [dir])	987	if (const shstr &path = map->tile_path [dir])
1021	if (maptile *&neigh = map->tile_map [dir])	988	if (maptile *&neigh = map->tile_map [dir])
1022	prefetch_surrounding_maps (neigh, distance);	989	prefetch_surrounding_maps (neigh, distance);
1023	else	990	else
1024	neigh = maptile::find_async (path, map);	991	neigh = maptile::find_async (path, map);
…		…
1029	prefetch_surrounding_maps (object *op)	996	prefetch_surrounding_maps (object *op)
1030	{	997	{
1031	prefetch_surrounding_maps (op->map, 3);	998	prefetch_surrounding_maps (op->map, 3);
1032	}	999	}
1033		1000
		1001	//+GPL
		1002
1034	/**	1003	/**
1035	* Draws client map.	1004	* Draws client map.
1036	*/	1005	*/
1037	void	1006	void
1038	draw_client_map (player *pl)	1007	draw_client_map (player *pl)
1039	{	1008	{
1040	object *ob = pl->observe;	1009	object *ob = pl->viewpoint;
1041	if (!ob->active)	1010	if (!pl->observe->active)
1042	return;	1011	return;
1043
1044	maptile *plmap = ob->map;
1045		1012
1046	/* If player is just joining the game, he isn't here yet, so the map	1013	/* If player is just joining the game, he isn't here yet, so the map
1047	* can get swapped out. If so, don't try to send them a map. All will	1014	* can get swapped out. If so, don't try to send them a map. All will
1048	* be OK once they really log in.	1015	* be OK once they really log in.
1049	*/	1016	*/
1050	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)	1017	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1051	return;	1018	return;
1052		1019
1053	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1054	int estartlen, eoldlen;	1020	int startlen, oldlen;
1055	uint8 eentrysize;
1056	uint16 ewhatstart, ewhatflag;
1057	uint8 extendedinfos;
1058		1021
1059	check_map_change (pl);	1022	check_map_change (pl);
1060	prefetch_surrounding_maps (pl->ob);	1023	prefetch_surrounding_maps (pl->ob);
1061		1024
1062	/* do LOS after calls to update_position */	1025	/* do LOS after calls to update_position */
1063	if (ob != pl->ob)	1026	/* unfortunately, we need to udpate los when observing, currently */
1064	clear_los (pl);	1027	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1065	else if (pl->do_los)
1066	{	1028	{
1067	update_los (ob);
1068	pl->do_los = 0;	1029	pl->do_los = 0;
		1030	pl->update_los ();
1069	}	1031	}
1070		1032
1071	/**	1033	/**
1072	* This function uses the new map1 protocol command to send the map	1034	* This function uses the new map1 protocol command to send the map
1073	* to the client. It is necessary because the old map command supports	1035	* to the client. It is necessary because the old map command supports
…		…
1092	*/	1054	*/
1093		1055
1094	client &socket = *pl->ns;	1056	client &socket = *pl->ns;
1095		1057
1096	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1058	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1097	packet esl;
1098		1059
1099	startlen = sl.length ();	1060	startlen = sl.length ();
1100		1061
1101	/Extendedmapinfo structure initialisation /	1062	int hx = socket.mapx / 2;
1102	if (socket.ext_mapinfos)	1063	int hy = socket.mapy / 2;
1103	{
1104	extendedinfos = EMI_NOREDRAW;
1105		1064
1106	if (socket.EMI_smooth)	1065	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1107	extendedinfos \|= EMI_SMOOTH;	1066	int ax = dx + hx;
		1067	int ay = dy + hy;
1108		1068
1109	ewhatstart = esl.length ();	1069	int mask = (ax << 10) \| (ay << 4);
1110	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	1070	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1111	could need to be taken away */
1112	eentrysize = getExtendedMapInfoSize (&socket);
1113	esl << "mapextended "
1114	<< uint8 (extendedinfos)
1115	<< uint8 (eentrysize);
1116		1071
1117	estartlen = esl.length ();	1072	/* If the coordinates are not valid, or it is too dark to see,
1118	}	1073	* we tell the client as such
1119
1120	/* x,y are the real map locations. ax, ay are viewport relative
1121	* locations.
1122	*/	1074	*/
1123	ay = 0;	1075	if (!m)
1124
1125	/* We could do this logic as conditionals in the if statement,
1126	* but that started to get a bit messy to look at.
1127	*/
1128	max_x = ob->x + (socket.mapx + 1) / 2;
1129	max_y = ob->y + (socket.mapy + 1) / 2;
1130
1131	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1132	{	1076	{
1133	sint16 nx, ny;	1077	/* space is out of map. Update space and clear values
1134	maptile *m = 0;	1078	* if this hasn't already been done. If the space is out
1135		1079	* of the map, it shouldn't have a head.
1136	ax = 0;	1080	*/
1137	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	1081	if (lastcell.count != -1)
1138	{	1082	{
1139	// check to see if we can simply go one right quickly	1083	sl << uint16 (mask);
		1084	map_clearcell (&lastcell, -1);
1140	++nx;	1085	}
1141	if (m && nx >= m->width)	1086
		1087	continue;
		1088	}
		1089
		1090	int d = pl->blocked_los_uc (dx, dy);
		1091
		1092	if (d > 3)
		1093	{
		1094	/* This block deals with spaces that are not visible for whatever
		1095	* reason. Still may need to send the head for this space.
		1096	*/
		1097	if (lastcell.count != -1
		1098	\|\| lastcell.faces[0]
		1099	\|\| lastcell.faces[1]
		1100	\|\| lastcell.faces[2]
		1101	\|\| lastcell.stat_hp
		1102	\|\| lastcell.flags
		1103	\|\| lastcell.player)
		1104	sl << uint16 (mask);
		1105
		1106	/* properly clear a previously sent big face */
		1107	map_clearcell (&lastcell, -1);
		1108	}
		1109	else
		1110	{
		1111	/* In this block, the space is visible.
		1112	*/
		1113
		1114	/* Rather than try to figure out what everything that we might
		1115	* need to send is, then form the packet after that,
		1116	* we presume that we will in fact form a packet, and update
		1117	* the bits by what we do actually send. If we send nothing,
		1118	* we just back out sl.length () to the old value, and no harm
		1119	* is done.
		1120	* I think this is simpler than doing a bunch of checks to see
		1121	* what if anything we need to send, setting the bits, then
		1122	* doing those checks again to add the real data.
		1123	*/
		1124	oldlen = sl.length ();
		1125
		1126	sl << uint16 (mask);
		1127
		1128	unsigned char dummy;
		1129	unsigned char *last_ext = &dummy;
		1130
		1131	/* Darkness changed */
		1132	if (lastcell.count != d)
		1133	{
1142	m = 0;	1134	mask \|= 0x8;
1143		1135
1144	if (!m)	1136	*last_ext \|= 0x80;
		1137	last_ext = &sl[sl.length ()];
		1138	sl << uint8 (d);
		1139	}
		1140
		1141	lastcell.count = d;
		1142
		1143	mapspace &ms = m->at (nx, ny);
		1144	ms.update ();
		1145
		1146	// extmap handling
		1147	uint8 stat_hp = 0;
		1148	uint8 stat_width = 0;
		1149	uint8 flags = 0;
		1150	tag_t player = 0;
		1151
		1152	// send hp information, if applicable
		1153	if (object *op = ms.faces_obj [0])
		1154	if (op->is_head () && !op->invisible)
1145	{	1155	{
1146	nx = x; ny = y; m = plmap;	1156	if (op->stats.maxhp > op->stats.hp
1147		1157	&& op->stats.maxhp > 0
1148	if (xy_normalise (m, nx, ny))	1158	&& (op->type == PLAYER
1149	m->touch ();	1159	\|\| op->type == DOOR // does not work, have maxhp 0
1150	else	1160	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1161	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1162	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1151	m = 0;	1163	{
		1164	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1165	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1166	}
		1167
		1168	if (expect_false (op->has_dialogue ()))
		1169	flags \|= 1;
		1170
		1171	if (expect_false (op->type == PLAYER))
		1172	player = op == ob ? pl->ob->count
		1173	: op == pl->ob ? ob->count
		1174	: op->count;
1152	}	1175	}
1153		1176
1154	int emask, mask;	1177	if (expect_false (lastcell.stat_hp != stat_hp))
1155	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1156
1157	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1158
1159	/* If the coordinates are not valid, or it is too dark to see,
1160	* we tell the client as such
1161	*/
1162	if (!m)
1163	{	1178	{
1164	/* space is out of map. Update space and clear values	1179	lastcell.stat_hp = stat_hp;
1165	* if this hasn't already been done. If the space is out	1180
1166	* of the map, it shouldn't have a head	1181	mask \|= 0x8;
1167	*/	1182	*last_ext \|= 0x80;
1168	if (lastcell.count != -1)	1183	last_ext = &sl[sl.length ()];
		1184
		1185	sl << uint8 (5) << uint8 (stat_hp);
		1186
		1187	if (stat_width > 1)
1169	{	1188	{
1170	sl << uint16 (mask);
1171	map_clearcell (&lastcell, -1);
1172	}
1173
1174	continue;
1175	}
1176
1177	int d = pl->blocked_los[ax][ay];
1178
1179	if (d > 3)
1180	{
1181	int need_send = 0, count;
1182
1183	/* This block deals with spaces that are not visible for whatever
1184	* reason. Still may need to send the head for this space.
1185	*/
1186
1187	oldlen = sl.length ();
1188
1189	sl << uint16 (mask);
1190
1191	if (lastcell.count != -1)
1192	need_send = 1;
1193
1194	count = -1;
1195
1196	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1197	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1198	need_send = 1;
1199
1200	/* properly clear a previously sent big face */
1201	map_clearcell (&lastcell, count);
1202
1203	if ((mask & 0xf) \|\| need_send)
1204	sl[oldlen + 1] = mask & 0xff;
1205	else
1206	sl.reset (oldlen);
1207	}
1208	else
1209	{
1210	/* In this block, the space is visible.
1211	*/
1212
1213	/* Rather than try to figure out what everything that we might
1214	* need to send is, then form the packet after that,
1215	* we presume that we will in fact form a packet, and update
1216	* the bits by what we do actually send. If we send nothing,
1217	* we just back out sl.length () to the old value, and no harm
1218	* is done.
1219	* I think this is simpler than doing a bunch of checks to see
1220	* what if anything we need to send, setting the bits, then
1221	* doing those checks again to add the real data.
1222	*/
1223	oldlen = sl.length ();
1224	eoldlen = esl.length ();
1225
1226	sl << uint16 (mask);
1227
1228	unsigned char dummy;
1229	unsigned char *last_ext = &dummy;
1230
1231	/* Darkness changed */
1232	if (lastcell.count != d && socket.darkness)
1233	{
1234	mask \|= 0x8;
1235
1236	if (socket.extmap)
1237	{
1238	*last_ext \|= 0x80;	1189	*last_ext \|= 0x80;
1239	last_ext = &sl[sl.length ()];	1190	last_ext = &sl[sl.length ()];
1240	sl << uint8 (d);	1191
1241	}	1192	sl << uint8 (6) << uint8 (stat_width);
1242	else
1243	sl << uint8 (255 - 64 * d);
1244	}	1193	}
		1194	}
1245		1195
1246	lastcell.count = d;	1196	if (expect_false (lastcell.player != player))
1247
1248	mapspace &ms = m->at (nx, ny);
1249	ms.update ();
1250
1251	if (socket.extmap)
1252	{	1197	{
1253	uint8 stat_hp = 0;	1198	lastcell.player = player;
1254	uint8 stat_width = 0;
1255	uint8 flags = 0;
1256	tag_t player = 0;
1257		1199
1258	// send hp information, if applicable
1259	if (object *op = ms.faces_obj [0])
1260	if (op->is_head () && !op->invisible)
1261	{
1262	if (op->stats.maxhp > op->stats.hp
1263	&& op->stats.maxhp > 0
1264	&& (op->type == PLAYER
1265	\|\| op->type == DOOR // does not work, have maxhp 0
1266	\|\| QUERY_FLAG (op, FLAG_MONSTER)
1267	\|\| QUERY_FLAG (op, FLAG_ALIVE)
1268	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1269	{
1270	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1271	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1272	}
1273
1274	if (op->has_dialogue ())
1275	flags \|= 1;
1276
1277	if (op->type == PLAYER)
1278	player = op == ob ? pl->ob->count
1279	: op == pl->ob ? ob->count
1280	: op->count;
1281	}
1282
1283	if (lastcell.stat_hp != stat_hp)
1284	{
1285	lastcell.stat_hp = stat_hp;
1286
1287	mask \|= 0x8;	1200	mask \|= 0x8;
1288	*last_ext \|= 0x80;	1201	*last_ext \|= 0x80;
1289	last_ext = &sl[sl.length ()];	1202	last_ext = &sl[sl.length ()];
1290		1203
1291	sl << uint8 (5) << uint8 (stat_hp);
1292
1293	if (stat_width > 1)
1294	{
1295	*last_ext \|= 0x80;
1296	last_ext = &sl[sl.length ()];
1297
1298	sl << uint8 (6) << uint8 (stat_width);
1299	}
1300	}
1301
1302	if (lastcell.player != player)
1303	{
1304	lastcell.player = player;
1305
1306	mask \|= 0x8;
1307	*last_ext \|= 0x80;
1308	last_ext = &sl[sl.length ()];
1309
1310	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1204	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1311	}	1205	}
1312		1206
1313	if (lastcell.flags != flags)	1207	if (expect_false (lastcell.flags != flags))
1314	{	1208	{
1315	lastcell.flags = flags;	1209	lastcell.flags = flags;
1316		1210
1317	mask \|= 0x8;	1211	mask \|= 0x8;
1318	*last_ext \|= 0x80;	1212	*last_ext \|= 0x80;
1319	last_ext = &sl[sl.length ()];	1213	last_ext = &sl[sl.length ()];
1320		1214
1321	sl << uint8 (8) << uint8 (flags);	1215	sl << uint8 (8) << uint8 (flags);
1322	}
1323	}	1216	}
1324		1217
		1218	// faces
		1219
1325	/* Floor face */	1220	/* Floor face */
1326	if (update_space (sl, socket, ms, lastcell, 2))	1221	if (update_space (sl, socket, ms, lastcell, 2))
1327	mask \|= 0x4;	1222	mask \|= 0x4;
1328		1223
1329	/* Middle face */	1224	/* Middle face */
1330	if (update_space (sl, socket, ms, lastcell, 1))	1225	if (update_space (sl, socket, ms, lastcell, 1))
1331	mask \|= 0x2;	1226	mask \|= 0x2;
1332		1227
		1228	if (expect_false (ob->invisible)
		1229	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1333	if (ms.player () == ob	1230	&& ms.player () == ob)
1334	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1335	{	1231	{
1336	// force player to be visible to himself if invisible	1232	// force player to be visible to himself if invisible
1337	if (lastcell.faces[0] != ob->face)	1233	if (lastcell.faces[0] != ob->face)
1338	{	1234	{
1339	lastcell.faces[0] = ob->face;	1235	lastcell.faces[0] = ob->face;
1340		1236
1341	mask \|= 0x1;
1342	sl << uint16 (ob->face);
1343
1344	socket.send_faces (ob);
1345	}
1346	}
1347	/* Top face */
1348	else if (update_space (sl, socket, ms, lastcell, 0))
1349	mask \|= 0x1;	1237	mask \|= 0x1;
		1238	sl << uint16 (ob->face);
1350		1239
		1240	socket.send_faces (ob);
		1241	}
		1242	}
		1243	/* Top face */
		1244	else if (update_space (sl, socket, ms, lastcell, 0))
		1245	mask \|= 0x1;
		1246
1351	/* Check to see if we are in fact sending anything for this	1247	/* Check to see if we are in fact sending anything for this
1352	* space by checking the mask. If so, update the mask.	1248	* space by checking the mask. If so, update the mask.
1353	* if not, reset the len to that from before adding the mask	1249	* if not, reset the len to that from before adding the mask
1354	* value, so we don't send those bits.	1250	* value, so we don't send those bits.
1355	*/	1251	*/
1356	if (mask & 0xf)	1252	if (mask & 0xf)
1357	sl[oldlen + 1] = mask & 0xff;	1253	sl[oldlen + 1] = mask & 0xff;
1358	else	1254	else
1359	sl.reset (oldlen);	1255	sl.reset (oldlen);
1360
1361	if (socket.ext_mapinfos)
1362	esl << uint16 (emask);
1363
1364	if (socket.EMI_smooth)
1365	{
1366	for (int layer = 2+1; layer--; )
1367	{
1368	object *ob = ms.faces_obj [layer];
1369
1370	// If there is no object for this space, or if the face for the object
1371	// is the blank face, set the smoothlevel to zero.
1372	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1373
1374	// We've gotten what face we want to use for the object. Now see if
1375	// if it has changed since we last sent it to the client.
1376	if (lastcell.smooth[layer] != smoothlevel)
1377	{
1378	lastcell.smooth[layer] = smoothlevel;
1379	esl << uint8 (smoothlevel);
1380	emask \|= 1 << layer;
1381	}
1382	}
1383
1384	if (emask & 0xf)
1385	esl[eoldlen + 1] = emask & 0xff;
1386	else
1387	esl.reset (eoldlen);
1388	}
1389	} /* else this is a viewable space */	1256	} /* else this is a viewable space */
1390	} /* for x loop */	1257	ordered_mapwalk_end
1391	} /* for y loop */
1392		1258
1393	socket.flush_fx ();	1259	socket.flush_fx ();
1394
1395	/* Verify that we in fact do need to send this */
1396	if (socket.ext_mapinfos)
1397	{
1398	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1399	{
1400	/* No map data will follow, so don't say the client
1401	* it doesn't need draw!
1402	*/
1403	ewhatflag &= ~EMI_NOREDRAW;
1404	esl[ewhatstart + 1] = ewhatflag & 0xff;
1405	}
1406
1407	if (esl.length () > estartlen)
1408	socket.send_packet (esl);
1409	}
1410		1260
1411	if (sl.length () > startlen \|\| socket.sent_scroll)	1261	if (sl.length () > startlen \|\| socket.sent_scroll)
1412	{	1262	{
1413	socket.send_packet (sl);	1263	socket.send_packet (sl);
1414	socket.sent_scroll = 0;	1264	socket.sent_scroll = 0;
1415	}	1265	}
1416	}	1266	}
1417		1267
1418	/*****************************************************************************/
1419	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1420	/* a player. Of course, the client need to know the command to be able to */
1421	/* manage it ! */
1422	/*****************************************************************************/
1423	void
1424	send_plugin_custom_message (object pl, char buf)
1425	{
1426	pl->contr->ns->send_packet (buf);
1427	}
1428
1429	/**
1430	* This sends the skill number to name mapping. We ignore
1431	* the params - we always send the same info no matter what.
1432	*/
1433	void
1434	send_skill_info (client ns, char params)
1435	{
1436	packet sl;
1437	sl << "replyinfo skill_info\n";
1438
1439	for (int i = 1; i < NUM_SKILLS; i++)
1440	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1441
1442	if (sl.length () > MAXSOCKBUF)
1443	{
1444	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1445	fatal (0);
1446	}
1447
1448	ns->send_packet (sl);
1449	}
1450
1451	/**
1452	* This sends the spell path to name mapping. We ignore
1453	* the params - we always send the same info no matter what.
1454	*/
1455	void
1456	send_spell_paths (client * ns, char *params)
1457	{
1458	packet sl;
1459
1460	sl << "replyinfo spell_paths\n";
1461
1462	for (int i = 0; i < NRSPELLPATHS; i++)
1463	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1464
1465	if (sl.length () > MAXSOCKBUF)
1466	{
1467	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1468	fatal (0);
1469	}
1470
1471	ns->send_packet (sl);
1472	}
1473
1474	/**	1268	/**
1475	* This looks for any spells the player may have that have changed their stats.	1269	* This looks for any spells the player may have that have changed their stats.
1476	* it then sends an updspell packet for each spell that has changed in this way	1270	* it then sends an updspell packet for each spell that has changed in this way
1477	*/	1271	*/
1478	void	1272	void
1479	esrv_update_spells (player *pl)	1273	esrv_update_spells (player *pl)
1480	{	1274	{
1481	if (!pl->ns)	1275	if (!pl->ns)
1482	return;	1276	return;
1483		1277
		1278	pl->ns->update_spells = false;
		1279
1484	if (!pl->ns->monitor_spells)	1280	if (!pl->ns->monitor_spells)
1485	return;	1281	return;
1486		1282
1487	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1283	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1488	{
1489	if (spell->type == SPELL)	1284	if (spell->type == SPELL)
1490	{	1285	{
1491	int flags = 0;	1286	int flags = 0;
		1287	int val;
1492		1288
1493	/* check if we need to update it */	1289	/* check if we need to update it */
1494	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1290	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1291	if (spell->cached_sp != val)
1495	{	1292	{
1496	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1293	spell->cached_sp = val;
1497	flags \|= UPD_SP_MANA;	1294	flags \|= UPD_SP_MANA;
1498	}	1295	}
1499		1296
1500	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1297	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1298	if (spell->cached_grace != val)
1501	{	1299	{
1502	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1300	spell->cached_grace = val;
1503	flags \|= UPD_SP_GRACE;	1301	flags \|= UPD_SP_GRACE;
1504	}	1302	}
1505		1303
1506	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1304	val = casting_level (pl->ob, spell);
		1305	if (spell->cached_eat != val)
1507	{	1306	{
1508	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1307	spell->cached_eat = val;
1509	flags \|= UPD_SP_DAMAGE;	1308	flags \|= UPD_SP_LEVEL;
1510	}	1309	}
1511		1310
1512	if (flags)	1311	if (flags)
1513	{	1312	{
1514	packet sl;	1313	packet sl;
1515		1314
1516	sl << "updspell "	1315	sl << "updspell "
1517	<< uint8 (flags)	1316	<< uint8 (flags)
1518	<< uint32 (spell->count);	1317	<< uint32 (spell->count);
1519		1318
1520	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1319	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1521	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1320	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1522	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1321	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1523		1322
1524	pl->ns->send_packet (sl);	1323	pl->ns->send_packet (sl);
1525	}	1324	}
1526	}	1325	}
1527	}
1528	}	1326	}
1529		1327
1530	void	1328	void
1531	esrv_remove_spell (player pl, object spell)	1329	esrv_remove_spell (player pl, object spell)
1532	{	1330	{
…		…
1559	}	1357	}
1560		1358
1561	/* store costs and damage in the object struct, to compare to later */	1359	/* store costs and damage in the object struct, to compare to later */
1562	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1360	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1563	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1361	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1564	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1362	spell->cached_eat = casting_level (pl->ob, spell);
1565		1363
1566	/* figure out which skill it uses, if it uses one */	1364	/* figure out which skill it uses, if it uses one */
1567	if (spell->skill)	1365	if (spell->skill)
1568	{	1366	if (object *tmp = pl->find_skill (spell->skill))
1569	for (i = 1; i < NUM_SKILLS; i++)
1570	if (!strcmp (spell->skill, skill_names[i]))
1571	{
1572	skill = i + CS_STAT_SKILLINFO;	1367	skill = tmp->subtype + CS_STAT_SKILLINFO;
1573	break;
1574	}
1575	}
1576		1368
1577	// spells better have a face	1369	// spells better have a face
1578	if (!spell->face)	1370	if (!spell->face)
1579	{	1371	{
1580	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1372	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1664	/* finally, we can send the packet */	1456	/* finally, we can send the packet */
1665	pl->ns->flush_fx ();	1457	pl->ns->flush_fx ();
1666	pl->ns->send_packet (sl);	1458	pl->ns->send_packet (sl);
1667	}	1459	}
1668		1460
		1461	//-GPL
		1462

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.138 by root, Thu Sep 25 04:09:57 2008 UTC vs. Revision 1.164 by root, Fri Mar 26 00:59:22 2010 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.138 by root, Thu Sep 25 04:09:57 2008 UTC vs.
Revision 1.164 by root, Fri Mar 26 00:59:22 2010 UTC