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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.131 by root, Tue May 20 13:25:55 2008 UTC vs.
Revision 1.177 by root, Sat Oct 16 22:51:52 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,2009,2010 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	};
…		…
98	*/	114	*/
99	mx = ns->mapx;	115	mx = ns->mapx;
100	my = ns->mapy;	116	my = ns->mapy;
101		117
102	/* the x and y here are coordinates for the new map, i.e. if we moved	118	/* 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,	119	* (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	120	* if the destination x or y coordinate is outside the viewable
105	* area, we clear the values - otherwise, the old values	121	* area, we clear the values - otherwise, the old values
106	* are preserved, and the check_head thinks it needs to clear them.	122	* are preserved, and the check_head thinks it needs to clear them.
107	*/	123	*/
108	for (x = 0; x < mx; x++)	124	for (x = 0; x < mx; x++)
109	{
110	for (y = 0; y < my; y++)	125	for (y = 0; y < my; y++)
111	{
112	if (x >= ns->mapx \|\| y >= ns->mapy)	126	if (x >= ns->mapx \|\| y >= ns->mapy)
113	/* clear cells outside the viewable area */	127	/* clear cells outside the viewable area */
114	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	128	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)	129	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 */	130	/* clear newly visible tiles within the viewable area */
117	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	131	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118	else	132	else
119	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	133	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120	}
121	}
122		134
123	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	135	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124		136
125	/* Make sure that the next "map1" command will be sent (even if it is	137	/* Make sure that the next "map1" command will be sent (even if it is
126	* empty).	138	* empty).
…		…
134	pl->ns->mapinfo_queue_clear ();	146	pl->ns->mapinfo_queue_clear ();
135		147
136	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	148	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
137		149
138	pl->ns->force_newmap = false;	150	pl->ns->force_newmap = false;
139
140	if (pl->ns->newmapcmd == 1)
141	pl->ns->send_packet ("newmap");	151	pl->ns->send_packet ("newmap");
142
143	pl->ns->floorbox_reset ();	152	pl->ns->floorbox_reset ();
144	}	153	}
145		154
146	static void	155	static void
147	send_map_info (player *pl)	156	send_map_info (player *pl)
148	{	157	{
149	client &socket = *pl->ns;	158	client &socket = *pl->ns;
150	object *ob = pl->observe;	159	object *ob = pl->viewpoint;
151		160
152	if (socket.mapinfocmd)	161	if (socket.mapinfocmd)
153	{	162	{
154	if (ob->map && ob->map->path[0])	163	if (ob->map && ob->map->path[0])
155	{	164	{
…		…
172	/** check for map/region change and send new map data */	181	/** check for map/region change and send new map data */
173	static void	182	static void
174	check_map_change (player *pl)	183	check_map_change (player *pl)
175	{	184	{
176	client &socket = *pl->ns;	185	client &socket = *pl->ns;
177	object *ob = pl->observe;	186	object *ob = pl->viewpoint;
178		187
179	region *reg = ob->region ();	188	region *reg = ob->region ();
180	if (socket.current_region != reg)	189	if (socket.current_region != reg)
181	{	190	{
182	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	191	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)	221	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)
213	{	222	{
214	int dx = ob->x - socket.current_x;	223	int dx = ob->x - socket.current_x;
215	int dy = ob->y - socket.current_y;	224	int dy = ob->y - socket.current_y;
216		225
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);	226	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
222	socket.floorbox_reset ();	227	socket.floorbox_reset ();
223	}
224	}	228	}
225		229
226	socket.current_x = ob->x;	230	socket.current_x = ob->x;
227	socket.current_y = ob->y;	231	socket.current_y = ob->y;
		232	}
		233
		234	/**
		235	* This sends the skill number to name mapping. We ignore
		236	* the params - we always send the same info no matter what.
		237	*/
		238	static void
		239	send_skill_info (client ns, char params)
		240	{
		241	packet sl;
		242	sl << "replyinfo skill_info\n";
		243
		244	for (int i = 0; i < skillvec.size (); ++i)
		245	sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
		246
		247	if (sl.length () > MAXSOCKBUF)
		248	cleanup ("buffer overflow in send_skill_info!");
		249
		250	ns->send_packet (sl);
		251	}
		252
		253	/**
		254	* This sends the spell path to name mapping. We ignore
		255	* the params - we always send the same info no matter what.
		256	*/
		257	static void
		258	send_spell_paths (client * ns, char *params)
		259	{
		260	packet sl;
		261
		262	sl << "replyinfo spell_paths\n";
		263
		264	for (int i = 0; i < NRSPELLPATHS; i++)
		265	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		266
		267	if (sl.length () > MAXSOCKBUF)
		268	cleanup ("buffer overflow in send_spell_paths!");
		269
		270	ns->send_packet (sl);
228	}	271	}
229		272
230	/**	273	/**
231	* RequestInfo is sort of a meta command. There is some specific	274	* RequestInfo is sort of a meta command. There is some specific
232	* request of information, but we call other functions to provide	275	* request of information, but we call other functions to provide
…		…
245	{	288	{
246	*params++ = 0;	289	*params++ = 0;
247	break;	290	break;
248	}	291	}
249		292
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"))	293	if (!strcmp (buf, "skill_info"))
255	send_skill_info (ns, params);	294	send_skill_info (ns, params);
256	else if (!strcmp (buf, "spell_paths"))	295	else if (!strcmp (buf, "spell_paths"))
257	send_spell_paths (ns, params);	296	send_spell_paths (ns, params);
258	else	297	else
259	{	298	{
…		…
275	ExtiCmd (char buf, int len, client ns)	314	ExtiCmd (char buf, int len, client ns)
276	{	315	{
277	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	316	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278	}	317	}
279		318
		319	//-GPL
		320
280	void	321	void
281	client::mapinfo_queue_clear ()	322	client::mapinfo_queue_clear ()
282	{	323	{
283	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	324	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284	free (*i);	325	free (*i);
…		…
291	{	332	{
292	char *token = buf;	333	char *token = buf;
293	buf += strlen (buf) + 9;	334	buf += strlen (buf) + 9;
294		335
295	// initial map and its origin	336	// initial map and its origin
296	maptile *map = pl->observe->map;	337	maptile *map = pl->viewpoint->map;
297	int mapx = pl->ns->mapx / 2 - pl->observe->x;	338	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
298	int mapy = pl->ns->mapy / 2 - pl->observe->y;	339	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
299	int max_distance = 8; // limit maximum path length to something generous	340	int max_distance = 8; // limit maximum path length to something generous
300		341
301	while (*buf && map && max_distance)	342	while (*buf && map && max_distance)
302	{	343	{
303	int dir = *buf++ - '1';	344	int dir = *buf++ - '1';
…		…
408	AddMeCmd (char buf, int len, client ns)	449	AddMeCmd (char buf, int len, client ns)
409	{	450	{
410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	451	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
411	}	452	}
412		453
413	/** Reply to ExtendedInfos command */	454	//+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
466	/*
467	#define MSG_TYPE_BOOK 1
468	#define MSG_TYPE_CARD 2
469	#define MSG_TYPE_PAPER 3
470	#define MSG_TYPE_SIGN 4
471	#define MSG_TYPE_MONUMENT 5
472	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
473
474	/** Reply to ExtendedInfos command */
475	void
476	ToggleExtendedText (char buf, int len, client ns)
477	{
478	char cmdback[MAX_BUF];
479	char temp[10];
480	char command[50];
481	int info, nextinfo, i, flag;
482
483	cmdback[0] = '\0';
484
485	nextinfo = 0;
486	while (1)
487	{
488	/* 1. Extract an info */
489	info = nextinfo;
490
491	while ((info < len) && (buf[info] == ' '))
492	info++;
493
494	if (info >= len)
495	break;
496
497	nextinfo = info + 1;
498
499	while ((nextinfo < len) && (buf[nextinfo] != ' '))
500	nextinfo++;
501
502	if (nextinfo - info >= 49) /Erroneous info asked /
503	continue;
504
505	strncpy (command, &(buf[info]), nextinfo - info);
506	command[nextinfo - info] = '\0';
507	/* 2. Interpret info */
508	i = sscanf (command, "%d", &flag);
509
510	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
511	ns->supported_readables \|= (1 << flag);
512	/3. Next info /
513	}
514
515	/* Send resulting state */
516	strcpy (cmdback, "ExtendedTextSet");
517
518	for (i = 0; i <= MSG_TYPE_LAST; i++)
519	if (ns->supported_readables & (1 << i))
520	{
521	strcat (cmdback, " ");
522	snprintf (temp, sizeof (temp), "%d", i);
523	strcat (cmdback, temp);
524	}
525
526	ns->send_packet (cmdback);
527	}
528		455
529	/**	456	/**
530	* This handles the general commands from the client (ie, north, fire, cast,	457	* This handles the general commands from the client (ie, north, fire, cast,
531	* etc.)	458	* etc.)
532	*/	459	*/
…		…
545	return;	472	return;
546		473
547	buf++;	474	buf++;
548	}	475	}
549		476
550	execute_newserver_command (pl->ob, (char *) buf);	477	execute_newserver_command (pl->ob, (char *)buf);
551		478
552	/* Perhaps something better should be done with a left over count.	479	/* Perhaps something better should be done with a left over count.
553	* Cleaning up the input should probably be done first - all actions	480	* 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	481	* for the command that issued the count should be done before any other
555	* commands.	482	* commands.
…		…
589	* commands.	516	* commands.
590	*/	517	*/
591	pl->count = 0;	518	pl->count = 0;
592		519
593	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	520	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
594	int time = fabs (pl->ob->speed) < 0.001	521	int time = pl->ob->has_active_speed ()
595	? time = MAX_TIME * 100
596	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	522	? (int) (MAX_TIME / pl->ob->speed)
		523	: MAX_TIME * 100;
597		524
598	/* Send confirmation of command execution now */	525	/* Send confirmation of command execution now */
599	packet sl ("comc");	526	packet sl ("comc");
600	sl << uint16 (cmdid) << uint32 (time);	527	sl << uint16 (cmdid) << uint32 (time);
601	pl->ns->send_packet (sl);	528	pl->ns->send_packet (sl);
…		…
643	LOG (llevError, "Unknown input state: %d\n", ns->state);	570	LOG (llevError, "Unknown input state: %d\n", ns->state);
644	}	571	}
645	}	572	}
646		573
647	/**	574	/**
648	* Client tells its version. If there is a mismatch, we close the	575	* Client tells its version info.
649	* socket. In real life, all we should care about is the client having
650	* something older than the server. If we assume the client will be
651	* backwards compatible, having it be a later version should not be a
652	* problem.
653	*/	576	*/
654	void	577	void
655	VersionCmd (char buf, int len, client ns)	578	VersionCmd (char buf, int len, client ns)
656	{	579	{
657	if (!buf)	580	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
658	{
659	LOG (llevError, "CS: received corrupted version command\n");
660	return;
661	}
662
663	ns->cs_version = atoi (buf);
664	ns->sc_version = ns->cs_version;
665
666	LOG (llevDebug, "connection from client <%s>\n", buf);
667
668	//TODO: should log here just for statistics
669
670	//if (VERSION_CS != ns->cs_version)
671	// unchecked;
672
673	char *cp = strchr (buf + 1, ' ');
674	if (!cp)
675	return;
676
677	ns->sc_version = atoi (cp);
678
679	//if (VERSION_SC != ns->sc_version)
680	// unchecked;
681
682	cp = strchr (cp + 1, ' ');
683
684	if (cp)
685	{
686	ns->version = cp + 1;
687
688	if (ns->sc_version < 1026)
689	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
690	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
691	}
692	}	581	}
693		582
694	/** sound related functions. */	583	/** sound related functions. */
695	void	584	void
696	SetSound (char buf, int len, client ns)	585	SetSound (char buf, int len, client ns)
…		…
747	* Get player's current range attack in obuf.	636	* Get player's current range attack in obuf.
748	*/	637	*/
749	static void	638	static void
750	rangetostring (player pl, char obuf)	639	rangetostring (player pl, char obuf)
751	{	640	{
752	dynbuf_text buf;	641	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		642
		643	#if 0
		644	// print ranged/chosen_skill etc. objects every call
		645	printf ("%s %s => %s (%s)\n",
		646	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		647	pl->combat_ob ? &pl->combat_ob->name : "-",
		648	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		649	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		650	);
		651	#endif
753		652
754	if (pl->ranged_ob)	653	if (pl->ranged_ob)
755	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	654	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
756		655
757	if (pl->combat_ob)	656	if (pl->combat_ob)
…		…
803	* commands for now.	702	* commands for now.
804	*/	703	*/
805	void	704	void
806	esrv_update_stats (player *pl)	705	esrv_update_stats (player *pl)
807	{	706	{
808	char buf[MAX_BUF];
809	uint16 flags;
810
811	client *ns = pl->ns;	707	client *ns = pl->ns;
812	if (!ns)	708	if (!ns)
813	return;	709	return;
814		710
815	object *ob = pl->observe;	711	object *ob = pl->observe;
…		…
832	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	728	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
833	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	729	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
834	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	730	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
835	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	731	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
836		732
837	for (int s = 0; s < NUM_SKILLS; s++)	733	for (int s = 0; s < CS_NUM_SKILLS; s++)
838	if (object *skill = opl->last_skill_ob[s])	734	if (object *skill = opl->last_skill_ob [s])
839	if (skill->stats.exp != ns->last_skill_exp [s])	735	if (skill->stats.exp != ns->last_skill_exp [s])
840	{	736	{
841	ns->last_skill_exp [s] = skill->stats.exp;	737	ns->last_skill_exp [s] = skill->stats.exp;
842		738
843	/* Always send along the level if exp changes. This is only	739	/* Always send along the level if exp changes. This is only
844	* 1 extra byte, but keeps processing simpler.	740	* 1 extra byte, but keeps processing simpler.
845	*/	741	*/
846	sl << uint8 (s + CS_STAT_SKILLINFO)	742	sl << uint8 (CS_STAT_SKILLINFO + s)
847	<< uint8 (skill->level)	743	<< uint8 (skill->level)
848	<< uint64 (skill->stats.exp);	744	<< uint64 (skill->stats.exp);
849	}	745	}
850		746
851	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	747	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
852	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	748	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
853	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	749	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
854	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	750	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
855	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	751	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
856	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	752	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
857	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	753	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);	754	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);	755	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
860		756
861	flags = 0;	757	int flags = (opl->fire_on ? SF_FIREON : 0)
862		758	\| (opl->run_on ? SF_RUNON : 0);
863	if (opl->fire_on)
864	flags \|= SF_FIREON;
865
866	if (opl->run_on)
867	flags \|= SF_RUNON;
868		759
869	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	760	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
870		761
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++)	762	for (int i = 0; i < NROFATTACKS; i++)
875	{
876	/* Skip ones we won't send */	763	/* Skip ones we won't send */
877	if (atnr_cs_stat[i] == -1)	764	if (atnr_cs_stat[i] >= 0)
878	continue;
879
880	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	765	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
881	}
882		766
883	if (pl->ns->monitor_spells)	767	if (pl->ns->monitor_spells)
884	{	768	{
885	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	769	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);	770	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
887	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	771	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
888	}	772	}
889		773
		774	char buf[MAX_BUF];
890	rangetostring (opl, buf); /* we want use the new fire & run system in new client */	775	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
891	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	776	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
892	set_title (ob, buf);	777	set_title (ob, buf);
893	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	778	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
894		779
…		…
912	<< uint32 (pl->ob->face)	797	<< uint32 (pl->ob->face)
913	<< data8 (pl->ob->name);	798	<< data8 (pl->ob->name);
914		799
915	pl->ns->last_weight = weight;	800	pl->ns->last_weight = weight;
916	pl->ns->send_packet (sl);	801	pl->ns->send_packet (sl);
917	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
918	}	802	}
919		803
920	/******************************************************************************	804	/******************************************************************************
921	*	805	*
922	* Start of map related commands.	806	* Start of map related commands.
…		…
989		873
990	/* Nothing changed */	874	/* Nothing changed */
991	return 0;	875	return 0;
992	}	876	}
993		877
994	/**	878	//-GPL
995	* Returns the size of a data for a map square as returned by
996	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
997	* available.
998	*/
999	int
1000	getExtendedMapInfoSize (client * ns)
1001	{
1002	int result = 0;
1003		879
1004	if (ns->ext_mapinfos)	880	// prefetch maps in an area of PREFETCH x PREFETCH around the player
1005	{	881	#define PREFETCH 40
1006	if (ns->EMI_smooth)
1007	result += 1; /One byte for smoothlevel /
1008	}
1009
1010	return result;
1011	}
1012
1013	// prefetch (and touch) all maps within a specific distancd
1014	static void
1015	prefetch_surrounding_maps (maptile *map, int distance)
1016	{
1017	map->last_access = runtime;
1018
1019	if (--distance)
1020	for (int dir = 4; --dir; )
1021	if (const shstr &path = map->tile_path [dir])
1022	if (maptile *&neigh = map->tile_map [dir])
1023	prefetch_surrounding_maps (neigh, distance);
1024	else
1025	neigh = maptile::find_async (path, map);
1026	}
1027		882
1028	// prefetch a generous area around the player	883	// prefetch a generous area around the player
1029	static void	884	static void
1030	prefetch_surrounding_maps (object *op)	885	prefetch_surrounding_maps (object *op)
1031	{	886	{
1032	prefetch_surrounding_maps (op->map, 3);	887	for (maprect *rect = op->map->split_to_tiles (mapwalk_buf,
		888	op->x - PREFETCH , op->y - PREFETCH ,
		889	op->x + PREFETCH + 1, op->y + PREFETCH + 1);
		890	rect->m;
		891	++rect)
		892	rect->m->touch ();
1033	}	893	}
		894
		895	//+GPL
1034		896
1035	/**	897	/**
1036	* Draws client map.	898	* Draws client map.
1037	*/	899	*/
1038	void	900	void
1039	draw_client_map (player *pl)	901	draw_client_map (player *pl)
1040	{	902	{
1041	object *ob = pl->observe;	903	object *ob = pl->viewpoint;
1042	if (!ob->active)	904	if (!pl->observe->active)
1043	return;	905	return;
1044
1045	maptile *plmap = ob->map;
1046		906
1047	/* If player is just joining the game, he isn't here yet, so the map	907	/* If player is just joining the game, he isn't here yet, so the map
1048	* can get swapped out. If so, don't try to send them a map. All will	908	* can get swapped out. If so, don't try to send them a map. All will
1049	* be OK once they really log in.	909	* be OK once they really log in.
1050	*/	910	*/
1051	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)	911	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1052	return;	912	return;
1053		913
1054	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1055	int estartlen, eoldlen;	914	int startlen, oldlen;
1056	uint8 eentrysize;
1057	uint16 ewhatstart, ewhatflag;
1058	uint8 extendedinfos;
1059		915
1060	check_map_change (pl);	916	check_map_change (pl);
1061	prefetch_surrounding_maps (pl->ob);	917	prefetch_surrounding_maps (pl->ob);
1062		918
1063	/* do LOS after calls to update_position */	919	/* do LOS after calls to update_position */
1064	if (ob != pl->ob)	920	/* unfortunately, we need to udpate los when observing, currently */
1065	clear_los (pl);	921	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1066	else if (pl->do_los)
1067	{	922	{
1068	update_los (ob);
1069	pl->do_los = 0;	923	pl->do_los = 0;
		924	pl->update_los ();
1070	}	925	}
1071		926
1072	/**	927	/**
1073	* This function uses the new map1 protocol command to send the map	928	* This function uses the new map1 protocol command to send the map
1074	* to the client. It is necessary because the old map command supports	929	* to the client. It is necessary because the old map command supports
…		…
1092	* look like.	947	* look like.
1093	*/	948	*/
1094		949
1095	client &socket = *pl->ns;	950	client &socket = *pl->ns;
1096		951
1097	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	952	packet sl ("map1a");
1098	packet esl;
1099		953
1100	startlen = sl.length ();	954	startlen = sl.length ();
1101		955
1102	/Extendedmapinfo structure initialisation /	956	int hx = socket.mapx / 2;
1103	if (socket.ext_mapinfos)	957	int hy = socket.mapy / 2;
1104	{
1105	extendedinfos = EMI_NOREDRAW;
1106		958
1107	if (socket.EMI_smooth)	959	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1108	extendedinfos \|= EMI_SMOOTH;	960	int ax = dx + hx;
		961	int ay = dy + hy;
1109		962
1110	ewhatstart = esl.length ();	963	int mask = (ax << 10) \| (ay << 4);
1111	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	964	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1112	could need to be taken away */
1113	eentrysize = getExtendedMapInfoSize (&socket);
1114	esl << "mapextended "
1115	<< uint8 (extendedinfos)
1116	<< uint8 (eentrysize);
1117		965
1118	estartlen = esl.length ();	966	/* If the coordinates are not valid, or it is too dark to see,
1119	}	967	* we tell the client as such
1120
1121	/* x,y are the real map locations. ax, ay are viewport relative
1122	* locations.
1123	*/	968	*/
1124	ay = 0;	969	if (!m)
1125
1126	/* We could do this logic as conditionals in the if statement,
1127	* but that started to get a bit messy to look at.
1128	*/
1129	max_x = ob->x + (socket.mapx + 1) / 2;
1130	max_y = ob->y + (socket.mapy + 1) / 2;
1131
1132	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1133	{	970	{
1134	sint16 nx, ny;	971	/* space is out of map. Update space and clear values
1135	maptile *m = 0;	972	* if this hasn't already been done. If the space is out
1136		973	* of the map, it shouldn't have a head.
1137	ax = 0;	974	*/
1138	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	975	if (lastcell.count != -1)
1139	{	976	{
1140	// check to see if we can simply go one right quickly	977	sl << uint16 (mask);
		978	map_clearcell (&lastcell, -1);
1141	++nx;	979	}
1142	if (m && nx >= m->width)	980
		981	continue;
		982	}
		983
		984	int d = pl->blocked_los_uc (dx, dy);
		985
		986	if (d > 3)
		987	{
		988	/* This block deals with spaces that are not visible for whatever
		989	* reason. Still may need to send the head for this space.
		990	*/
		991	if (lastcell.count != -1
		992	\|\| lastcell.faces[0]
		993	\|\| lastcell.faces[1]
		994	\|\| lastcell.faces[2]
		995	\|\| lastcell.stat_hp
		996	\|\| lastcell.flags
		997	\|\| lastcell.player)
		998	sl << uint16 (mask);
		999
		1000	/* properly clear a previously sent big face */
		1001	map_clearcell (&lastcell, -1);
		1002	}
		1003	else
		1004	{
		1005	/* In this block, the space is visible.
		1006	*/
		1007
		1008	/* Rather than try to figure out what everything that we might
		1009	* need to send is, then form the packet after that,
		1010	* we presume that we will in fact form a packet, and update
		1011	* the bits by what we do actually send. If we send nothing,
		1012	* we just back out sl.length () to the old value, and no harm
		1013	* is done.
		1014	* I think this is simpler than doing a bunch of checks to see
		1015	* what if anything we need to send, setting the bits, then
		1016	* doing those checks again to add the real data.
		1017	*/
		1018	oldlen = sl.length ();
		1019
		1020	sl << uint16 (mask);
		1021
		1022	unsigned char dummy;
		1023	unsigned char *last_ext = &dummy;
		1024
		1025	/* Darkness changed */
		1026	if (lastcell.count != d)
		1027	{
1143	m = 0;	1028	mask \|= 0x8;
1144		1029
1145	if (!m)	1030	*last_ext \|= 0x80;
		1031	last_ext = &sl[sl.length ()];
		1032	sl << uint8 (d);
		1033	}
		1034
		1035	lastcell.count = d;
		1036
		1037	mapspace &ms = m->at (nx, ny);
		1038	ms.update ();
		1039
		1040	// extmap handling
		1041	uint8 stat_hp = 0;
		1042	uint8 stat_width = 0;
		1043	uint8 flags = 0;
		1044	tag_t player = 0;
		1045
		1046	// send hp information, if applicable
		1047	if (object *op = ms.faces_obj [0])
		1048	if (op->is_head () && !op->invisible)
1146	{	1049	{
1147	nx = x; ny = y; m = plmap;	1050	if (op->stats.maxhp > op->stats.hp
1148		1051	&& op->stats.maxhp > 0
1149	if (xy_normalise (m, nx, ny))	1052	&& (op->type == PLAYER
1150	m->touch ();	1053	\|\| op->type == DOOR // does not work, have maxhp 0
1151	else	1054	\|\| op->flag [FLAG_MONSTER]
		1055	\|\| op->flag [FLAG_ALIVE]
		1056	\|\| op->flag [FLAG_GENERATOR]))
1152	m = 0;	1057	{
		1058	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1059	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1060	}
		1061
		1062	if (expect_false (op->has_dialogue ()))
		1063	flags \|= 1;
		1064
		1065	if (expect_false (op->type == PLAYER))
		1066	player = op == ob ? pl->ob->count
		1067	: op == pl->ob ? ob->count
		1068	: op->count;
1153	}	1069	}
1154		1070
1155	int emask, mask;	1071	if (expect_false (lastcell.stat_hp != stat_hp))
1156	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1157
1158	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1159
1160	/* If the coordinates are not valid, or it is too dark to see,
1161	* we tell the client as such
1162	*/
1163	if (!m)
1164	{	1072	{
1165	/* space is out of map. Update space and clear values	1073	lastcell.stat_hp = stat_hp;
1166	* if this hasn't already been done. If the space is out	1074
1167	* of the map, it shouldn't have a head	1075	mask \|= 0x8;
1168	*/	1076	*last_ext \|= 0x80;
1169	if (lastcell.count != -1)	1077	last_ext = &sl[sl.length ()];
		1078
		1079	sl << uint8 (5) << uint8 (stat_hp);
		1080
		1081	if (stat_width > 1)
1170	{	1082	{
1171	sl << uint16 (mask);
1172	map_clearcell (&lastcell, -1);
1173	}
1174
1175	continue;
1176	}
1177
1178	int d = pl->blocked_los[ax][ay];
1179
1180	if (d > 3)
1181	{
1182
1183	int need_send = 0, count;
1184
1185	/* This block deals with spaces that are not visible for whatever
1186	* reason. Still may need to send the head for this space.
1187	*/
1188
1189	oldlen = sl.length ();
1190
1191	sl << uint16 (mask);
1192
1193	if (lastcell.count != -1)
1194	need_send = 1;
1195
1196	count = -1;
1197
1198	/* properly clear a previously sent big face */
1199	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1200	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1201	need_send = 1;
1202
1203	map_clearcell (&lastcell, count);
1204
1205	if ((mask & 0xf) \|\| need_send)
1206	sl[oldlen + 1] = mask & 0xff;
1207	else
1208	sl.reset (oldlen);
1209	}
1210	else
1211	{
1212	/* In this block, the space is visible.
1213	*/
1214
1215	/* Rather than try to figure out what everything that we might
1216	* need to send is, then form the packet after that,
1217	* we presume that we will in fact form a packet, and update
1218	* the bits by what we do actually send. If we send nothing,
1219	* we just back out sl.length () to the old value, and no harm
1220	* is done.
1221	* I think this is simpler than doing a bunch of checks to see
1222	* what if anything we need to send, setting the bits, then
1223	* doing those checks again to add the real data.
1224	*/
1225	oldlen = sl.length ();
1226	eoldlen = esl.length ();
1227
1228	sl << uint16 (mask);
1229
1230	unsigned char dummy;
1231	unsigned char *last_ext = &dummy;
1232
1233	/* Darkness changed */
1234	if (lastcell.count != d && socket.darkness)
1235	{
1236	mask \|= 0x8;
1237
1238	if (socket.extmap)
1239	{
1240	*last_ext \|= 0x80;	1083	*last_ext \|= 0x80;
1241	last_ext = &sl[sl.length ()];	1084	last_ext = &sl[sl.length ()];
1242	sl << uint8 (d);	1085
1243	}	1086	sl << uint8 (6) << uint8 (stat_width);
1244	else
1245	sl << uint8 (255 - 64 * d);
1246	}	1087	}
		1088	}
1247		1089
1248	lastcell.count = d;	1090	if (expect_false (lastcell.player != player))
1249
1250	mapspace &ms = m->at (nx, ny);
1251	ms.update ();
1252
1253	if (socket.extmap)
1254	{	1091	{
1255	uint8 stat_hp = 0;	1092	lastcell.player = player;
1256	uint8 stat_width = 0;
1257	uint8 flags = 0;
1258	tag_t player = 0;
1259		1093
1260	// send hp information, if applicable
1261	if (object *op = ms.faces_obj [0])
1262	if (op->is_head () && !op->invisible)
1263	{
1264	if (op->stats.maxhp > op->stats.hp
1265	&& op->stats.maxhp > 0
1266	&& (op->type == PLAYER
1267	\|\| op->type == DOOR // does not work, have maxhp 0
1268	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| 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->msg && op->msg[0] == '@')
1275	flags \|= 1;
1276
1277	if (op->type == PLAYER && op != ob)
1278	player = op->count;
1279	}
1280
1281	if (lastcell.stat_hp != stat_hp)
1282	{
1283	lastcell.stat_hp = stat_hp;
1284
1285	mask \|= 0x8;	1094	mask \|= 0x8;
1286	*last_ext \|= 0x80;	1095	*last_ext \|= 0x80;
1287	last_ext = &sl[sl.length ()];	1096	last_ext = &sl[sl.length ()];
1288		1097
1289	sl << uint8 (5) << uint8 (stat_hp);
1290
1291	if (stat_width > 1)
1292	{
1293	*last_ext \|= 0x80;
1294	last_ext = &sl[sl.length ()];
1295
1296	sl << uint8 (6) << uint8 (stat_width);
1297	}
1298	}
1299
1300	if (lastcell.player != player)
1301	{
1302	lastcell.player = player;
1303
1304	mask \|= 0x8;
1305	*last_ext \|= 0x80;
1306	last_ext = &sl[sl.length ()];
1307
1308	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1098	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1309	}	1099	}
1310		1100
1311	if (lastcell.flags != flags)	1101	if (expect_false (lastcell.flags != flags))
1312	{	1102	{
1313	lastcell.flags = flags;	1103	lastcell.flags = flags;
1314		1104
1315	mask \|= 0x8;	1105	mask \|= 0x8;
1316	*last_ext \|= 0x80;	1106	*last_ext \|= 0x80;
1317	last_ext = &sl[sl.length ()];	1107	last_ext = &sl[sl.length ()];
1318		1108
1319	sl << uint8 (8) << uint8 (flags);	1109	sl << uint8 (8) << uint8 (flags);
1320	}
1321	}	1110	}
1322		1111
		1112	// faces
		1113
1323	/* Floor face */	1114	/* Floor face */
1324	if (update_space (sl, socket, ms, lastcell, 2))	1115	if (update_space (sl, socket, ms, lastcell, 2))
1325	mask \|= 0x4;	1116	mask \|= 0x4;
1326		1117
1327	/* Middle face */	1118	/* Middle face */
1328	if (update_space (sl, socket, ms, lastcell, 1))	1119	if (update_space (sl, socket, ms, lastcell, 1))
1329	mask \|= 0x2;	1120	mask \|= 0x2;
1330		1121
		1122	if (expect_false (ob->invisible)
		1123	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1331	if (ms.player () == ob	1124	&& ms.player () == ob)
1332	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1333	{	1125	{
1334	// force player to be visible to himself if invisible	1126	// force player to be visible to himself if invisible
1335	if (lastcell.faces[0] != ob->face)	1127	if (lastcell.faces[0] != ob->face)
1336	{	1128	{
1337	lastcell.faces[0] = ob->face;	1129	lastcell.faces[0] = ob->face;
1338		1130
1339	mask \|= 0x1;
1340	sl << uint16 (ob->face);
1341
1342	socket.send_faces (ob);
1343	}
1344	}
1345	/* Top face */
1346	else if (update_space (sl, socket, ms, lastcell, 0))
1347	mask \|= 0x1;	1131	mask \|= 0x1;
		1132	sl << uint16 (ob->face);
1348		1133
		1134	socket.send_faces (ob);
		1135	}
		1136	}
		1137	/* Top face */
		1138	else if (update_space (sl, socket, ms, lastcell, 0))
		1139	mask \|= 0x1;
		1140
1349	/* Check to see if we are in fact sending anything for this	1141	/* Check to see if we are in fact sending anything for this
1350	* space by checking the mask. If so, update the mask.	1142	* space by checking the mask. If so, update the mask.
1351	* if not, reset the len to that from before adding the mask	1143	* if not, reset the len to that from before adding the mask
1352	* value, so we don't send those bits.	1144	* value, so we don't send those bits.
1353	*/	1145	*/
1354	if (mask & 0xf)	1146	if (mask & 0xf)
1355	sl[oldlen + 1] = mask & 0xff;	1147	sl[oldlen + 1] = mask & 0xff;
1356	else	1148	else
1357	sl.reset (oldlen);	1149	sl.reset (oldlen);
1358
1359	if (socket.ext_mapinfos)
1360	esl << uint16 (emask);
1361
1362	if (socket.EMI_smooth)
1363	{
1364	for (int layer = 2+1; layer--; )
1365	{
1366	object *ob = ms.faces_obj [layer];
1367
1368	// If there is no object for this space, or if the face for the object
1369	// is the blank face, set the smoothlevel to zero.
1370	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1371
1372	// We've gotten what face we want to use for the object. Now see if
1373	// if it has changed since we last sent it to the client.
1374	if (lastcell.smooth[layer] != smoothlevel)
1375	{
1376	lastcell.smooth[layer] = smoothlevel;
1377	esl << uint8 (smoothlevel);
1378	emask \|= 1 << layer;
1379	}
1380	}
1381
1382	if (emask & 0xf)
1383	esl[eoldlen + 1] = emask & 0xff;
1384	else
1385	esl.reset (eoldlen);
1386	}
1387	} /* else this is a viewable space */	1150	} /* else this is a viewable space */
1388	} /* for x loop */	1151	ordered_mapwalk_end
1389	} /* for y loop */
1390		1152
1391	socket.flush_fx ();	1153	socket.flush_fx ();
1392
1393	/* Verify that we in fact do need to send this */
1394	if (socket.ext_mapinfos)
1395	{
1396	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1397	{
1398	/* No map data will follow, so don't say the client
1399	* it doesn't need draw!
1400	*/
1401	ewhatflag &= ~EMI_NOREDRAW;
1402	esl[ewhatstart + 1] = ewhatflag & 0xff;
1403	}
1404
1405	if (esl.length () > estartlen)
1406	socket.send_packet (esl);
1407	}
1408		1154
1409	if (sl.length () > startlen \|\| socket.sent_scroll)	1155	if (sl.length () > startlen \|\| socket.sent_scroll)
1410	{	1156	{
1411	socket.send_packet (sl);	1157	socket.send_packet (sl);
1412	socket.sent_scroll = 0;	1158	socket.sent_scroll = 0;
1413	}	1159	}
1414	}	1160	}
1415		1161
1416	/*****************************************************************************/
1417	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1418	/* a player. Of course, the client need to know the command to be able to */
1419	/* manage it ! */
1420	/*****************************************************************************/
1421	void
1422	send_plugin_custom_message (object pl, char buf)
1423	{
1424	pl->contr->ns->send_packet (buf);
1425	}
1426
1427	/**
1428	* This sends the skill number to name mapping. We ignore
1429	* the params - we always send the same info no matter what.
1430	*/
1431	void
1432	send_skill_info (client ns, char params)
1433	{
1434	packet sl;
1435	sl << "replyinfo skill_info\n";
1436
1437	for (int i = 1; i < NUM_SKILLS; i++)
1438	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1439
1440	if (sl.length () > MAXSOCKBUF)
1441	{
1442	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1443	fatal (0);
1444	}
1445
1446	ns->send_packet (sl);
1447	}
1448
1449	/**
1450	* This sends the spell path to name mapping. We ignore
1451	* the params - we always send the same info no matter what.
1452	*/
1453	void
1454	send_spell_paths (client * ns, char *params)
1455	{
1456	packet sl;
1457
1458	sl << "replyinfo spell_paths\n";
1459
1460	for (int i = 0; i < NRSPELLPATHS; i++)
1461	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1462
1463	if (sl.length () > MAXSOCKBUF)
1464	{
1465	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1466	fatal (0);
1467	}
1468
1469	ns->send_packet (sl);
1470	}
1471
1472	/**	1162	/**
1473	* This looks for any spells the player may have that have changed their stats.	1163	* This looks for any spells the player may have that have changed their stats.
1474	* it then sends an updspell packet for each spell that has changed in this way	1164	* it then sends an updspell packet for each spell that has changed in this way
1475	*/	1165	*/
1476	void	1166	void
1477	esrv_update_spells (player *pl)	1167	esrv_update_spells (player *pl)
1478	{	1168	{
1479	if (!pl->ns)	1169	if (!pl->ns)
1480	return;	1170	return;
1481		1171
		1172	pl->ns->update_spells = false;
		1173
1482	if (!pl->ns->monitor_spells)	1174	if (!pl->ns->monitor_spells)
1483	return;	1175	return;
1484		1176
1485	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1177	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1486	{
1487	if (spell->type == SPELL)	1178	if (spell->type == SPELL)
1488	{	1179	{
1489	int flags = 0;	1180	int flags = 0;
		1181	int val;
1490		1182
1491	/* check if we need to update it */	1183	/* check if we need to update it */
1492	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1184	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1185	if (spell->cached_sp != val)
1493	{	1186	{
1494	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1187	spell->cached_sp = val;
1495	flags \|= UPD_SP_MANA;	1188	flags \|= UPD_SP_MANA;
1496	}	1189	}
1497		1190
1498	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1191	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1192	if (spell->cached_grace != val)
1499	{	1193	{
1500	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1194	spell->cached_grace = val;
1501	flags \|= UPD_SP_GRACE;	1195	flags \|= UPD_SP_GRACE;
1502	}	1196	}
1503		1197
1504	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1198	val = casting_level (pl->ob, spell);
		1199	if (spell->cached_eat != val)
1505	{	1200	{
1506	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1201	spell->cached_eat = val;
1507	flags \|= UPD_SP_DAMAGE;	1202	flags \|= UPD_SP_LEVEL;
1508	}	1203	}
1509		1204
1510	if (flags)	1205	if (flags)
1511	{	1206	{
1512	packet sl;	1207	packet sl;
1513		1208
1514	sl << "updspell "	1209	sl << "updspell "
1515	<< uint8 (flags)	1210	<< uint8 (flags)
1516	<< uint32 (spell->count);	1211	<< uint32 (spell->count);
1517		1212
1518	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1213	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1519	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1214	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1520	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1215	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1521		1216
1522	pl->ns->send_packet (sl);	1217	pl->ns->send_packet (sl);
1523	}	1218	}
1524	}	1219	}
1525	}
1526	}	1220	}
1527		1221
1528	void	1222	void
1529	esrv_remove_spell (player pl, object spell)	1223	esrv_remove_spell (player pl, object spell)
1530	{	1224	{
…		…
1555	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1249	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1556	return;	1250	return;
1557	}	1251	}
1558		1252
1559	/* store costs and damage in the object struct, to compare to later */	1253	/* store costs and damage in the object struct, to compare to later */
1560	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1254	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1561	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1255	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1562	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1256	spell->cached_eat = casting_level (pl->ob, spell);
1563		1257
1564	/* figure out which skill it uses, if it uses one */	1258	/* figure out which skill it uses, if it uses one */
1565	if (spell->skill)	1259	if (spell->skill)
1566	{	1260	if (object *tmp = pl->find_skill (spell->skill))
1567	for (i = 1; i < NUM_SKILLS; i++)	1261	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1568	if (!strcmp (spell->skill, skill_names[i]))
1569	{
1570	skill = i + CS_STAT_SKILLINFO;
1571	break;
1572	}
1573	}
1574		1262
1575	// spells better have a face	1263	// spells better have a face
1576	if (!spell->face)	1264	if (!spell->face)
1577	{	1265	{
1578	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1266	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1583		1271
1584	/* send the current values */	1272	/* send the current values */
1585	sl << uint32 (spell->count)	1273	sl << uint32 (spell->count)
1586	<< uint16 (spell->level)	1274	<< uint16 (spell->level)
1587	<< uint16 (spell->casting_time)	1275	<< uint16 (spell->casting_time)
1588	<< uint16 (spell->last_sp)	1276	<< uint16 (spell->cached_sp)
1589	<< uint16 (spell->last_grace)	1277	<< uint16 (spell->cached_grace)
1590	<< uint16 (spell->last_eat)	1278	<< uint16 (spell->cached_eat)
1591	<< uint8 (skill)	1279	<< uint8 (skill)
1592	<< uint32 (spell->path_attuned)	1280	<< uint32 (spell->path_attuned)
1593	<< uint32 (spell->face)	1281	<< uint32 (spell->face)
1594	<< data8 (spell->name)	1282	<< data8 (spell->name)
1595	<< data16 (spell->msg);	1283	<< data16 (spell->msg);
…		…
1652	}	1340	}
1653	else	1341	else
1654	append_spell (pl, sl, spell);	1342	append_spell (pl, sl, spell);
1655		1343
1656	if (sl.length () > MAXSOCKBUF)	1344	if (sl.length () > MAXSOCKBUF)
1657	{
1658	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1345	cleanup ("buffer overflow in esrv_add_spells!");
1659	fatal (0);
1660	}
1661		1346
1662	/* finally, we can send the packet */	1347	/* finally, we can send the packet */
1663	pl->ns->flush_fx ();	1348	pl->ns->flush_fx ();
1664	pl->ns->send_packet (sl);	1349	pl->ns->send_packet (sl);
1665	}	1350	}
1666		1351
		1352	//-GPL
		1353

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.131 by root, Tue May 20 13:25:55 2008 UTC vs. Revision 1.177 by root, Sat Oct 16 22:51:52 2010 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.131 by root, Tue May 20 13:25:55 2008 UTC vs.
Revision 1.177 by root, Sat Oct 16 22:51:52 2010 UTC