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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.154 by root, Wed Nov 4 17:24:00 2009 UTC vs.
Revision 1.189 by root, Wed Oct 31 09:17:14 2012 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 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 it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* 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 Affero GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* and the GNU General Public License along with this program. If not, see	19	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* 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>
23	*/	23	*/
		24
		25	//+GPL
24		26
25	/**	27	/**
26	* \file	28	* \file
27	* Client handling.	29	* Client handling.
28	*	30	*
42		44
43	#include <global.h>	45	#include <global.h>
44	#include <sproto.h>	46	#include <sproto.h>
45		47
46	#include <living.h>	48	#include <living.h>
47	#include <commands.h>
48		49
49	/* 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,
50	* it should work here.	51	* it should work here.
51	*/	52	*/
52	#include <sys/types.h>	53	#include <sys/types.h>
…		…
64	* This table translates the attack numbers as used within the	65	* This table translates the attack numbers as used within the
65	* 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
66	* 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
67	* client.	68	* client.
68	*/	69	*/
69	short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,	70	static short atnr_cs_stat[NROFATTACKS] =
70	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,	71	{
71	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,	72	CS_STAT_RES_PHYS,
72	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	73	CS_STAT_RES_MAG,
73	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	74	CS_STAT_RES_FIRE,
74	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,	75	CS_STAT_RES_ELEC,
75	CS_STAT_RES_FEAR, -1 /* Cancellation */ ,	76	CS_STAT_RES_COLD,
76	CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,	77	CS_STAT_RES_CONF,
77	-1 /* Chaos / , -1 / Counterspell */ ,	78	CS_STAT_RES_ACID,
78	-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,
79	CS_STAT_RES_BLIND,	94	CS_STAT_RES_BLIND,
80	-1, /* Internal */	95	-1, /* Internal */
81	-1, /* life stealing */	96	-1, /* life stealing */
82	-1 /* Disease - not fully done yet */	97	-1 /* Disease - not fully done yet */
83	};	98	};
…		…
131	pl->ns->mapinfo_queue_clear ();	146	pl->ns->mapinfo_queue_clear ();
132		147
133	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	148	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
134		149
135	pl->ns->force_newmap = false;	150	pl->ns->force_newmap = false;
136
137	if (pl->ns->newmapcmd == 1)
138	pl->ns->send_packet ("newmap");	151	pl->ns->send_packet ("newmap");
139
140	pl->ns->floorbox_reset ();	152	pl->ns->floorbox_reset ();
141	}	153	}
142		154
143	static void	155	static void
144	send_map_info (player *pl)	156	send_map_info (player *pl)
…		…
146	client &socket = *pl->ns;	158	client &socket = *pl->ns;
147	object *ob = pl->viewpoint;	159	object *ob = pl->viewpoint;
148		160
149	if (socket.mapinfocmd)	161	if (socket.mapinfocmd)
150	{	162	{
151	if (ob->map && ob->map->path[0])	163	if (ob->map && ob->map->path)
152	{	164	{
153	int flags = 0;	165	int flags = 0;
154		166
		167	// due to historical glitches, the bit ordering and map index ordering differs
155	if (ob->map->tile_path[0]) flags \|= 1;	168	if (ob->map->tile_path [TILE_NORTH]) flags \|= 0x01;
156	if (ob->map->tile_path[1]) flags \|= 2;	169	if (ob->map->tile_path [TILE_EAST ]) flags \|= 0x02;
157	if (ob->map->tile_path[2]) flags \|= 4;	170	if (ob->map->tile_path [TILE_SOUTH]) flags \|= 0x04;
158	if (ob->map->tile_path[3]) flags \|= 8;	171	if (ob->map->tile_path [TILE_WEST ]) flags \|= 0x08;
		172	// these two are debatable
		173	if (ob->map->tile_path [TILE_UP ]) flags \|= 0x10;
		174	if (ob->map->tile_path [TILE_DOWN ]) flags \|= 0x20;
159		175
160	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",	176	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
161	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,	177	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
162	ob->map->width, ob->map->height, &ob->map->path);	178	ob->map->width, ob->map->height, &ob->map->path);
163	}	179	}
…		…
178	{	194	{
179	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	195	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
180	socket.current_region = reg;	196	socket.current_region = reg;
181	}	197	}
182		198
183	// first try to aovid a full newmap on tiled map scrolls	199	// first try to avoid a full newmap on tiled map scrolls
184	if (socket.current_map != ob->map && !socket.force_newmap)	200	if (socket.current_map != ob->map && !socket.force_newmap)
185	{	201	{
186	rv_vector rv;	202	rv_vector rv;
187		203
188	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);	204	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
…		…
215	socket.floorbox_reset ();	231	socket.floorbox_reset ();
216	}	232	}
217		233
218	socket.current_x = ob->x;	234	socket.current_x = ob->x;
219	socket.current_y = ob->y;	235	socket.current_y = ob->y;
		236	}
		237
		238	/**
		239	* This sends the skill number to name mapping. We ignore
		240	* the params - we always send the same info no matter what.
		241	*/
		242	static void
		243	send_skill_info (client ns, char params)
		244	{
		245	packet sl;
		246	sl << "replyinfo skill_info\n";
		247
		248	for (int i = 0; i < skillvec.size (); ++i)
		249	sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
		250
		251	if (sl.length () > MAXSOCKBUF)
		252	cleanup ("buffer overflow in send_skill_info!");
		253
		254	ns->send_packet (sl);
		255	}
		256
		257	/**
		258	* This sends the spell path to name mapping. We ignore
		259	* the params - we always send the same info no matter what.
		260	*/
		261	static void
		262	send_spell_paths (client * ns, char *params)
		263	{
		264	packet sl;
		265
		266	sl << "replyinfo spell_paths\n";
		267
		268	for (int i = 0; i < NRSPELLPATHS; i++)
		269	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		270
		271	if (sl.length () > MAXSOCKBUF)
		272	cleanup ("buffer overflow in send_spell_paths!");
		273
		274	ns->send_packet (sl);
220	}	275	}
221		276
222	/**	277	/**
223	* RequestInfo is sort of a meta command. There is some specific	278	* RequestInfo is sort of a meta command. There is some specific
224	* request of information, but we call other functions to provide	279	* request of information, but we call other functions to provide
…		…
263	ExtiCmd (char buf, int len, client ns)	318	ExtiCmd (char buf, int len, client ns)
264	{	319	{
265	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	320	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
266	}	321	}
267		322
		323	//-GPL
		324
268	void	325	void
269	client::mapinfo_queue_clear ()	326	client::mapinfo_queue_clear ()
270	{	327	{
271	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	328	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
272	free (*i);	329	free (*i);
…		…
288		345
289	while (*buf && map && max_distance)	346	while (*buf && map && max_distance)
290	{	347	{
291	int dir = *buf++ - '1';	348	int dir = *buf++ - '1';
292		349
293	if (dir >= 0 && dir <= 3)	350	// due to historical glitches, the mapinfo index and tile index differs
		351	static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
		352
		353	// maybe we should only allow the four flat directions
		354	if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
294	{	355	{
		356	dir = dirmap [dir];
		357
295	if (!map->tile_path [dir])	358	if (!map->tile_path [dir])
296	map = 0;	359	map = 0;
297	else if (map->tile_available (dir, false))	360	else if (map->tile_available (dir, false))
298	{	361	{
299	maptile *neigh = map->tile_map [dir];	362	maptile *neigh = map->tile_map [dir];
…		…
322	send_packet_printf ("mapinfo %s nomap", token);	385	send_packet_printf ("mapinfo %s nomap", token);
323	else	386	else
324	{	387	{
325	int flags = 0;	388	int flags = 0;
326		389
		390	// due to historical glitches, the bit ordering and map index ordering differs
327	if (map->tile_path[0]) flags \|= 1;	391	if (map->tile_path [TILE_NORTH]) flags \|= 0x01;
328	if (map->tile_path[1]) flags \|= 2;	392	if (map->tile_path [TILE_EAST ]) flags \|= 0x02;
329	if (map->tile_path[2]) flags \|= 4;	393	if (map->tile_path [TILE_SOUTH]) flags \|= 0x04;
330	if (map->tile_path[3]) flags \|= 8;	394	if (map->tile_path [TILE_WEST ]) flags \|= 0x08;
		395	// these two are debatable
		396	if (map->tile_path [TILE_UP ]) flags \|= 0x10;
		397	if (map->tile_path [TILE_DOWN ]) flags \|= 0x20;
331		398
332	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);	399	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
333	}	400	}
334		401
335	return 1;	402	return 1;
…		…
396	AddMeCmd (char buf, int len, client ns)	463	AddMeCmd (char buf, int len, client ns)
397	{	464	{
398	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	465	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
399	}	466	}
400		467
401	/*	468	//+GPL
402	#define MSG_TYPE_BOOK 1
403	#define MSG_TYPE_CARD 2
404	#define MSG_TYPE_PAPER 3
405	#define MSG_TYPE_SIGN 4
406	#define MSG_TYPE_MONUMENT 5
407	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
408
409	/** Reply to ExtendedInfos command */
410	void
411	ToggleExtendedText (char buf, int len, client ns)
412	{
413	char cmdback[MAX_BUF];
414	char temp[10];
415	char command[50];
416	int info, nextinfo, i, flag;
417
418	cmdback[0] = '\0';
419
420	nextinfo = 0;
421	while (1)
422	{
423	/* 1. Extract an info */
424	info = nextinfo;
425
426	while ((info < len) && (buf [info] == ' '))
427	info++;
428
429	if (info >= len)
430	break;
431
432	nextinfo = info + 1;
433
434	while ((nextinfo < len) && (buf [nextinfo] != ' '))
435	nextinfo++;
436
437	if (nextinfo - info >= 49) /Erroneous info asked /
438	continue;
439
440	memcpy (command, buf + info, nextinfo - info);
441	command [nextinfo - info] = 0;
442
443	/* 2. Interpret info */
444	i = sscanf (command, "%d", &flag);
445
446	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
447	ns->supported_readables \|= (1 << flag);
448	/3. Next info /
449	}
450
451	/* Send resulting state */
452	strcpy (cmdback, "ExtendedTextSet");
453
454	for (i = 0; i <= MSG_TYPE_LAST; i++)
455	if (ns->supported_readables & (1 << i))
456	{
457	strcat (cmdback, " ");
458	snprintf (temp, sizeof (temp), "%d", i);
459	strcat (cmdback, temp);
460	}
461
462	ns->send_packet (cmdback);
463	}
464		469
465	/**	470	/**
466	* This handles the general commands from the client (ie, north, fire, cast,	471	* This handles the general commands from the client (ie, north, fire, cast,
467	* etc.)	472	* etc.)
468	*/	473	*/
…		…
525	* commands.	530	* commands.
526	*/	531	*/
527	pl->count = 0;	532	pl->count = 0;
528		533
529	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	534	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
530	int time = fabs (pl->ob->speed) < 0.001	535	int time = pl->ob->has_active_speed ()
531	? time = MAX_TIME * 100
532	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	536	? (int) (MAX_TIME / pl->ob->speed)
		537	: MAX_TIME * 100;
533		538
534	/* Send confirmation of command execution now */	539	/* Send confirmation of command execution now */
535	packet sl ("comc");	540	packet sl ("comc");
536	sl << uint16 (cmdid) << uint32 (time);	541	sl << uint16 (cmdid) << uint32 (time);
537	pl->ns->send_packet (sl);	542	pl->ns->send_packet (sl);
…		…
579	LOG (llevError, "Unknown input state: %d\n", ns->state);	584	LOG (llevError, "Unknown input state: %d\n", ns->state);
580	}	585	}
581	}	586	}
582		587
583	/**	588	/**
584	* Client tells its version. If there is a mismatch, we close the	589	* Client tells its version info.
585	* socket. In real life, all we should care about is the client having
586	* something older than the server. If we assume the client will be
587	* backwards compatible, having it be a later version should not be a
588	* problem.
589	*/	590	*/
590	void	591	void
591	VersionCmd (char buf, int len, client ns)	592	VersionCmd (char buf, int len, client ns)
592	{	593	{
593	if (!buf)	594	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
594	{
595	LOG (llevError, "CS: received corrupted version command\n");
596	return;
597	}
598
599	ns->cs_version = atoi (buf);
600	ns->sc_version = ns->cs_version;
601
602	LOG (llevDebug, "connection from client <%s>\n", buf);
603
604	//TODO: should log here just for statistics
605
606	//if (VERSION_CS != ns->cs_version)
607	// unchecked;
608
609	char *cp = strchr (buf + 1, ' ');
610	if (!cp)
611	return;
612
613	ns->sc_version = atoi (cp);
614
615	//if (VERSION_SC != ns->sc_version)
616	// unchecked;
617
618	cp = strchr (cp + 1, ' ');
619
620	if (cp)
621	{
622	ns->version = cp + 1;
623
624	if (ns->sc_version < 1026)
625	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
626	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
627	}
628	}	595	}
629		596
630	/** sound related functions. */	597	/** sound related functions. */
631	void	598	void
632	SetSound (char buf, int len, client ns)	599	SetSound (char buf, int len, client ns)
…		…
685	static void	652	static void
686	rangetostring (player pl, char obuf)	653	rangetostring (player pl, char obuf)
687	{	654	{
688	dynbuf_text &buf = msg_dynbuf; buf.clear ();	655	dynbuf_text &buf = msg_dynbuf; buf.clear ();
689		656
		657	#if 0
		658	// print ranged/chosen_skill etc. objects every call
		659	printf ("%s %s => %s (%s)\n",
		660	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		661	pl->combat_ob ? &pl->combat_ob->name : "-",
		662	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		663	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		664	);
		665	#endif
		666
690	if (pl->ranged_ob)	667	if (pl->ranged_ob)
691	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	668	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
692		669
693	if (pl->combat_ob)	670	if (pl->combat_ob)
694	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;	671	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
…		…
739	* commands for now.	716	* commands for now.
740	*/	717	*/
741	void	718	void
742	esrv_update_stats (player *pl)	719	esrv_update_stats (player *pl)
743	{	720	{
744	char buf[MAX_BUF];
745	uint16 flags;
746
747	client *ns = pl->ns;	721	client *ns = pl->ns;
748	if (!ns)	722	if (!ns)
749	return;	723	return;
750		724
751	object *ob = pl->observe;	725	object *ob = pl->observe;
…		…
768	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	742	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
769	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	743	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
770	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	744	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
771	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	745	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
772		746
773	for (int s = 0; s < NUM_SKILLS; s++)	747	for (int s = 0; s < CS_NUM_SKILLS; s++)
774	if (object *skill = opl->last_skill_ob [s])	748	if (object *skill = opl->last_skill_ob [s])
775	if (skill->stats.exp != ns->last_skill_exp [s])	749	if (skill->stats.exp != ns->last_skill_exp [s])
776	{	750	{
777	ns->last_skill_exp [s] = skill->stats.exp;	751	ns->last_skill_exp [s] = skill->stats.exp;
778		752
779	/* Always send along the level if exp changes. This is only	753	/* Always send along the level if exp changes. This is only
780	* 1 extra byte, but keeps processing simpler.	754	* 1 extra byte, but keeps processing simpler.
781	*/	755	*/
782	sl << uint8 (s + CS_STAT_SKILLINFO)	756	sl << uint8 (CS_STAT_SKILLINFO + s)
783	<< uint8 (skill->level)	757	<< uint8 (skill->level)
784	<< uint64 (skill->stats.exp);	758	<< uint64 (skill->stats.exp);
785	}	759	}
786		760
787	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	761	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
788	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	762	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
789	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	763	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
790	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	764	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
791	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	765	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
792	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	766	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
793	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	767	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
794	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	768	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
795	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	769	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
796		770
797	flags = 0;	771	int flags = (opl->fire_on ? SF_FIREON : 0)
798		772	\| (opl->run_on ? SF_RUNON : 0);
799	if (opl->fire_on)
800	flags \|= SF_FIREON;
801
802	if (opl->run_on)
803	flags \|= SF_RUNON;
804		773
805	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	774	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
806		775
807	if (ns->sc_version < 1025)
808	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
809	else
810	for (int i = 0; i < NROFATTACKS; i++)	776	for (int i = 0; i < NROFATTACKS; i++)
811	{
812	/* Skip ones we won't send */	777	/* Skip ones we won't send */
813	if (atnr_cs_stat[i] == -1)	778	if (atnr_cs_stat[i] >= 0)
814	continue;
815
816	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	779	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
817	}
818		780
819	if (pl->ns->monitor_spells)	781	if (pl->ns->monitor_spells)
820	{	782	{
821	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	783	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
822	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	784	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
823	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	785	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
824	}	786	}
825		787
		788	char buf[MAX_BUF];
826	rangetostring (opl, buf); /* we want use the new fire & run system in new client */	789	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
827	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	790	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
828	set_title (ob, buf);	791	set_title (ob, buf);
829	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	792	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
830		793
…		…
924		887
925	/* Nothing changed */	888	/* Nothing changed */
926	return 0;	889	return 0;
927	}	890	}
928		891
929	// prefetch (and touch) all maps within a specific distancd
930	static void
931	prefetch_surrounding_maps (maptile *map, int distance)
932	{
933	map->touch ();
934
935	if (--distance)
936	for (int dir = 4; --dir; )
937	if (const shstr &path = map->tile_path [dir])
938	if (maptile *&neigh = map->tile_map [dir])
939	prefetch_surrounding_maps (neigh, distance);
940	else
941	neigh = maptile::find_async (path, map);
942	}
943
944	// prefetch a generous area around the player
945	static void
946	prefetch_surrounding_maps (object *op)
947	{
948	prefetch_surrounding_maps (op->map, 3);
949	}
950
951	/**	892	/**
952	* Draws client map.	893	* Draws client map.
953	*/	894	*/
954	void	895	void
955	draw_client_map (player *pl)	896	draw_client_map (player *pl)
…		…
960		901
961	/* If player is just joining the game, he isn't here yet, so the map	902	/* If player is just joining the game, he isn't here yet, so the map
962	* can get swapped out. If so, don't try to send them a map. All will	903	* can get swapped out. If so, don't try to send them a map. All will
963	* be OK once they really log in.	904	* be OK once they really log in.
964	*/	905	*/
965	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	906	if (!ob->map \|\| ob->map->state != MAP_ACTIVE)
966	return;	907	return;
967		908
968	int startlen, oldlen;	909	int startlen, oldlen;
969		910
970	check_map_change (pl);	911	check_map_change (pl);
971	prefetch_surrounding_maps (pl->ob);	912	pl->ob->prefetch_surrounding_maps ();
972		913
973	/* do LOS after calls to update_position */	914	/* do LOS after calls to update_position */
974	/* unfortunately, we need to udpate los when observing, currently */	915	/* unfortunately, we need to udpate los when observing, currently */
975	if (pl->do_los \|\| pl->viewpoint != pl->ob)	916	if (pl->do_los \|\| pl->viewpoint != pl->ob)
976	{	917	{
…		…
1001	* look like.	942	* look like.
1002	*/	943	*/
1003		944
1004	client &socket = *pl->ns;	945	client &socket = *pl->ns;
1005		946
1006	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	947	packet sl ("map1a");
1007		948
1008	startlen = sl.length ();	949	startlen = sl.length ();
1009		950
1010	int hx = socket.mapx / 2;	951	int hx = socket.mapx / 2;
1011	int hy = socket.mapy / 2;	952	int hy = socket.mapy / 2;
…		…
1032	map_clearcell (&lastcell, -1);	973	map_clearcell (&lastcell, -1);
1033	}	974	}
1034		975
1035	continue;	976	continue;
1036	}	977	}
1037		978
1038	int d = pl->blocked_los_uc (dx, dy);	979	int d = pl->blocked_los_uc (dx, dy);
1039		980
1040	if (d > 3)	981	if (d > 3)
1041	{	982	{
1042	/* This block deals with spaces that are not visible for whatever	983	/* This block deals with spaces that are not visible for whatever
…		…
1103	{	1044	{
1104	if (op->stats.maxhp > op->stats.hp	1045	if (op->stats.maxhp > op->stats.hp
1105	&& op->stats.maxhp > 0	1046	&& op->stats.maxhp > 0
1106	&& (op->type == PLAYER	1047	&& (op->type == PLAYER
1107	\|\| op->type == DOOR // does not work, have maxhp 0	1048	\|\| op->type == DOOR // does not work, have maxhp 0
1108	\|\| QUERY_FLAG (op, FLAG_MONSTER)	1049	\|\| op->flag [FLAG_MONSTER]
1109	\|\| QUERY_FLAG (op, FLAG_ALIVE)	1050	\|\| op->flag [FLAG_ALIVE]
1110	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))	1051	\|\| op->flag [FLAG_GENERATOR]))
1111	{	1052	{
1112	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1053	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1113	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge	1054	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1114	}	1055	}
1115		1056
…		…
1211	socket.send_packet (sl);	1152	socket.send_packet (sl);
1212	socket.sent_scroll = 0;	1153	socket.sent_scroll = 0;
1213	}	1154	}
1214	}	1155	}
1215		1156
1216	/*****************************************************************************/
1217	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1218	/* a player. Of course, the client need to know the command to be able to */
1219	/* manage it ! */
1220	/*****************************************************************************/
1221	void
1222	send_plugin_custom_message (object pl, char buf)
1223	{
1224	pl->contr->ns->send_packet (buf);
1225	}
1226
1227	/**
1228	* This sends the skill number to name mapping. We ignore
1229	* the params - we always send the same info no matter what.
1230	*/
1231	void
1232	send_skill_info (client ns, char params)
1233	{
1234	packet sl;
1235	sl << "replyinfo skill_info\n";
1236
1237	for (int i = 1; i < NUM_SKILLS; i++)
1238	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1239
1240	if (sl.length () > MAXSOCKBUF)
1241	{
1242	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1243	fatal (0);
1244	}
1245
1246	ns->send_packet (sl);
1247	}
1248
1249	/**
1250	* This sends the spell path to name mapping. We ignore
1251	* the params - we always send the same info no matter what.
1252	*/
1253	void
1254	send_spell_paths (client * ns, char *params)
1255	{
1256	packet sl;
1257
1258	sl << "replyinfo spell_paths\n";
1259
1260	for (int i = 0; i < NRSPELLPATHS; i++)
1261	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1262
1263	if (sl.length () > MAXSOCKBUF)
1264	{
1265	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1266	fatal (0);
1267	}
1268
1269	ns->send_packet (sl);
1270	}
1271
1272	/**	1157	/**
1273	* This looks for any spells the player may have that have changed their stats.	1158	* This looks for any spells the player may have that have changed their stats.
1274	* it then sends an updspell packet for each spell that has changed in this way	1159	* it then sends an updspell packet for each spell that has changed in this way
1275	*/	1160	*/
1276	void	1161	void
1277	esrv_update_spells (player *pl)	1162	esrv_update_spells (player *pl)
1278	{	1163	{
1279	if (!pl->ns)	1164	if (!pl->ns)
1280	return;	1165	return;
1281		1166
		1167	pl->ns->update_spells = false;
		1168
1282	if (!pl->ns->monitor_spells)	1169	if (!pl->ns->monitor_spells)
1283	return;	1170	return;
1284		1171
1285	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1172	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1286	{
1287	if (spell->type == SPELL)	1173	if (spell->type == SPELL)
1288	{	1174	{
1289	int flags = 0;	1175	int flags = 0;
		1176	int val;
1290		1177
1291	/* check if we need to update it */	1178	/* check if we need to update it */
1292	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1179	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1180	if (spell->cached_sp != val)
1293	{	1181	{
1294	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1182	spell->cached_sp = val;
1295	flags \|= UPD_SP_MANA;	1183	flags \|= UPD_SP_MANA;
1296	}	1184	}
1297		1185
1298	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1186	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1187	if (spell->cached_grace != val)
1299	{	1188	{
1300	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1189	spell->cached_grace = val;
1301	flags \|= UPD_SP_GRACE;	1190	flags \|= UPD_SP_GRACE;
1302	}	1191	}
1303		1192
1304	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1193	val = casting_level (pl->ob, spell);
		1194	if (spell->cached_eat != val)
1305	{	1195	{
1306	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1196	spell->cached_eat = val;
1307	flags \|= UPD_SP_DAMAGE;	1197	flags \|= UPD_SP_LEVEL;
1308	}	1198	}
1309		1199
1310	if (flags)	1200	if (flags)
1311	{	1201	{
1312	packet sl;	1202	packet sl;
1313		1203
1314	sl << "updspell "	1204	sl << "updspell "
1315	<< uint8 (flags)	1205	<< uint8 (flags)
1316	<< uint32 (spell->count);	1206	<< uint32 (spell->count);
1317		1207
1318	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1208	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1319	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1209	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1320	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1210	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1321		1211
1322	pl->ns->send_packet (sl);	1212	pl->ns->send_packet (sl);
1323	}	1213	}
1324	}	1214	}
1325	}
1326	}	1215	}
1327		1216
1328	void	1217	void
1329	esrv_remove_spell (player pl, object spell)	1218	esrv_remove_spell (player pl, object spell)
1330	{	1219	{
…		…
1346		1235
1347	/* appends the spell spell to the Socklist we will send the data to. /	1236	/* appends the spell spell to the Socklist we will send the data to. /
1348	static void	1237	static void
1349	append_spell (player pl, packet &sl, object spell)	1238	append_spell (player pl, packet &sl, object spell)
1350	{	1239	{
1351	int i, skill = 0;	1240	int skill = 0;
1352		1241
1353	if (!(spell->name))	1242	if (!(spell->name))
1354	{	1243	{
1355	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1244	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1356	return;	1245	return;
1357	}	1246	}
1358		1247
1359	/* store costs and damage in the object struct, to compare to later */	1248	/* store costs and damage in the object struct, to compare to later */
1360	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1249	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1361	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1250	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1362	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1251	spell->cached_eat = casting_level (pl->ob, spell);
1363		1252
1364	/* figure out which skill it uses, if it uses one */	1253	/* figure out which skill it uses, if it uses one */
1365	if (spell->skill)	1254	if (spell->skill)
1366	if (object *tmp = pl->find_skill (spell->skill))	1255	if (object *tmp = pl->find_skill (spell->skill))
1367	skill = tmp->subtype + CS_STAT_SKILLINFO;	1256	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1368		1257
1369	// spells better have a face	1258	// spells better have a face
1370	if (!spell->face)	1259	if (!spell->face)
1371	{	1260	{
1372	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1261	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1446	}	1335	}
1447	else	1336	else
1448	append_spell (pl, sl, spell);	1337	append_spell (pl, sl, spell);
1449		1338
1450	if (sl.length () > MAXSOCKBUF)	1339	if (sl.length () > MAXSOCKBUF)
1451	{
1452	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1340	cleanup ("buffer overflow in esrv_add_spells!");
1453	fatal (0);
1454	}
1455		1341
1456	/* finally, we can send the packet */	1342	/* finally, we can send the packet */
1457	pl->ns->flush_fx ();	1343	pl->ns->flush_fx ();
1458	pl->ns->send_packet (sl);	1344	pl->ns->send_packet (sl);
1459	}	1345	}
1460		1346
		1347	//-GPL
		1348

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.154 by root, Wed Nov 4 17:24:00 2009 UTC vs. Revision 1.189 by root, Wed Oct 31 09:17:14 2012 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.154 by root, Wed Nov 4 17:24:00 2009 UTC vs.
Revision 1.189 by root, Wed Oct 31 09:17:14 2012 UTC