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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.156 by root, Fri Nov 6 12:49:19 2009 UTC vs.
Revision 1.191 by root, Thu Nov 15 04:50:50 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		24
25	//+GPL	25	//+GPL
26		26
44		44
45	#include <global.h>	45	#include <global.h>
46	#include <sproto.h>	46	#include <sproto.h>
47		47
48	#include <living.h>	48	#include <living.h>
49	#include <commands.h>
50		49
51	/* 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,
52	* it should work here.	51	* it should work here.
53	*/	52	*/
54	#include <sys/types.h>	53	#include <sys/types.h>
…		…
66	* This table translates the attack numbers as used within the	65	* This table translates the attack numbers as used within the
67	* 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
68	* 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
69	* client.	68	* client.
70	*/	69	*/
71	static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,	70	static short atnr_cs_stat[NROFATTACKS] =
72	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,	71	{
73	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,	72	CS_STAT_RES_PHYS,
74	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	73	CS_STAT_RES_MAG,
75	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	74	CS_STAT_RES_FIRE,
76	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,	75	CS_STAT_RES_ELEC,
77	CS_STAT_RES_FEAR, -1 /* Cancellation */ ,	76	CS_STAT_RES_COLD,
78	CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,	77	CS_STAT_RES_CONF,
79	-1 /* Chaos / , -1 / Counterspell */ ,	78	CS_STAT_RES_ACID,
80	-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,
81	CS_STAT_RES_BLIND,	94	CS_STAT_RES_BLIND,
82	-1, /* Internal */	95	-1, /* Internal */
83	-1, /* life stealing */	96	-1, /* life stealing */
84	-1 /* Disease - not fully done yet */	97	-1 /* Disease - not fully done yet */
85	};	98	};
…		…
133	pl->ns->mapinfo_queue_clear ();	146	pl->ns->mapinfo_queue_clear ();
134		147
135	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	148	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
136		149
137	pl->ns->force_newmap = false;	150	pl->ns->force_newmap = false;
138
139	if (pl->ns->newmapcmd == 1)
140	pl->ns->send_packet ("newmap");	151	pl->ns->send_packet ("newmap");
141
142	pl->ns->floorbox_reset ();	152	pl->ns->floorbox_reset ();
143	}	153	}
144		154
145	static void	155	static void
146	send_map_info (player *pl)	156	send_map_info (player *pl)
…		…
148	client &socket = *pl->ns;	158	client &socket = *pl->ns;
149	object *ob = pl->viewpoint;	159	object *ob = pl->viewpoint;
150		160
151	if (socket.mapinfocmd)	161	if (socket.mapinfocmd)
152	{	162	{
153	if (ob->map && ob->map->path[0])	163	if (ob->map && ob->map->path)
154	{	164	{
155	int flags = 0;	165	int flags = 0;
156		166
		167	// due to historical glitches, the bit ordering and map index ordering differs
157	if (ob->map->tile_path[0]) flags \|= 1;	168	if (ob->map->tile_path [TILE_NORTH]) flags \|= 0x01;
158	if (ob->map->tile_path[1]) flags \|= 2;	169	if (ob->map->tile_path [TILE_EAST ]) flags \|= 0x02;
159	if (ob->map->tile_path[2]) flags \|= 4;	170	if (ob->map->tile_path [TILE_SOUTH]) flags \|= 0x04;
160	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;
161		175
162	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",
163	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,	177	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
164	ob->map->width, ob->map->height, &ob->map->path);	178	ob->map->width, ob->map->height, &ob->map->path);
165	}	179	}
…		…
180	{	194	{
181	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));
182	socket.current_region = reg;	196	socket.current_region = reg;
183	}	197	}
184		198
185	// first try to aovid a full newmap on tiled map scrolls	199	// first try to avoid a full newmap on tiled map scrolls
186	if (socket.current_map != ob->map && !socket.force_newmap)	200	if (socket.current_map != ob->map && !socket.force_newmap)
187	{	201	{
188	rv_vector rv;	202	rv_vector rv;
189		203
190	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);
…		…
220	socket.current_x = ob->x;	234	socket.current_x = ob->x;
221	socket.current_y = ob->y;	235	socket.current_y = ob->y;
222	}	236	}
223		237
224	/**	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);
		275	}
		276
		277	/**
225	* RequestInfo is sort of a meta command. There is some specific	278	* RequestInfo is sort of a meta command. There is some specific
226	* request of information, but we call other functions to provide	279	* request of information, but we call other functions to provide
227	* that information.	280	* that information.
		281	* requestinfo is completely deprecated, use resource exti request
		282	* and the fxix or http protocols.
228	*/	283	*/
229	void	284	void
230	RequestInfo (char buf, int len, client ns)	285	RequestInfo (char buf, int len, client ns)
231	{	286	{
232	char *params;	287	char *params;
…		…
292		347
293	while (*buf && map && max_distance)	348	while (*buf && map && max_distance)
294	{	349	{
295	int dir = *buf++ - '1';	350	int dir = *buf++ - '1';
296		351
297	if (dir >= 0 && dir <= 3)	352	// due to historical glitches, the mapinfo index and tile index differs
		353	static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
		354
		355	// maybe we should only allow the four flat directions
		356	if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
298	{	357	{
		358	dir = dirmap [dir];
		359
299	if (!map->tile_path [dir])	360	if (!map->tile_path [dir])
300	map = 0;	361	map = 0;
301	else if (map->tile_available (dir, false))	362	else if (map->tile_available (dir, false))
302	{	363	{
303	maptile *neigh = map->tile_map [dir];	364	maptile *neigh = map->tile_map [dir];
…		…
326	send_packet_printf ("mapinfo %s nomap", token);	387	send_packet_printf ("mapinfo %s nomap", token);
327	else	388	else
328	{	389	{
329	int flags = 0;	390	int flags = 0;
330		391
		392	// due to historical glitches, the bit ordering and map index ordering differs
331	if (map->tile_path[0]) flags \|= 1;	393	if (map->tile_path [TILE_NORTH]) flags \|= 0x01;
332	if (map->tile_path[1]) flags \|= 2;	394	if (map->tile_path [TILE_EAST ]) flags \|= 0x02;
333	if (map->tile_path[2]) flags \|= 4;	395	if (map->tile_path [TILE_SOUTH]) flags \|= 0x04;
334	if (map->tile_path[3]) flags \|= 8;	396	if (map->tile_path [TILE_WEST ]) flags \|= 0x08;
		397	// these two are debatable
		398	if (map->tile_path [TILE_UP ]) flags \|= 0x10;
		399	if (map->tile_path [TILE_DOWN ]) flags \|= 0x20;
335		400
336	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);	401	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
337	}	402	}
338		403
339	return 1;	404	return 1;
…		…
402	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	467	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
403	}	468	}
404		469
405	//+GPL	470	//+GPL
406		471
407	/*
408	#define MSG_TYPE_BOOK 1
409	#define MSG_TYPE_CARD 2
410	#define MSG_TYPE_PAPER 3
411	#define MSG_TYPE_SIGN 4
412	#define MSG_TYPE_MONUMENT 5
413	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
414
415	/** Reply to ExtendedInfos command */
416	void
417	ToggleExtendedText (char buf, int len, client ns)
418	{
419	char cmdback[MAX_BUF];
420	char temp[10];
421	char command[50];
422	int info, nextinfo, i, flag;
423
424	cmdback[0] = '\0';
425
426	nextinfo = 0;
427	while (1)
428	{
429	/* 1. Extract an info */
430	info = nextinfo;
431
432	while ((info < len) && (buf [info] == ' '))
433	info++;
434
435	if (info >= len)
436	break;
437
438	nextinfo = info + 1;
439
440	while ((nextinfo < len) && (buf [nextinfo] != ' '))
441	nextinfo++;
442
443	if (nextinfo - info >= 49) /Erroneous info asked /
444	continue;
445
446	memcpy (command, buf + info, nextinfo - info);
447	command [nextinfo - info] = 0;
448
449	/* 2. Interpret info */
450	i = sscanf (command, "%d", &flag);
451
452	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
453	ns->supported_readables \|= (1 << flag);
454	/3. Next info /
455	}
456
457	/* Send resulting state */
458	strcpy (cmdback, "ExtendedTextSet");
459
460	for (i = 0; i <= MSG_TYPE_LAST; i++)
461	if (ns->supported_readables & (1 << i))
462	{
463	strcat (cmdback, " ");
464	snprintf (temp, sizeof (temp), "%d", i);
465	strcat (cmdback, temp);
466	}
467
468	ns->send_packet (cmdback);
469	}
470
471	/**	472	/**
472	* This handles the general commands from the client (ie, north, fire, cast,	473	* This handles the general commands from the client (ie, north, fire, cast,
473	* etc.)	474	* etc.)
474	*/	475	*/
475	void	476	void
…		…
495	* Cleaning up the input should probably be done first - all actions	496	* Cleaning up the input should probably be done first - all actions
496	* for the command that issued the count should be done before any other	497	* for the command that issued the count should be done before any other
497	* commands.	498	* commands.
498	*/	499	*/
499	pl->count = 0;	500	pl->count = 0;
500	}
501
502	/**
503	* This handles the general commands from the client (ie, north, fire, cast,
504	* etc.). It is a lot like PlayerCmd above, but is called with the
505	* 'ncom' method which gives more information back to the client so it
506	* can throttle.
507	*/
508	void
509	NewPlayerCmd (char buf, int len, player pl)
510	{
511	if (len <= 6)
512	{
513	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
514	return;
515	}
516
517	uint16 cmdid = net_uint16 ((uint8 *)buf);
518	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
519
520	/* -1 is special - no repeat, but don't update */
521	if (repeat != -1)
522	pl->count = repeat;
523
524	buf += 6; //len -= 6;
525
526	execute_newserver_command (pl->ob, buf);
527
528	/* Perhaps something better should be done with a left over count.
529	* Cleaning up the input should probably be done first - all actions
530	* for the command that issued the count should be done before any other
531	* commands.
532	*/
533	pl->count = 0;
534
535	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
536	int time = fabs (pl->ob->speed) < 0.001
537	? time = MAX_TIME * 100
538	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
539
540	/* Send confirmation of command execution now */
541	packet sl ("comc");
542	sl << uint16 (cmdid) << uint32 (time);
543	pl->ns->send_packet (sl);
544	}	501	}
545		502
546	/** This is a reply to a previous query. */	503	/** This is a reply to a previous query. */
547	void	504	void
548	ReplyCmd (char buf, int len, client ns)	505	ReplyCmd (char buf, int len, client ns)
…		…
585	LOG (llevError, "Unknown input state: %d\n", ns->state);	542	LOG (llevError, "Unknown input state: %d\n", ns->state);
586	}	543	}
587	}	544	}
588		545
589	/**	546	/**
590	* Client tells its version. If there is a mismatch, we close the	547	* Client tells its version info.
591	* socket. In real life, all we should care about is the client having
592	* something older than the server. If we assume the client will be
593	* backwards compatible, having it be a later version should not be a
594	* problem.
595	*/	548	*/
596	void	549	void
597	VersionCmd (char buf, int len, client ns)	550	VersionCmd (char buf, int len, client ns)
598	{	551	{
599	if (!buf)	552	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
600	{
601	LOG (llevError, "CS: received corrupted version command\n");
602	return;
603	}
604
605	ns->cs_version = atoi (buf);
606	ns->sc_version = ns->cs_version;
607
608	LOG (llevDebug, "connection from client <%s>\n", buf);
609
610	//TODO: should log here just for statistics
611
612	//if (VERSION_CS != ns->cs_version)
613	// unchecked;
614
615	char *cp = strchr (buf + 1, ' ');
616	if (!cp)
617	return;
618
619	ns->sc_version = atoi (cp);
620
621	//if (VERSION_SC != ns->sc_version)
622	// unchecked;
623
624	cp = strchr (cp + 1, ' ');
625
626	if (cp)
627	{
628	ns->version = cp + 1;
629
630	if (ns->sc_version < 1026)
631	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
632	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
633	}
634	}	553	}
635		554
636	/** sound related functions. */	555	/** sound related functions. */
637	void	556	void
638	SetSound (char buf, int len, client ns)	557	SetSound (char buf, int len, client ns)
…		…
691	static void	610	static void
692	rangetostring (player pl, char obuf)	611	rangetostring (player pl, char obuf)
693	{	612	{
694	dynbuf_text &buf = msg_dynbuf; buf.clear ();	613	dynbuf_text &buf = msg_dynbuf; buf.clear ();
695		614
		615	#if 0
		616	// print ranged/chosen_skill etc. objects every call
		617	printf ("%s %s => %s (%s)\n",
		618	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		619	pl->combat_ob ? &pl->combat_ob->name : "-",
		620	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		621	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		622	);
		623	#endif
		624
696	if (pl->ranged_ob)	625	if (pl->ranged_ob)
697	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	626	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
698		627
699	if (pl->combat_ob)	628	if (pl->combat_ob)
700	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;	629	buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
…		…
745	* commands for now.	674	* commands for now.
746	*/	675	*/
747	void	676	void
748	esrv_update_stats (player *pl)	677	esrv_update_stats (player *pl)
749	{	678	{
750	char buf[MAX_BUF];
751	uint16 flags;
752
753	client *ns = pl->ns;	679	client *ns = pl->ns;
754	if (!ns)	680	if (!ns)
755	return;	681	return;
756		682
757	object *ob = pl->observe;	683	object *ob = pl->observe;
…		…
774	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	700	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
775	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	701	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
776	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	702	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
777	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	703	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
778		704
779	for (int s = 0; s < NUM_SKILLS; s++)	705	for (int s = 0; s < CS_NUM_SKILLS; s++)
780	if (object *skill = opl->last_skill_ob [s])	706	if (object *skill = opl->last_skill_ob [s])
781	if (skill->stats.exp != ns->last_skill_exp [s])	707	if (skill->stats.exp != ns->last_skill_exp [s])
782	{	708	{
783	ns->last_skill_exp [s] = skill->stats.exp;	709	ns->last_skill_exp [s] = skill->stats.exp;
784		710
785	/* Always send along the level if exp changes. This is only	711	/* Always send along the level if exp changes. This is only
786	* 1 extra byte, but keeps processing simpler.	712	* 1 extra byte, but keeps processing simpler.
787	*/	713	*/
788	sl << uint8 (s + CS_STAT_SKILLINFO)	714	sl << uint8 (CS_STAT_SKILLINFO + s)
789	<< uint8 (skill->level)	715	<< uint8 (skill->level)
790	<< uint64 (skill->stats.exp);	716	<< uint64 (skill->stats.exp);
791	}	717	}
792		718
793	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	719	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
794	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	720	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
795	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	721	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
796	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	722	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
797	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	723	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
798	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	724	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
799	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	725	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
800	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	726	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
801	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	727	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
802		728
803	flags = 0;	729	int flags = (opl->fire_on ? SF_FIREON : 0)
804		730	\| (opl->run_on ? SF_RUNON : 0);
805	if (opl->fire_on)
806	flags \|= SF_FIREON;
807
808	if (opl->run_on)
809	flags \|= SF_RUNON;
810		731
811	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	732	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
812		733
813	if (ns->sc_version < 1025)
814	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
815	else
816	for (int i = 0; i < NROFATTACKS; i++)	734	for (int i = 0; i < NROFATTACKS; i++)
817	{
818	/* Skip ones we won't send */	735	/* Skip ones we won't send */
819	if (atnr_cs_stat[i] == -1)	736	if (atnr_cs_stat[i] >= 0)
820	continue;
821
822	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	737	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
823	}
824		738
825	if (pl->ns->monitor_spells)	739	if (pl->ns->monitor_spells)
826	{	740	{
827	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	741	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
828	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	742	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
829	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	743	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
830	}	744	}
831		745
		746	char buf[MAX_BUF];
832	rangetostring (opl, buf); /* we want use the new fire & run system in new client */	747	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
833	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	748	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
834	set_title (ob, buf);	749	set_title (ob, buf);
835	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	750	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
836		751
…		…
930		845
931	/* Nothing changed */	846	/* Nothing changed */
932	return 0;	847	return 0;
933	}	848	}
934		849
935	//-GPL
936
937	// prefetch (and touch) all maps within a specific distancd
938	static void
939	prefetch_surrounding_maps (maptile *map, int distance)
940	{
941	map->touch ();
942
943	if (--distance)
944	for (int dir = 4; --dir; )
945	if (const shstr &path = map->tile_path [dir])
946	if (maptile *&neigh = map->tile_map [dir])
947	prefetch_surrounding_maps (neigh, distance);
948	else
949	neigh = maptile::find_async (path, map);
950	}
951
952	// prefetch a generous area around the player
953	static void
954	prefetch_surrounding_maps (object *op)
955	{
956	prefetch_surrounding_maps (op->map, 3);
957	}
958
959	//+GPL
960
961	/**	850	/**
962	* Draws client map.	851	* Draws client map.
963	*/	852	*/
964	void	853	void
965	draw_client_map (player *pl)	854	draw_client_map (player *pl)
…		…
970		859
971	/* If player is just joining the game, he isn't here yet, so the map	860	/* If player is just joining the game, he isn't here yet, so the map
972	* can get swapped out. If so, don't try to send them a map. All will	861	* can get swapped out. If so, don't try to send them a map. All will
973	* be OK once they really log in.	862	* be OK once they really log in.
974	*/	863	*/
975	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	864	if (!ob->map \|\| ob->map->state != MAP_ACTIVE)
976	return;	865	return;
977		866
978	int startlen, oldlen;	867	int startlen, oldlen;
979		868
980	check_map_change (pl);	869	check_map_change (pl);
981	prefetch_surrounding_maps (pl->ob);	870	pl->ob->prefetch_surrounding_maps ();
982		871
983	/* do LOS after calls to update_position */	872	/* do LOS after calls to update_position */
984	/* unfortunately, we need to udpate los when observing, currently */	873	/* unfortunately, we need to udpate los when observing, currently */
985	if (pl->do_los \|\| pl->viewpoint != pl->ob)	874	if (pl->do_los \|\| pl->viewpoint != pl->ob)
986	{	875	{
…		…
1011	* look like.	900	* look like.
1012	*/	901	*/
1013		902
1014	client &socket = *pl->ns;	903	client &socket = *pl->ns;
1015		904
1016	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	905	packet sl ("map1a");
1017		906
1018	startlen = sl.length ();	907	startlen = sl.length ();
1019		908
1020	int hx = socket.mapx / 2;	909	int hx = socket.mapx / 2;
1021	int hy = socket.mapy / 2;	910	int hy = socket.mapy / 2;
…		…
1042	map_clearcell (&lastcell, -1);	931	map_clearcell (&lastcell, -1);
1043	}	932	}
1044		933
1045	continue;	934	continue;
1046	}	935	}
1047		936
1048	int d = pl->blocked_los_uc (dx, dy);	937	int d = pl->blocked_los_uc (dx, dy);
1049		938
1050	if (d > 3)	939	if (d > 3)
1051	{	940	{
1052	/* This block deals with spaces that are not visible for whatever	941	/* This block deals with spaces that are not visible for whatever
…		…
1113	{	1002	{
1114	if (op->stats.maxhp > op->stats.hp	1003	if (op->stats.maxhp > op->stats.hp
1115	&& op->stats.maxhp > 0	1004	&& op->stats.maxhp > 0
1116	&& (op->type == PLAYER	1005	&& (op->type == PLAYER
1117	\|\| op->type == DOOR // does not work, have maxhp 0	1006	\|\| op->type == DOOR // does not work, have maxhp 0
1118	\|\| QUERY_FLAG (op, FLAG_MONSTER)	1007	\|\| op->flag [FLAG_MONSTER]
1119	\|\| QUERY_FLAG (op, FLAG_ALIVE)	1008	\|\| op->flag [FLAG_ALIVE]
1120	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))	1009	\|\| op->flag [FLAG_GENERATOR]))
1121	{	1010	{
1122	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;	1011	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1123	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge	1012	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1124	}	1013	}
1125		1014
…		…
1221	socket.send_packet (sl);	1110	socket.send_packet (sl);
1222	socket.sent_scroll = 0;	1111	socket.sent_scroll = 0;
1223	}	1112	}
1224	}	1113	}
1225		1114
1226	/*****************************************************************************/
1227	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1228	/* a player. Of course, the client need to know the command to be able to */
1229	/* manage it ! */
1230	/*****************************************************************************/
1231	void
1232	send_plugin_custom_message (object pl, char buf)
1233	{
1234	pl->contr->ns->send_packet (buf);
1235	}
1236
1237	/**
1238	* This sends the skill number to name mapping. We ignore
1239	* the params - we always send the same info no matter what.
1240	*/
1241	void
1242	send_skill_info (client ns, char params)
1243	{
1244	packet sl;
1245	sl << "replyinfo skill_info\n";
1246
1247	for (int i = 1; i < NUM_SKILLS; i++)
1248	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1249
1250	if (sl.length () > MAXSOCKBUF)
1251	{
1252	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1253	fatal (0);
1254	}
1255
1256	ns->send_packet (sl);
1257	}
1258
1259	/**
1260	* This sends the spell path to name mapping. We ignore
1261	* the params - we always send the same info no matter what.
1262	*/
1263	void
1264	send_spell_paths (client * ns, char *params)
1265	{
1266	packet sl;
1267
1268	sl << "replyinfo spell_paths\n";
1269
1270	for (int i = 0; i < NRSPELLPATHS; i++)
1271	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1272
1273	if (sl.length () > MAXSOCKBUF)
1274	{
1275	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1276	fatal (0);
1277	}
1278
1279	ns->send_packet (sl);
1280	}
1281
1282	/**	1115	/**
1283	* This looks for any spells the player may have that have changed their stats.	1116	* This looks for any spells the player may have that have changed their stats.
1284	* it then sends an updspell packet for each spell that has changed in this way	1117	* it then sends an updspell packet for each spell that has changed in this way
1285	*/	1118	*/
1286	void	1119	void
1287	esrv_update_spells (player *pl)	1120	esrv_update_spells (player *pl)
1288	{	1121	{
1289	if (!pl->ns)	1122	if (!pl->ns)
1290	return;	1123	return;
1291		1124
		1125	pl->ns->update_spells = false;
		1126
1292	if (!pl->ns->monitor_spells)	1127	if (!pl->ns->monitor_spells)
1293	return;	1128	return;
1294		1129
1295	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1130	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1296	{
1297	if (spell->type == SPELL)	1131	if (spell->type == SPELL)
1298	{	1132	{
1299	int flags = 0;	1133	int flags = 0;
		1134	int val;
1300		1135
1301	/* check if we need to update it */	1136	/* check if we need to update it */
1302	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1137	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1138	if (spell->cached_sp != val)
1303	{	1139	{
1304	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1140	spell->cached_sp = val;
1305	flags \|= UPD_SP_MANA;	1141	flags \|= UPD_SP_MANA;
1306	}	1142	}
1307		1143
1308	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1144	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1145	if (spell->cached_grace != val)
1309	{	1146	{
1310	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1147	spell->cached_grace = val;
1311	flags \|= UPD_SP_GRACE;	1148	flags \|= UPD_SP_GRACE;
1312	}	1149	}
1313		1150
1314	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1151	val = casting_level (pl->ob, spell);
		1152	if (spell->cached_eat != val)
1315	{	1153	{
1316	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1154	spell->cached_eat = val;
1317	flags \|= UPD_SP_DAMAGE;	1155	flags \|= UPD_SP_LEVEL;
1318	}	1156	}
1319		1157
1320	if (flags)	1158	if (flags)
1321	{	1159	{
1322	packet sl;	1160	packet sl;
1323		1161
1324	sl << "updspell "	1162	sl << "updspell "
1325	<< uint8 (flags)	1163	<< uint8 (flags)
1326	<< uint32 (spell->count);	1164	<< uint32 (spell->count);
1327		1165
1328	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1166	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1329	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1167	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1330	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1168	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1331		1169
1332	pl->ns->send_packet (sl);	1170	pl->ns->send_packet (sl);
1333	}	1171	}
1334	}	1172	}
1335	}
1336	}	1173	}
1337		1174
1338	void	1175	void
1339	esrv_remove_spell (player pl, object spell)	1176	esrv_remove_spell (player pl, object spell)
1340	{	1177	{
…		…
1356		1193
1357	/* appends the spell spell to the Socklist we will send the data to. /	1194	/* appends the spell spell to the Socklist we will send the data to. /
1358	static void	1195	static void
1359	append_spell (player pl, packet &sl, object spell)	1196	append_spell (player pl, packet &sl, object spell)
1360	{	1197	{
1361	int i, skill = 0;	1198	int skill = 0;
1362		1199
1363	if (!(spell->name))	1200	if (!(spell->name))
1364	{	1201	{
1365	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1202	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1366	return;	1203	return;
1367	}	1204	}
1368		1205
1369	/* store costs and damage in the object struct, to compare to later */	1206	/* store costs and damage in the object struct, to compare to later */
1370	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1207	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1371	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1208	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1372	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1209	spell->cached_eat = casting_level (pl->ob, spell);
1373		1210
1374	/* figure out which skill it uses, if it uses one */	1211	/* figure out which skill it uses, if it uses one */
1375	if (spell->skill)	1212	if (spell->skill)
1376	if (object *tmp = pl->find_skill (spell->skill))	1213	if (object *tmp = pl->find_skill (spell->skill))
1377	skill = tmp->subtype + CS_STAT_SKILLINFO;	1214	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1378		1215
1379	// spells better have a face	1216	// spells better have a face
1380	if (!spell->face)	1217	if (!spell->face)
1381	{	1218	{
1382	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1219	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1456	}	1293	}
1457	else	1294	else
1458	append_spell (pl, sl, spell);	1295	append_spell (pl, sl, spell);
1459		1296
1460	if (sl.length () > MAXSOCKBUF)	1297	if (sl.length () > MAXSOCKBUF)
1461	{
1462	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1298	cleanup ("buffer overflow in esrv_add_spells!");
1463	fatal (0);
1464	}
1465		1299
1466	/* finally, we can send the packet */	1300	/* finally, we can send the packet */
1467	pl->ns->flush_fx ();	1301	pl->ns->flush_fx ();
1468	pl->ns->send_packet (sl);	1302	pl->ns->send_packet (sl);
1469	}	1303	}

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.156 by root, Fri Nov 6 12:49:19 2009 UTC vs. Revision 1.191 by root, Thu Nov 15 04:50:50 2012 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.156 by root, Fri Nov 6 12:49:19 2009 UTC vs.
Revision 1.191 by root, Thu Nov 15 04:50:50 2012 UTC