[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.176 by root, Thu Apr 29 15:59:10 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	};
…		…
141		157
142	static void	158	static void
143	send_map_info (player *pl)	159	send_map_info (player *pl)
144	{	160	{
145	client &socket = *pl->ns;	161	client &socket = *pl->ns;
146	object *ob = pl->observe;	162	object *ob = pl->viewpoint;
147		163
148	if (socket.mapinfocmd)	164	if (socket.mapinfocmd)
149	{	165	{
150	if (ob->map && ob->map->path[0])	166	if (ob->map && ob->map->path[0])
151	{	167	{
…		…
168	/** check for map/region change and send new map data */	184	/** check for map/region change and send new map data */
169	static void	185	static void
170	check_map_change (player *pl)	186	check_map_change (player *pl)
171	{	187	{
172	client &socket = *pl->ns;	188	client &socket = *pl->ns;
173	object *ob = pl->observe;	189	object *ob = pl->viewpoint;
174		190
175	region *reg = ob->region ();	191	region *reg = ob->region ();
176	if (socket.current_region != reg)	192	if (socket.current_region != reg)
177	{	193	{
178	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	194	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)	224	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)
209	{	225	{
210	int dx = ob->x - socket.current_x;	226	int dx = ob->x - socket.current_x;
211	int dy = ob->y - socket.current_y;	227	int dy = ob->y - socket.current_y;
212		228
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);	229	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218	socket.floorbox_reset ();	230	socket.floorbox_reset ();
219	}
220	}	231	}
221		232
222	socket.current_x = ob->x;	233	socket.current_x = ob->x;
223	socket.current_y = ob->y;	234	socket.current_y = ob->y;
		235	}
		236
		237	/**
		238	* This sends the skill number to name mapping. We ignore
		239	* the params - we always send the same info no matter what.
		240	*/
		241	static void
		242	send_skill_info (client ns, char params)
		243	{
		244	packet sl;
		245	sl << "replyinfo skill_info\n";
		246
		247	for (int i = 0; i < skillvec.size (); ++i)
		248	sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
		249
		250	if (sl.length () > MAXSOCKBUF)
		251	cleanup ("buffer overflow in send_skill_info!");
		252
		253	ns->send_packet (sl);
		254	}
		255
		256	/**
		257	* This sends the spell path to name mapping. We ignore
		258	* the params - we always send the same info no matter what.
		259	*/
		260	static void
		261	send_spell_paths (client * ns, char *params)
		262	{
		263	packet sl;
		264
		265	sl << "replyinfo spell_paths\n";
		266
		267	for (int i = 0; i < NRSPELLPATHS; i++)
		268	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		269
		270	if (sl.length () > MAXSOCKBUF)
		271	cleanup ("buffer overflow in send_spell_paths!");
		272
		273	ns->send_packet (sl);
224	}	274	}
225		275
226	/**	276	/**
227	* RequestInfo is sort of a meta command. There is some specific	277	* RequestInfo is sort of a meta command. There is some specific
228	* request of information, but we call other functions to provide	278	* request of information, but we call other functions to provide
…		…
241	{	291	{
242	*params++ = 0;	292	*params++ = 0;
243	break;	293	break;
244	}	294	}
245		295
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"))	296	if (!strcmp (buf, "skill_info"))
251	send_skill_info (ns, params);	297	send_skill_info (ns, params);
252	else if (!strcmp (buf, "spell_paths"))	298	else if (!strcmp (buf, "spell_paths"))
253	send_spell_paths (ns, params);	299	send_spell_paths (ns, params);
254	else	300	else
255	{	301	{
…		…
271	ExtiCmd (char buf, int len, client ns)	317	ExtiCmd (char buf, int len, client ns)
272	{	318	{
273	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	319	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274	}	320	}
275		321
		322	//-GPL
		323
276	void	324	void
277	client::mapinfo_queue_clear ()	325	client::mapinfo_queue_clear ()
278	{	326	{
279	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	327	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280	free (*i);	328	free (*i);
…		…
287	{	335	{
288	char *token = buf;	336	char *token = buf;
289	buf += strlen (buf) + 9;	337	buf += strlen (buf) + 9;
290		338
291	// initial map and its origin	339	// initial map and its origin
292	maptile *map = pl->observe->map;	340	maptile *map = pl->viewpoint->map;
293	int mapx = pl->ns->mapx / 2 - pl->observe->x;	341	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
294	int mapy = pl->ns->mapy / 2 - pl->observe->y;	342	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
295	int max_distance = 8; // limit maximum path length to something generous	343	int max_distance = 8; // limit maximum path length to something generous
296		344
297	while (*buf && map && max_distance)	345	while (*buf && map && max_distance)
298	{	346	{
299	int dir = *buf++ - '1';	347	int dir = *buf++ - '1';
…		…
404	AddMeCmd (char buf, int len, client ns)	452	AddMeCmd (char buf, int len, client ns)
405	{	453	{
406	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	454	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
407	}	455	}
408		456
409	/*	457	//+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		458
472	/**	459	/**
473	* This handles the general commands from the client (ie, north, fire, cast,	460	* This handles the general commands from the client (ie, north, fire, cast,
474	* etc.)	461	* etc.)
475	*/	462	*/
…		…
488	return;	475	return;
489		476
490	buf++;	477	buf++;
491	}	478	}
492		479
493	execute_newserver_command (pl->ob, (char *) buf);	480	execute_newserver_command (pl->ob, (char *)buf);
494		481
495	/* Perhaps something better should be done with a left over count.	482	/* Perhaps something better should be done with a left over count.
496	* Cleaning up the input should probably be done first - all actions	483	* 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	484	* for the command that issued the count should be done before any other
498	* commands.	485	* commands.
…		…
532	* commands.	519	* commands.
533	*/	520	*/
534	pl->count = 0;	521	pl->count = 0;
535		522
536	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	523	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
537	int time = fabs (pl->ob->speed) < 0.001	524	int time = pl->ob->has_active_speed ()
538	? time = MAX_TIME * 100
539	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	525	? (int) (MAX_TIME / pl->ob->speed)
		526	: MAX_TIME * 100;
540		527
541	/* Send confirmation of command execution now */	528	/* Send confirmation of command execution now */
542	packet sl ("comc");	529	packet sl ("comc");
543	sl << uint16 (cmdid) << uint32 (time);	530	sl << uint16 (cmdid) << uint32 (time);
544	pl->ns->send_packet (sl);	531	pl->ns->send_packet (sl);
…		…
586	LOG (llevError, "Unknown input state: %d\n", ns->state);	573	LOG (llevError, "Unknown input state: %d\n", ns->state);
587	}	574	}
588	}	575	}
589		576
590	/**	577	/**
591	* Client tells its version. If there is a mismatch, we close the	578	* 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	*/	579	*/
597	void	580	void
598	VersionCmd (char buf, int len, client ns)	581	VersionCmd (char buf, int len, client ns)
599	{	582	{
600	if (!buf)	583	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	}	584	}
636		585
637	/** sound related functions. */	586	/** sound related functions. */
638	void	587	void
639	SetSound (char buf, int len, client ns)	588	SetSound (char buf, int len, client ns)
…		…
690	* Get player's current range attack in obuf.	639	* Get player's current range attack in obuf.
691	*/	640	*/
692	static void	641	static void
693	rangetostring (player pl, char obuf)	642	rangetostring (player pl, char obuf)
694	{	643	{
695	dynbuf_text buf;	644	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		645
		646	#if 0
		647	// print ranged/chosen_skill etc. objects every call
		648	printf ("%s %s => %s (%s)\n",
		649	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		650	pl->combat_ob ? &pl->combat_ob->name : "-",
		651	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		652	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		653	);
		654	#endif
696		655
697	if (pl->ranged_ob)	656	if (pl->ranged_ob)
698	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	657	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
699		658
700	if (pl->combat_ob)	659	if (pl->combat_ob)
…		…
746	* commands for now.	705	* commands for now.
747	*/	706	*/
748	void	707	void
749	esrv_update_stats (player *pl)	708	esrv_update_stats (player *pl)
750	{	709	{
751	char buf[MAX_BUF];
752	uint16 flags;
753
754	client *ns = pl->ns;	710	client *ns = pl->ns;
755	if (!ns)	711	if (!ns)
756	return;	712	return;
757		713
758	object *ob = pl->observe;	714	object *ob = pl->observe;
…		…
775	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	731	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
776	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	732	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
777	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	733	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
778	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	734	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
779		735
780	for (int s = 0; s < NUM_SKILLS; s++)	736	for (int s = 0; s < CS_NUM_SKILLS; s++)
781	if (object *skill = opl->last_skill_ob [s])	737	if (object *skill = opl->last_skill_ob [s])
782	if (skill->stats.exp != ns->last_skill_exp [s])	738	if (skill->stats.exp != ns->last_skill_exp [s])
783	{	739	{
784	ns->last_skill_exp [s] = skill->stats.exp;	740	ns->last_skill_exp [s] = skill->stats.exp;
785		741
786	/* Always send along the level if exp changes. This is only	742	/* Always send along the level if exp changes. This is only
787	* 1 extra byte, but keeps processing simpler.	743	* 1 extra byte, but keeps processing simpler.
788	*/	744	*/
789	sl << uint8 (s + CS_STAT_SKILLINFO)	745	sl << uint8 (CS_STAT_SKILLINFO + s)
790	<< uint8 (skill->level)	746	<< uint8 (skill->level)
791	<< uint64 (skill->stats.exp);	747	<< uint64 (skill->stats.exp);
792	}	748	}
793		749
794	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	750	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
795	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	751	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
796	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	752	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
797	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	753	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
798	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	754	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
799	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	755	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
800	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	756	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);	757	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);	758	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
803		759
804	flags = 0;	760	int flags = (opl->fire_on ? SF_FIREON : 0)
805		761	\| (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		762
812	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	763	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
813		764
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++)	765	for (int i = 0; i < NROFATTACKS; i++)
818	{
819	/* Skip ones we won't send */	766	/* Skip ones we won't send */
820	if (atnr_cs_stat[i] == -1)	767	if (atnr_cs_stat[i] >= 0)
821	continue;
822
823	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	768	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
824	}
825		769
826	if (pl->ns->monitor_spells)	770	if (pl->ns->monitor_spells)
827	{	771	{
828	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	772	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);	773	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);	774	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
831	}	775	}
832		776
		777	char buf[MAX_BUF];
833	rangetostring (opl, buf); /* we want use the new fire & run system in new client */	778	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
834	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	779	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
835	set_title (ob, buf);	780	set_title (ob, buf);
836	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	781	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
837		782
…		…
931		876
932	/* Nothing changed */	877	/* Nothing changed */
933	return 0;	878	return 0;
934	}	879	}
935		880
936	// prefetch (and touch) all maps within a specific distancd	881	//-GPL
937	static void
938	prefetch_surrounding_maps (maptile *map, int distance)
939	{
940	map->last_access = runtime;
941		882
942	if (--distance)	883	// prefetch maps in an area of PREFETCH x PREFETCH around the player
943	for (int dir = 4; --dir; )	884	#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		885
951	// prefetch a generous area around the player	886	// prefetch a generous area around the player
952	static void	887	static void
953	prefetch_surrounding_maps (object *op)	888	prefetch_surrounding_maps (object *op)
954	{	889	{
955	prefetch_surrounding_maps (op->map, 3);	890	for (maprect *rect = op->map->split_to_tiles (mapwalk_buf,
		891	op->x - PREFETCH , op->y - PREFETCH ,
		892	op->x + PREFETCH + 1, op->y + PREFETCH + 1);
		893	rect->m;
		894	++rect)
		895	rect->m->touch ();
956	}	896	}
		897
		898	//+GPL
957		899
958	/**	900	/**
959	* Draws client map.	901	* Draws client map.
960	*/	902	*/
961	void	903	void
962	draw_client_map (player *pl)	904	draw_client_map (player *pl)
963	{	905	{
964	object *ob = pl->observe;	906	object *ob = pl->viewpoint;
965	if (!ob->active)	907	if (!pl->observe->active)
966	return;	908	return;
967		909
968	/* If player is just joining the game, he isn't here yet, so the map	910	/* 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	911	* can get swapped out. If so, don't try to send them a map. All will
970	* be OK once they really log in.	912	* be OK once they really log in.
…		…
977	check_map_change (pl);	919	check_map_change (pl);
978	prefetch_surrounding_maps (pl->ob);	920	prefetch_surrounding_maps (pl->ob);
979		921
980	/* do LOS after calls to update_position */	922	/* do LOS after calls to update_position */
981	/* unfortunately, we need to udpate los when observing, currently */	923	/* unfortunately, we need to udpate los when observing, currently */
982	if (pl->do_los \|\| pl->observe != pl->ob)	924	if (pl->do_los \|\| pl->viewpoint != pl->ob)
983	{	925	{
984	pl->do_los = 0;	926	pl->do_los = 0;
985	pl->update_los ();	927	pl->update_los ();
986	}	928	}
987		929
…		…
1039	map_clearcell (&lastcell, -1);	981	map_clearcell (&lastcell, -1);
1040	}	982	}
1041		983
1042	continue;	984	continue;
1043	}	985	}
1044		986
1045	int d = pl->blocked_los_uc (dx, dy);	987	int d = pl->blocked_los_uc (dx, dy);
1046		988
1047	if (d > 3)	989	if (d > 3)
1048	{	990	{
1049	/* This block deals with spaces that are not visible for whatever	991	/* This block deals with spaces that are not visible for whatever
…		…
1082		1024
1083	unsigned char dummy;	1025	unsigned char dummy;
1084	unsigned char *last_ext = &dummy;	1026	unsigned char *last_ext = &dummy;
1085		1027
1086	/* Darkness changed */	1028	/* Darkness changed */
1087	if (lastcell.count != d && socket.darkness)	1029	if (lastcell.count != d)
1088	{	1030	{
1089	mask \|= 0x8;	1031	mask \|= 0x8;
1090		1032
1091	if (socket.extmap)	1033	*last_ext \|= 0x80;
		1034	last_ext = &sl[sl.length ()];
		1035	sl << uint8 (d);
		1036	}
		1037
		1038	lastcell.count = d;
		1039
		1040	mapspace &ms = m->at (nx, ny);
		1041	ms.update ();
		1042
		1043	// extmap handling
		1044	uint8 stat_hp = 0;
		1045	uint8 stat_width = 0;
		1046	uint8 flags = 0;
		1047	tag_t player = 0;
		1048
		1049	// send hp information, if applicable
		1050	if (object *op = ms.faces_obj [0])
		1051	if (op->is_head () && !op->invisible)
		1052	{
		1053	if (op->stats.maxhp > op->stats.hp
		1054	&& op->stats.maxhp > 0
		1055	&& (op->type == PLAYER
		1056	\|\| op->type == DOOR // does not work, have maxhp 0
		1057	\|\| op->flag [FLAG_MONSTER]
		1058	\|\| op->flag [FLAG_ALIVE]
		1059	\|\| op->flag [FLAG_GENERATOR]))
		1060	{
		1061	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1062	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1063	}
		1064
		1065	if (expect_false (op->has_dialogue ()))
		1066	flags \|= 1;
		1067
		1068	if (expect_false (op->type == PLAYER))
		1069	player = op == ob ? pl->ob->count
		1070	: op == pl->ob ? ob->count
		1071	: op->count;
		1072	}
		1073
		1074	if (expect_false (lastcell.stat_hp != stat_hp))
		1075	{
		1076	lastcell.stat_hp = stat_hp;
		1077
		1078	mask \|= 0x8;
		1079	*last_ext \|= 0x80;
		1080	last_ext = &sl[sl.length ()];
		1081
		1082	sl << uint8 (5) << uint8 (stat_hp);
		1083
		1084	if (stat_width > 1)
1092	{	1085	{
1093	*last_ext \|= 0x80;	1086	*last_ext \|= 0x80;
1094	last_ext = &sl[sl.length ()];	1087	last_ext = &sl[sl.length ()];
1095	sl << uint8 (d);
1096	}
1097	else
1098	sl << uint8 (255 - 64 * d);
1099	}
1100		1088
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);	1089	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	}	1090	}
1178	}	1091	}
		1092
		1093	if (expect_false (lastcell.player != player))
		1094	{
		1095	lastcell.player = player;
		1096
		1097	mask \|= 0x8;
		1098	*last_ext \|= 0x80;
		1099	last_ext = &sl[sl.length ()];
		1100
		1101	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
		1102	}
		1103
		1104	if (expect_false (lastcell.flags != flags))
		1105	{
		1106	lastcell.flags = flags;
		1107
		1108	mask \|= 0x8;
		1109	*last_ext \|= 0x80;
		1110	last_ext = &sl[sl.length ()];
		1111
		1112	sl << uint8 (8) << uint8 (flags);
		1113	}
		1114
		1115	// faces
1179		1116
1180	/* Floor face */	1117	/* Floor face */
1181	if (update_space (sl, socket, ms, lastcell, 2))	1118	if (update_space (sl, socket, ms, lastcell, 2))
1182	mask \|= 0x4;	1119	mask \|= 0x4;
1183		1120
…		…
1223	socket.send_packet (sl);	1160	socket.send_packet (sl);
1224	socket.sent_scroll = 0;	1161	socket.sent_scroll = 0;
1225	}	1162	}
1226	}	1163	}
1227		1164
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	/**	1165	/**
1285	* This looks for any spells the player may have that have changed their stats.	1166	* 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	1167	* it then sends an updspell packet for each spell that has changed in this way
1287	*/	1168	*/
1288	void	1169	void
1289	esrv_update_spells (player *pl)	1170	esrv_update_spells (player *pl)
1290	{	1171	{
1291	if (!pl->ns)	1172	if (!pl->ns)
1292	return;	1173	return;
1293		1174
		1175	pl->ns->update_spells = false;
		1176
1294	if (!pl->ns->monitor_spells)	1177	if (!pl->ns->monitor_spells)
1295	return;	1178	return;
1296		1179
1297	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1180	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1298	{
1299	if (spell->type == SPELL)	1181	if (spell->type == SPELL)
1300	{	1182	{
1301	int flags = 0;	1183	int flags = 0;
		1184	int val;
1302		1185
1303	/* check if we need to update it */	1186	/* check if we need to update it */
1304	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1187	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1188	if (spell->cached_sp != val)
1305	{	1189	{
1306	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1190	spell->cached_sp = val;
1307	flags \|= UPD_SP_MANA;	1191	flags \|= UPD_SP_MANA;
1308	}	1192	}
1309		1193
1310	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1194	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1195	if (spell->cached_grace != val)
1311	{	1196	{
1312	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1197	spell->cached_grace = val;
1313	flags \|= UPD_SP_GRACE;	1198	flags \|= UPD_SP_GRACE;
1314	}	1199	}
1315		1200
1316	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1201	val = casting_level (pl->ob, spell);
		1202	if (spell->cached_eat != val)
1317	{	1203	{
1318	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1204	spell->cached_eat = val;
1319	flags \|= UPD_SP_DAMAGE;	1205	flags \|= UPD_SP_LEVEL;
1320	}	1206	}
1321		1207
1322	if (flags)	1208	if (flags)
1323	{	1209	{
1324	packet sl;	1210	packet sl;
1325		1211
1326	sl << "updspell "	1212	sl << "updspell "
1327	<< uint8 (flags)	1213	<< uint8 (flags)
1328	<< uint32 (spell->count);	1214	<< uint32 (spell->count);
1329		1215
1330	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1216	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1331	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1217	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1332	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1218	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1333		1219
1334	pl->ns->send_packet (sl);	1220	pl->ns->send_packet (sl);
1335	}	1221	}
1336	}	1222	}
1337	}
1338	}	1223	}
1339		1224
1340	void	1225	void
1341	esrv_remove_spell (player pl, object spell)	1226	esrv_remove_spell (player pl, object spell)
1342	{	1227	{
…		…
1369	}	1254	}
1370		1255
1371	/* store costs and damage in the object struct, to compare to later */	1256	/* 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);	1257	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);	1258	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);	1259	spell->cached_eat = casting_level (pl->ob, spell);
1375		1260
1376	/* figure out which skill it uses, if it uses one */	1261	/* figure out which skill it uses, if it uses one */
1377	if (spell->skill)	1262	if (spell->skill)
1378	if (object *tmp = pl->find_skill (spell->skill))	1263	if (object *tmp = pl->find_skill (spell->skill))
1379	skill = tmp->subtype + CS_STAT_SKILLINFO;	1264	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1380		1265
1381	// spells better have a face	1266	// spells better have a face
1382	if (!spell->face)	1267	if (!spell->face)
1383	{	1268	{
1384	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1269	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1458	}	1343	}
1459	else	1344	else
1460	append_spell (pl, sl, spell);	1345	append_spell (pl, sl, spell);
1461		1346
1462	if (sl.length () > MAXSOCKBUF)	1347	if (sl.length () > MAXSOCKBUF)
1463	{
1464	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1348	cleanup ("buffer overflow in esrv_add_spells!");
1465	fatal (0);
1466	}
1467		1349
1468	/* finally, we can send the packet */	1350	/* finally, we can send the packet */
1469	pl->ns->flush_fx ();	1351	pl->ns->flush_fx ();
1470	pl->ns->send_packet (sl);	1352	pl->ns->send_packet (sl);
1471	}	1353	}
1472		1354
		1355	//-GPL
		1356

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.176 by root, Thu Apr 29 15:59:10 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.176 by root, Thu Apr 29 15:59:10 2010 UTC