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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.148 by root, Sun Dec 28 06:59:27 2008 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	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
		24
		25	//+GPL
23		26
24	/**	27	/**
25	* \file	28	* \file
26	* Client handling.	29	* Client handling.
27	*	30	*
41		44
42	#include <global.h>	45	#include <global.h>
43	#include <sproto.h>	46	#include <sproto.h>
44		47
45	#include <living.h>	48	#include <living.h>
46	#include <commands.h>
47		49
48	/* This block is basically taken from socket.c - I assume if it works there,	50	/* This block is basically taken from socket.c - I assume if it works there,
49	* it should work here.	51	* it should work here.
50	*/	52	*/
51	#include <sys/types.h>	53	#include <sys/types.h>
…		…
63	* This table translates the attack numbers as used within the	65	* This table translates the attack numbers as used within the
64	* program to the value we use when sending STATS command to the	66	* program to the value we use when sending STATS command to the
65	* client. If a value is -1, then we don't send that to the	67	* client. If a value is -1, then we don't send that to the
66	* client.	68	* client.
67	*/	69	*/
68	short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,	70	static short atnr_cs_stat[NROFATTACKS] =
69	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,	71	{
70	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,	72	CS_STAT_RES_PHYS,
71	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	73	CS_STAT_RES_MAG,
72	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	74	CS_STAT_RES_FIRE,
73	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,	75	CS_STAT_RES_ELEC,
74	CS_STAT_RES_FEAR, -1 /* Cancellation */ ,	76	CS_STAT_RES_COLD,
75	CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,	77	CS_STAT_RES_CONF,
76	-1 /* Chaos / , -1 / Counterspell */ ,	78	CS_STAT_RES_ACID,
77	-1 /* Godpower */ , CS_STAT_RES_HOLYWORD,	79	CS_STAT_RES_DRAIN,
		80	-1 /* weaponmagic */,
		81	CS_STAT_RES_GHOSTHIT,
		82	CS_STAT_RES_POISON,
		83	CS_STAT_RES_SLOW,
		84	CS_STAT_RES_PARA,
		85	CS_STAT_TURN_UNDEAD,
		86	CS_STAT_RES_FEAR,
		87	-1 /* Cancellation */,
		88	CS_STAT_RES_DEPLETE,
		89	CS_STAT_RES_DEATH,
		90	-1 /* Chaos */,
		91	-1 /* Counterspell */,
		92	-1 /* Godpower */,
		93	CS_STAT_RES_HOLYWORD,
78	CS_STAT_RES_BLIND,	94	CS_STAT_RES_BLIND,
79	-1, /* Internal */	95	-1, /* Internal */
80	-1, /* life stealing */	96	-1, /* life stealing */
81	-1 /* Disease - not fully done yet */	97	-1 /* Disease - not fully done yet */
82	};	98	};
…		…
130	pl->ns->mapinfo_queue_clear ();	146	pl->ns->mapinfo_queue_clear ();
131		147
132	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	148	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
133		149
134	pl->ns->force_newmap = false;	150	pl->ns->force_newmap = false;
135
136	if (pl->ns->newmapcmd == 1)
137	pl->ns->send_packet ("newmap");	151	pl->ns->send_packet ("newmap");
138
139	pl->ns->floorbox_reset ();	152	pl->ns->floorbox_reset ();
140	}	153	}
141		154
142	static void	155	static void
143	send_map_info (player *pl)	156	send_map_info (player *pl)
144	{	157	{
145	client &socket = *pl->ns;	158	client &socket = *pl->ns;
146	object *ob = pl->observe;	159	object *ob = pl->viewpoint;
147		160
148	if (socket.mapinfocmd)	161	if (socket.mapinfocmd)
149	{	162	{
150	if (ob->map && ob->map->path[0])	163	if (ob->map && ob->map->path)
151	{	164	{
152	int flags = 0;	165	int flags = 0;
153		166
		167	// due to historical glitches, the bit ordering and map index ordering differs
154	if (ob->map->tile_path[0]) flags \|= 1;	168	if (ob->map->tile_path[TILE_NORTH]) flags \|= 0x01;
155	if (ob->map->tile_path[1]) flags \|= 2;	169	if (ob->map->tile_path[TILE_EAST ]) flags \|= 0x02;
156	if (ob->map->tile_path[2]) flags \|= 4;	170	if (ob->map->tile_path[TILE_SOUTH]) flags \|= 0x04;
157	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;
158		175
159	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",
160	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,	177	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161	ob->map->width, ob->map->height, &ob->map->path);	178	ob->map->width, ob->map->height, &ob->map->path);
162	}	179	}
…		…
168	/** check for map/region change and send new map data */	185	/** check for map/region change and send new map data */
169	static void	186	static void
170	check_map_change (player *pl)	187	check_map_change (player *pl)
171	{	188	{
172	client &socket = *pl->ns;	189	client &socket = *pl->ns;
173	object *ob = pl->observe;	190	object *ob = pl->viewpoint;
174		191
175	region *reg = ob->region ();	192	region *reg = ob->region ();
176	if (socket.current_region != reg)	193	if (socket.current_region != reg)
177	{	194	{
178	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));
…		…
214	socket.floorbox_reset ();	231	socket.floorbox_reset ();
215	}	232	}
216		233
217	socket.current_x = ob->x;	234	socket.current_x = ob->x;
218	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);
219	}	275	}
220		276
221	/**	277	/**
222	* RequestInfo is sort of a meta command. There is some specific	278	* RequestInfo is sort of a meta command. There is some specific
223	* request of information, but we call other functions to provide	279	* request of information, but we call other functions to provide
…		…
236	{	292	{
237	*params++ = 0;	293	*params++ = 0;
238	break;	294	break;
239	}	295	}
240		296
241	if (!strcmp (buf, "image_info"))
242	send_image_info (ns, params);
243	else if (!strcmp (buf, "image_sums"))
244	send_image_sums (ns, params);
245	else if (!strcmp (buf, "skill_info"))	297	if (!strcmp (buf, "skill_info"))
246	send_skill_info (ns, params);	298	send_skill_info (ns, params);
247	else if (!strcmp (buf, "spell_paths"))	299	else if (!strcmp (buf, "spell_paths"))
248	send_spell_paths (ns, params);	300	send_spell_paths (ns, params);
249	else	301	else
250	{	302	{
…		…
266	ExtiCmd (char buf, int len, client ns)	318	ExtiCmd (char buf, int len, client ns)
267	{	319	{
268	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	320	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269	}	321	}
270		322
		323	//-GPL
		324
271	void	325	void
272	client::mapinfo_queue_clear ()	326	client::mapinfo_queue_clear ()
273	{	327	{
274	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	328	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275	free (*i);	329	free (*i);
…		…
282	{	336	{
283	char *token = buf;	337	char *token = buf;
284	buf += strlen (buf) + 9;	338	buf += strlen (buf) + 9;
285		339
286	// initial map and its origin	340	// initial map and its origin
287	maptile *map = pl->observe->map;	341	maptile *map = pl->viewpoint->map;
288	int mapx = pl->ns->mapx / 2 - pl->observe->x;	342	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
289	int mapy = pl->ns->mapy / 2 - pl->observe->y;	343	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
290	int max_distance = 8; // limit maximum path length to something generous	344	int max_distance = 8; // limit maximum path length to something generous
291		345
292	while (*buf && map && max_distance)	346	while (*buf && map && max_distance)
293	{	347	{
294	int dir = *buf++ - '1';	348	int dir = *buf++ - '1';
295		349
296	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))
297	{	355	{
		356	dir = dirmap [dir];
		357
298	if (!map->tile_path [dir])	358	if (!map->tile_path [dir])
299	map = 0;	359	map = 0;
300	else if (map->tile_available (dir, false))	360	else if (map->tile_available (dir, false))
301	{	361	{
302	maptile *neigh = map->tile_map [dir];	362	maptile *neigh = map->tile_map [dir];
…		…
325	send_packet_printf ("mapinfo %s nomap", token);	385	send_packet_printf ("mapinfo %s nomap", token);
326	else	386	else
327	{	387	{
328	int flags = 0;	388	int flags = 0;
329		389
		390	// due to historical glitches, the bit ordering and map index ordering differs
330	if (map->tile_path[0]) flags \|= 1;	391	if (map->tile_path[TILE_NORTH]) flags \|= 0x01;
331	if (map->tile_path[1]) flags \|= 2;	392	if (map->tile_path[TILE_EAST ]) flags \|= 0x02;
332	if (map->tile_path[2]) flags \|= 4;	393	if (map->tile_path[TILE_SOUTH]) flags \|= 0x04;
333	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;
334		398
335	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);
336	}	400	}
337		401
338	return 1;	402	return 1;
…		…
399	AddMeCmd (char buf, int len, client ns)	463	AddMeCmd (char buf, int len, client ns)
400	{	464	{
401	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	465	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402	}	466	}
403		467
404	/*	468	//+GPL
405	#define MSG_TYPE_BOOK 1
406	#define MSG_TYPE_CARD 2
407	#define MSG_TYPE_PAPER 3
408	#define MSG_TYPE_SIGN 4
409	#define MSG_TYPE_MONUMENT 5
410	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
411
412	/** Reply to ExtendedInfos command */
413	void
414	ToggleExtendedText (char buf, int len, client ns)
415	{
416	char cmdback[MAX_BUF];
417	char temp[10];
418	char command[50];
419	int info, nextinfo, i, flag;
420
421	cmdback[0] = '\0';
422
423	nextinfo = 0;
424	while (1)
425	{
426	/* 1. Extract an info */
427	info = nextinfo;
428
429	while ((info < len) && (buf[info] == ' '))
430	info++;
431
432	if (info >= len)
433	break;
434
435	nextinfo = info + 1;
436
437	while ((nextinfo < len) && (buf[nextinfo] != ' '))
438	nextinfo++;
439
440	if (nextinfo - info >= 49) /Erroneous info asked /
441	continue;
442
443	strncpy (command, &(buf[info]), nextinfo - info);
444	command[nextinfo - info] = '\0';
445	/* 2. Interpret info */
446	i = sscanf (command, "%d", &flag);
447
448	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
449	ns->supported_readables \|= (1 << flag);
450	/3. Next info /
451	}
452
453	/* Send resulting state */
454	strcpy (cmdback, "ExtendedTextSet");
455
456	for (i = 0; i <= MSG_TYPE_LAST; i++)
457	if (ns->supported_readables & (1 << i))
458	{
459	strcat (cmdback, " ");
460	snprintf (temp, sizeof (temp), "%d", i);
461	strcat (cmdback, temp);
462	}
463
464	ns->send_packet (cmdback);
465	}
466		469
467	/**	470	/**
468	* 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,
469	* etc.)	472	* etc.)
470	*/	473	*/
…		…
483	return;	486	return;
484		487
485	buf++;	488	buf++;
486	}	489	}
487		490
488	execute_newserver_command (pl->ob, (char *) buf);	491	execute_newserver_command (pl->ob, (char *)buf);
489		492
490	/* Perhaps something better should be done with a left over count.	493	/* Perhaps something better should be done with a left over count.
491	* Cleaning up the input should probably be done first - all actions	494	* Cleaning up the input should probably be done first - all actions
492	* for the command that issued the count should be done before any other	495	* for the command that issued the count should be done before any other
493	* commands.	496	* commands.
…		…
527	* commands.	530	* commands.
528	*/	531	*/
529	pl->count = 0;	532	pl->count = 0;
530		533
531	//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
532	int time = fabs (pl->ob->speed) < 0.001	535	int time = pl->ob->has_active_speed ()
533	? time = MAX_TIME * 100
534	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	536	? (int) (MAX_TIME / pl->ob->speed)
		537	: MAX_TIME * 100;
535		538
536	/* Send confirmation of command execution now */	539	/* Send confirmation of command execution now */
537	packet sl ("comc");	540	packet sl ("comc");
538	sl << uint16 (cmdid) << uint32 (time);	541	sl << uint16 (cmdid) << uint32 (time);
539	pl->ns->send_packet (sl);	542	pl->ns->send_packet (sl);
…		…
581	LOG (llevError, "Unknown input state: %d\n", ns->state);	584	LOG (llevError, "Unknown input state: %d\n", ns->state);
582	}	585	}
583	}	586	}
584		587
585	/**	588	/**
586	* Client tells its version. If there is a mismatch, we close the	589	* Client tells its version info.
587	* socket. In real life, all we should care about is the client having
588	* something older than the server. If we assume the client will be
589	* backwards compatible, having it be a later version should not be a
590	* problem.
591	*/	590	*/
592	void	591	void
593	VersionCmd (char buf, int len, client ns)	592	VersionCmd (char buf, int len, client ns)
594	{	593	{
595	if (!buf)	594	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
596	{
597	LOG (llevError, "CS: received corrupted version command\n");
598	return;
599	}
600
601	ns->cs_version = atoi (buf);
602	ns->sc_version = ns->cs_version;
603
604	LOG (llevDebug, "connection from client <%s>\n", buf);
605
606	//TODO: should log here just for statistics
607
608	//if (VERSION_CS != ns->cs_version)
609	// unchecked;
610
611	char *cp = strchr (buf + 1, ' ');
612	if (!cp)
613	return;
614
615	ns->sc_version = atoi (cp);
616
617	//if (VERSION_SC != ns->sc_version)
618	// unchecked;
619
620	cp = strchr (cp + 1, ' ');
621
622	if (cp)
623	{
624	ns->version = cp + 1;
625
626	if (ns->sc_version < 1026)
627	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
628	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
629	}
630	}	595	}
631		596
632	/** sound related functions. */	597	/** sound related functions. */
633	void	598	void
634	SetSound (char buf, int len, client ns)	599	SetSound (char buf, int len, client ns)
…		…
685	* Get player's current range attack in obuf.	650	* Get player's current range attack in obuf.
686	*/	651	*/
687	static void	652	static void
688	rangetostring (player pl, char obuf)	653	rangetostring (player pl, char obuf)
689	{	654	{
690	dynbuf_text buf;	655	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		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
691		666
692	if (pl->ranged_ob)	667	if (pl->ranged_ob)
693	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;
694		669
695	if (pl->combat_ob)	670	if (pl->combat_ob)
…		…
741	* commands for now.	716	* commands for now.
742	*/	717	*/
743	void	718	void
744	esrv_update_stats (player *pl)	719	esrv_update_stats (player *pl)
745	{	720	{
746	char buf[MAX_BUF];
747	uint16 flags;
748
749	client *ns = pl->ns;	721	client *ns = pl->ns;
750	if (!ns)	722	if (!ns)
751	return;	723	return;
752		724
753	object *ob = pl->observe;	725	object *ob = pl->observe;
…		…
770	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	742	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
771	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	743	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
772	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	744	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
773	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	745	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
774		746
775	for (int s = 0; s < NUM_SKILLS; s++)	747	for (int s = 0; s < CS_NUM_SKILLS; s++)
776	if (object *skill = opl->last_skill_ob [s])	748	if (object *skill = opl->last_skill_ob [s])
777	if (skill->stats.exp != ns->last_skill_exp [s])	749	if (skill->stats.exp != ns->last_skill_exp [s])
778	{	750	{
779	ns->last_skill_exp [s] = skill->stats.exp;	751	ns->last_skill_exp [s] = skill->stats.exp;
780		752
781	/* Always send along the level if exp changes. This is only	753	/* Always send along the level if exp changes. This is only
782	* 1 extra byte, but keeps processing simpler.	754	* 1 extra byte, but keeps processing simpler.
783	*/	755	*/
784	sl << uint8 (s + CS_STAT_SKILLINFO)	756	sl << uint8 (CS_STAT_SKILLINFO + s)
785	<< uint8 (skill->level)	757	<< uint8 (skill->level)
786	<< uint64 (skill->stats.exp);	758	<< uint64 (skill->stats.exp);
787	}	759	}
788		760
789	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	761	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
790	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	762	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
791	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	763	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
792	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	764	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
793	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	765	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
794	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);
795	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	767	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
796	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	768	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
797	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	769	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
798		770
799	flags = 0;	771	int flags = (opl->fire_on ? SF_FIREON : 0)
800		772	\| (opl->run_on ? SF_RUNON : 0);
801	if (opl->fire_on)
802	flags \|= SF_FIREON;
803
804	if (opl->run_on)
805	flags \|= SF_RUNON;
806		773
807	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	774	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
808		775
809	if (ns->sc_version < 1025)
810	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
811	else
812	for (int i = 0; i < NROFATTACKS; i++)	776	for (int i = 0; i < NROFATTACKS; i++)
813	{
814	/* Skip ones we won't send */	777	/* Skip ones we won't send */
815	if (atnr_cs_stat[i] == -1)	778	if (atnr_cs_stat[i] >= 0)
816	continue;
817
818	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]);
819	}
820		780
821	if (pl->ns->monitor_spells)	781	if (pl->ns->monitor_spells)
822	{	782	{
823	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);
824	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);
825	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);
826	}	786	}
827		787
		788	char buf[MAX_BUF];
828	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 */
829	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	790	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
830	set_title (ob, buf);	791	set_title (ob, buf);
831	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	792	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
832		793
…		…
926		887
927	/* Nothing changed */	888	/* Nothing changed */
928	return 0;	889	return 0;
929	}	890	}
930		891
931	// prefetch (and touch) all maps within a specific distancd	892	//-GPL
		893
		894	// prefetch some flat area around the player
932	static void	895	static void
933	prefetch_surrounding_maps (maptile *map, int distance)	896	prefetch_surrounding_area (object op, maptile map, int range)
934	{	897	{
935	map->touch ();	898	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
936		899	op->x - range , op->y - range ,
937	if (--distance)	900	op->x + range + 1, op->y + range + 1);
938	for (int dir = 4; --dir; )	901	rect->m;
939	if (const shstr &path = map->tile_path [dir])	902	++rect)
940	if (maptile *&neigh = map->tile_map [dir])	903	{
941	prefetch_surrounding_maps (neigh, distance);	904	rect->m->touch ();
942	else	905	rect->m->activate ();
943	neigh = maptile::find_async (path, map);	906	}
944	}	907	}
945		908
946	// prefetch a generous area around the player	909	// prefetch a generous area around the player, also up and down
947	static void	910	void
948	prefetch_surrounding_maps (object *op)	911	object::prefetch_surrounding_maps ()
949	{	912	{
950	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);
951	}	920	}
		921
		922	//+GPL
952		923
953	/**	924	/**
954	* Draws client map.	925	* Draws client map.
955	*/	926	*/
956	void	927	void
957	draw_client_map (player *pl)	928	draw_client_map (player *pl)
958	{	929	{
959	object *ob = pl->observe;	930	object *ob = pl->viewpoint;
960	if (!ob->active)	931	if (!pl->observe->active)
961	return;	932	return;
962		933
963	/* 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
964	* 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
965	* be OK once they really log in.	936	* be OK once they really log in.
966	*/	937	*/
967	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	938	if (!ob->map \|\| ob->map->state != MAP_ACTIVE)
968	return;	939	return;
969		940
970	int startlen, oldlen;	941	int startlen, oldlen;
971		942
972	check_map_change (pl);	943	check_map_change (pl);
973	prefetch_surrounding_maps (pl->ob);	944	pl->ob->prefetch_surrounding_maps ();
974		945
975	/* do LOS after calls to update_position */	946	/* do LOS after calls to update_position */
976	/* unfortunately, we need to udpate los when observing, currently */	947	/* unfortunately, we need to udpate los when observing, currently */
977	if (pl->do_los \|\| pl->observe != pl->ob)	948	if (pl->do_los \|\| pl->viewpoint != pl->ob)
978	{	949	{
979	pl->do_los = 0;	950	pl->do_los = 0;
980	pl->update_los ();	951	pl->update_los ();
981	}	952	}
982		953
…		…
1003	* look like.	974	* look like.
1004	*/	975	*/
1005		976
1006	client &socket = *pl->ns;	977	client &socket = *pl->ns;
1007		978
1008	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	979	packet sl ("map1a");
1009		980
1010	startlen = sl.length ();	981	startlen = sl.length ();
1011		982
1012	int hx = socket.mapx / 2;	983	int hx = socket.mapx / 2;
1013	int hy = socket.mapy / 2;	984	int hy = socket.mapy / 2;
…		…
1034	map_clearcell (&lastcell, -1);	1005	map_clearcell (&lastcell, -1);
1035	}	1006	}
1036		1007
1037	continue;	1008	continue;
1038	}	1009	}
1039		1010
1040	int d = pl->blocked_los_uc (dx, dy);	1011	int d = pl->blocked_los_uc (dx, dy);
1041		1012
1042	if (d > 3)	1013	if (d > 3)
1043	{	1014	{
1044	/* This block deals with spaces that are not visible for whatever	1015	/* This block deals with spaces that are not visible for whatever
…		…
1105	{	1076	{
1106	if (op->stats.maxhp > op->stats.hp	1077	if (op->stats.maxhp > op->stats.hp
1107	&& op->stats.maxhp > 0	1078	&& op->stats.maxhp > 0
1108	&& (op->type == PLAYER	1079	&& (op->type == PLAYER
1109	\|\| op->type == DOOR // does not work, have maxhp 0	1080	\|\| op->type == DOOR // does not work, have maxhp 0
1110	\|\| QUERY_FLAG (op, FLAG_MONSTER)	1081	\|\| op->flag [FLAG_MONSTER]
1111	\|\| QUERY_FLAG (op, FLAG_ALIVE)	1082	\|\| op->flag [FLAG_ALIVE]
1112	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))	1083	\|\| op->flag [FLAG_GENERATOR]))
1113	{	1084	{
1114	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1085	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1115	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
1116	}	1087	}
1117		1088
…		…
1213	socket.send_packet (sl);	1184	socket.send_packet (sl);
1214	socket.sent_scroll = 0;	1185	socket.sent_scroll = 0;
1215	}	1186	}
1216	}	1187	}
1217		1188
1218	/*****************************************************************************/
1219	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1220	/* a player. Of course, the client need to know the command to be able to */
1221	/* manage it ! */
1222	/*****************************************************************************/
1223	void
1224	send_plugin_custom_message (object pl, char buf)
1225	{
1226	pl->contr->ns->send_packet (buf);
1227	}
1228
1229	/**
1230	* This sends the skill number to name mapping. We ignore
1231	* the params - we always send the same info no matter what.
1232	*/
1233	void
1234	send_skill_info (client ns, char params)
1235	{
1236	packet sl;
1237	sl << "replyinfo skill_info\n";
1238
1239	for (int i = 1; i < NUM_SKILLS; i++)
1240	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1241
1242	if (sl.length () > MAXSOCKBUF)
1243	{
1244	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1245	fatal (0);
1246	}
1247
1248	ns->send_packet (sl);
1249	}
1250
1251	/**
1252	* This sends the spell path to name mapping. We ignore
1253	* the params - we always send the same info no matter what.
1254	*/
1255	void
1256	send_spell_paths (client * ns, char *params)
1257	{
1258	packet sl;
1259
1260	sl << "replyinfo spell_paths\n";
1261
1262	for (int i = 0; i < NRSPELLPATHS; i++)
1263	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1264
1265	if (sl.length () > MAXSOCKBUF)
1266	{
1267	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1268	fatal (0);
1269	}
1270
1271	ns->send_packet (sl);
1272	}
1273
1274	/**	1189	/**
1275	* 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.
1276	* 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
1277	*/	1192	*/
1278	void	1193	void
1279	esrv_update_spells (player *pl)	1194	esrv_update_spells (player *pl)
1280	{	1195	{
1281	if (!pl->ns)	1196	if (!pl->ns)
1282	return;	1197	return;
1283		1198
		1199	pl->ns->update_spells = false;
		1200
1284	if (!pl->ns->monitor_spells)	1201	if (!pl->ns->monitor_spells)
1285	return;	1202	return;
1286		1203
1287	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1204	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1288	{
1289	if (spell->type == SPELL)	1205	if (spell->type == SPELL)
1290	{	1206	{
1291	int flags = 0;	1207	int flags = 0;
		1208	int val;
1292		1209
1293	/* check if we need to update it */	1210	/* check if we need to update it */
1294	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)
1295	{	1213	{
1296	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1214	spell->cached_sp = val;
1297	flags \|= UPD_SP_MANA;	1215	flags \|= UPD_SP_MANA;
1298	}	1216	}
1299		1217
1300	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)
1301	{	1220	{
1302	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1221	spell->cached_grace = val;
1303	flags \|= UPD_SP_GRACE;	1222	flags \|= UPD_SP_GRACE;
1304	}	1223	}
1305		1224
1306	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)
1307	{	1227	{
1308	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1228	spell->cached_eat = val;
1309	flags \|= UPD_SP_DAMAGE;	1229	flags \|= UPD_SP_LEVEL;
1310	}	1230	}
1311		1231
1312	if (flags)	1232	if (flags)
1313	{	1233	{
1314	packet sl;	1234	packet sl;
1315		1235
1316	sl << "updspell "	1236	sl << "updspell "
1317	<< uint8 (flags)	1237	<< uint8 (flags)
1318	<< uint32 (spell->count);	1238	<< uint32 (spell->count);
1319		1239
1320	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1240	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1321	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1241	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1322	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1242	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1323		1243
1324	pl->ns->send_packet (sl);	1244	pl->ns->send_packet (sl);
1325	}	1245	}
1326	}	1246	}
1327	}
1328	}	1247	}
1329		1248
1330	void	1249	void
1331	esrv_remove_spell (player pl, object spell)	1250	esrv_remove_spell (player pl, object spell)
1332	{	1251	{
…		…
1359	}	1278	}
1360		1279
1361	/* 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 */
1362	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);
1363	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);
1364	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1283	spell->cached_eat = casting_level (pl->ob, spell);
1365		1284
1366	/* figure out which skill it uses, if it uses one */	1285	/* figure out which skill it uses, if it uses one */
1367	if (spell->skill)	1286	if (spell->skill)
1368	if (object *tmp = pl->find_skill (spell->skill))	1287	if (object *tmp = pl->find_skill (spell->skill))
1369	skill = tmp->subtype + CS_STAT_SKILLINFO;	1288	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1370		1289
1371	// spells better have a face	1290	// spells better have a face
1372	if (!spell->face)	1291	if (!spell->face)
1373	{	1292	{
1374	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);
…		…
1448	}	1367	}
1449	else	1368	else
1450	append_spell (pl, sl, spell);	1369	append_spell (pl, sl, spell);
1451		1370
1452	if (sl.length () > MAXSOCKBUF)	1371	if (sl.length () > MAXSOCKBUF)
1453	{
1454	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1372	cleanup ("buffer overflow in esrv_add_spells!");
1455	fatal (0);
1456	}
1457		1373
1458	/* finally, we can send the packet */	1374	/* finally, we can send the packet */
1459	pl->ns->flush_fx ();	1375	pl->ns->flush_fx ();
1460	pl->ns->send_packet (sl);	1376	pl->ns->send_packet (sl);
1461	}	1377	}
1462		1378
		1379	//-GPL
		1380

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.148 by root, Sun Dec 28 06:59:27 2008 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.148 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.183 by root, Sat May 7 20:03:28 2011 UTC