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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.126 by root, Tue Apr 22 07:01:47 2008 UTC vs.
Revision 1.156 by root, Fri Nov 6 12:49:19 2009 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 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;
193
194	region *reg = ob->region ();
195	if (socket.current_region != reg)
196	{
197	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
198	socket.current_region = reg;
199	}
200	}	222	}
201		223
202	/**	224	/**
203	* RequestInfo is sort of a meta command. There is some specific	225	* RequestInfo is sort of a meta command. There is some specific
204	* request of information, but we call other functions to provide	226	* request of information, but we call other functions to provide
…		…
217	{	239	{
218	*params++ = 0;	240	*params++ = 0;
219	break;	241	break;
220	}	242	}
221		243
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"))	244	if (!strcmp (buf, "skill_info"))
227	send_skill_info (ns, params);	245	send_skill_info (ns, params);
228	else if (!strcmp (buf, "spell_paths"))	246	else if (!strcmp (buf, "spell_paths"))
229	send_spell_paths (ns, params);	247	send_spell_paths (ns, params);
230	else	248	else
231	{	249	{
…		…
247	ExtiCmd (char buf, int len, client ns)	265	ExtiCmd (char buf, int len, client ns)
248	{	266	{
249	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	267	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
250	}	268	}
251		269
		270	//-GPL
		271
252	void	272	void
253	client::mapinfo_queue_clear ()	273	client::mapinfo_queue_clear ()
254	{	274	{
255	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	275	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
256	free (*i);	276	free (*i);
…		…
263	{	283	{
264	char *token = buf;	284	char *token = buf;
265	buf += strlen (buf) + 9;	285	buf += strlen (buf) + 9;
266		286
267	// initial map and its origin	287	// initial map and its origin
268	maptile *map = pl->observe->map;	288	maptile *map = pl->viewpoint->map;
269	int mapx = pl->ns->mapx / 2 - pl->observe->x;	289	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
270	int mapy = pl->ns->mapy / 2 - pl->observe->y;	290	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
271	int max_distance = 8; // limit maximum path length to something generous	291	int max_distance = 8; // limit maximum path length to something generous
272		292
273	while (*buf && map && max_distance)	293	while (*buf && map && max_distance)
274	{	294	{
275	int dir = *buf++ - '1';	295	int dir = *buf++ - '1';
…		…
380	AddMeCmd (char buf, int len, client ns)	400	AddMeCmd (char buf, int len, client ns)
381	{	401	{
382	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	402	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
383	}	403	}
384		404
385	/** Reply to ExtendedInfos command */	405	//+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		406
438	/*	407	/*
439	#define MSG_TYPE_BOOK 1	408	#define MSG_TYPE_BOOK 1
440	#define MSG_TYPE_CARD 2	409	#define MSG_TYPE_CARD 2
441	#define MSG_TYPE_PAPER 3	410	#define MSG_TYPE_PAPER 3
…		…
458	while (1)	427	while (1)
459	{	428	{
460	/* 1. Extract an info */	429	/* 1. Extract an info */
461	info = nextinfo;	430	info = nextinfo;
462		431
463	while ((info < len) && (buf[info] == ' '))	432	while ((info < len) && (buf [info] == ' '))
464	info++;	433	info++;
465		434
466	if (info >= len)	435	if (info >= len)
467	break;	436	break;
468		437
469	nextinfo = info + 1;	438	nextinfo = info + 1;
470		439
471	while ((nextinfo < len) && (buf[nextinfo] != ' '))	440	while ((nextinfo < len) && (buf [nextinfo] != ' '))
472	nextinfo++;	441	nextinfo++;
473		442
474	if (nextinfo - info >= 49) /Erroneous info asked /	443	if (nextinfo - info >= 49) /Erroneous info asked /
475	continue;	444	continue;
476		445
477	strncpy (command, &(buf[info]), nextinfo - info);	446	memcpy (command, buf + info, nextinfo - info);
478	command[nextinfo - info] = '\0';	447	command [nextinfo - info] = 0;
		448
479	/* 2. Interpret info */	449	/* 2. Interpret info */
480	i = sscanf (command, "%d", &flag);	450	i = sscanf (command, "%d", &flag);
481		451
482	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))	452	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
483	ns->supported_readables \|= (1 << flag);	453	ns->supported_readables \|= (1 << flag);
…		…
517	return;	487	return;
518		488
519	buf++;	489	buf++;
520	}	490	}
521		491
522	execute_newserver_command (pl->ob, (char *) buf);	492	execute_newserver_command (pl->ob, (char *)buf);
523		493
524	/* Perhaps something better should be done with a left over count.	494	/* Perhaps something better should be done with a left over count.
525	* Cleaning up the input should probably be done first - all actions	495	* 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	496	* for the command that issued the count should be done before any other
527	* commands.	497	* commands.
…		…
686	* syntax is: move (to) (tag) (nrof)	656	* syntax is: move (to) (tag) (nrof)
687	*/	657	*/
688	void	658	void
689	MoveCmd (char buf, int len, player pl)	659	MoveCmd (char buf, int len, player pl)
690	{	660	{
691	int vals[3], i;	661	int to, tag, nrof;
692		662
693	/* A little funky here. We only cycle for 2 records, because	663	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	{	664	{
700	vals[i] = atoi (buf);
701
702	if (!(buf = strchr (buf, ' ')))
703	{
704	LOG (llevError, "Incomplete move command: %s\n", buf);	665	LOG (llevError, "Incomplete move command: %s\n", buf);
705	return;	666	return;
706	}
707
708	buf++;
709	}	667	}
710		668
711	vals[2] = atoi (buf);	669	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	}	670	}
716		671
717	/******************************************************************************	672	/******************************************************************************
718	*	673	*
719	* Start of commands the server sends to the client.	674	* Start of commands the server sends to the client.
…		…
734	* Get player's current range attack in obuf.	689	* Get player's current range attack in obuf.
735	*/	690	*/
736	static void	691	static void
737	rangetostring (player pl, char obuf)	692	rangetostring (player pl, char obuf)
738	{	693	{
739	dynbuf_text buf;	694	dynbuf_text &buf = msg_dynbuf; buf.clear ();
740		695
741	if (pl->ranged_ob)	696	if (pl->ranged_ob)
742	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	697	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
743		698
744	if (pl->combat_ob)	699	if (pl->combat_ob)
…		…
820	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	775	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
821	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	776	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
822	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	777	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
823		778
824	for (int s = 0; s < NUM_SKILLS; s++)	779	for (int s = 0; s < NUM_SKILLS; s++)
825	if (object *skill = opl->last_skill_ob[s])	780	if (object *skill = opl->last_skill_ob [s])
826	if (skill->stats.exp != ns->last_skill_exp [s])	781	if (skill->stats.exp != ns->last_skill_exp [s])
827	{	782	{
828	ns->last_skill_exp [s] = skill->stats.exp;	783	ns->last_skill_exp [s] = skill->stats.exp;
829		784
830	/* Always send along the level if exp changes. This is only	785	/* Always send along the level if exp changes. This is only
…		…
897	sl << uint32 (pl->ob->count)	852	sl << uint32 (pl->ob->count)
898	<< uint32 (weight)	853	<< uint32 (weight)
899	<< uint32 (pl->ob->face)	854	<< uint32 (pl->ob->face)
900	<< data8 (pl->ob->name);	855	<< data8 (pl->ob->name);
901		856
902	#if 0
903	pl->ns->last_weight = weight;	857	pl->ns->last_weight = weight;
904	#endif
905	pl->ns->send_packet (sl);	858	pl->ns->send_packet (sl);
906	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
907	}	859	}
908		860
909	/******************************************************************************	861	/******************************************************************************
910	*	862	*
911	* Start of map related commands.	863	* Start of map related commands.
…		…
978		930
979	/* Nothing changed */	931	/* Nothing changed */
980	return 0;	932	return 0;
981	}	933	}
982		934
983	/**	935	//-GPL
984	* Returns the size of a data for a map square as returned by
985	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
986	* available.
987	*/
988	int
989	getExtendedMapInfoSize (client * ns)
990	{
991	int result = 0;
992
993	if (ns->ext_mapinfos)
994	{
995	if (ns->EMI_smooth)
996	result += 1; /One byte for smoothlevel /
997	}
998
999	return result;
1000	}
1001		936
1002	// prefetch (and touch) all maps within a specific distancd	937	// prefetch (and touch) all maps within a specific distancd
1003	static void	938	static void
1004	prefetch_surrounding_maps (maptile *map, int distance)	939	prefetch_surrounding_maps (maptile *map, int distance)
1005	{	940	{
1006	map->last_access = runtime;	941	map->touch ();
1007		942
1008	if (--distance)	943	if (--distance)
1009	for (int dir = 4; --dir; )	944	for (int dir = 4; --dir; )
1010	if (const shstr &path = map->tile_path [dir])	945	if (const shstr &path = map->tile_path [dir])
1011	if (maptile *&neigh = map->tile_map [dir])	946	if (maptile *&neigh = map->tile_map [dir])
…		…
1019	prefetch_surrounding_maps (object *op)	954	prefetch_surrounding_maps (object *op)
1020	{	955	{
1021	prefetch_surrounding_maps (op->map, 3);	956	prefetch_surrounding_maps (op->map, 3);
1022	}	957	}
1023		958
		959	//+GPL
		960
1024	/**	961	/**
1025	* Draws client map.	962	* Draws client map.
1026	*/	963	*/
1027	void	964	void
1028	draw_client_map (player *pl)	965	draw_client_map (player *pl)
1029	{	966	{
1030	object *ob = pl->observe;	967	object *ob = pl->viewpoint;
1031	if (!ob->active)	968	if (!pl->observe->active)
1032	return;	969	return;
1033
1034	maptile *plmap = ob->map;
1035		970
1036	/* If player is just joining the game, he isn't here yet, so the map	971	/* If player is just joining the game, he isn't here yet, so the map
1037	* can get swapped out. If so, don't try to send them a map. All will	972	* can get swapped out. If so, don't try to send them a map. All will
1038	* be OK once they really log in.	973	* be OK once they really log in.
1039	*/	974	*/
1040	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)	975	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1041	return;	976	return;
1042		977
1043	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1044	int estartlen, eoldlen;	978	int startlen, oldlen;
1045	uint8 eentrysize;
1046	uint16 ewhatstart, ewhatflag;
1047	uint8 extendedinfos;
1048		979
1049	check_map_change (pl);	980	check_map_change (pl);
1050	prefetch_surrounding_maps (pl->ob);	981	prefetch_surrounding_maps (pl->ob);
1051		982
1052	/* do LOS after calls to update_position */	983	/* do LOS after calls to update_position */
1053	if (ob != pl->ob)	984	/* unfortunately, we need to udpate los when observing, currently */
1054	clear_los (pl);	985	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1055	else if (pl->do_los)
1056	{	986	{
1057	update_los (ob);
1058	pl->do_los = 0;	987	pl->do_los = 0;
		988	pl->update_los ();
1059	}	989	}
1060		990
1061	/**	991	/**
1062	* This function uses the new map1 protocol command to send the map	992	* This function uses the new map1 protocol command to send the map
1063	* to the client. It is necessary because the old map command supports	993	* to the client. It is necessary because the old map command supports
…		…
1082	*/	1012	*/
1083		1013
1084	client &socket = *pl->ns;	1014	client &socket = *pl->ns;
1085		1015
1086	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1016	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1087	packet esl;
1088		1017
1089	startlen = sl.length ();	1018	startlen = sl.length ();
1090		1019
1091	/Extendedmapinfo structure initialisation /	1020	int hx = socket.mapx / 2;
1092	if (socket.ext_mapinfos)	1021	int hy = socket.mapy / 2;
1093	{
1094	extendedinfos = EMI_NOREDRAW;
1095		1022
1096	if (socket.EMI_smooth)	1023	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1097	extendedinfos \|= EMI_SMOOTH;	1024	int ax = dx + hx;
		1025	int ay = dy + hy;
1098		1026
1099	ewhatstart = esl.length ();	1027	int mask = (ax << 10) \| (ay << 4);
1100	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	1028	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1101	could need to be taken away */
1102	eentrysize = getExtendedMapInfoSize (&socket);
1103	esl << "mapextended "
1104	<< uint8 (extendedinfos)
1105	<< uint8 (eentrysize);
1106		1029
1107	estartlen = esl.length ();	1030	/* If the coordinates are not valid, or it is too dark to see,
1108	}	1031	* we tell the client as such
1109
1110	/* x,y are the real map locations. ax, ay are viewport relative
1111	* locations.
1112	*/	1032	*/
1113	ay = 0;	1033	if (!m)
1114
1115	/* We could do this logic as conditionals in the if statement,
1116	* but that started to get a bit messy to look at.
1117	*/
1118	max_x = ob->x + (socket.mapx + 1) / 2;
1119	max_y = ob->y + (socket.mapy + 1) / 2;
1120
1121	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1122	{	1034	{
1123	sint16 nx, ny;	1035	/* space is out of map. Update space and clear values
1124	maptile *m = 0;	1036	* if this hasn't already been done. If the space is out
1125		1037	* of the map, it shouldn't have a head.
1126	ax = 0;	1038	*/
1127	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	1039	if (lastcell.count != -1)
1128	{	1040	{
1129	// check to see if we can simply go one right quickly	1041	sl << uint16 (mask);
		1042	map_clearcell (&lastcell, -1);
1130	++nx;	1043	}
1131	if (m && nx >= m->width)	1044
		1045	continue;
		1046	}
		1047
		1048	int d = pl->blocked_los_uc (dx, dy);
		1049
		1050	if (d > 3)
		1051	{
		1052	/* This block deals with spaces that are not visible for whatever
		1053	* reason. Still may need to send the head for this space.
		1054	*/
		1055	if (lastcell.count != -1
		1056	\|\| lastcell.faces[0]
		1057	\|\| lastcell.faces[1]
		1058	\|\| lastcell.faces[2]
		1059	\|\| lastcell.stat_hp
		1060	\|\| lastcell.flags
		1061	\|\| lastcell.player)
		1062	sl << uint16 (mask);
		1063
		1064	/* properly clear a previously sent big face */
		1065	map_clearcell (&lastcell, -1);
		1066	}
		1067	else
		1068	{
		1069	/* In this block, the space is visible.
		1070	*/
		1071
		1072	/* Rather than try to figure out what everything that we might
		1073	* need to send is, then form the packet after that,
		1074	* we presume that we will in fact form a packet, and update
		1075	* the bits by what we do actually send. If we send nothing,
		1076	* we just back out sl.length () to the old value, and no harm
		1077	* is done.
		1078	* I think this is simpler than doing a bunch of checks to see
		1079	* what if anything we need to send, setting the bits, then
		1080	* doing those checks again to add the real data.
		1081	*/
		1082	oldlen = sl.length ();
		1083
		1084	sl << uint16 (mask);
		1085
		1086	unsigned char dummy;
		1087	unsigned char *last_ext = &dummy;
		1088
		1089	/* Darkness changed */
		1090	if (lastcell.count != d)
		1091	{
1132	m = 0;	1092	mask \|= 0x8;
1133		1093
1134	if (!m)	1094	*last_ext \|= 0x80;
		1095	last_ext = &sl[sl.length ()];
		1096	sl << uint8 (d);
		1097	}
		1098
		1099	lastcell.count = d;
		1100
		1101	mapspace &ms = m->at (nx, ny);
		1102	ms.update ();
		1103
		1104	// extmap handling
		1105	uint8 stat_hp = 0;
		1106	uint8 stat_width = 0;
		1107	uint8 flags = 0;
		1108	tag_t player = 0;
		1109
		1110	// send hp information, if applicable
		1111	if (object *op = ms.faces_obj [0])
		1112	if (op->is_head () && !op->invisible)
1135	{	1113	{
1136	nx = x; ny = y; m = plmap;	1114	if (op->stats.maxhp > op->stats.hp
1137		1115	&& op->stats.maxhp > 0
1138	if (xy_normalise (m, nx, ny))	1116	&& (op->type == PLAYER
1139	m->touch ();	1117	\|\| op->type == DOOR // does not work, have maxhp 0
1140	else	1118	\|\| QUERY_FLAG (op, FLAG_MONSTER)
		1119	\|\| QUERY_FLAG (op, FLAG_ALIVE)
		1120	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1141	m = 0;	1121	{
		1122	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1123	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1124	}
		1125
		1126	if (expect_false (op->has_dialogue ()))
		1127	flags \|= 1;
		1128
		1129	if (expect_false (op->type == PLAYER))
		1130	player = op == ob ? pl->ob->count
		1131	: op == pl->ob ? ob->count
		1132	: op->count;
1142	}	1133	}
1143		1134
1144	int emask, mask;	1135	if (expect_false (lastcell.stat_hp != stat_hp))
1145	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1146
1147	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1148
1149	/* If the coordinates are not valid, or it is too dark to see,
1150	* we tell the client as such
1151	*/
1152	if (!m)
1153	{	1136	{
1154	/* space is out of map. Update space and clear values	1137	lastcell.stat_hp = stat_hp;
1155	* if this hasn't already been done. If the space is out	1138
1156	* of the map, it shouldn't have a head	1139	mask \|= 0x8;
1157	*/	1140	*last_ext \|= 0x80;
1158	if (lastcell.count != -1)	1141	last_ext = &sl[sl.length ()];
		1142
		1143	sl << uint8 (5) << uint8 (stat_hp);
		1144
		1145	if (stat_width > 1)
1159	{	1146	{
1160	sl << uint16 (mask);
1161	map_clearcell (&lastcell, -1);
1162	}
1163
1164	continue;
1165	}
1166
1167	int d = pl->blocked_los[ax][ay];
1168
1169	if (d > 3)
1170	{
1171
1172	int need_send = 0, count;
1173
1174	/* This block deals with spaces that are not visible for whatever
1175	* reason. Still may need to send the head for this space.
1176	*/
1177
1178	oldlen = sl.length ();
1179
1180	sl << uint16 (mask);
1181
1182	if (lastcell.count != -1)
1183	need_send = 1;
1184
1185	count = -1;
1186
1187	/* properly clear a previously sent big face */
1188	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1189	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1190	need_send = 1;
1191
1192	map_clearcell (&lastcell, count);
1193
1194	if ((mask & 0xf) \|\| need_send)
1195	sl[oldlen + 1] = mask & 0xff;
1196	else
1197	sl.reset (oldlen);
1198	}
1199	else
1200	{
1201	/* In this block, the space is visible.
1202	*/
1203
1204	/* Rather than try to figure out what everything that we might
1205	* need to send is, then form the packet after that,
1206	* we presume that we will in fact form a packet, and update
1207	* the bits by what we do actually send. If we send nothing,
1208	* we just back out sl.length () to the old value, and no harm
1209	* is done.
1210	* I think this is simpler than doing a bunch of checks to see
1211	* what if anything we need to send, setting the bits, then
1212	* doing those checks again to add the real data.
1213	*/
1214	oldlen = sl.length ();
1215	eoldlen = esl.length ();
1216
1217	sl << uint16 (mask);
1218
1219	unsigned char dummy;
1220	unsigned char *last_ext = &dummy;
1221
1222	/* Darkness changed */
1223	if (lastcell.count != d && socket.darkness)
1224	{
1225	mask \|= 0x8;
1226
1227	if (socket.extmap)
1228	{
1229	*last_ext \|= 0x80;	1147	*last_ext \|= 0x80;
1230	last_ext = &sl[sl.length ()];	1148	last_ext = &sl[sl.length ()];
1231	sl << uint8 (d);	1149
1232	}	1150	sl << uint8 (6) << uint8 (stat_width);
1233	else
1234	sl << uint8 (255 - 64 * d);
1235	}	1151	}
		1152	}
1236		1153
1237	lastcell.count = d;	1154	if (expect_false (lastcell.player != player))
1238
1239	mapspace &ms = m->at (nx, ny);
1240	ms.update ();
1241
1242	if (socket.extmap)
1243	{	1155	{
1244	uint8 stat_hp = 0;	1156	lastcell.player = player;
1245	uint8 stat_width = 0;
1246	uint8 flags = 0;
1247	tag_t player = 0;
1248		1157
1249	// send hp information, if applicable
1250	if (object *op = ms.faces_obj [0])
1251	if (op->is_head () && !op->invisible)
1252	{
1253	if (op->stats.maxhp > op->stats.hp
1254	&& op->stats.maxhp > 0
1255	&& (op->type == PLAYER
1256	\|\| op->type == DOOR // does not work, have maxhp 0
1257	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1258	{
1259	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1260	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1261	}
1262
1263	if (op->msg && op->msg[0] == '@')
1264	flags \|= 1;
1265
1266	if (op->type == PLAYER && op != ob)
1267	player = op->count;
1268	}
1269
1270	if (lastcell.stat_hp != stat_hp)
1271	{
1272	lastcell.stat_hp = stat_hp;
1273
1274	mask \|= 0x8;	1158	mask \|= 0x8;
1275	*last_ext \|= 0x80;	1159	*last_ext \|= 0x80;
1276	last_ext = &sl[sl.length ()];	1160	last_ext = &sl[sl.length ()];
1277		1161
1278	sl << uint8 (5) << uint8 (stat_hp);
1279
1280	if (stat_width > 1)
1281	{
1282	*last_ext \|= 0x80;
1283	last_ext = &sl[sl.length ()];
1284
1285	sl << uint8 (6) << uint8 (stat_width);
1286	}
1287	}
1288
1289	if (lastcell.player != player)
1290	{
1291	lastcell.player = player;
1292
1293	mask \|= 0x8;
1294	*last_ext \|= 0x80;
1295	last_ext = &sl[sl.length ()];
1296
1297	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1162	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1298	}	1163	}
1299		1164
1300	if (lastcell.flags != flags)	1165	if (expect_false (lastcell.flags != flags))
1301	{	1166	{
1302	lastcell.flags = flags;	1167	lastcell.flags = flags;
1303		1168
1304	mask \|= 0x8;	1169	mask \|= 0x8;
1305	*last_ext \|= 0x80;	1170	*last_ext \|= 0x80;
1306	last_ext = &sl[sl.length ()];	1171	last_ext = &sl[sl.length ()];
1307		1172
1308	sl << uint8 (8) << uint8 (flags);	1173	sl << uint8 (8) << uint8 (flags);
1309	}
1310	}	1174	}
1311		1175
		1176	// faces
		1177
1312	/* Floor face */	1178	/* Floor face */
1313	if (update_space (sl, socket, ms, lastcell, 2))	1179	if (update_space (sl, socket, ms, lastcell, 2))
1314	mask \|= 0x4;	1180	mask \|= 0x4;
1315		1181
1316	/* Middle face */	1182	/* Middle face */
1317	if (update_space (sl, socket, ms, lastcell, 1))	1183	if (update_space (sl, socket, ms, lastcell, 1))
1318	mask \|= 0x2;	1184	mask \|= 0x2;
1319		1185
		1186	if (expect_false (ob->invisible)
		1187	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1320	if (ms.player () == ob	1188	&& ms.player () == ob)
1321	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1322	{	1189	{
1323	// force player to be visible to himself if invisible	1190	// force player to be visible to himself if invisible
1324	if (lastcell.faces[0] != ob->face)	1191	if (lastcell.faces[0] != ob->face)
1325	{	1192	{
1326	lastcell.faces[0] = ob->face;	1193	lastcell.faces[0] = ob->face;
1327		1194
1328	mask \|= 0x1;
1329	sl << uint16 (ob->face);
1330
1331	socket.send_faces (ob);
1332	}
1333	}
1334	/* Top face */
1335	else if (update_space (sl, socket, ms, lastcell, 0))
1336	mask \|= 0x1;	1195	mask \|= 0x1;
		1196	sl << uint16 (ob->face);
1337		1197
		1198	socket.send_faces (ob);
		1199	}
		1200	}
		1201	/* Top face */
		1202	else if (update_space (sl, socket, ms, lastcell, 0))
		1203	mask \|= 0x1;
		1204
1338	/* Check to see if we are in fact sending anything for this	1205	/* Check to see if we are in fact sending anything for this
1339	* space by checking the mask. If so, update the mask.	1206	* space by checking the mask. If so, update the mask.
1340	* if not, reset the len to that from before adding the mask	1207	* if not, reset the len to that from before adding the mask
1341	* value, so we don't send those bits.	1208	* value, so we don't send those bits.
1342	*/	1209	*/
1343	if (mask & 0xf)	1210	if (mask & 0xf)
1344	sl[oldlen + 1] = mask & 0xff;	1211	sl[oldlen + 1] = mask & 0xff;
1345	else	1212	else
1346	sl.reset (oldlen);	1213	sl.reset (oldlen);
1347
1348	if (socket.ext_mapinfos)
1349	esl << uint16 (emask);
1350
1351	if (socket.EMI_smooth)
1352	{
1353	for (int layer = 2+1; layer--; )
1354	{
1355	object *ob = ms.faces_obj [layer];
1356
1357	// If there is no object for this space, or if the face for the object
1358	// is the blank face, set the smoothlevel to zero.
1359	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1360
1361	// We've gotten what face we want to use for the object. Now see if
1362	// if it has changed since we last sent it to the client.
1363	if (lastcell.smooth[layer] != smoothlevel)
1364	{
1365	lastcell.smooth[layer] = smoothlevel;
1366	esl << uint8 (smoothlevel);
1367	emask \|= 1 << layer;
1368	}
1369	}
1370
1371	if (emask & 0xf)
1372	esl[eoldlen + 1] = emask & 0xff;
1373	else
1374	esl.reset (eoldlen);
1375	}
1376	} /* else this is a viewable space */	1214	} /* else this is a viewable space */
1377	} /* for x loop */	1215	ordered_mapwalk_end
1378	} /* for y loop */
1379		1216
1380	socket.flush_fx ();	1217	socket.flush_fx ();
1381
1382	/* Verify that we in fact do need to send this */
1383	if (socket.ext_mapinfos)
1384	{
1385	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1386	{
1387	/* No map data will follow, so don't say the client
1388	* it doesn't need draw!
1389	*/
1390	ewhatflag &= ~EMI_NOREDRAW;
1391	esl[ewhatstart + 1] = ewhatflag & 0xff;
1392	}
1393
1394	if (esl.length () > estartlen)
1395	socket.send_packet (esl);
1396	}
1397		1218
1398	if (sl.length () > startlen \|\| socket.sent_scroll)	1219	if (sl.length () > startlen \|\| socket.sent_scroll)
1399	{	1220	{
1400	socket.send_packet (sl);	1221	socket.send_packet (sl);
1401	socket.sent_scroll = 0;	1222	socket.sent_scroll = 0;
…		…
1422	{	1243	{
1423	packet sl;	1244	packet sl;
1424	sl << "replyinfo skill_info\n";	1245	sl << "replyinfo skill_info\n";
1425		1246
1426	for (int i = 1; i < NUM_SKILLS; i++)	1247	for (int i = 1; i < NUM_SKILLS; i++)
1427	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);	1248	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1428		1249
1429	if (sl.length () > MAXSOCKBUF)	1250	if (sl.length () > MAXSOCKBUF)
1430	{	1251	{
1431	LOG (llevError, "Buffer overflow in send_skill_info!\n");	1252	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1432	fatal (0);	1253	fatal (0);
…		…
1476	if (spell->type == SPELL)	1297	if (spell->type == SPELL)
1477	{	1298	{
1478	int flags = 0;	1299	int flags = 0;
1479		1300
1480	/* check if we need to update it */	1301	/* check if we need to update it */
1481	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))
1482	{	1303	{
1483	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);
1484	flags \|= UPD_SP_MANA;	1305	flags \|= UPD_SP_MANA;
1485	}	1306	}
1486		1307
1487	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))
1488	{	1309	{
1489	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);
1490	flags \|= UPD_SP_GRACE;	1311	flags \|= UPD_SP_GRACE;
1491	}	1312	}
1492		1313
1493	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))
1494	{	1315	{
1495	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);
1496	flags \|= UPD_SP_DAMAGE;	1317	flags \|= UPD_SP_DAMAGE;
1497	}	1318	}
1498		1319
1499	if (flags)	1320	if (flags)
1500	{	1321	{
…		…
1502		1323
1503	sl << "updspell "	1324	sl << "updspell "
1504	<< uint8 (flags)	1325	<< uint8 (flags)
1505	<< uint32 (spell->count);	1326	<< uint32 (spell->count);
1506		1327
1507	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1328	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1508	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1329	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
1509	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1330	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
1510		1331
1511	pl->ns->send_packet (sl);	1332	pl->ns->send_packet (sl);
1512	}	1333	}
1513	}	1334	}
1514	}	1335	}
…		…
1544	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);
1545	return;	1366	return;
1546	}	1367	}
1547		1368
1548	/* 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 */
1549	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);
1550	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);
1551	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);
1552		1373
1553	/* figure out which skill it uses, if it uses one */	1374	/* figure out which skill it uses, if it uses one */
1554	if (spell->skill)	1375	if (spell->skill)
1555	{	1376	if (object *tmp = pl->find_skill (spell->skill))
1556	for (i = 1; i < NUM_SKILLS; i++)
1557	if (!strcmp (spell->skill, skill_names[i]))
1558	{
1559	skill = i + CS_STAT_SKILLINFO;	1377	skill = tmp->subtype + CS_STAT_SKILLINFO;
1560	break;
1561	}
1562	}
1563		1378
1564	// spells better have a face	1379	// spells better have a face
1565	if (!spell->face)	1380	if (!spell->face)
1566	{	1381	{
1567	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);
…		…
1572		1387
1573	/* send the current values */	1388	/* send the current values */
1574	sl << uint32 (spell->count)	1389	sl << uint32 (spell->count)
1575	<< uint16 (spell->level)	1390	<< uint16 (spell->level)
1576	<< uint16 (spell->casting_time)	1391	<< uint16 (spell->casting_time)
1577	<< uint16 (spell->last_sp)	1392	<< uint16 (spell->cached_sp)
1578	<< uint16 (spell->last_grace)	1393	<< uint16 (spell->cached_grace)
1579	<< uint16 (spell->last_eat)	1394	<< uint16 (spell->cached_eat)
1580	<< uint8 (skill)	1395	<< uint8 (skill)
1581	<< uint32 (spell->path_attuned)	1396	<< uint32 (spell->path_attuned)
1582	<< uint32 (spell->face)	1397	<< uint32 (spell->face)
1583	<< data8 (spell->name)	1398	<< data8 (spell->name)
1584	<< data16 (spell->msg);	1399	<< data16 (spell->msg);
…		…
1651	/* finally, we can send the packet */	1466	/* finally, we can send the packet */
1652	pl->ns->flush_fx ();	1467	pl->ns->flush_fx ();
1653	pl->ns->send_packet (sl);	1468	pl->ns->send_packet (sl);
1654	}	1469	}
1655		1470
		1471	//-GPL
		1472

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.126 by root, Tue Apr 22 07:01:47 2008 UTC vs. Revision 1.156 by root, Fri Nov 6 12:49:19 2009 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.126 by root, Tue Apr 22 07:01:47 2008 UTC vs.
Revision 1.156 by root, Fri Nov 6 12:49:19 2009 UTC