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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.144 by root, Fri Dec 26 10:36:42 2008 UTC vs.
Revision 1.183 by root, Sat May 7 20:03:28 2011 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,2009,2010,2011 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	*
41		44
42	#include <global.h>	45	#include <global.h>
43	#include <sproto.h>	46	#include <sproto.h>
44		47
45	#include <living.h>	48	#include <living.h>
46	#include <commands.h>
47		49
48	/* This block is basically taken from socket.c - I assume if it works there,	50	/* This block is basically taken from socket.c - I assume if it works there,
49	* it should work here.	51	* it should work here.
50	*/	52	*/
51	#include <sys/types.h>	53	#include <sys/types.h>
…		…
63	* This table translates the attack numbers as used within the	65	* This table translates the attack numbers as used within the
64	* program to the value we use when sending STATS command to the	66	* 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	67	* client. If a value is -1, then we don't send that to the
66	* client.	68	* client.
67	*/	69	*/
68	short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,	70	static short atnr_cs_stat[NROFATTACKS] =
69	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,	71	{
70	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,	72	CS_STAT_RES_PHYS,
71	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	73	CS_STAT_RES_MAG,
72	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	74	CS_STAT_RES_FIRE,
73	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,	75	CS_STAT_RES_ELEC,
74	CS_STAT_RES_FEAR, -1 /* Cancellation */ ,	76	CS_STAT_RES_COLD,
75	CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,	77	CS_STAT_RES_CONF,
76	-1 /* Chaos / , -1 / Counterspell */ ,	78	CS_STAT_RES_ACID,
77	-1 /* Godpower */ , CS_STAT_RES_HOLYWORD,	79	CS_STAT_RES_DRAIN,
		80	-1 /* weaponmagic */,
		81	CS_STAT_RES_GHOSTHIT,
		82	CS_STAT_RES_POISON,
		83	CS_STAT_RES_SLOW,
		84	CS_STAT_RES_PARA,
		85	CS_STAT_TURN_UNDEAD,
		86	CS_STAT_RES_FEAR,
		87	-1 /* Cancellation */,
		88	CS_STAT_RES_DEPLETE,
		89	CS_STAT_RES_DEATH,
		90	-1 /* Chaos */,
		91	-1 /* Counterspell */,
		92	-1 /* Godpower */,
		93	CS_STAT_RES_HOLYWORD,
78	CS_STAT_RES_BLIND,	94	CS_STAT_RES_BLIND,
79	-1, /* Internal */	95	-1, /* Internal */
80	-1, /* life stealing */	96	-1, /* life stealing */
81	-1 /* Disease - not fully done yet */	97	-1 /* Disease - not fully done yet */
82	};	98	};
…		…
130	pl->ns->mapinfo_queue_clear ();	146	pl->ns->mapinfo_queue_clear ();
131		147
132	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	148	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
133		149
134	pl->ns->force_newmap = false;	150	pl->ns->force_newmap = false;
135
136	if (pl->ns->newmapcmd == 1)
137	pl->ns->send_packet ("newmap");	151	pl->ns->send_packet ("newmap");
138
139	pl->ns->floorbox_reset ();	152	pl->ns->floorbox_reset ();
140	}	153	}
141		154
142	static void	155	static void
143	send_map_info (player *pl)	156	send_map_info (player *pl)
144	{	157	{
145	client &socket = *pl->ns;	158	client &socket = *pl->ns;
146	object *ob = pl->observe;	159	object *ob = pl->viewpoint;
147		160
148	if (socket.mapinfocmd)	161	if (socket.mapinfocmd)
149	{	162	{
150	if (ob->map && ob->map->path[0])	163	if (ob->map && ob->map->path)
151	{	164	{
152	int flags = 0;	165	int flags = 0;
153		166
		167	// due to historical glitches, the bit ordering and map index ordering differs
154	if (ob->map->tile_path[0]) flags \|= 1;	168	if (ob->map->tile_path[TILE_NORTH]) flags \|= 0x01;
155	if (ob->map->tile_path[1]) flags \|= 2;	169	if (ob->map->tile_path[TILE_EAST ]) flags \|= 0x02;
156	if (ob->map->tile_path[2]) flags \|= 4;	170	if (ob->map->tile_path[TILE_SOUTH]) flags \|= 0x04;
157	if (ob->map->tile_path[3]) flags \|= 8;	171	if (ob->map->tile_path[TILE_WEST ]) flags \|= 0x08;
		172	// these two are debatable
		173	if (ob->map->tile_path[TILE_UP ]) flags \|= 0x10;
		174	if (ob->map->tile_path[TILE_DOWN ]) flags \|= 0x20;
158		175
159	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",	176	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,	177	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161	ob->map->width, ob->map->height, &ob->map->path);	178	ob->map->width, ob->map->height, &ob->map->path);
162	}	179	}
…		…
168	/** check for map/region change and send new map data */	185	/** check for map/region change and send new map data */
169	static void	186	static void
170	check_map_change (player *pl)	187	check_map_change (player *pl)
171	{	188	{
172	client &socket = *pl->ns;	189	client &socket = *pl->ns;
173	object *ob = pl->observe;	190	object *ob = pl->viewpoint;
174		191
175	region *reg = ob->region ();	192	region *reg = ob->region ();
176	if (socket.current_region != reg)	193	if (socket.current_region != reg)
177	{	194	{
178	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	195	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
…		…
208	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)	225	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)
209	{	226	{
210	int dx = ob->x - socket.current_x;	227	int dx = ob->x - socket.current_x;
211	int dy = ob->y - socket.current_y;	228	int dy = ob->y - socket.current_y;
212		229
213	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))
214	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
215	else
216	{
217	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	230	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218	socket.floorbox_reset ();	231	socket.floorbox_reset ();
219	}
220	}	232	}
221		233
222	socket.current_x = ob->x;	234	socket.current_x = ob->x;
223	socket.current_y = ob->y;	235	socket.current_y = ob->y;
		236	}
		237
		238	/**
		239	* This sends the skill number to name mapping. We ignore
		240	* the params - we always send the same info no matter what.
		241	*/
		242	static void
		243	send_skill_info (client ns, char params)
		244	{
		245	packet sl;
		246	sl << "replyinfo skill_info\n";
		247
		248	for (int i = 0; i < skillvec.size (); ++i)
		249	sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
		250
		251	if (sl.length () > MAXSOCKBUF)
		252	cleanup ("buffer overflow in send_skill_info!");
		253
		254	ns->send_packet (sl);
		255	}
		256
		257	/**
		258	* This sends the spell path to name mapping. We ignore
		259	* the params - we always send the same info no matter what.
		260	*/
		261	static void
		262	send_spell_paths (client * ns, char *params)
		263	{
		264	packet sl;
		265
		266	sl << "replyinfo spell_paths\n";
		267
		268	for (int i = 0; i < NRSPELLPATHS; i++)
		269	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		270
		271	if (sl.length () > MAXSOCKBUF)
		272	cleanup ("buffer overflow in send_spell_paths!");
		273
		274	ns->send_packet (sl);
224	}	275	}
225		276
226	/**	277	/**
227	* RequestInfo is sort of a meta command. There is some specific	278	* RequestInfo is sort of a meta command. There is some specific
228	* request of information, but we call other functions to provide	279	* request of information, but we call other functions to provide
…		…
241	{	292	{
242	*params++ = 0;	293	*params++ = 0;
243	break;	294	break;
244	}	295	}
245		296
246	if (!strcmp (buf, "image_info"))
247	send_image_info (ns, params);
248	else if (!strcmp (buf, "image_sums"))
249	send_image_sums (ns, params);
250	else if (!strcmp (buf, "skill_info"))	297	if (!strcmp (buf, "skill_info"))
251	send_skill_info (ns, params);	298	send_skill_info (ns, params);
252	else if (!strcmp (buf, "spell_paths"))	299	else if (!strcmp (buf, "spell_paths"))
253	send_spell_paths (ns, params);	300	send_spell_paths (ns, params);
254	else	301	else
255	{	302	{
…		…
271	ExtiCmd (char buf, int len, client ns)	318	ExtiCmd (char buf, int len, client ns)
272	{	319	{
273	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	320	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274	}	321	}
275		322
		323	//-GPL
		324
276	void	325	void
277	client::mapinfo_queue_clear ()	326	client::mapinfo_queue_clear ()
278	{	327	{
279	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	328	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280	free (*i);	329	free (*i);
…		…
287	{	336	{
288	char *token = buf;	337	char *token = buf;
289	buf += strlen (buf) + 9;	338	buf += strlen (buf) + 9;
290		339
291	// initial map and its origin	340	// initial map and its origin
292	maptile *map = pl->observe->map;	341	maptile *map = pl->viewpoint->map;
293	int mapx = pl->ns->mapx / 2 - pl->observe->x;	342	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
294	int mapy = pl->ns->mapy / 2 - pl->observe->y;	343	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
295	int max_distance = 8; // limit maximum path length to something generous	344	int max_distance = 8; // limit maximum path length to something generous
296		345
297	while (*buf && map && max_distance)	346	while (*buf && map && max_distance)
298	{	347	{
299	int dir = *buf++ - '1';	348	int dir = *buf++ - '1';
300		349
301	if (dir >= 0 && dir <= 3)	350	// due to historical glitches, the mapinfo index and tile index differs
		351	static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
		352
		353	// maybe we should only allow the four flat directions
		354	if (dir >= 0 && dir < array_length (dirmap))
302	{	355	{
		356	dir = dirmap [dir];
		357
303	if (!map->tile_path [dir])	358	if (!map->tile_path [dir])
304	map = 0;	359	map = 0;
305	else if (map->tile_available (dir, false))	360	else if (map->tile_available (dir, false))
306	{	361	{
307	maptile *neigh = map->tile_map [dir];	362	maptile *neigh = map->tile_map [dir];
…		…
330	send_packet_printf ("mapinfo %s nomap", token);	385	send_packet_printf ("mapinfo %s nomap", token);
331	else	386	else
332	{	387	{
333	int flags = 0;	388	int flags = 0;
334		389
		390	// due to historical glitches, the bit ordering and map index ordering differs
335	if (map->tile_path[0]) flags \|= 1;	391	if (map->tile_path[TILE_NORTH]) flags \|= 0x01;
336	if (map->tile_path[1]) flags \|= 2;	392	if (map->tile_path[TILE_EAST ]) flags \|= 0x02;
337	if (map->tile_path[2]) flags \|= 4;	393	if (map->tile_path[TILE_SOUTH]) flags \|= 0x04;
338	if (map->tile_path[3]) flags \|= 8;	394	if (map->tile_path[TILE_WEST ]) flags \|= 0x08;
		395	// these two are debatable
		396	if (map->tile_path[TILE_UP ]) flags \|= 0x10;
		397	if (map->tile_path[TILE_DOWN ]) flags \|= 0x20;
339		398
340	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);	399	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
341	}	400	}
342		401
343	return 1;	402	return 1;
…		…
404	AddMeCmd (char buf, int len, client ns)	463	AddMeCmd (char buf, int len, client ns)
405	{	464	{
406	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	465	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
407	}	466	}
408		467
409	/** Reply to ExtendedInfos command */	468	//+GPL
410	void
411	ToggleExtendedInfos (char buf, int len, client ns)
412	{
413	char cmdback[MAX_BUF];
414	char command[50];
415	int info, nextinfo;
416
417	cmdback[0] = '\0';
418	nextinfo = 0;
419
420	while (1)
421	{
422	/* 1. Extract an info */
423	info = nextinfo;
424
425	while ((info < len) && (buf[info] == ' '))
426	info++;
427
428	if (info >= len)
429	break;
430
431	nextinfo = info + 1;
432
433	while ((nextinfo < len) && (buf[nextinfo] != ' '))
434	nextinfo++;
435
436	if (nextinfo - info >= 49) /Erroneous info asked /
437	continue;
438
439	strncpy (command, &(buf[info]), nextinfo - info);
440
441	/* 2. Interpret info */
442	if (!strcmp ("smooth", command))
443	/* Toggle smoothing */
444	ns->EMI_smooth = !ns->EMI_smooth;
445	else
446	/bad value /;
447
448	/3. Next info /
449	}
450
451	strcpy (cmdback, "ExtendedInfoSet");
452
453	if (ns->EMI_smooth)
454	{
455	strcat (cmdback, " ");
456	strcat (cmdback, "smoothing");
457	}
458
459	ns->send_packet (cmdback);
460	}
461
462	/*
463	#define MSG_TYPE_BOOK 1
464	#define MSG_TYPE_CARD 2
465	#define MSG_TYPE_PAPER 3
466	#define MSG_TYPE_SIGN 4
467	#define MSG_TYPE_MONUMENT 5
468	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
469
470	/** Reply to ExtendedInfos command */
471	void
472	ToggleExtendedText (char buf, int len, client ns)
473	{
474	char cmdback[MAX_BUF];
475	char temp[10];
476	char command[50];
477	int info, nextinfo, i, flag;
478
479	cmdback[0] = '\0';
480
481	nextinfo = 0;
482	while (1)
483	{
484	/* 1. Extract an info */
485	info = nextinfo;
486
487	while ((info < len) && (buf[info] == ' '))
488	info++;
489
490	if (info >= len)
491	break;
492
493	nextinfo = info + 1;
494
495	while ((nextinfo < len) && (buf[nextinfo] != ' '))
496	nextinfo++;
497
498	if (nextinfo - info >= 49) /Erroneous info asked /
499	continue;
500
501	strncpy (command, &(buf[info]), nextinfo - info);
502	command[nextinfo - info] = '\0';
503	/* 2. Interpret info */
504	i = sscanf (command, "%d", &flag);
505
506	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
507	ns->supported_readables \|= (1 << flag);
508	/3. Next info /
509	}
510
511	/* Send resulting state */
512	strcpy (cmdback, "ExtendedTextSet");
513
514	for (i = 0; i <= MSG_TYPE_LAST; i++)
515	if (ns->supported_readables & (1 << i))
516	{
517	strcat (cmdback, " ");
518	snprintf (temp, sizeof (temp), "%d", i);
519	strcat (cmdback, temp);
520	}
521
522	ns->send_packet (cmdback);
523	}
524		469
525	/**	470	/**
526	* This handles the general commands from the client (ie, north, fire, cast,	471	* This handles the general commands from the client (ie, north, fire, cast,
527	* etc.)	472	* etc.)
528	*/	473	*/
…		…
541	return;	486	return;
542		487
543	buf++;	488	buf++;
544	}	489	}
545		490
546	execute_newserver_command (pl->ob, (char *) buf);	491	execute_newserver_command (pl->ob, (char *)buf);
547		492
548	/* Perhaps something better should be done with a left over count.	493	/* Perhaps something better should be done with a left over count.
549	* Cleaning up the input should probably be done first - all actions	494	* Cleaning up the input should probably be done first - all actions
550	* for the command that issued the count should be done before any other	495	* for the command that issued the count should be done before any other
551	* commands.	496	* commands.
…		…
585	* commands.	530	* commands.
586	*/	531	*/
587	pl->count = 0;	532	pl->count = 0;
588		533
589	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	534	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
590	int time = fabs (pl->ob->speed) < 0.001	535	int time = pl->ob->has_active_speed ()
591	? time = MAX_TIME * 100
592	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	536	? (int) (MAX_TIME / pl->ob->speed)
		537	: MAX_TIME * 100;
593		538
594	/* Send confirmation of command execution now */	539	/* Send confirmation of command execution now */
595	packet sl ("comc");	540	packet sl ("comc");
596	sl << uint16 (cmdid) << uint32 (time);	541	sl << uint16 (cmdid) << uint32 (time);
597	pl->ns->send_packet (sl);	542	pl->ns->send_packet (sl);
…		…
639	LOG (llevError, "Unknown input state: %d\n", ns->state);	584	LOG (llevError, "Unknown input state: %d\n", ns->state);
640	}	585	}
641	}	586	}
642		587
643	/**	588	/**
644	* Client tells its version. If there is a mismatch, we close the	589	* Client tells its version info.
645	* socket. In real life, all we should care about is the client having
646	* something older than the server. If we assume the client will be
647	* backwards compatible, having it be a later version should not be a
648	* problem.
649	*/	590	*/
650	void	591	void
651	VersionCmd (char buf, int len, client ns)	592	VersionCmd (char buf, int len, client ns)
652	{	593	{
653	if (!buf)	594	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
654	{
655	LOG (llevError, "CS: received corrupted version command\n");
656	return;
657	}
658
659	ns->cs_version = atoi (buf);
660	ns->sc_version = ns->cs_version;
661
662	LOG (llevDebug, "connection from client <%s>\n", buf);
663
664	//TODO: should log here just for statistics
665
666	//if (VERSION_CS != ns->cs_version)
667	// unchecked;
668
669	char *cp = strchr (buf + 1, ' ');
670	if (!cp)
671	return;
672
673	ns->sc_version = atoi (cp);
674
675	//if (VERSION_SC != ns->sc_version)
676	// unchecked;
677
678	cp = strchr (cp + 1, ' ');
679
680	if (cp)
681	{
682	ns->version = cp + 1;
683
684	if (ns->sc_version < 1026)
685	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
686	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
687	}
688	}	595	}
689		596
690	/** sound related functions. */	597	/** sound related functions. */
691	void	598	void
692	SetSound (char buf, int len, client ns)	599	SetSound (char buf, int len, client ns)
…		…
743	* Get player's current range attack in obuf.	650	* Get player's current range attack in obuf.
744	*/	651	*/
745	static void	652	static void
746	rangetostring (player pl, char obuf)	653	rangetostring (player pl, char obuf)
747	{	654	{
748	dynbuf_text buf;	655	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		656
		657	#if 0
		658	// print ranged/chosen_skill etc. objects every call
		659	printf ("%s %s => %s (%s)\n",
		660	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		661	pl->combat_ob ? &pl->combat_ob->name : "-",
		662	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		663	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		664	);
		665	#endif
749		666
750	if (pl->ranged_ob)	667	if (pl->ranged_ob)
751	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	668	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
752		669
753	if (pl->combat_ob)	670	if (pl->combat_ob)
…		…
799	* commands for now.	716	* commands for now.
800	*/	717	*/
801	void	718	void
802	esrv_update_stats (player *pl)	719	esrv_update_stats (player *pl)
803	{	720	{
804	char buf[MAX_BUF];
805	uint16 flags;
806
807	client *ns = pl->ns;	721	client *ns = pl->ns;
808	if (!ns)	722	if (!ns)
809	return;	723	return;
810		724
811	object *ob = pl->observe;	725	object *ob = pl->observe;
…		…
828	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	742	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
829	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	743	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
830	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	744	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
831	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	745	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
832		746
833	for (int s = 0; s < NUM_SKILLS; s++)	747	for (int s = 0; s < CS_NUM_SKILLS; s++)
834	if (object *skill = opl->last_skill_ob [s])	748	if (object *skill = opl->last_skill_ob [s])
835	if (skill->stats.exp != ns->last_skill_exp [s])	749	if (skill->stats.exp != ns->last_skill_exp [s])
836	{	750	{
837	ns->last_skill_exp [s] = skill->stats.exp;	751	ns->last_skill_exp [s] = skill->stats.exp;
838		752
839	/* Always send along the level if exp changes. This is only	753	/* Always send along the level if exp changes. This is only
840	* 1 extra byte, but keeps processing simpler.	754	* 1 extra byte, but keeps processing simpler.
841	*/	755	*/
842	sl << uint8 (s + CS_STAT_SKILLINFO)	756	sl << uint8 (CS_STAT_SKILLINFO + s)
843	<< uint8 (skill->level)	757	<< uint8 (skill->level)
844	<< uint64 (skill->stats.exp);	758	<< uint64 (skill->stats.exp);
845	}	759	}
846		760
847	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	761	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
848	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	762	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
849	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	763	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
850	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	764	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
851	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	765	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
852	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	766	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
853	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	767	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
854	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	768	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
855	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	769	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
856		770
857	flags = 0;	771	int flags = (opl->fire_on ? SF_FIREON : 0)
858		772	\| (opl->run_on ? SF_RUNON : 0);
859	if (opl->fire_on)
860	flags \|= SF_FIREON;
861
862	if (opl->run_on)
863	flags \|= SF_RUNON;
864		773
865	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	774	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
866		775
867	if (ns->sc_version < 1025)
868	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
869	else
870	for (int i = 0; i < NROFATTACKS; i++)	776	for (int i = 0; i < NROFATTACKS; i++)
871	{
872	/* Skip ones we won't send */	777	/* Skip ones we won't send */
873	if (atnr_cs_stat[i] == -1)	778	if (atnr_cs_stat[i] >= 0)
874	continue;
875
876	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	779	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
877	}
878		780
879	if (pl->ns->monitor_spells)	781	if (pl->ns->monitor_spells)
880	{	782	{
881	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	783	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
882	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	784	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
883	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	785	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
884	}	786	}
885		787
		788	char buf[MAX_BUF];
886	rangetostring (opl, buf); /* we want use the new fire & run system in new client */	789	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
887	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	790	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
888	set_title (ob, buf);	791	set_title (ob, buf);
889	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	792	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
890		793
…		…
984		887
985	/* Nothing changed */	888	/* Nothing changed */
986	return 0;	889	return 0;
987	}	890	}
988		891
989	/**	892	//-GPL
990	* Returns the size of a data for a map square as returned by
991	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
992	* available.
993	*/
994	int
995	getExtendedMapInfoSize (client * ns)
996	{
997	int result = 0;
998		893
999	if (ns->ext_mapinfos)	894	// prefetch some flat area around the player
1000	{
1001	if (ns->EMI_smooth)
1002	result += 1; /One byte for smoothlevel /
1003	}
1004
1005	return result;
1006	}
1007
1008	// prefetch (and touch) all maps within a specific distancd
1009	static void	895	static void
1010	prefetch_surrounding_maps (maptile *map, int distance)	896	prefetch_surrounding_area (object op, maptile map, int range)
1011	{	897	{
1012	map->last_access = runtime;	898	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
1013		899	op->x - range , op->y - range ,
1014	if (--distance)	900	op->x + range + 1, op->y + range + 1);
1015	for (int dir = 4; --dir; )	901	rect->m;
1016	if (const shstr &path = map->tile_path [dir])	902	++rect)
1017	if (maptile *&neigh = map->tile_map [dir])	903	{
1018	prefetch_surrounding_maps (neigh, distance);	904	rect->m->touch ();
1019	else	905	rect->m->activate ();
1020	neigh = maptile::find_async (path, map);	906	}
1021	}	907	}
1022		908
1023	// prefetch a generous area around the player	909	// prefetch a generous area around the player, also up and down
1024	static void	910	void
1025	prefetch_surrounding_maps (object *op)	911	object::prefetch_surrounding_maps ()
1026	{	912	{
1027	prefetch_surrounding_maps (op->map, 3);	913	prefetch_surrounding_area (this, map, 40);
		914
		915	if (maptile *m = map->tile_available (TILE_DOWN))
		916	prefetch_surrounding_area (this, m, 20);
		917
		918	if (maptile *m = map->tile_available (TILE_UP))
		919	prefetch_surrounding_area (this, m, 20);
1028	}	920	}
		921
		922	//+GPL
1029		923
1030	/**	924	/**
1031	* Draws client map.	925	* Draws client map.
1032	*/	926	*/
1033	void	927	void
1034	draw_client_map (player *pl)	928	draw_client_map (player *pl)
1035	{	929	{
1036	object *ob = pl->observe;	930	object *ob = pl->viewpoint;
1037	if (!ob->active)	931	if (!pl->observe->active)
1038	return;	932	return;
1039		933
1040	/* If player is just joining the game, he isn't here yet, so the map	934	/* If player is just joining the game, he isn't here yet, so the map
1041	* can get swapped out. If so, don't try to send them a map. All will	935	* can get swapped out. If so, don't try to send them a map. All will
1042	* be OK once they really log in.	936	* be OK once they really log in.
1043	*/	937	*/
1044	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	938	if (!ob->map \|\| ob->map->state != MAP_ACTIVE)
1045	return;	939	return;
1046		940
1047	int startlen, oldlen;	941	int startlen, oldlen;
1048	int estartlen, eoldlen;
1049	uint8 eentrysize;
1050	uint16 ewhatstart, ewhatflag;
1051	uint8 extendedinfos;
1052		942
1053	check_map_change (pl);	943	check_map_change (pl);
1054	prefetch_surrounding_maps (pl->ob);	944	pl->ob->prefetch_surrounding_maps ();
1055		945
1056	/* do LOS after calls to update_position */	946	/* do LOS after calls to update_position */
1057	/* unfortunately, we need to udpate los when observing, currently */	947	/* unfortunately, we need to udpate los when observing, currently */
1058	if (pl->do_los \|\| pl->observe != pl->ob)	948	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1059	{	949	{
1060	pl->do_los = 0;	950	pl->do_los = 0;
1061	pl->update_los ();	951	pl->update_los ();
1062	}	952	}
1063		953
…		…
1084	* look like.	974	* look like.
1085	*/	975	*/
1086		976
1087	client &socket = *pl->ns;	977	client &socket = *pl->ns;
1088		978
1089	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	979	packet sl ("map1a");
1090	packet esl;
1091		980
1092	startlen = sl.length ();	981	startlen = sl.length ();
1093
1094	/Extendedmapinfo structure initialisation /
1095	if (socket.ext_mapinfos)
1096	{
1097	extendedinfos = EMI_NOREDRAW;
1098
1099	if (socket.EMI_smooth)
1100	extendedinfos \|= EMI_SMOOTH;
1101
1102	ewhatstart = esl.length ();
1103	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
1104	could need to be taken away */
1105	eentrysize = getExtendedMapInfoSize (&socket);
1106	esl << "mapextended "
1107	<< uint8 (extendedinfos)
1108	<< uint8 (eentrysize);
1109
1110	estartlen = esl.length ();
1111	}
1112		982
1113	int hx = socket.mapx / 2;	983	int hx = socket.mapx / 2;
1114	int hy = socket.mapy / 2;	984	int hy = socket.mapy / 2;
1115		985
1116	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)	986	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1117	int ax = dx + hx;	987	int ax = dx + hx;
1118	int ay = dy + hy;	988	int ay = dy + hy;
1119		989
1120	int emask, mask;
1121	emask = mask = (ax << 10) \| (ay << 4);	990	int mask = (ax << 10) \| (ay << 4);
1122
1123	MapCell &lastcell = socket.lastmap.cells[ax][ay];	991	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1124		992
1125	/* If the coordinates are not valid, or it is too dark to see,	993	/* If the coordinates are not valid, or it is too dark to see,
1126	* we tell the client as such	994	* we tell the client as such
1127	*/	995	*/
…		…
1137	map_clearcell (&lastcell, -1);	1005	map_clearcell (&lastcell, -1);
1138	}	1006	}
1139		1007
1140	continue;	1008	continue;
1141	}	1009	}
1142		1010
1143	int d = pl->blocked_los_uc (dx, dy);	1011	int d = pl->blocked_los_uc (dx, dy);
1144		1012
1145	if (d > 3)	1013	if (d > 3)
1146	{	1014	{
1147	/* This block deals with spaces that are not visible for whatever	1015	/* This block deals with spaces that are not visible for whatever
…		…
1173	* I think this is simpler than doing a bunch of checks to see	1041	* I think this is simpler than doing a bunch of checks to see
1174	* what if anything we need to send, setting the bits, then	1042	* what if anything we need to send, setting the bits, then
1175	* doing those checks again to add the real data.	1043	* doing those checks again to add the real data.
1176	*/	1044	*/
1177	oldlen = sl.length ();	1045	oldlen = sl.length ();
1178	eoldlen = esl.length ();
1179		1046
1180	sl << uint16 (mask);	1047	sl << uint16 (mask);
1181		1048
1182	unsigned char dummy;	1049	unsigned char dummy;
1183	unsigned char *last_ext = &dummy;	1050	unsigned char *last_ext = &dummy;
1184		1051
1185	/* Darkness changed */	1052	/* Darkness changed */
1186	if (lastcell.count != d && socket.darkness)	1053	if (lastcell.count != d)
1187	{	1054	{
1188	mask \|= 0x8;	1055	mask \|= 0x8;
1189		1056
1190	if (socket.extmap)	1057	*last_ext \|= 0x80;
		1058	last_ext = &sl[sl.length ()];
		1059	sl << uint8 (d);
		1060	}
		1061
		1062	lastcell.count = d;
		1063
		1064	mapspace &ms = m->at (nx, ny);
		1065	ms.update ();
		1066
		1067	// extmap handling
		1068	uint8 stat_hp = 0;
		1069	uint8 stat_width = 0;
		1070	uint8 flags = 0;
		1071	tag_t player = 0;
		1072
		1073	// send hp information, if applicable
		1074	if (object *op = ms.faces_obj [0])
		1075	if (op->is_head () && !op->invisible)
		1076	{
		1077	if (op->stats.maxhp > op->stats.hp
		1078	&& op->stats.maxhp > 0
		1079	&& (op->type == PLAYER
		1080	\|\| op->type == DOOR // does not work, have maxhp 0
		1081	\|\| op->flag [FLAG_MONSTER]
		1082	\|\| op->flag [FLAG_ALIVE]
		1083	\|\| op->flag [FLAG_GENERATOR]))
		1084	{
		1085	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1086	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1087	}
		1088
		1089	if (expect_false (op->has_dialogue ()))
		1090	flags \|= 1;
		1091
		1092	if (expect_false (op->type == PLAYER))
		1093	player = op == ob ? pl->ob->count
		1094	: op == pl->ob ? ob->count
		1095	: op->count;
		1096	}
		1097
		1098	if (expect_false (lastcell.stat_hp != stat_hp))
		1099	{
		1100	lastcell.stat_hp = stat_hp;
		1101
		1102	mask \|= 0x8;
		1103	*last_ext \|= 0x80;
		1104	last_ext = &sl[sl.length ()];
		1105
		1106	sl << uint8 (5) << uint8 (stat_hp);
		1107
		1108	if (stat_width > 1)
1191	{	1109	{
1192	*last_ext \|= 0x80;	1110	*last_ext \|= 0x80;
1193	last_ext = &sl[sl.length ()];	1111	last_ext = &sl[sl.length ()];
1194	sl << uint8 (d);
1195	}
1196	else
1197	sl << uint8 (255 - 64 * d);
1198	}
1199		1112
1200	lastcell.count = d;
1201
1202	mapspace &ms = m->at (nx, ny);
1203	ms.update ();
1204
1205	if (expect_true (socket.extmap))
1206	{
1207	uint8 stat_hp = 0;
1208	uint8 stat_width = 0;
1209	uint8 flags = 0;
1210	tag_t player = 0;
1211
1212	// send hp information, if applicable
1213	if (object *op = ms.faces_obj [0])
1214	if (op->is_head () && !op->invisible)
1215	{
1216	if (op->stats.maxhp > op->stats.hp
1217	&& op->stats.maxhp > 0
1218	&& (op->type == PLAYER
1219	\|\| op->type == DOOR // does not work, have maxhp 0
1220	\|\| QUERY_FLAG (op, FLAG_MONSTER)
1221	\|\| QUERY_FLAG (op, FLAG_ALIVE)
1222	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1223	{
1224	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1225	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1226	}
1227
1228	if (expect_false (op->has_dialogue ()))
1229	flags \|= 1;
1230
1231	if (expect_false (op->type == PLAYER))
1232	player = op == ob ? pl->ob->count
1233	: op == pl->ob ? ob->count
1234	: op->count;
1235	}
1236
1237	if (expect_false (lastcell.stat_hp != stat_hp))
1238	{
1239	lastcell.stat_hp = stat_hp;
1240
1241	mask \|= 0x8;
1242	*last_ext \|= 0x80;
1243	last_ext = &sl[sl.length ()];
1244
1245	sl << uint8 (5) << uint8 (stat_hp);
1246
1247	if (stat_width > 1)
1248	{
1249	*last_ext \|= 0x80;
1250	last_ext = &sl[sl.length ()];
1251
1252	sl << uint8 (6) << uint8 (stat_width);	1113	sl << uint8 (6) << uint8 (stat_width);
1253	}
1254	}
1255
1256	if (expect_false (lastcell.player != player))
1257	{
1258	lastcell.player = player;
1259
1260	mask \|= 0x8;
1261	*last_ext \|= 0x80;
1262	last_ext = &sl[sl.length ()];
1263
1264	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1265	}
1266
1267	if (expect_false (lastcell.flags != flags))
1268	{
1269	lastcell.flags = flags;
1270
1271	mask \|= 0x8;
1272	*last_ext \|= 0x80;
1273	last_ext = &sl[sl.length ()];
1274
1275	sl << uint8 (8) << uint8 (flags);
1276	}	1114	}
1277	}	1115	}
		1116
		1117	if (expect_false (lastcell.player != player))
		1118	{
		1119	lastcell.player = player;
		1120
		1121	mask \|= 0x8;
		1122	*last_ext \|= 0x80;
		1123	last_ext = &sl[sl.length ()];
		1124
		1125	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
		1126	}
		1127
		1128	if (expect_false (lastcell.flags != flags))
		1129	{
		1130	lastcell.flags = flags;
		1131
		1132	mask \|= 0x8;
		1133	*last_ext \|= 0x80;
		1134	last_ext = &sl[sl.length ()];
		1135
		1136	sl << uint8 (8) << uint8 (flags);
		1137	}
		1138
		1139	// faces
1278		1140
1279	/* Floor face */	1141	/* Floor face */
1280	if (update_space (sl, socket, ms, lastcell, 2))	1142	if (update_space (sl, socket, ms, lastcell, 2))
1281	mask \|= 0x4;	1143	mask \|= 0x4;
1282		1144
…		…
1310	*/	1172	*/
1311	if (mask & 0xf)	1173	if (mask & 0xf)
1312	sl[oldlen + 1] = mask & 0xff;	1174	sl[oldlen + 1] = mask & 0xff;
1313	else	1175	else
1314	sl.reset (oldlen);	1176	sl.reset (oldlen);
1315
1316	if (socket.ext_mapinfos)
1317	esl << uint16 (emask);
1318
1319	if (socket.EMI_smooth)
1320	{
1321	for (int layer = 2+1; layer--; )
1322	{
1323	object *ob = ms.faces_obj [layer];
1324
1325	// If there is no object for this space, or if the face for the object
1326	// is the blank face, set the smoothlevel to zero.
1327	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1328
1329	// We've gotten what face we want to use for the object. Now see if
1330	// if it has changed since we last sent it to the client.
1331	if (lastcell.smooth[layer] != smoothlevel)
1332	{
1333	lastcell.smooth[layer] = smoothlevel;
1334	esl << uint8 (smoothlevel);
1335	emask \|= 1 << layer;
1336	}
1337	}
1338
1339	if (emask & 0xf)
1340	esl[eoldlen + 1] = emask & 0xff;
1341	else
1342	esl.reset (eoldlen);
1343	}
1344	} /* else this is a viewable space */	1177	} /* else this is a viewable space */
1345	ordered_mapwalk_end	1178	ordered_mapwalk_end
1346		1179
1347	socket.flush_fx ();	1180	socket.flush_fx ();
1348		1181
1349	/* Verify that we in fact do need to send this */
1350	if (socket.ext_mapinfos)
1351	{
1352	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1353	{
1354	/* No map data will follow, so don't say the client
1355	* it doesn't need draw!
1356	*/
1357	ewhatflag &= ~EMI_NOREDRAW;
1358	esl[ewhatstart + 1] = ewhatflag & 0xff;
1359	}
1360
1361	if (esl.length () > estartlen)
1362	socket.send_packet (esl);
1363	}
1364
1365	if (sl.length () > startlen \|\| socket.sent_scroll)	1182	if (sl.length () > startlen \|\| socket.sent_scroll)
1366	{	1183	{
1367	socket.send_packet (sl);	1184	socket.send_packet (sl);
1368	socket.sent_scroll = 0;	1185	socket.sent_scroll = 0;
1369	}	1186	}
1370	}	1187	}
1371		1188
1372	/*****************************************************************************/
1373	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1374	/* a player. Of course, the client need to know the command to be able to */
1375	/* manage it ! */
1376	/*****************************************************************************/
1377	void
1378	send_plugin_custom_message (object pl, char buf)
1379	{
1380	pl->contr->ns->send_packet (buf);
1381	}
1382
1383	/**
1384	* This sends the skill number to name mapping. We ignore
1385	* the params - we always send the same info no matter what.
1386	*/
1387	void
1388	send_skill_info (client ns, char params)
1389	{
1390	packet sl;
1391	sl << "replyinfo skill_info\n";
1392
1393	for (int i = 1; i < NUM_SKILLS; i++)
1394	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1395
1396	if (sl.length () > MAXSOCKBUF)
1397	{
1398	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1399	fatal (0);
1400	}
1401
1402	ns->send_packet (sl);
1403	}
1404
1405	/**
1406	* This sends the spell path to name mapping. We ignore
1407	* the params - we always send the same info no matter what.
1408	*/
1409	void
1410	send_spell_paths (client * ns, char *params)
1411	{
1412	packet sl;
1413
1414	sl << "replyinfo spell_paths\n";
1415
1416	for (int i = 0; i < NRSPELLPATHS; i++)
1417	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1418
1419	if (sl.length () > MAXSOCKBUF)
1420	{
1421	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1422	fatal (0);
1423	}
1424
1425	ns->send_packet (sl);
1426	}
1427
1428	/**	1189	/**
1429	* This looks for any spells the player may have that have changed their stats.	1190	* This looks for any spells the player may have that have changed their stats.
1430	* it then sends an updspell packet for each spell that has changed in this way	1191	* it then sends an updspell packet for each spell that has changed in this way
1431	*/	1192	*/
1432	void	1193	void
1433	esrv_update_spells (player *pl)	1194	esrv_update_spells (player *pl)
1434	{	1195	{
1435	if (!pl->ns)	1196	if (!pl->ns)
1436	return;	1197	return;
1437		1198
		1199	pl->ns->update_spells = false;
		1200
1438	if (!pl->ns->monitor_spells)	1201	if (!pl->ns->monitor_spells)
1439	return;	1202	return;
1440		1203
1441	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1204	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1442	{
1443	if (spell->type == SPELL)	1205	if (spell->type == SPELL)
1444	{	1206	{
1445	int flags = 0;	1207	int flags = 0;
		1208	int val;
1446		1209
1447	/* check if we need to update it */	1210	/* check if we need to update it */
1448	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1211	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1212	if (spell->cached_sp != val)
1449	{	1213	{
1450	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1214	spell->cached_sp = val;
1451	flags \|= UPD_SP_MANA;	1215	flags \|= UPD_SP_MANA;
1452	}	1216	}
1453		1217
1454	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1218	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1219	if (spell->cached_grace != val)
1455	{	1220	{
1456	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1221	spell->cached_grace = val;
1457	flags \|= UPD_SP_GRACE;	1222	flags \|= UPD_SP_GRACE;
1458	}	1223	}
1459		1224
1460	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1225	val = casting_level (pl->ob, spell);
		1226	if (spell->cached_eat != val)
1461	{	1227	{
1462	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1228	spell->cached_eat = val;
1463	flags \|= UPD_SP_DAMAGE;	1229	flags \|= UPD_SP_LEVEL;
1464	}	1230	}
1465		1231
1466	if (flags)	1232	if (flags)
1467	{	1233	{
1468	packet sl;	1234	packet sl;
1469		1235
1470	sl << "updspell "	1236	sl << "updspell "
1471	<< uint8 (flags)	1237	<< uint8 (flags)
1472	<< uint32 (spell->count);	1238	<< uint32 (spell->count);
1473		1239
1474	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1240	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1475	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1241	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1476	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1242	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1477		1243
1478	pl->ns->send_packet (sl);	1244	pl->ns->send_packet (sl);
1479	}	1245	}
1480	}	1246	}
1481	}
1482	}	1247	}
1483		1248
1484	void	1249	void
1485	esrv_remove_spell (player pl, object spell)	1250	esrv_remove_spell (player pl, object spell)
1486	{	1251	{
…		…
1513	}	1278	}
1514		1279
1515	/* store costs and damage in the object struct, to compare to later */	1280	/* store costs and damage in the object struct, to compare to later */
1516	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1281	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1517	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1282	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1518	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1283	spell->cached_eat = casting_level (pl->ob, spell);
1519		1284
1520	/* figure out which skill it uses, if it uses one */	1285	/* figure out which skill it uses, if it uses one */
1521	if (spell->skill)	1286	if (spell->skill)
1522	if (object *tmp = pl->find_skill (spell->skill))	1287	if (object *tmp = pl->find_skill (spell->skill))
1523	skill = tmp->subtype + CS_STAT_SKILLINFO;	1288	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1524		1289
1525	// spells better have a face	1290	// spells better have a face
1526	if (!spell->face)	1291	if (!spell->face)
1527	{	1292	{
1528	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1293	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1602	}	1367	}
1603	else	1368	else
1604	append_spell (pl, sl, spell);	1369	append_spell (pl, sl, spell);
1605		1370
1606	if (sl.length () > MAXSOCKBUF)	1371	if (sl.length () > MAXSOCKBUF)
1607	{
1608	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1372	cleanup ("buffer overflow in esrv_add_spells!");
1609	fatal (0);
1610	}
1611		1373
1612	/* finally, we can send the packet */	1374	/* finally, we can send the packet */
1613	pl->ns->flush_fx ();	1375	pl->ns->flush_fx ();
1614	pl->ns->send_packet (sl);	1376	pl->ns->send_packet (sl);
1615	}	1377	}
1616		1378
		1379	//-GPL
		1380

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.144 by root, Fri Dec 26 10:36:42 2008 UTC vs. Revision 1.183 by root, Sat May 7 20:03:28 2011 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.144 by root, Fri Dec 26 10:36:42 2008 UTC vs.
Revision 1.183 by root, Sat May 7 20:03:28 2011 UTC