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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.130 by root, Tue May 20 03:14:19 2008 UTC vs.
Revision 1.174 by root, Thu Apr 15 00:40:34 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel	5	* Copyright (©) 2001 Mark Wedel
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
		24
		25	//+GPL
23		26
24	/**	27	/**
25	* \file	28	* \file
26	* Client handling.	29	* Client handling.
27	*	30	*
41		44
42	#include <global.h>	45	#include <global.h>
43	#include <sproto.h>	46	#include <sproto.h>
44		47
45	#include <living.h>	48	#include <living.h>
46	#include <commands.h>
47		49
48	/* This block is basically taken from socket.c - I assume if it works there,	50	/* This block is basically taken from socket.c - I assume if it works there,
49	* it should work here.	51	* it should work here.
50	*/	52	*/
51	#include <sys/types.h>	53	#include <sys/types.h>
…		…
63	* This table translates the attack numbers as used within the	65	* This table translates the attack numbers as used within the
64	* program to the value we use when sending STATS command to the	66	* program to the value we use when sending STATS command to the
65	* client. If a value is -1, then we don't send that to the	67	* client. If a value is -1, then we don't send that to the
66	* client.	68	* client.
67	*/	69	*/
68	short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,	70	static short atnr_cs_stat[NROFATTACKS] =
69	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,	71	{
70	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,	72	CS_STAT_RES_PHYS,
71	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	73	CS_STAT_RES_MAG,
72	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	74	CS_STAT_RES_FIRE,
73	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,	75	CS_STAT_RES_ELEC,
74	CS_STAT_RES_FEAR, -1 /* Cancellation */ ,	76	CS_STAT_RES_COLD,
75	CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,	77	CS_STAT_RES_CONF,
76	-1 /* Chaos / , -1 / Counterspell */ ,	78	CS_STAT_RES_ACID,
77	-1 /* Godpower */ , CS_STAT_RES_HOLYWORD,	79	CS_STAT_RES_DRAIN,
		80	-1 /* weaponmagic */,
		81	CS_STAT_RES_GHOSTHIT,
		82	CS_STAT_RES_POISON,
		83	CS_STAT_RES_SLOW,
		84	CS_STAT_RES_PARA,
		85	CS_STAT_TURN_UNDEAD,
		86	CS_STAT_RES_FEAR,
		87	-1 /* Cancellation */,
		88	CS_STAT_RES_DEPLETE,
		89	CS_STAT_RES_DEATH,
		90	-1 /* Chaos */,
		91	-1 /* Counterspell */,
		92	-1 /* Godpower */,
		93	CS_STAT_RES_HOLYWORD,
78	CS_STAT_RES_BLIND,	94	CS_STAT_RES_BLIND,
79	-1, /* Internal */	95	-1, /* Internal */
80	-1, /* life stealing */	96	-1, /* life stealing */
81	-1 /* Disease - not fully done yet */	97	-1 /* Disease - not fully done yet */
82	};	98	};
…		…
98	*/	114	*/
99	mx = ns->mapx;	115	mx = ns->mapx;
100	my = ns->mapy;	116	my = ns->mapy;
101		117
102	/* the x and y here are coordinates for the new map, i.e. if we moved	118	/* the x and y here are coordinates for the new map, i.e. if we moved
103	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,	119	* (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
104	* if the destination x or y coordinate is outside the viewable	120	* if the destination x or y coordinate is outside the viewable
105	* area, we clear the values - otherwise, the old values	121	* area, we clear the values - otherwise, the old values
106	* are preserved, and the check_head thinks it needs to clear them.	122	* are preserved, and the check_head thinks it needs to clear them.
107	*/	123	*/
108	for (x = 0; x < mx; x++)	124	for (x = 0; x < mx; x++)
109	{
110	for (y = 0; y < my; y++)	125	for (y = 0; y < my; y++)
111	{
112	if (x >= ns->mapx \|\| y >= ns->mapy)	126	if (x >= ns->mapx \|\| y >= ns->mapy)
113	/* clear cells outside the viewable area */	127	/* clear cells outside the viewable area */
114	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));	128	memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
115	else if ((x + dx) < 0 \|\| (x + dx) >= ns->mapx \|\| (y + dy) < 0 \|\| (y + dy) >= ns->mapy)	129	else if ((x + dx) < 0 \|\| (x + dx) >= ns->mapx \|\| (y + dy) < 0 \|\| (y + dy) >= ns->mapy)
116	/* clear newly visible tiles within the viewable area */	130	/* clear newly visible tiles within the viewable area */
117	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));	131	memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
118	else	132	else
119	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));	133	memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
120	}
121	}
122		134
123	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));	135	memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
124		136
125	/* Make sure that the next "map1" command will be sent (even if it is	137	/* Make sure that the next "map1" command will be sent (even if it is
126	* empty).	138	* empty).
…		…
141	pl->ns->send_packet ("newmap");	153	pl->ns->send_packet ("newmap");
142		154
143	pl->ns->floorbox_reset ();	155	pl->ns->floorbox_reset ();
144	}	156	}
145		157
		158	static void
		159	send_map_info (player *pl)
		160	{
		161	client &socket = *pl->ns;
		162	object *ob = pl->viewpoint;
		163
		164	if (socket.mapinfocmd)
		165	{
		166	if (ob->map && ob->map->path[0])
		167	{
		168	int flags = 0;
		169
		170	if (ob->map->tile_path[0]) flags \|= 1;
		171	if (ob->map->tile_path[1]) flags \|= 2;
		172	if (ob->map->tile_path[2]) flags \|= 4;
		173	if (ob->map->tile_path[3]) flags \|= 8;
		174
		175	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
		176	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
		177	ob->map->width, ob->map->height, &ob->map->path);
		178	}
		179	else
		180	socket.send_packet ("mapinfo current");
		181	}
		182	}
		183
146	/** check for map/region change and send new map data */	184	/** check for map/region change and send new map data */
147	static void	185	static void
148	check_map_change (player *pl)	186	check_map_change (player *pl)
149	{	187	{
150	client &socket = *pl->ns;	188	client &socket = *pl->ns;
151	object *ob = pl->observe;	189	object *ob = pl->viewpoint;
		190
		191	region *reg = ob->region ();
		192	if (socket.current_region != reg)
		193	{
		194	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
		195	socket.current_region = reg;
		196	}
152		197
153	// first try to aovid a full newmap on tiled map scrolls	198	// first try to aovid a full newmap on tiled map scrolls
154	if (socket.current_map != ob->map)	199	if (socket.current_map != ob->map && !socket.force_newmap)
155	{	200	{
156	rv_vector rv;	201	rv_vector rv;
157		202
158	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);	203	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
159		204
…		…
164	socket.current_x = ob->x;	209	socket.current_x = ob->x;
165	socket.current_y = ob->y;	210	socket.current_y = ob->y;
166		211
167	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);	212	socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
168	socket.floorbox_reset ();	213	socket.floorbox_reset ();
		214	send_map_info (pl);
169	}	215	}
170	}	216	}
171		217
172	if (socket.current_map != ob->map \|\| socket.force_newmap)	218	if (socket.current_map != ob->map \|\| socket.force_newmap)
173	{	219	{
174	clear_map (pl);	220	clear_map (pl);
175	socket.current_map = ob->map;	221	socket.current_map = ob->map;
176		222	send_map_info (pl);
177	if (socket.mapinfocmd)
178	{
179	if (ob->map && ob->map->path[0])
180	{
181	int flags = 0;
182
183	if (ob->map->tile_path[0]) flags \|= 1;
184	if (ob->map->tile_path[1]) flags \|= 2;
185	if (ob->map->tile_path[2]) flags \|= 4;
186	if (ob->map->tile_path[3]) flags \|= 8;
187
188	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
189	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
190	ob->map->width, ob->map->height, &ob->map->path);
191	}
192	else
193	socket.send_packet ("mapinfo current");
194	}
195	}	223	}
196	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)	224	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)
197	{	225	{
198	int dx = ob->x - socket.current_x;	226	int dx = ob->x - socket.current_x;
199	int dy = ob->y - socket.current_y;	227	int dy = ob->y - socket.current_y;
200		228
201	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))
202	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
203	else
204	{
205	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	229	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
206	socket.floorbox_reset ();	230	socket.floorbox_reset ();
207	}
208	}	231	}
209		232
210	socket.current_x = ob->x;	233	socket.current_x = ob->x;
211	socket.current_y = ob->y;	234	socket.current_y = ob->y;
		235	}
212		236
213	region *reg = ob->region ();	237	/**
214	if (socket.current_region != reg)	238	* This sends the skill number to name mapping. We ignore
215	{	239	* the params - we always send the same info no matter what.
216	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	240	*/
217	socket.current_region = reg;	241	static void
		242	send_skill_info (client ns, char params)
		243	{
		244	packet sl;
		245	sl << "replyinfo skill_info\n";
		246
		247	for (int i = 0; i < skillvec.size (); ++i)
		248	sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
		249
		250	if (sl.length () > MAXSOCKBUF)
218	}	251	{
		252	LOG (llevError, "Buffer overflow in send_skill_info!\n");
		253	fatal (0);
		254	}
		255
		256	ns->send_packet (sl);
		257	}
		258
		259	/**
		260	* This sends the spell path to name mapping. We ignore
		261	* the params - we always send the same info no matter what.
		262	*/
		263	static void
		264	send_spell_paths (client * ns, char *params)
		265	{
		266	packet sl;
		267
		268	sl << "replyinfo spell_paths\n";
		269
		270	for (int i = 0; i < NRSPELLPATHS; i++)
		271	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		272
		273	if (sl.length () > MAXSOCKBUF)
		274	{
		275	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
		276	fatal (0);
		277	}
		278
		279	ns->send_packet (sl);
219	}	280	}
220		281
221	/**	282	/**
222	* RequestInfo is sort of a meta command. There is some specific	283	* RequestInfo is sort of a meta command. There is some specific
223	* request of information, but we call other functions to provide	284	* request of information, but we call other functions to provide
…		…
236	{	297	{
237	*params++ = 0;	298	*params++ = 0;
238	break;	299	break;
239	}	300	}
240		301
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"))	302	if (!strcmp (buf, "skill_info"))
246	send_skill_info (ns, params);	303	send_skill_info (ns, params);
247	else if (!strcmp (buf, "spell_paths"))	304	else if (!strcmp (buf, "spell_paths"))
248	send_spell_paths (ns, params);	305	send_spell_paths (ns, params);
249	else	306	else
250	{	307	{
…		…
266	ExtiCmd (char buf, int len, client ns)	323	ExtiCmd (char buf, int len, client ns)
267	{	324	{
268	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	325	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269	}	326	}
270		327
		328	//-GPL
		329
271	void	330	void
272	client::mapinfo_queue_clear ()	331	client::mapinfo_queue_clear ()
273	{	332	{
274	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	333	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
275	free (*i);	334	free (*i);
…		…
282	{	341	{
283	char *token = buf;	342	char *token = buf;
284	buf += strlen (buf) + 9;	343	buf += strlen (buf) + 9;
285		344
286	// initial map and its origin	345	// initial map and its origin
287	maptile *map = pl->observe->map;	346	maptile *map = pl->viewpoint->map;
288	int mapx = pl->ns->mapx / 2 - pl->observe->x;	347	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
289	int mapy = pl->ns->mapy / 2 - pl->observe->y;	348	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
290	int max_distance = 8; // limit maximum path length to something generous	349	int max_distance = 8; // limit maximum path length to something generous
291		350
292	while (*buf && map && max_distance)	351	while (*buf && map && max_distance)
293	{	352	{
294	int dir = *buf++ - '1';	353	int dir = *buf++ - '1';
…		…
399	AddMeCmd (char buf, int len, client ns)	458	AddMeCmd (char buf, int len, client ns)
400	{	459	{
401	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	460	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402	}	461	}
403		462
404	/** Reply to ExtendedInfos command */	463	//+GPL
405	void
406	ToggleExtendedInfos (char buf, int len, client ns)
407	{
408	char cmdback[MAX_BUF];
409	char command[50];
410	int info, nextinfo;
411
412	cmdback[0] = '\0';
413	nextinfo = 0;
414
415	while (1)
416	{
417	/* 1. Extract an info */
418	info = nextinfo;
419
420	while ((info < len) && (buf[info] == ' '))
421	info++;
422
423	if (info >= len)
424	break;
425
426	nextinfo = info + 1;
427
428	while ((nextinfo < len) && (buf[nextinfo] != ' '))
429	nextinfo++;
430
431	if (nextinfo - info >= 49) /Erroneous info asked /
432	continue;
433
434	strncpy (command, &(buf[info]), nextinfo - info);
435
436	/* 2. Interpret info */
437	if (!strcmp ("smooth", command))
438	/* Toggle smoothing */
439	ns->EMI_smooth = !ns->EMI_smooth;
440	else
441	/bad value /;
442
443	/3. Next info /
444	}
445
446	strcpy (cmdback, "ExtendedInfoSet");
447
448	if (ns->EMI_smooth)
449	{
450	strcat (cmdback, " ");
451	strcat (cmdback, "smoothing");
452	}
453
454	ns->send_packet (cmdback);
455	}
456
457	/*
458	#define MSG_TYPE_BOOK 1
459	#define MSG_TYPE_CARD 2
460	#define MSG_TYPE_PAPER 3
461	#define MSG_TYPE_SIGN 4
462	#define MSG_TYPE_MONUMENT 5
463	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
464
465	/** Reply to ExtendedInfos command */
466	void
467	ToggleExtendedText (char buf, int len, client ns)
468	{
469	char cmdback[MAX_BUF];
470	char temp[10];
471	char command[50];
472	int info, nextinfo, i, flag;
473
474	cmdback[0] = '\0';
475
476	nextinfo = 0;
477	while (1)
478	{
479	/* 1. Extract an info */
480	info = nextinfo;
481
482	while ((info < len) && (buf[info] == ' '))
483	info++;
484
485	if (info >= len)
486	break;
487
488	nextinfo = info + 1;
489
490	while ((nextinfo < len) && (buf[nextinfo] != ' '))
491	nextinfo++;
492
493	if (nextinfo - info >= 49) /Erroneous info asked /
494	continue;
495
496	strncpy (command, &(buf[info]), nextinfo - info);
497	command[nextinfo - info] = '\0';
498	/* 2. Interpret info */
499	i = sscanf (command, "%d", &flag);
500
501	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
502	ns->supported_readables \|= (1 << flag);
503	/3. Next info /
504	}
505
506	/* Send resulting state */
507	strcpy (cmdback, "ExtendedTextSet");
508
509	for (i = 0; i <= MSG_TYPE_LAST; i++)
510	if (ns->supported_readables & (1 << i))
511	{
512	strcat (cmdback, " ");
513	snprintf (temp, sizeof (temp), "%d", i);
514	strcat (cmdback, temp);
515	}
516
517	ns->send_packet (cmdback);
518	}
519		464
520	/**	465	/**
521	* This handles the general commands from the client (ie, north, fire, cast,	466	* This handles the general commands from the client (ie, north, fire, cast,
522	* etc.)	467	* etc.)
523	*/	468	*/
…		…
536	return;	481	return;
537		482
538	buf++;	483	buf++;
539	}	484	}
540		485
541	execute_newserver_command (pl->ob, (char *) buf);	486	execute_newserver_command (pl->ob, (char *)buf);
542		487
543	/* Perhaps something better should be done with a left over count.	488	/* Perhaps something better should be done with a left over count.
544	* Cleaning up the input should probably be done first - all actions	489	* Cleaning up the input should probably be done first - all actions
545	* for the command that issued the count should be done before any other	490	* for the command that issued the count should be done before any other
546	* commands.	491	* commands.
…		…
580	* commands.	525	* commands.
581	*/	526	*/
582	pl->count = 0;	527	pl->count = 0;
583		528
584	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	529	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
585	int time = fabs (pl->ob->speed) < 0.001	530	int time = pl->ob->has_active_speed ()
586	? time = MAX_TIME * 100
587	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	531	? (int) (MAX_TIME / pl->ob->speed)
		532	: MAX_TIME * 100;
588		533
589	/* Send confirmation of command execution now */	534	/* Send confirmation of command execution now */
590	packet sl ("comc");	535	packet sl ("comc");
591	sl << uint16 (cmdid) << uint32 (time);	536	sl << uint16 (cmdid) << uint32 (time);
592	pl->ns->send_packet (sl);	537	pl->ns->send_packet (sl);
…		…
634	LOG (llevError, "Unknown input state: %d\n", ns->state);	579	LOG (llevError, "Unknown input state: %d\n", ns->state);
635	}	580	}
636	}	581	}
637		582
638	/**	583	/**
639	* Client tells its version. If there is a mismatch, we close the	584	* Client tells its version info.
640	* socket. In real life, all we should care about is the client having
641	* something older than the server. If we assume the client will be
642	* backwards compatible, having it be a later version should not be a
643	* problem.
644	*/	585	*/
645	void	586	void
646	VersionCmd (char buf, int len, client ns)	587	VersionCmd (char buf, int len, client ns)
647	{	588	{
648	if (!buf)	589	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
649	{
650	LOG (llevError, "CS: received corrupted version command\n");
651	return;
652	}
653
654	ns->cs_version = atoi (buf);
655	ns->sc_version = ns->cs_version;
656
657	LOG (llevDebug, "connection from client <%s>\n", buf);
658
659	//TODO: should log here just for statistics
660
661	//if (VERSION_CS != ns->cs_version)
662	// unchecked;
663
664	char *cp = strchr (buf + 1, ' ');
665	if (!cp)
666	return;
667
668	ns->sc_version = atoi (cp);
669
670	//if (VERSION_SC != ns->sc_version)
671	// unchecked;
672
673	cp = strchr (cp + 1, ' ');
674
675	if (cp)
676	{
677	ns->version = cp + 1;
678
679	if (ns->sc_version < 1026)
680	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
681	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
682	}
683	}	590	}
684		591
685	/** sound related functions. */	592	/** sound related functions. */
686	void	593	void
687	SetSound (char buf, int len, client ns)	594	SetSound (char buf, int len, client ns)
…		…
738	* Get player's current range attack in obuf.	645	* Get player's current range attack in obuf.
739	*/	646	*/
740	static void	647	static void
741	rangetostring (player pl, char obuf)	648	rangetostring (player pl, char obuf)
742	{	649	{
743	dynbuf_text buf;	650	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		651
		652	#if 0
		653	// print ranged/chosen_skill etc. objects every call
		654	printf ("%s %s => %s (%s)\n",
		655	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		656	pl->combat_ob ? &pl->combat_ob->name : "-",
		657	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		658	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		659	);
		660	#endif
744		661
745	if (pl->ranged_ob)	662	if (pl->ranged_ob)
746	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	663	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
747		664
748	if (pl->combat_ob)	665	if (pl->combat_ob)
…		…
794	* commands for now.	711	* commands for now.
795	*/	712	*/
796	void	713	void
797	esrv_update_stats (player *pl)	714	esrv_update_stats (player *pl)
798	{	715	{
799	char buf[MAX_BUF];
800	uint16 flags;
801
802	client *ns = pl->ns;	716	client *ns = pl->ns;
803	if (!ns)	717	if (!ns)
804	return;	718	return;
805		719
806	object *ob = pl->observe;	720	object *ob = pl->observe;
…		…
823	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	737	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
824	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	738	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
825	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	739	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
826	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	740	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
827		741
828	for (int s = 0; s < NUM_SKILLS; s++)	742	for (int s = 0; s < CS_NUM_SKILLS; s++)
829	if (object *skill = opl->last_skill_ob[s])	743	if (object *skill = opl->last_skill_ob [s])
830	if (skill->stats.exp != ns->last_skill_exp [s])	744	if (skill->stats.exp != ns->last_skill_exp [s])
831	{	745	{
832	ns->last_skill_exp [s] = skill->stats.exp;	746	ns->last_skill_exp [s] = skill->stats.exp;
833		747
834	/* Always send along the level if exp changes. This is only	748	/* Always send along the level if exp changes. This is only
835	* 1 extra byte, but keeps processing simpler.	749	* 1 extra byte, but keeps processing simpler.
836	*/	750	*/
837	sl << uint8 (s + CS_STAT_SKILLINFO)	751	sl << uint8 (CS_STAT_SKILLINFO + s)
838	<< uint8 (skill->level)	752	<< uint8 (skill->level)
839	<< uint64 (skill->stats.exp);	753	<< uint64 (skill->stats.exp);
840	}	754	}
841		755
842	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	756	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
843	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	757	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
844	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	758	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
845	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	759	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
846	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	760	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
847	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	761	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
848	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	762	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
849	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	763	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
850	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	764	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
851		765
852	flags = 0;	766	int flags = (opl->fire_on ? SF_FIREON : 0)
853		767	\| (opl->run_on ? SF_RUNON : 0);
854	if (opl->fire_on)
855	flags \|= SF_FIREON;
856
857	if (opl->run_on)
858	flags \|= SF_RUNON;
859		768
860	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	769	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
861		770
862	if (ns->sc_version < 1025)
863	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
864	else
865	for (int i = 0; i < NROFATTACKS; i++)	771	for (int i = 0; i < NROFATTACKS; i++)
866	{
867	/* Skip ones we won't send */	772	/* Skip ones we won't send */
868	if (atnr_cs_stat[i] == -1)	773	if (atnr_cs_stat[i] >= 0)
869	continue;
870
871	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	774	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
872	}
873		775
874	if (pl->ns->monitor_spells)	776	if (pl->ns->monitor_spells)
875	{	777	{
876	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	778	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
877	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	779	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
878	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	780	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
879	}	781	}
880		782
		783	char buf[MAX_BUF];
881	rangetostring (opl, buf); /* we want use the new fire & run system in new client */	784	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
882	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	785	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
883	set_title (ob, buf);	786	set_title (ob, buf);
884	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	787	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
885		788
…		…
903	<< uint32 (pl->ob->face)	806	<< uint32 (pl->ob->face)
904	<< data8 (pl->ob->name);	807	<< data8 (pl->ob->name);
905		808
906	pl->ns->last_weight = weight;	809	pl->ns->last_weight = weight;
907	pl->ns->send_packet (sl);	810	pl->ns->send_packet (sl);
908	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
909	}	811	}
910		812
911	/******************************************************************************	813	/******************************************************************************
912	*	814	*
913	* Start of map related commands.	815	* Start of map related commands.
…		…
980		882
981	/* Nothing changed */	883	/* Nothing changed */
982	return 0;	884	return 0;
983	}	885	}
984		886
985	/**	887	//-GPL
986	* Returns the size of a data for a map square as returned by
987	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
988	* available.
989	*/
990	int
991	getExtendedMapInfoSize (client * ns)
992	{
993	int result = 0;
994
995	if (ns->ext_mapinfos)
996	{
997	if (ns->EMI_smooth)
998	result += 1; /One byte for smoothlevel /
999	}
1000
1001	return result;
1002	}
1003		888
1004	// prefetch (and touch) all maps within a specific distancd	889	// prefetch (and touch) all maps within a specific distancd
1005	static void	890	static void
1006	prefetch_surrounding_maps (maptile *map, int distance)	891	prefetch_surrounding_maps (maptile *map, int distance)
1007	{	892	{
1008	map->last_access = runtime;	893	map->touch ();
1009		894
1010	if (--distance)	895	if (--distance)
1011	for (int dir = 4; --dir; )	896	for (int dir = 4; dir--; )
1012	if (const shstr &path = map->tile_path [dir])	897	if (const shstr &path = map->tile_path [dir])
1013	if (maptile *&neigh = map->tile_map [dir])	898	if (maptile *&neigh = map->tile_map [dir])
1014	prefetch_surrounding_maps (neigh, distance);	899	prefetch_surrounding_maps (neigh, distance);
1015	else	900	else
1016	neigh = maptile::find_async (path, map);	901	neigh = maptile::find_async (path, map);
…		…
1021	prefetch_surrounding_maps (object *op)	906	prefetch_surrounding_maps (object *op)
1022	{	907	{
1023	prefetch_surrounding_maps (op->map, 3);	908	prefetch_surrounding_maps (op->map, 3);
1024	}	909	}
1025		910
		911	//+GPL
		912
1026	/**	913	/**
1027	* Draws client map.	914	* Draws client map.
1028	*/	915	*/
1029	void	916	void
1030	draw_client_map (player *pl)	917	draw_client_map (player *pl)
1031	{	918	{
1032	object *ob = pl->observe;	919	object *ob = pl->viewpoint;
1033	if (!ob->active)	920	if (!pl->observe->active)
1034	return;	921	return;
1035
1036	maptile *plmap = ob->map;
1037		922
1038	/* If player is just joining the game, he isn't here yet, so the map	923	/* If player is just joining the game, he isn't here yet, so the map
1039	* can get swapped out. If so, don't try to send them a map. All will	924	* can get swapped out. If so, don't try to send them a map. All will
1040	* be OK once they really log in.	925	* be OK once they really log in.
1041	*/	926	*/
1042	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)	927	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)
1043	return;	928	return;
1044		929
1045	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1046	int estartlen, eoldlen;	930	int startlen, oldlen;
1047	uint8 eentrysize;
1048	uint16 ewhatstart, ewhatflag;
1049	uint8 extendedinfos;
1050		931
1051	check_map_change (pl);	932	check_map_change (pl);
1052	prefetch_surrounding_maps (pl->ob);	933	prefetch_surrounding_maps (pl->ob);
1053		934
1054	/* do LOS after calls to update_position */	935	/* do LOS after calls to update_position */
1055	if (ob != pl->ob)	936	/* unfortunately, we need to udpate los when observing, currently */
1056	clear_los (pl);	937	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1057	else if (pl->do_los)
1058	{	938	{
1059	update_los (ob);
1060	pl->do_los = 0;	939	pl->do_los = 0;
		940	pl->update_los ();
1061	}	941	}
1062		942
1063	/**	943	/**
1064	* This function uses the new map1 protocol command to send the map	944	* This function uses the new map1 protocol command to send the map
1065	* to the client. It is necessary because the old map command supports	945	* to the client. It is necessary because the old map command supports
…		…
1084	*/	964	*/
1085		965
1086	client &socket = *pl->ns;	966	client &socket = *pl->ns;
1087		967
1088	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	968	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1089	packet esl;
1090		969
1091	startlen = sl.length ();	970	startlen = sl.length ();
1092		971
1093	/Extendedmapinfo structure initialisation /	972	int hx = socket.mapx / 2;
1094	if (socket.ext_mapinfos)	973	int hy = socket.mapy / 2;
1095	{
1096	extendedinfos = EMI_NOREDRAW;
1097		974
1098	if (socket.EMI_smooth)	975	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1099	extendedinfos \|= EMI_SMOOTH;	976	int ax = dx + hx;
		977	int ay = dy + hy;
1100		978
1101	ewhatstart = esl.length ();	979	int mask = (ax << 10) \| (ay << 4);
1102	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	980	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1103	could need to be taken away */
1104	eentrysize = getExtendedMapInfoSize (&socket);
1105	esl << "mapextended "
1106	<< uint8 (extendedinfos)
1107	<< uint8 (eentrysize);
1108		981
1109	estartlen = esl.length ();	982	/* If the coordinates are not valid, or it is too dark to see,
1110	}	983	* we tell the client as such
1111
1112	/* x,y are the real map locations. ax, ay are viewport relative
1113	* locations.
1114	*/	984	*/
1115	ay = 0;	985	if (!m)
1116
1117	/* We could do this logic as conditionals in the if statement,
1118	* but that started to get a bit messy to look at.
1119	*/
1120	max_x = ob->x + (socket.mapx + 1) / 2;
1121	max_y = ob->y + (socket.mapy + 1) / 2;
1122
1123	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1124	{	986	{
1125	sint16 nx, ny;	987	/* space is out of map. Update space and clear values
1126	maptile *m = 0;	988	* if this hasn't already been done. If the space is out
1127		989	* of the map, it shouldn't have a head.
1128	ax = 0;	990	*/
1129	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	991	if (lastcell.count != -1)
1130	{	992	{
1131	// check to see if we can simply go one right quickly	993	sl << uint16 (mask);
		994	map_clearcell (&lastcell, -1);
1132	++nx;	995	}
1133	if (m && nx >= m->width)	996
		997	continue;
		998	}
		999
		1000	int d = pl->blocked_los_uc (dx, dy);
		1001
		1002	if (d > 3)
		1003	{
		1004	/* This block deals with spaces that are not visible for whatever
		1005	* reason. Still may need to send the head for this space.
		1006	*/
		1007	if (lastcell.count != -1
		1008	\|\| lastcell.faces[0]
		1009	\|\| lastcell.faces[1]
		1010	\|\| lastcell.faces[2]
		1011	\|\| lastcell.stat_hp
		1012	\|\| lastcell.flags
		1013	\|\| lastcell.player)
		1014	sl << uint16 (mask);
		1015
		1016	/* properly clear a previously sent big face */
		1017	map_clearcell (&lastcell, -1);
		1018	}
		1019	else
		1020	{
		1021	/* In this block, the space is visible.
		1022	*/
		1023
		1024	/* Rather than try to figure out what everything that we might
		1025	* need to send is, then form the packet after that,
		1026	* we presume that we will in fact form a packet, and update
		1027	* the bits by what we do actually send. If we send nothing,
		1028	* we just back out sl.length () to the old value, and no harm
		1029	* is done.
		1030	* I think this is simpler than doing a bunch of checks to see
		1031	* what if anything we need to send, setting the bits, then
		1032	* doing those checks again to add the real data.
		1033	*/
		1034	oldlen = sl.length ();
		1035
		1036	sl << uint16 (mask);
		1037
		1038	unsigned char dummy;
		1039	unsigned char *last_ext = &dummy;
		1040
		1041	/* Darkness changed */
		1042	if (lastcell.count != d)
		1043	{
1134	m = 0;	1044	mask \|= 0x8;
1135		1045
1136	if (!m)	1046	*last_ext \|= 0x80;
		1047	last_ext = &sl[sl.length ()];
		1048	sl << uint8 (d);
		1049	}
		1050
		1051	lastcell.count = d;
		1052
		1053	mapspace &ms = m->at (nx, ny);
		1054	ms.update ();
		1055
		1056	// extmap handling
		1057	uint8 stat_hp = 0;
		1058	uint8 stat_width = 0;
		1059	uint8 flags = 0;
		1060	tag_t player = 0;
		1061
		1062	// send hp information, if applicable
		1063	if (object *op = ms.faces_obj [0])
		1064	if (op->is_head () && !op->invisible)
1137	{	1065	{
1138	nx = x; ny = y; m = plmap;	1066	if (op->stats.maxhp > op->stats.hp
1139		1067	&& op->stats.maxhp > 0
1140	if (xy_normalise (m, nx, ny))	1068	&& (op->type == PLAYER
1141	m->touch ();	1069	\|\| op->type == DOOR // does not work, have maxhp 0
1142	else	1070	\|\| op->flag [FLAG_MONSTER]
		1071	\|\| op->flag [FLAG_ALIVE]
		1072	\|\| op->flag [FLAG_GENERATOR]))
1143	m = 0;	1073	{
		1074	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1075	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1076	}
		1077
		1078	if (expect_false (op->has_dialogue ()))
		1079	flags \|= 1;
		1080
		1081	if (expect_false (op->type == PLAYER))
		1082	player = op == ob ? pl->ob->count
		1083	: op == pl->ob ? ob->count
		1084	: op->count;
1144	}	1085	}
1145		1086
1146	int emask, mask;	1087	if (expect_false (lastcell.stat_hp != stat_hp))
1147	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1148
1149	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1150
1151	/* If the coordinates are not valid, or it is too dark to see,
1152	* we tell the client as such
1153	*/
1154	if (!m)
1155	{	1088	{
1156	/* space is out of map. Update space and clear values	1089	lastcell.stat_hp = stat_hp;
1157	* if this hasn't already been done. If the space is out	1090
1158	* of the map, it shouldn't have a head	1091	mask \|= 0x8;
1159	*/	1092	*last_ext \|= 0x80;
1160	if (lastcell.count != -1)	1093	last_ext = &sl[sl.length ()];
		1094
		1095	sl << uint8 (5) << uint8 (stat_hp);
		1096
		1097	if (stat_width > 1)
1161	{	1098	{
1162	sl << uint16 (mask);
1163	map_clearcell (&lastcell, -1);
1164	}
1165
1166	continue;
1167	}
1168
1169	int d = pl->blocked_los[ax][ay];
1170
1171	if (d > 3)
1172	{
1173
1174	int need_send = 0, count;
1175
1176	/* This block deals with spaces that are not visible for whatever
1177	* reason. Still may need to send the head for this space.
1178	*/
1179
1180	oldlen = sl.length ();
1181
1182	sl << uint16 (mask);
1183
1184	if (lastcell.count != -1)
1185	need_send = 1;
1186
1187	count = -1;
1188
1189	/* properly clear a previously sent big face */
1190	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1191	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1192	need_send = 1;
1193
1194	map_clearcell (&lastcell, count);
1195
1196	if ((mask & 0xf) \|\| need_send)
1197	sl[oldlen + 1] = mask & 0xff;
1198	else
1199	sl.reset (oldlen);
1200	}
1201	else
1202	{
1203	/* In this block, the space is visible.
1204	*/
1205
1206	/* Rather than try to figure out what everything that we might
1207	* need to send is, then form the packet after that,
1208	* we presume that we will in fact form a packet, and update
1209	* the bits by what we do actually send. If we send nothing,
1210	* we just back out sl.length () to the old value, and no harm
1211	* is done.
1212	* I think this is simpler than doing a bunch of checks to see
1213	* what if anything we need to send, setting the bits, then
1214	* doing those checks again to add the real data.
1215	*/
1216	oldlen = sl.length ();
1217	eoldlen = esl.length ();
1218
1219	sl << uint16 (mask);
1220
1221	unsigned char dummy;
1222	unsigned char *last_ext = &dummy;
1223
1224	/* Darkness changed */
1225	if (lastcell.count != d && socket.darkness)
1226	{
1227	mask \|= 0x8;
1228
1229	if (socket.extmap)
1230	{
1231	*last_ext \|= 0x80;	1099	*last_ext \|= 0x80;
1232	last_ext = &sl[sl.length ()];	1100	last_ext = &sl[sl.length ()];
1233	sl << uint8 (d);	1101
1234	}	1102	sl << uint8 (6) << uint8 (stat_width);
1235	else
1236	sl << uint8 (255 - 64 * d);
1237	}	1103	}
		1104	}
1238		1105
1239	lastcell.count = d;	1106	if (expect_false (lastcell.player != player))
1240
1241	mapspace &ms = m->at (nx, ny);
1242	ms.update ();
1243
1244	if (socket.extmap)
1245	{	1107	{
1246	uint8 stat_hp = 0;	1108	lastcell.player = player;
1247	uint8 stat_width = 0;
1248	uint8 flags = 0;
1249	tag_t player = 0;
1250		1109
1251	// send hp information, if applicable
1252	if (object *op = ms.faces_obj [0])
1253	if (op->is_head () && !op->invisible)
1254	{
1255	if (op->stats.maxhp > op->stats.hp
1256	&& op->stats.maxhp > 0
1257	&& (op->type == PLAYER
1258	\|\| op->type == DOOR // does not work, have maxhp 0
1259	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1260	{
1261	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1262	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1263	}
1264
1265	if (op->msg && op->msg[0] == '@')
1266	flags \|= 1;
1267
1268	if (op->type == PLAYER && op != ob)
1269	player = op->count;
1270	}
1271
1272	if (lastcell.stat_hp != stat_hp)
1273	{
1274	lastcell.stat_hp = stat_hp;
1275
1276	mask \|= 0x8;	1110	mask \|= 0x8;
1277	*last_ext \|= 0x80;	1111	*last_ext \|= 0x80;
1278	last_ext = &sl[sl.length ()];	1112	last_ext = &sl[sl.length ()];
1279		1113
1280	sl << uint8 (5) << uint8 (stat_hp);
1281
1282	if (stat_width > 1)
1283	{
1284	*last_ext \|= 0x80;
1285	last_ext = &sl[sl.length ()];
1286
1287	sl << uint8 (6) << uint8 (stat_width);
1288	}
1289	}
1290
1291	if (lastcell.player != player)
1292	{
1293	lastcell.player = player;
1294
1295	mask \|= 0x8;
1296	*last_ext \|= 0x80;
1297	last_ext = &sl[sl.length ()];
1298
1299	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1114	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1300	}	1115	}
1301		1116
1302	if (lastcell.flags != flags)	1117	if (expect_false (lastcell.flags != flags))
1303	{	1118	{
1304	lastcell.flags = flags;	1119	lastcell.flags = flags;
1305		1120
1306	mask \|= 0x8;	1121	mask \|= 0x8;
1307	*last_ext \|= 0x80;	1122	*last_ext \|= 0x80;
1308	last_ext = &sl[sl.length ()];	1123	last_ext = &sl[sl.length ()];
1309		1124
1310	sl << uint8 (8) << uint8 (flags);	1125	sl << uint8 (8) << uint8 (flags);
1311	}
1312	}	1126	}
1313		1127
		1128	// faces
		1129
1314	/* Floor face */	1130	/* Floor face */
1315	if (update_space (sl, socket, ms, lastcell, 2))	1131	if (update_space (sl, socket, ms, lastcell, 2))
1316	mask \|= 0x4;	1132	mask \|= 0x4;
1317		1133
1318	/* Middle face */	1134	/* Middle face */
1319	if (update_space (sl, socket, ms, lastcell, 1))	1135	if (update_space (sl, socket, ms, lastcell, 1))
1320	mask \|= 0x2;	1136	mask \|= 0x2;
1321		1137
		1138	if (expect_false (ob->invisible)
		1139	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1322	if (ms.player () == ob	1140	&& ms.player () == ob)
1323	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1324	{	1141	{
1325	// force player to be visible to himself if invisible	1142	// force player to be visible to himself if invisible
1326	if (lastcell.faces[0] != ob->face)	1143	if (lastcell.faces[0] != ob->face)
1327	{	1144	{
1328	lastcell.faces[0] = ob->face;	1145	lastcell.faces[0] = ob->face;
1329		1146
1330	mask \|= 0x1;
1331	sl << uint16 (ob->face);
1332
1333	socket.send_faces (ob);
1334	}
1335	}
1336	/* Top face */
1337	else if (update_space (sl, socket, ms, lastcell, 0))
1338	mask \|= 0x1;	1147	mask \|= 0x1;
		1148	sl << uint16 (ob->face);
1339		1149
		1150	socket.send_faces (ob);
		1151	}
		1152	}
		1153	/* Top face */
		1154	else if (update_space (sl, socket, ms, lastcell, 0))
		1155	mask \|= 0x1;
		1156
1340	/* Check to see if we are in fact sending anything for this	1157	/* Check to see if we are in fact sending anything for this
1341	* space by checking the mask. If so, update the mask.	1158	* space by checking the mask. If so, update the mask.
1342	* if not, reset the len to that from before adding the mask	1159	* if not, reset the len to that from before adding the mask
1343	* value, so we don't send those bits.	1160	* value, so we don't send those bits.
1344	*/	1161	*/
1345	if (mask & 0xf)	1162	if (mask & 0xf)
1346	sl[oldlen + 1] = mask & 0xff;	1163	sl[oldlen + 1] = mask & 0xff;
1347	else	1164	else
1348	sl.reset (oldlen);	1165	sl.reset (oldlen);
1349
1350	if (socket.ext_mapinfos)
1351	esl << uint16 (emask);
1352
1353	if (socket.EMI_smooth)
1354	{
1355	for (int layer = 2+1; layer--; )
1356	{
1357	object *ob = ms.faces_obj [layer];
1358
1359	// If there is no object for this space, or if the face for the object
1360	// is the blank face, set the smoothlevel to zero.
1361	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1362
1363	// We've gotten what face we want to use for the object. Now see if
1364	// if it has changed since we last sent it to the client.
1365	if (lastcell.smooth[layer] != smoothlevel)
1366	{
1367	lastcell.smooth[layer] = smoothlevel;
1368	esl << uint8 (smoothlevel);
1369	emask \|= 1 << layer;
1370	}
1371	}
1372
1373	if (emask & 0xf)
1374	esl[eoldlen + 1] = emask & 0xff;
1375	else
1376	esl.reset (eoldlen);
1377	}
1378	} /* else this is a viewable space */	1166	} /* else this is a viewable space */
1379	} /* for x loop */	1167	ordered_mapwalk_end
1380	} /* for y loop */
1381		1168
1382	socket.flush_fx ();	1169	socket.flush_fx ();
1383
1384	/* Verify that we in fact do need to send this */
1385	if (socket.ext_mapinfos)
1386	{
1387	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1388	{
1389	/* No map data will follow, so don't say the client
1390	* it doesn't need draw!
1391	*/
1392	ewhatflag &= ~EMI_NOREDRAW;
1393	esl[ewhatstart + 1] = ewhatflag & 0xff;
1394	}
1395
1396	if (esl.length () > estartlen)
1397	socket.send_packet (esl);
1398	}
1399		1170
1400	if (sl.length () > startlen \|\| socket.sent_scroll)	1171	if (sl.length () > startlen \|\| socket.sent_scroll)
1401	{	1172	{
1402	socket.send_packet (sl);	1173	socket.send_packet (sl);
1403	socket.sent_scroll = 0;	1174	socket.sent_scroll = 0;
1404	}	1175	}
1405	}	1176	}
1406		1177
1407	/*****************************************************************************/
1408	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1409	/* a player. Of course, the client need to know the command to be able to */
1410	/* manage it ! */
1411	/*****************************************************************************/
1412	void
1413	send_plugin_custom_message (object pl, char buf)
1414	{
1415	pl->contr->ns->send_packet (buf);
1416	}
1417
1418	/**
1419	* This sends the skill number to name mapping. We ignore
1420	* the params - we always send the same info no matter what.
1421	*/
1422	void
1423	send_skill_info (client ns, char params)
1424	{
1425	packet sl;
1426	sl << "replyinfo skill_info\n";
1427
1428	for (int i = 1; i < NUM_SKILLS; i++)
1429	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1430
1431	if (sl.length () > MAXSOCKBUF)
1432	{
1433	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1434	fatal (0);
1435	}
1436
1437	ns->send_packet (sl);
1438	}
1439
1440	/**
1441	* This sends the spell path to name mapping. We ignore
1442	* the params - we always send the same info no matter what.
1443	*/
1444	void
1445	send_spell_paths (client * ns, char *params)
1446	{
1447	packet sl;
1448
1449	sl << "replyinfo spell_paths\n";
1450
1451	for (int i = 0; i < NRSPELLPATHS; i++)
1452	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1453
1454	if (sl.length () > MAXSOCKBUF)
1455	{
1456	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1457	fatal (0);
1458	}
1459
1460	ns->send_packet (sl);
1461	}
1462
1463	/**	1178	/**
1464	* This looks for any spells the player may have that have changed their stats.	1179	* This looks for any spells the player may have that have changed their stats.
1465	* it then sends an updspell packet for each spell that has changed in this way	1180	* it then sends an updspell packet for each spell that has changed in this way
1466	*/	1181	*/
1467	void	1182	void
1468	esrv_update_spells (player *pl)	1183	esrv_update_spells (player *pl)
1469	{	1184	{
1470	if (!pl->ns)	1185	if (!pl->ns)
1471	return;	1186	return;
1472		1187
		1188	pl->ns->update_spells = false;
		1189
1473	if (!pl->ns->monitor_spells)	1190	if (!pl->ns->monitor_spells)
1474	return;	1191	return;
1475		1192
1476	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1193	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1477	{
1478	if (spell->type == SPELL)	1194	if (spell->type == SPELL)
1479	{	1195	{
1480	int flags = 0;	1196	int flags = 0;
		1197	int val;
1481		1198
1482	/* check if we need to update it */	1199	/* check if we need to update it */
1483	if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1200	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1201	if (spell->cached_sp != val)
1484	{	1202	{
1485	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1203	spell->cached_sp = val;
1486	flags \|= UPD_SP_MANA;	1204	flags \|= UPD_SP_MANA;
1487	}	1205	}
1488		1206
1489	if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1207	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1208	if (spell->cached_grace != val)
1490	{	1209	{
1491	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1210	spell->cached_grace = val;
1492	flags \|= UPD_SP_GRACE;	1211	flags \|= UPD_SP_GRACE;
1493	}	1212	}
1494		1213
1495	if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1214	val = casting_level (pl->ob, spell);
		1215	if (spell->cached_eat != val)
1496	{	1216	{
1497	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1217	spell->cached_eat = val;
1498	flags \|= UPD_SP_DAMAGE;	1218	flags \|= UPD_SP_LEVEL;
1499	}	1219	}
1500		1220
1501	if (flags)	1221	if (flags)
1502	{	1222	{
1503	packet sl;	1223	packet sl;
1504		1224
1505	sl << "updspell "	1225	sl << "updspell "
1506	<< uint8 (flags)	1226	<< uint8 (flags)
1507	<< uint32 (spell->count);	1227	<< uint32 (spell->count);
1508		1228
1509	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	1229	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1510	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	1230	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1511	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	1231	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1512		1232
1513	pl->ns->send_packet (sl);	1233	pl->ns->send_packet (sl);
1514	}	1234	}
1515	}	1235	}
1516	}
1517	}	1236	}
1518		1237
1519	void	1238	void
1520	esrv_remove_spell (player pl, object spell)	1239	esrv_remove_spell (player pl, object spell)
1521	{	1240	{
…		…
1546	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1265	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1547	return;	1266	return;
1548	}	1267	}
1549		1268
1550	/* store costs and damage in the object struct, to compare to later */	1269	/* store costs and damage in the object struct, to compare to later */
1551	spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1270	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1552	spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1271	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1553	spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1272	spell->cached_eat = casting_level (pl->ob, spell);
1554		1273
1555	/* figure out which skill it uses, if it uses one */	1274	/* figure out which skill it uses, if it uses one */
1556	if (spell->skill)	1275	if (spell->skill)
1557	{	1276	if (object *tmp = pl->find_skill (spell->skill))
1558	for (i = 1; i < NUM_SKILLS; i++)	1277	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1559	if (!strcmp (spell->skill, skill_names[i]))
1560	{
1561	skill = i + CS_STAT_SKILLINFO;
1562	break;
1563	}
1564	}
1565		1278
1566	// spells better have a face	1279	// spells better have a face
1567	if (!spell->face)	1280	if (!spell->face)
1568	{	1281	{
1569	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1282	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1574		1287
1575	/* send the current values */	1288	/* send the current values */
1576	sl << uint32 (spell->count)	1289	sl << uint32 (spell->count)
1577	<< uint16 (spell->level)	1290	<< uint16 (spell->level)
1578	<< uint16 (spell->casting_time)	1291	<< uint16 (spell->casting_time)
1579	<< uint16 (spell->last_sp)	1292	<< uint16 (spell->cached_sp)
1580	<< uint16 (spell->last_grace)	1293	<< uint16 (spell->cached_grace)
1581	<< uint16 (spell->last_eat)	1294	<< uint16 (spell->cached_eat)
1582	<< uint8 (skill)	1295	<< uint8 (skill)
1583	<< uint32 (spell->path_attuned)	1296	<< uint32 (spell->path_attuned)
1584	<< uint32 (spell->face)	1297	<< uint32 (spell->face)
1585	<< data8 (spell->name)	1298	<< data8 (spell->name)
1586	<< data16 (spell->msg);	1299	<< data16 (spell->msg);
…		…
1653	/* finally, we can send the packet */	1366	/* finally, we can send the packet */
1654	pl->ns->flush_fx ();	1367	pl->ns->flush_fx ();
1655	pl->ns->send_packet (sl);	1368	pl->ns->send_packet (sl);
1656	}	1369	}
1657		1370
		1371	//-GPL
		1372

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.130 by root, Tue May 20 03:14:19 2008 UTC vs. Revision 1.174 by root, Thu Apr 15 00:40:34 2010 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.130 by root, Tue May 20 03:14:19 2008 UTC vs.
Revision 1.174 by root, Thu Apr 15 00:40:34 2010 UTC