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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.145 by root, Fri Dec 26 10:44:17 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	};
…		…
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[0])
151	{	164	{
…		…
168	/** check for map/region change and send new map data */	181	/** check for map/region change and send new map data */
169	static void	182	static void
170	check_map_change (player *pl)	183	check_map_change (player *pl)
171	{	184	{
172	client &socket = *pl->ns;	185	client &socket = *pl->ns;
173	object *ob = pl->observe;	186	object *ob = pl->viewpoint;
174		187
175	region *reg = ob->region ();	188	region *reg = ob->region ();
176	if (socket.current_region != reg)	189	if (socket.current_region != reg)
177	{	190	{
178	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));
…		…
208	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)
209	{	222	{
210	int dx = ob->x - socket.current_x;	223	int dx = ob->x - socket.current_x;
211	int dy = ob->y - socket.current_y;	224	int dy = ob->y - socket.current_y;
212		225
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);	226	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218	socket.floorbox_reset ();	227	socket.floorbox_reset ();
219	}
220	}	228	}
221		229
222	socket.current_x = ob->x;	230	socket.current_x = ob->x;
223	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);
224	}	271	}
225		272
226	/**	273	/**
227	* RequestInfo is sort of a meta command. There is some specific	274	* RequestInfo is sort of a meta command. There is some specific
228	* request of information, but we call other functions to provide	275	* request of information, but we call other functions to provide
…		…
241	{	288	{
242	*params++ = 0;	289	*params++ = 0;
243	break;	290	break;
244	}	291	}
245		292
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"))	293	if (!strcmp (buf, "skill_info"))
251	send_skill_info (ns, params);	294	send_skill_info (ns, params);
252	else if (!strcmp (buf, "spell_paths"))	295	else if (!strcmp (buf, "spell_paths"))
253	send_spell_paths (ns, params);	296	send_spell_paths (ns, params);
254	else	297	else
255	{	298	{
…		…
271	ExtiCmd (char buf, int len, client ns)	314	ExtiCmd (char buf, int len, client ns)
272	{	315	{
273	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	316	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274	}	317	}
275		318
		319	//-GPL
		320
276	void	321	void
277	client::mapinfo_queue_clear ()	322	client::mapinfo_queue_clear ()
278	{	323	{
279	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	324	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280	free (*i);	325	free (*i);
…		…
287	{	332	{
288	char *token = buf;	333	char *token = buf;
289	buf += strlen (buf) + 9;	334	buf += strlen (buf) + 9;
290		335
291	// initial map and its origin	336	// initial map and its origin
292	maptile *map = pl->observe->map;	337	maptile *map = pl->viewpoint->map;
293	int mapx = pl->ns->mapx / 2 - pl->observe->x;	338	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
294	int mapy = pl->ns->mapy / 2 - pl->observe->y;	339	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
295	int max_distance = 8; // limit maximum path length to something generous	340	int max_distance = 8; // limit maximum path length to something generous
296		341
297	while (*buf && map && max_distance)	342	while (*buf && map && max_distance)
298	{	343	{
299	int dir = *buf++ - '1';	344	int dir = *buf++ - '1';
…		…
404	AddMeCmd (char buf, int len, client ns)	449	AddMeCmd (char buf, int len, client ns)
405	{	450	{
406	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	451	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
407	}	452	}
408		453
409	/*	454	//+GPL
410	#define MSG_TYPE_BOOK 1
411	#define MSG_TYPE_CARD 2
412	#define MSG_TYPE_PAPER 3
413	#define MSG_TYPE_SIGN 4
414	#define MSG_TYPE_MONUMENT 5
415	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
416
417	/** Reply to ExtendedInfos command */
418	void
419	ToggleExtendedText (char buf, int len, client ns)
420	{
421	char cmdback[MAX_BUF];
422	char temp[10];
423	char command[50];
424	int info, nextinfo, i, flag;
425
426	cmdback[0] = '\0';
427
428	nextinfo = 0;
429	while (1)
430	{
431	/* 1. Extract an info */
432	info = nextinfo;
433
434	while ((info < len) && (buf[info] == ' '))
435	info++;
436
437	if (info >= len)
438	break;
439
440	nextinfo = info + 1;
441
442	while ((nextinfo < len) && (buf[nextinfo] != ' '))
443	nextinfo++;
444
445	if (nextinfo - info >= 49) /Erroneous info asked /
446	continue;
447
448	strncpy (command, &(buf[info]), nextinfo - info);
449	command[nextinfo - info] = '\0';
450	/* 2. Interpret info */
451	i = sscanf (command, "%d", &flag);
452
453	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
454	ns->supported_readables \|= (1 << flag);
455	/3. Next info /
456	}
457
458	/* Send resulting state */
459	strcpy (cmdback, "ExtendedTextSet");
460
461	for (i = 0; i <= MSG_TYPE_LAST; i++)
462	if (ns->supported_readables & (1 << i))
463	{
464	strcat (cmdback, " ");
465	snprintf (temp, sizeof (temp), "%d", i);
466	strcat (cmdback, temp);
467	}
468
469	ns->send_packet (cmdback);
470	}
471		455
472	/**	456	/**
473	* 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,
474	* etc.)	458	* etc.)
475	*/	459	*/
…		…
488	return;	472	return;
489		473
490	buf++;	474	buf++;
491	}	475	}
492		476
493	execute_newserver_command (pl->ob, (char *) buf);	477	execute_newserver_command (pl->ob, (char *)buf);
494		478
495	/* Perhaps something better should be done with a left over count.	479	/* Perhaps something better should be done with a left over count.
496	* Cleaning up the input should probably be done first - all actions	480	* Cleaning up the input should probably be done first - all actions
497	* 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
498	* commands.	482	* commands.
…		…
532	* commands.	516	* commands.
533	*/	517	*/
534	pl->count = 0;	518	pl->count = 0;
535		519
536	//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
537	int time = fabs (pl->ob->speed) < 0.001	521	int time = pl->ob->has_active_speed ()
538	? time = MAX_TIME * 100
539	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	522	? (int) (MAX_TIME / pl->ob->speed)
		523	: MAX_TIME * 100;
540		524
541	/* Send confirmation of command execution now */	525	/* Send confirmation of command execution now */
542	packet sl ("comc");	526	packet sl ("comc");
543	sl << uint16 (cmdid) << uint32 (time);	527	sl << uint16 (cmdid) << uint32 (time);
544	pl->ns->send_packet (sl);	528	pl->ns->send_packet (sl);
…		…
586	LOG (llevError, "Unknown input state: %d\n", ns->state);	570	LOG (llevError, "Unknown input state: %d\n", ns->state);
587	}	571	}
588	}	572	}
589		573
590	/**	574	/**
591	* Client tells its version. If there is a mismatch, we close the	575	* Client tells its version info.
592	* socket. In real life, all we should care about is the client having
593	* something older than the server. If we assume the client will be
594	* backwards compatible, having it be a later version should not be a
595	* problem.
596	*/	576	*/
597	void	577	void
598	VersionCmd (char buf, int len, client ns)	578	VersionCmd (char buf, int len, client ns)
599	{	579	{
600	if (!buf)	580	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
601	{
602	LOG (llevError, "CS: received corrupted version command\n");
603	return;
604	}
605
606	ns->cs_version = atoi (buf);
607	ns->sc_version = ns->cs_version;
608
609	LOG (llevDebug, "connection from client <%s>\n", buf);
610
611	//TODO: should log here just for statistics
612
613	//if (VERSION_CS != ns->cs_version)
614	// unchecked;
615
616	char *cp = strchr (buf + 1, ' ');
617	if (!cp)
618	return;
619
620	ns->sc_version = atoi (cp);
621
622	//if (VERSION_SC != ns->sc_version)
623	// unchecked;
624
625	cp = strchr (cp + 1, ' ');
626
627	if (cp)
628	{
629	ns->version = cp + 1;
630
631	if (ns->sc_version < 1026)
632	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
633	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
634	}
635	}	581	}
636		582
637	/** sound related functions. */	583	/** sound related functions. */
638	void	584	void
639	SetSound (char buf, int len, client ns)	585	SetSound (char buf, int len, client ns)
…		…
690	* Get player's current range attack in obuf.	636	* Get player's current range attack in obuf.
691	*/	637	*/
692	static void	638	static void
693	rangetostring (player pl, char obuf)	639	rangetostring (player pl, char obuf)
694	{	640	{
695	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
696		652
697	if (pl->ranged_ob)	653	if (pl->ranged_ob)
698	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;
699		655
700	if (pl->combat_ob)	656	if (pl->combat_ob)
…		…
746	* commands for now.	702	* commands for now.
747	*/	703	*/
748	void	704	void
749	esrv_update_stats (player *pl)	705	esrv_update_stats (player *pl)
750	{	706	{
751	char buf[MAX_BUF];
752	uint16 flags;
753
754	client *ns = pl->ns;	707	client *ns = pl->ns;
755	if (!ns)	708	if (!ns)
756	return;	709	return;
757		710
758	object *ob = pl->observe;	711	object *ob = pl->observe;
…		…
775	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	728	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
776	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	729	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
777	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	730	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
778	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	731	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
779		732
780	for (int s = 0; s < NUM_SKILLS; s++)	733	for (int s = 0; s < CS_NUM_SKILLS; s++)
781	if (object *skill = opl->last_skill_ob [s])	734	if (object *skill = opl->last_skill_ob [s])
782	if (skill->stats.exp != ns->last_skill_exp [s])	735	if (skill->stats.exp != ns->last_skill_exp [s])
783	{	736	{
784	ns->last_skill_exp [s] = skill->stats.exp;	737	ns->last_skill_exp [s] = skill->stats.exp;
785		738
786	/* Always send along the level if exp changes. This is only	739	/* Always send along the level if exp changes. This is only
787	* 1 extra byte, but keeps processing simpler.	740	* 1 extra byte, but keeps processing simpler.
788	*/	741	*/
789	sl << uint8 (s + CS_STAT_SKILLINFO)	742	sl << uint8 (CS_STAT_SKILLINFO + s)
790	<< uint8 (skill->level)	743	<< uint8 (skill->level)
791	<< uint64 (skill->stats.exp);	744	<< uint64 (skill->stats.exp);
792	}	745	}
793		746
794	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	747	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
795	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	748	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
796	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	749	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
797	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	750	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
798	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	751	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
799	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);
800	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	753	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
801	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);
802	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);
803		756
804	flags = 0;	757	int flags = (opl->fire_on ? SF_FIREON : 0)
805		758	\| (opl->run_on ? SF_RUNON : 0);
806	if (opl->fire_on)
807	flags \|= SF_FIREON;
808
809	if (opl->run_on)
810	flags \|= SF_RUNON;
811		759
812	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	760	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
813		761
814	if (ns->sc_version < 1025)
815	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
816	else
817	for (int i = 0; i < NROFATTACKS; i++)	762	for (int i = 0; i < NROFATTACKS; i++)
818	{
819	/* Skip ones we won't send */	763	/* Skip ones we won't send */
820	if (atnr_cs_stat[i] == -1)	764	if (atnr_cs_stat[i] >= 0)
821	continue;
822
823	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]);
824	}
825		766
826	if (pl->ns->monitor_spells)	767	if (pl->ns->monitor_spells)
827	{	768	{
828	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);
829	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);
830	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);
831	}	772	}
832		773
		774	char buf[MAX_BUF];
833	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 */
834	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	776	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
835	set_title (ob, buf);	777	set_title (ob, buf);
836	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	778	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
837		779
…		…
931		873
932	/* Nothing changed */	874	/* Nothing changed */
933	return 0;	875	return 0;
934	}	876	}
935		877
936	// prefetch (and touch) all maps within a specific distancd	878	//-GPL
937	static void
938	prefetch_surrounding_maps (maptile *map, int distance)
939	{
940	map->last_access = runtime;
941		879
942	if (--distance)	880	// prefetch maps in an area of PREFETCH x PREFETCH around the player
943	for (int dir = 4; --dir; )	881	#define PREFETCH 40
944	if (const shstr &path = map->tile_path [dir])
945	if (maptile *&neigh = map->tile_map [dir])
946	prefetch_surrounding_maps (neigh, distance);
947	else
948	neigh = maptile::find_async (path, map);
949	}
950		882
951	// prefetch a generous area around the player	883	// prefetch a generous area around the player
952	static void	884	static void
953	prefetch_surrounding_maps (object *op)	885	prefetch_surrounding_maps (object *op)
954	{	886	{
955	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 ();
956	}	893	}
		894
		895	//+GPL
957		896
958	/**	897	/**
959	* Draws client map.	898	* Draws client map.
960	*/	899	*/
961	void	900	void
962	draw_client_map (player *pl)	901	draw_client_map (player *pl)
963	{	902	{
964	object *ob = pl->observe;	903	object *ob = pl->viewpoint;
965	if (!ob->active)	904	if (!pl->observe->active)
966	return;	905	return;
967		906
968	/* 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
969	* 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
970	* be OK once they really log in.	909	* be OK once they really log in.
…		…
977	check_map_change (pl);	916	check_map_change (pl);
978	prefetch_surrounding_maps (pl->ob);	917	prefetch_surrounding_maps (pl->ob);
979		918
980	/* do LOS after calls to update_position */	919	/* do LOS after calls to update_position */
981	/* unfortunately, we need to udpate los when observing, currently */	920	/* unfortunately, we need to udpate los when observing, currently */
982	if (pl->do_los \|\| pl->observe != pl->ob)	921	if (pl->do_los \|\| pl->viewpoint != pl->ob)
983	{	922	{
984	pl->do_los = 0;	923	pl->do_los = 0;
985	pl->update_los ();	924	pl->update_los ();
986	}	925	}
987		926
…		…
1008	* look like.	947	* look like.
1009	*/	948	*/
1010		949
1011	client &socket = *pl->ns;	950	client &socket = *pl->ns;
1012		951
1013	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	952	packet sl ("map1a");
1014		953
1015	startlen = sl.length ();	954	startlen = sl.length ();
1016		955
1017	int hx = socket.mapx / 2;	956	int hx = socket.mapx / 2;
1018	int hy = socket.mapy / 2;	957	int hy = socket.mapy / 2;
…		…
1039	map_clearcell (&lastcell, -1);	978	map_clearcell (&lastcell, -1);
1040	}	979	}
1041		980
1042	continue;	981	continue;
1043	}	982	}
1044		983
1045	int d = pl->blocked_los_uc (dx, dy);	984	int d = pl->blocked_los_uc (dx, dy);
1046		985
1047	if (d > 3)	986	if (d > 3)
1048	{	987	{
1049	/* This block deals with spaces that are not visible for whatever	988	/* This block deals with spaces that are not visible for whatever
…		…
1082		1021
1083	unsigned char dummy;	1022	unsigned char dummy;
1084	unsigned char *last_ext = &dummy;	1023	unsigned char *last_ext = &dummy;
1085		1024
1086	/* Darkness changed */	1025	/* Darkness changed */
1087	if (lastcell.count != d && socket.darkness)	1026	if (lastcell.count != d)
1088	{	1027	{
1089	mask \|= 0x8;	1028	mask \|= 0x8;
1090		1029
1091	if (socket.extmap)	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)
		1049	{
		1050	if (op->stats.maxhp > op->stats.hp
		1051	&& op->stats.maxhp > 0
		1052	&& (op->type == PLAYER
		1053	\|\| op->type == DOOR // does not work, have maxhp 0
		1054	\|\| op->flag [FLAG_MONSTER]
		1055	\|\| op->flag [FLAG_ALIVE]
		1056	\|\| op->flag [FLAG_GENERATOR]))
		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;
		1069	}
		1070
		1071	if (expect_false (lastcell.stat_hp != stat_hp))
		1072	{
		1073	lastcell.stat_hp = stat_hp;
		1074
		1075	mask \|= 0x8;
		1076	*last_ext \|= 0x80;
		1077	last_ext = &sl[sl.length ()];
		1078
		1079	sl << uint8 (5) << uint8 (stat_hp);
		1080
		1081	if (stat_width > 1)
1092	{	1082	{
1093	*last_ext \|= 0x80;	1083	*last_ext \|= 0x80;
1094	last_ext = &sl[sl.length ()];	1084	last_ext = &sl[sl.length ()];
1095	sl << uint8 (d);
1096	}
1097	else
1098	sl << uint8 (255 - 64 * d);
1099	}
1100		1085
1101	lastcell.count = d;
1102
1103	mapspace &ms = m->at (nx, ny);
1104	ms.update ();
1105
1106	if (expect_true (socket.extmap))
1107	{
1108	uint8 stat_hp = 0;
1109	uint8 stat_width = 0;
1110	uint8 flags = 0;
1111	tag_t player = 0;
1112
1113	// send hp information, if applicable
1114	if (object *op = ms.faces_obj [0])
1115	if (op->is_head () && !op->invisible)
1116	{
1117	if (op->stats.maxhp > op->stats.hp
1118	&& op->stats.maxhp > 0
1119	&& (op->type == PLAYER
1120	\|\| op->type == DOOR // does not work, have maxhp 0
1121	\|\| QUERY_FLAG (op, FLAG_MONSTER)
1122	\|\| QUERY_FLAG (op, FLAG_ALIVE)
1123	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1124	{
1125	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1126	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1127	}
1128
1129	if (expect_false (op->has_dialogue ()))
1130	flags \|= 1;
1131
1132	if (expect_false (op->type == PLAYER))
1133	player = op == ob ? pl->ob->count
1134	: op == pl->ob ? ob->count
1135	: op->count;
1136	}
1137
1138	if (expect_false (lastcell.stat_hp != stat_hp))
1139	{
1140	lastcell.stat_hp = stat_hp;
1141
1142	mask \|= 0x8;
1143	*last_ext \|= 0x80;
1144	last_ext = &sl[sl.length ()];
1145
1146	sl << uint8 (5) << uint8 (stat_hp);
1147
1148	if (stat_width > 1)
1149	{
1150	*last_ext \|= 0x80;
1151	last_ext = &sl[sl.length ()];
1152
1153	sl << uint8 (6) << uint8 (stat_width);	1086	sl << uint8 (6) << uint8 (stat_width);
1154	}
1155	}
1156
1157	if (expect_false (lastcell.player != player))
1158	{
1159	lastcell.player = player;
1160
1161	mask \|= 0x8;
1162	*last_ext \|= 0x80;
1163	last_ext = &sl[sl.length ()];
1164
1165	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1166	}
1167
1168	if (expect_false (lastcell.flags != flags))
1169	{
1170	lastcell.flags = flags;
1171
1172	mask \|= 0x8;
1173	*last_ext \|= 0x80;
1174	last_ext = &sl[sl.length ()];
1175
1176	sl << uint8 (8) << uint8 (flags);
1177	}	1087	}
1178	}	1088	}
		1089
		1090	if (expect_false (lastcell.player != player))
		1091	{
		1092	lastcell.player = player;
		1093
		1094	mask \|= 0x8;
		1095	*last_ext \|= 0x80;
		1096	last_ext = &sl[sl.length ()];
		1097
		1098	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
		1099	}
		1100
		1101	if (expect_false (lastcell.flags != flags))
		1102	{
		1103	lastcell.flags = flags;
		1104
		1105	mask \|= 0x8;
		1106	*last_ext \|= 0x80;
		1107	last_ext = &sl[sl.length ()];
		1108
		1109	sl << uint8 (8) << uint8 (flags);
		1110	}
		1111
		1112	// faces
1179		1113
1180	/* Floor face */	1114	/* Floor face */
1181	if (update_space (sl, socket, ms, lastcell, 2))	1115	if (update_space (sl, socket, ms, lastcell, 2))
1182	mask \|= 0x4;	1116	mask \|= 0x4;
1183		1117
…		…
1223	socket.send_packet (sl);	1157	socket.send_packet (sl);
1224	socket.sent_scroll = 0;	1158	socket.sent_scroll = 0;
1225	}	1159	}
1226	}	1160	}
1227		1161
1228	/*****************************************************************************/
1229	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1230	/* a player. Of course, the client need to know the command to be able to */
1231	/* manage it ! */
1232	/*****************************************************************************/
1233	void
1234	send_plugin_custom_message (object pl, char buf)
1235	{
1236	pl->contr->ns->send_packet (buf);
1237	}
1238
1239	/**
1240	* This sends the skill number to name mapping. We ignore
1241	* the params - we always send the same info no matter what.
1242	*/
1243	void
1244	send_skill_info (client ns, char params)
1245	{
1246	packet sl;
1247	sl << "replyinfo skill_info\n";
1248
1249	for (int i = 1; i < NUM_SKILLS; i++)
1250	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1251
1252	if (sl.length () > MAXSOCKBUF)
1253	{
1254	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1255	fatal (0);
1256	}
1257
1258	ns->send_packet (sl);
1259	}
1260
1261	/**
1262	* This sends the spell path to name mapping. We ignore
1263	* the params - we always send the same info no matter what.
1264	*/
1265	void
1266	send_spell_paths (client * ns, char *params)
1267	{
1268	packet sl;
1269
1270	sl << "replyinfo spell_paths\n";
1271
1272	for (int i = 0; i < NRSPELLPATHS; i++)
1273	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1274
1275	if (sl.length () > MAXSOCKBUF)
1276	{
1277	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1278	fatal (0);
1279	}
1280
1281	ns->send_packet (sl);
1282	}
1283
1284	/**	1162	/**
1285	* 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.
1286	* 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
1287	*/	1165	*/
1288	void	1166	void
1289	esrv_update_spells (player *pl)	1167	esrv_update_spells (player *pl)
1290	{	1168	{
1291	if (!pl->ns)	1169	if (!pl->ns)
1292	return;	1170	return;
1293		1171
		1172	pl->ns->update_spells = false;
		1173
1294	if (!pl->ns->monitor_spells)	1174	if (!pl->ns->monitor_spells)
1295	return;	1175	return;
1296		1176
1297	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1177	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1298	{
1299	if (spell->type == SPELL)	1178	if (spell->type == SPELL)
1300	{	1179	{
1301	int flags = 0;	1180	int flags = 0;
		1181	int val;
1302		1182
1303	/* check if we need to update it */	1183	/* check if we need to update it */
1304	if (spell->cached_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)
1305	{	1186	{
1306	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1187	spell->cached_sp = val;
1307	flags \|= UPD_SP_MANA;	1188	flags \|= UPD_SP_MANA;
1308	}	1189	}
1309		1190
1310	if (spell->cached_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)
1311	{	1193	{
1312	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1194	spell->cached_grace = val;
1313	flags \|= UPD_SP_GRACE;	1195	flags \|= UPD_SP_GRACE;
1314	}	1196	}
1315		1197
1316	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1198	val = casting_level (pl->ob, spell);
		1199	if (spell->cached_eat != val)
1317	{	1200	{
1318	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1201	spell->cached_eat = val;
1319	flags \|= UPD_SP_DAMAGE;	1202	flags \|= UPD_SP_LEVEL;
1320	}	1203	}
1321		1204
1322	if (flags)	1205	if (flags)
1323	{	1206	{
1324	packet sl;	1207	packet sl;
1325		1208
1326	sl << "updspell "	1209	sl << "updspell "
1327	<< uint8 (flags)	1210	<< uint8 (flags)
1328	<< uint32 (spell->count);	1211	<< uint32 (spell->count);
1329		1212
1330	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1213	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1331	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1214	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1332	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1215	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1333		1216
1334	pl->ns->send_packet (sl);	1217	pl->ns->send_packet (sl);
1335	}	1218	}
1336	}	1219	}
1337	}
1338	}	1220	}
1339		1221
1340	void	1222	void
1341	esrv_remove_spell (player pl, object spell)	1223	esrv_remove_spell (player pl, object spell)
1342	{	1224	{
…		…
1369	}	1251	}
1370		1252
1371	/* 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 */
1372	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1254	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1373	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1255	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1374	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1256	spell->cached_eat = casting_level (pl->ob, spell);
1375		1257
1376	/* figure out which skill it uses, if it uses one */	1258	/* figure out which skill it uses, if it uses one */
1377	if (spell->skill)	1259	if (spell->skill)
1378	if (object *tmp = pl->find_skill (spell->skill))	1260	if (object *tmp = pl->find_skill (spell->skill))
1379	skill = tmp->subtype + CS_STAT_SKILLINFO;	1261	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1380		1262
1381	// spells better have a face	1263	// spells better have a face
1382	if (!spell->face)	1264	if (!spell->face)
1383	{	1265	{
1384	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);
…		…
1458	}	1340	}
1459	else	1341	else
1460	append_spell (pl, sl, spell);	1342	append_spell (pl, sl, spell);
1461		1343
1462	if (sl.length () > MAXSOCKBUF)	1344	if (sl.length () > MAXSOCKBUF)
1463	{
1464	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1345	cleanup ("buffer overflow in esrv_add_spells!");
1465	fatal (0);
1466	}
1467		1346
1468	/* finally, we can send the packet */	1347	/* finally, we can send the packet */
1469	pl->ns->flush_fx ();	1348	pl->ns->flush_fx ();
1470	pl->ns->send_packet (sl);	1349	pl->ns->send_packet (sl);
1471	}	1350	}
1472		1351
		1352	//-GPL
		1353

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.145 by root, Fri Dec 26 10:44:17 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.145 by root, Fri Dec 26 10:44:17 2008 UTC vs.
Revision 1.177 by root, Sat Oct 16 22:51:52 2010 UTC