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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.152 by root, Tue Oct 20 07:18:11 2009 UTC vs.
Revision 1.183 by root, Sat May 7 20:03:28 2011 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 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.
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		24
		25	//+GPL
		26
25	/**	27	/**
26	* \file	28	* \file
27	* Client handling.	29	* Client handling.
28	*	30	*
29	* \date 2003-12-02	31	* \date 2003-12-02
…		…
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)
145	{	157	{
146	client &socket = *pl->ns;	158	client &socket = *pl->ns;
147	object *ob = pl->observe;	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	}
…		…
169	/** check for map/region change and send new map data */	185	/** check for map/region change and send new map data */
170	static void	186	static void
171	check_map_change (player *pl)	187	check_map_change (player *pl)
172	{	188	{
173	client &socket = *pl->ns;	189	client &socket = *pl->ns;
174	object *ob = pl->observe;	190	object *ob = pl->viewpoint;
175		191
176	region *reg = ob->region ();	192	region *reg = ob->region ();
177	if (socket.current_region != reg)	193	if (socket.current_region != reg)
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));
…		…
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
…		…
237	{	292	{
238	*params++ = 0;	293	*params++ = 0;
239	break;	294	break;
240	}	295	}
241		296
242	if (!strcmp (buf, "image_info"))
243	send_image_info (ns, params);
244	else if (!strcmp (buf, "image_sums"))
245	send_image_sums (ns, params);
246	else if (!strcmp (buf, "skill_info"))	297	if (!strcmp (buf, "skill_info"))
247	send_skill_info (ns, params);	298	send_skill_info (ns, params);
248	else if (!strcmp (buf, "spell_paths"))	299	else if (!strcmp (buf, "spell_paths"))
249	send_spell_paths (ns, params);	300	send_spell_paths (ns, params);
250	else	301	else
251	{	302	{
…		…
267	ExtiCmd (char buf, int len, client ns)	318	ExtiCmd (char buf, int len, client ns)
268	{	319	{
269	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	320	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
270	}	321	}
271		322
		323	//-GPL
		324
272	void	325	void
273	client::mapinfo_queue_clear ()	326	client::mapinfo_queue_clear ()
274	{	327	{
275	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	328	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
276	free (*i);	329	free (*i);
…		…
283	{	336	{
284	char *token = buf;	337	char *token = buf;
285	buf += strlen (buf) + 9;	338	buf += strlen (buf) + 9;
286		339
287	// initial map and its origin	340	// initial map and its origin
288	maptile *map = pl->observe->map;	341	maptile *map = pl->viewpoint->map;
289	int mapx = pl->ns->mapx / 2 - pl->observe->x;	342	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
290	int mapy = pl->ns->mapy / 2 - pl->observe->y;	343	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
291	int max_distance = 8; // limit maximum path length to something generous	344	int max_distance = 8; // limit maximum path length to something generous
292		345
293	while (*buf && map && max_distance)	346	while (*buf && map && max_distance)
294	{	347	{
295	int dir = *buf++ - '1';	348	int dir = *buf++ - '1';
296		349
297	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 (dir >= 0 && dir < array_length (dirmap))
298	{	355	{
		356	dir = dirmap [dir];
		357
299	if (!map->tile_path [dir])	358	if (!map->tile_path [dir])
300	map = 0;	359	map = 0;
301	else if (map->tile_available (dir, false))	360	else if (map->tile_available (dir, false))
302	{	361	{
303	maptile *neigh = map->tile_map [dir];	362	maptile *neigh = map->tile_map [dir];
…		…
326	send_packet_printf ("mapinfo %s nomap", token);	385	send_packet_printf ("mapinfo %s nomap", token);
327	else	386	else
328	{	387	{
329	int flags = 0;	388	int flags = 0;
330		389
		390	// due to historical glitches, the bit ordering and map index ordering differs
331	if (map->tile_path[0]) flags \|= 1;	391	if (map->tile_path[TILE_NORTH]) flags \|= 0x01;
332	if (map->tile_path[1]) flags \|= 2;	392	if (map->tile_path[TILE_EAST ]) flags \|= 0x02;
333	if (map->tile_path[2]) flags \|= 4;	393	if (map->tile_path[TILE_SOUTH]) flags \|= 0x04;
334	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;
335		398
336	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);
337	}	400	}
338		401
339	return 1;	402	return 1;
…		…
400	AddMeCmd (char buf, int len, client ns)	463	AddMeCmd (char buf, int len, client ns)
401	{	464	{
402	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	465	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
403	}	466	}
404		467
405	/*	468	//+GPL
406	#define MSG_TYPE_BOOK 1
407	#define MSG_TYPE_CARD 2
408	#define MSG_TYPE_PAPER 3
409	#define MSG_TYPE_SIGN 4
410	#define MSG_TYPE_MONUMENT 5
411	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
412
413	/** Reply to ExtendedInfos command */
414	void
415	ToggleExtendedText (char buf, int len, client ns)
416	{
417	char cmdback[MAX_BUF];
418	char temp[10];
419	char command[50];
420	int info, nextinfo, i, flag;
421
422	cmdback[0] = '\0';
423
424	nextinfo = 0;
425	while (1)
426	{
427	/* 1. Extract an info */
428	info = nextinfo;
429
430	while ((info < len) && (buf [info] == ' '))
431	info++;
432
433	if (info >= len)
434	break;
435
436	nextinfo = info + 1;
437
438	while ((nextinfo < len) && (buf [nextinfo] != ' '))
439	nextinfo++;
440
441	if (nextinfo - info >= 49) /Erroneous info asked /
442	continue;
443
444	memcpy (command, buf + info, nextinfo - info);
445	command [nextinfo - info] = 0;
446
447	/* 2. Interpret info */
448	i = sscanf (command, "%d", &flag);
449
450	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
451	ns->supported_readables \|= (1 << flag);
452	/3. Next info /
453	}
454
455	/* Send resulting state */
456	strcpy (cmdback, "ExtendedTextSet");
457
458	for (i = 0; i <= MSG_TYPE_LAST; i++)
459	if (ns->supported_readables & (1 << i))
460	{
461	strcat (cmdback, " ");
462	snprintf (temp, sizeof (temp), "%d", i);
463	strcat (cmdback, temp);
464	}
465
466	ns->send_packet (cmdback);
467	}
468		469
469	/**	470	/**
470	* 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,
471	* etc.)	472	* etc.)
472	*/	473	*/
…		…
529	* commands.	530	* commands.
530	*/	531	*/
531	pl->count = 0;	532	pl->count = 0;
532		533
533	//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
534	int time = fabs (pl->ob->speed) < 0.001	535	int time = pl->ob->has_active_speed ()
535	? time = MAX_TIME * 100
536	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	536	? (int) (MAX_TIME / pl->ob->speed)
		537	: MAX_TIME * 100;
537		538
538	/* Send confirmation of command execution now */	539	/* Send confirmation of command execution now */
539	packet sl ("comc");	540	packet sl ("comc");
540	sl << uint16 (cmdid) << uint32 (time);	541	sl << uint16 (cmdid) << uint32 (time);
541	pl->ns->send_packet (sl);	542	pl->ns->send_packet (sl);
…		…
583	LOG (llevError, "Unknown input state: %d\n", ns->state);	584	LOG (llevError, "Unknown input state: %d\n", ns->state);
584	}	585	}
585	}	586	}
586		587
587	/**	588	/**
588	* Client tells its version. If there is a mismatch, we close the	589	* Client tells its version info.
589	* socket. In real life, all we should care about is the client having
590	* something older than the server. If we assume the client will be
591	* backwards compatible, having it be a later version should not be a
592	* problem.
593	*/	590	*/
594	void	591	void
595	VersionCmd (char buf, int len, client ns)	592	VersionCmd (char buf, int len, client ns)
596	{	593	{
597	if (!buf)	594	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
598	{
599	LOG (llevError, "CS: received corrupted version command\n");
600	return;
601	}
602
603	ns->cs_version = atoi (buf);
604	ns->sc_version = ns->cs_version;
605
606	LOG (llevDebug, "connection from client <%s>\n", buf);
607
608	//TODO: should log here just for statistics
609
610	//if (VERSION_CS != ns->cs_version)
611	// unchecked;
612
613	char *cp = strchr (buf + 1, ' ');
614	if (!cp)
615	return;
616
617	ns->sc_version = atoi (cp);
618
619	//if (VERSION_SC != ns->sc_version)
620	// unchecked;
621
622	cp = strchr (cp + 1, ' ');
623
624	if (cp)
625	{
626	ns->version = cp + 1;
627
628	if (ns->sc_version < 1026)
629	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
630	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
631	}
632	}	595	}
633		596
634	/** sound related functions. */	597	/** sound related functions. */
635	void	598	void
636	SetSound (char buf, int len, client ns)	599	SetSound (char buf, int len, client ns)
…		…
689	static void	652	static void
690	rangetostring (player pl, char obuf)	653	rangetostring (player pl, char obuf)
691	{	654	{
692	dynbuf_text &buf = msg_dynbuf; buf.clear ();	655	dynbuf_text &buf = msg_dynbuf; buf.clear ();
693		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
694	if (pl->ranged_ob)	667	if (pl->ranged_ob)
695	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;
696		669
697	if (pl->combat_ob)	670	if (pl->combat_ob)
698	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;
…		…
743	* commands for now.	716	* commands for now.
744	*/	717	*/
745	void	718	void
746	esrv_update_stats (player *pl)	719	esrv_update_stats (player *pl)
747	{	720	{
748	char buf[MAX_BUF];
749	uint16 flags;
750
751	client *ns = pl->ns;	721	client *ns = pl->ns;
752	if (!ns)	722	if (!ns)
753	return;	723	return;
754		724
755	object *ob = pl->observe;	725	object *ob = pl->observe;
…		…
772	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	742	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
773	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	743	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
774	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	744	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
775	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	745	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
776		746
777	for (int s = 0; s < NUM_SKILLS; s++)	747	for (int s = 0; s < CS_NUM_SKILLS; s++)
778	if (object *skill = opl->last_skill_ob [s])	748	if (object *skill = opl->last_skill_ob [s])
779	if (skill->stats.exp != ns->last_skill_exp [s])	749	if (skill->stats.exp != ns->last_skill_exp [s])
780	{	750	{
781	ns->last_skill_exp [s] = skill->stats.exp;	751	ns->last_skill_exp [s] = skill->stats.exp;
782		752
783	/* Always send along the level if exp changes. This is only	753	/* Always send along the level if exp changes. This is only
784	* 1 extra byte, but keeps processing simpler.	754	* 1 extra byte, but keeps processing simpler.
785	*/	755	*/
786	sl << uint8 (s + CS_STAT_SKILLINFO)	756	sl << uint8 (CS_STAT_SKILLINFO + s)
787	<< uint8 (skill->level)	757	<< uint8 (skill->level)
788	<< uint64 (skill->stats.exp);	758	<< uint64 (skill->stats.exp);
789	}	759	}
790		760
791	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	761	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
792	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	762	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
793	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	763	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
794	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	764	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
795	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	765	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
796	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);
797	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	767	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
798	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);
799	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);
800		770
801	flags = 0;	771	int flags = (opl->fire_on ? SF_FIREON : 0)
802		772	\| (opl->run_on ? SF_RUNON : 0);
803	if (opl->fire_on)
804	flags \|= SF_FIREON;
805
806	if (opl->run_on)
807	flags \|= SF_RUNON;
808		773
809	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	774	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
810		775
811	if (ns->sc_version < 1025)
812	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
813	else
814	for (int i = 0; i < NROFATTACKS; i++)	776	for (int i = 0; i < NROFATTACKS; i++)
815	{
816	/* Skip ones we won't send */	777	/* Skip ones we won't send */
817	if (atnr_cs_stat[i] == -1)	778	if (atnr_cs_stat[i] >= 0)
818	continue;
819
820	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]);
821	}
822		780
823	if (pl->ns->monitor_spells)	781	if (pl->ns->monitor_spells)
824	{	782	{
825	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);
826	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);
827	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);
828	}	786	}
829		787
		788	char buf[MAX_BUF];
830	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 */
831	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	790	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
832	set_title (ob, buf);	791	set_title (ob, buf);
833	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	792	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
834		793
…		…
928		887
929	/* Nothing changed */	888	/* Nothing changed */
930	return 0;	889	return 0;
931	}	890	}
932		891
933	// prefetch (and touch) all maps within a specific distancd	892	//-GPL
		893
		894	// prefetch some flat area around the player
934	static void	895	static void
935	prefetch_surrounding_maps (maptile *map, int distance)	896	prefetch_surrounding_area (object op, maptile map, int range)
936	{	897	{
937	map->touch ();	898	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
938		899	op->x - range , op->y - range ,
939	if (--distance)	900	op->x + range + 1, op->y + range + 1);
940	for (int dir = 4; --dir; )	901	rect->m;
941	if (const shstr &path = map->tile_path [dir])	902	++rect)
942	if (maptile *&neigh = map->tile_map [dir])	903	{
943	prefetch_surrounding_maps (neigh, distance);	904	rect->m->touch ();
944	else	905	rect->m->activate ();
945	neigh = maptile::find_async (path, map);	906	}
946	}	907	}
947		908
948	// prefetch a generous area around the player	909	// prefetch a generous area around the player, also up and down
949	static void	910	void
950	prefetch_surrounding_maps (object *op)	911	object::prefetch_surrounding_maps ()
951	{	912	{
952	prefetch_surrounding_maps (op->map, 3);	913	prefetch_surrounding_area (this, map, 40);
		914
		915	if (maptile *m = map->tile_available (TILE_DOWN))
		916	prefetch_surrounding_area (this, m, 20);
		917
		918	if (maptile *m = map->tile_available (TILE_UP))
		919	prefetch_surrounding_area (this, m, 20);
953	}	920	}
		921
		922	//+GPL
954		923
955	/**	924	/**
956	* Draws client map.	925	* Draws client map.
957	*/	926	*/
958	void	927	void
959	draw_client_map (player *pl)	928	draw_client_map (player *pl)
960	{	929	{
961	object *ob = pl->observe;	930	object *ob = pl->viewpoint;
962	if (!ob->active)	931	if (!pl->observe->active)
963	return;	932	return;
964		933
965	/* If player is just joining the game, he isn't here yet, so the map	934	/* If player is just joining the game, he isn't here yet, so the map
966	* can get swapped out. If so, don't try to send them a map. All will	935	* can get swapped out. If so, don't try to send them a map. All will
967	* be OK once they really log in.	936	* be OK once they really log in.
968	*/	937	*/
969	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	938	if (!ob->map \|\| ob->map->state != MAP_ACTIVE)
970	return;	939	return;
971		940
972	int startlen, oldlen;	941	int startlen, oldlen;
973		942
974	check_map_change (pl);	943	check_map_change (pl);
975	prefetch_surrounding_maps (pl->ob);	944	pl->ob->prefetch_surrounding_maps ();
976		945
977	/* do LOS after calls to update_position */	946	/* do LOS after calls to update_position */
978	/* unfortunately, we need to udpate los when observing, currently */	947	/* unfortunately, we need to udpate los when observing, currently */
979	if (pl->do_los \|\| pl->observe != pl->ob)	948	if (pl->do_los \|\| pl->viewpoint != pl->ob)
980	{	949	{
981	pl->do_los = 0;	950	pl->do_los = 0;
982	pl->update_los ();	951	pl->update_los ();
983	}	952	}
984		953
…		…
1005	* look like.	974	* look like.
1006	*/	975	*/
1007		976
1008	client &socket = *pl->ns;	977	client &socket = *pl->ns;
1009		978
1010	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	979	packet sl ("map1a");
1011		980
1012	startlen = sl.length ();	981	startlen = sl.length ();
1013		982
1014	int hx = socket.mapx / 2;	983	int hx = socket.mapx / 2;
1015	int hy = socket.mapy / 2;	984	int hy = socket.mapy / 2;
…		…
1036	map_clearcell (&lastcell, -1);	1005	map_clearcell (&lastcell, -1);
1037	}	1006	}
1038		1007
1039	continue;	1008	continue;
1040	}	1009	}
1041		1010
1042	int d = pl->blocked_los_uc (dx, dy);	1011	int d = pl->blocked_los_uc (dx, dy);
1043		1012
1044	if (d > 3)	1013	if (d > 3)
1045	{	1014	{
1046	/* This block deals with spaces that are not visible for whatever	1015	/* This block deals with spaces that are not visible for whatever
…		…
1107	{	1076	{
1108	if (op->stats.maxhp > op->stats.hp	1077	if (op->stats.maxhp > op->stats.hp
1109	&& op->stats.maxhp > 0	1078	&& op->stats.maxhp > 0
1110	&& (op->type == PLAYER	1079	&& (op->type == PLAYER
1111	\|\| op->type == DOOR // does not work, have maxhp 0	1080	\|\| op->type == DOOR // does not work, have maxhp 0
1112	\|\| QUERY_FLAG (op, FLAG_MONSTER)	1081	\|\| op->flag [FLAG_MONSTER]
1113	\|\| QUERY_FLAG (op, FLAG_ALIVE)	1082	\|\| op->flag [FLAG_ALIVE]
1114	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))	1083	\|\| op->flag [FLAG_GENERATOR]))
1115	{	1084	{
1116	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1085	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1117	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge	1086	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1118	}	1087	}
1119		1088
…		…
1215	socket.send_packet (sl);	1184	socket.send_packet (sl);
1216	socket.sent_scroll = 0;	1185	socket.sent_scroll = 0;
1217	}	1186	}
1218	}	1187	}
1219		1188
1220	/*****************************************************************************/
1221	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1222	/* a player. Of course, the client need to know the command to be able to */
1223	/* manage it ! */
1224	/*****************************************************************************/
1225	void
1226	send_plugin_custom_message (object pl, char buf)
1227	{
1228	pl->contr->ns->send_packet (buf);
1229	}
1230
1231	/**
1232	* This sends the skill number to name mapping. We ignore
1233	* the params - we always send the same info no matter what.
1234	*/
1235	void
1236	send_skill_info (client ns, char params)
1237	{
1238	packet sl;
1239	sl << "replyinfo skill_info\n";
1240
1241	for (int i = 1; i < NUM_SKILLS; i++)
1242	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1243
1244	if (sl.length () > MAXSOCKBUF)
1245	{
1246	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1247	fatal (0);
1248	}
1249
1250	ns->send_packet (sl);
1251	}
1252
1253	/**
1254	* This sends the spell path to name mapping. We ignore
1255	* the params - we always send the same info no matter what.
1256	*/
1257	void
1258	send_spell_paths (client * ns, char *params)
1259	{
1260	packet sl;
1261
1262	sl << "replyinfo spell_paths\n";
1263
1264	for (int i = 0; i < NRSPELLPATHS; i++)
1265	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1266
1267	if (sl.length () > MAXSOCKBUF)
1268	{
1269	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1270	fatal (0);
1271	}
1272
1273	ns->send_packet (sl);
1274	}
1275
1276	/**	1189	/**
1277	* This looks for any spells the player may have that have changed their stats.	1190	* This looks for any spells the player may have that have changed their stats.
1278	* it then sends an updspell packet for each spell that has changed in this way	1191	* it then sends an updspell packet for each spell that has changed in this way
1279	*/	1192	*/
1280	void	1193	void
1281	esrv_update_spells (player *pl)	1194	esrv_update_spells (player *pl)
1282	{	1195	{
1283	if (!pl->ns)	1196	if (!pl->ns)
1284	return;	1197	return;
1285		1198
		1199	pl->ns->update_spells = false;
		1200
1286	if (!pl->ns->monitor_spells)	1201	if (!pl->ns->monitor_spells)
1287	return;	1202	return;
1288		1203
1289	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1204	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1290	{
1291	if (spell->type == SPELL)	1205	if (spell->type == SPELL)
1292	{	1206	{
1293	int flags = 0;	1207	int flags = 0;
		1208	int val;
1294		1209
1295	/* check if we need to update it */	1210	/* check if we need to update it */
1296	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1211	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1212	if (spell->cached_sp != val)
1297	{	1213	{
1298	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1214	spell->cached_sp = val;
1299	flags \|= UPD_SP_MANA;	1215	flags \|= UPD_SP_MANA;
1300	}	1216	}
1301		1217
1302	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1218	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1219	if (spell->cached_grace != val)
1303	{	1220	{
1304	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1221	spell->cached_grace = val;
1305	flags \|= UPD_SP_GRACE;	1222	flags \|= UPD_SP_GRACE;
1306	}	1223	}
1307		1224
1308	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1225	val = casting_level (pl->ob, spell);
		1226	if (spell->cached_eat != val)
1309	{	1227	{
1310	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1228	spell->cached_eat = val;
1311	flags \|= UPD_SP_DAMAGE;	1229	flags \|= UPD_SP_LEVEL;
1312	}	1230	}
1313		1231
1314	if (flags)	1232	if (flags)
1315	{	1233	{
1316	packet sl;	1234	packet sl;
1317		1235
1318	sl << "updspell "	1236	sl << "updspell "
1319	<< uint8 (flags)	1237	<< uint8 (flags)
1320	<< uint32 (spell->count);	1238	<< uint32 (spell->count);
1321		1239
1322	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1240	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1323	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1241	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1324	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1242	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1325		1243
1326	pl->ns->send_packet (sl);	1244	pl->ns->send_packet (sl);
1327	}	1245	}
1328	}	1246	}
1329	}
1330	}	1247	}
1331		1248
1332	void	1249	void
1333	esrv_remove_spell (player pl, object spell)	1250	esrv_remove_spell (player pl, object spell)
1334	{	1251	{
…		…
1361	}	1278	}
1362		1279
1363	/* store costs and damage in the object struct, to compare to later */	1280	/* store costs and damage in the object struct, to compare to later */
1364	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1281	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1365	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1282	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1366	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1283	spell->cached_eat = casting_level (pl->ob, spell);
1367		1284
1368	/* figure out which skill it uses, if it uses one */	1285	/* figure out which skill it uses, if it uses one */
1369	if (spell->skill)	1286	if (spell->skill)
1370	if (object *tmp = pl->find_skill (spell->skill))	1287	if (object *tmp = pl->find_skill (spell->skill))
1371	skill = tmp->subtype + CS_STAT_SKILLINFO;	1288	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1372		1289
1373	// spells better have a face	1290	// spells better have a face
1374	if (!spell->face)	1291	if (!spell->face)
1375	{	1292	{
1376	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1293	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1450	}	1367	}
1451	else	1368	else
1452	append_spell (pl, sl, spell);	1369	append_spell (pl, sl, spell);
1453		1370
1454	if (sl.length () > MAXSOCKBUF)	1371	if (sl.length () > MAXSOCKBUF)
1455	{
1456	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1372	cleanup ("buffer overflow in esrv_add_spells!");
1457	fatal (0);
1458	}
1459		1373
1460	/* finally, we can send the packet */	1374	/* finally, we can send the packet */
1461	pl->ns->flush_fx ();	1375	pl->ns->flush_fx ();
1462	pl->ns->send_packet (sl);	1376	pl->ns->send_packet (sl);
1463	}	1377	}
1464		1378
		1379	//-GPL
		1380

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.152 by root, Tue Oct 20 07:18:11 2009 UTC vs. Revision 1.183 by root, Sat May 7 20:03:28 2011 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.152 by root, Tue Oct 20 07:18:11 2009 UTC vs.
Revision 1.183 by root, Sat May 7 20:03:28 2011 UTC