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

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

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.146 by root, Sat Dec 27 01:25:00 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.146 by root, Sat Dec 27 01:25:00 2008 UTC vs.
Revision 1.177 by root, Sat Oct 16 22:51:52 2010 UTC