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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.133 by root, Sun Jul 13 11:57:25 2008 UTC vs.
Revision 1.188 by root, Mon Oct 29 23:55:57 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	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).
…		…
134	pl->ns->mapinfo_queue_clear ();	146	pl->ns->mapinfo_queue_clear ();
135		147
136	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	148	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
137		149
138	pl->ns->force_newmap = false;	150	pl->ns->force_newmap = false;
139
140	if (pl->ns->newmapcmd == 1)
141	pl->ns->send_packet ("newmap");	151	pl->ns->send_packet ("newmap");
142
143	pl->ns->floorbox_reset ();	152	pl->ns->floorbox_reset ();
144	}	153	}
145		154
146	static void	155	static void
147	send_map_info (player *pl)	156	send_map_info (player *pl)
148	{	157	{
149	client &socket = *pl->ns;	158	client &socket = *pl->ns;
150	object *ob = pl->observe;	159	object *ob = pl->viewpoint;
151		160
152	if (socket.mapinfocmd)	161	if (socket.mapinfocmd)
153	{	162	{
154	if (ob->map && ob->map->path[0])	163	if (ob->map && ob->map->path)
155	{	164	{
156	int flags = 0;	165	int flags = 0;
157		166
		167	// due to historical glitches, the bit ordering and map index ordering differs
158	if (ob->map->tile_path[0]) flags \|= 1;	168	if (ob->map->tile_path [TILE_NORTH]) flags \|= 0x01;
159	if (ob->map->tile_path[1]) flags \|= 2;	169	if (ob->map->tile_path [TILE_EAST ]) flags \|= 0x02;
160	if (ob->map->tile_path[2]) flags \|= 4;	170	if (ob->map->tile_path [TILE_SOUTH]) flags \|= 0x04;
161	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;
162		175
163	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",
164	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,	177	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
165	ob->map->width, ob->map->height, &ob->map->path);	178	ob->map->width, ob->map->height, &ob->map->path);
166	}	179	}
…		…
172	/** check for map/region change and send new map data */	185	/** check for map/region change and send new map data */
173	static void	186	static void
174	check_map_change (player *pl)	187	check_map_change (player *pl)
175	{	188	{
176	client &socket = *pl->ns;	189	client &socket = *pl->ns;
177	object *ob = pl->observe;	190	object *ob = pl->viewpoint;
178		191
179	region *reg = ob->region ();	192	region *reg = ob->region ();
180	if (socket.current_region != reg)	193	if (socket.current_region != reg)
181	{	194	{
182	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));
…		…
212	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)	225	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)
213	{	226	{
214	int dx = ob->x - socket.current_x;	227	int dx = ob->x - socket.current_x;
215	int dy = ob->y - socket.current_y;	228	int dy = ob->y - socket.current_y;
216		229
217	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))
218	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
219	else
220	{
221	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	230	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
222	socket.floorbox_reset ();	231	socket.floorbox_reset ();
223	}
224	}	232	}
225		233
226	socket.current_x = ob->x;	234	socket.current_x = ob->x;
227	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);
228	}	275	}
229		276
230	/**	277	/**
231	* RequestInfo is sort of a meta command. There is some specific	278	* RequestInfo is sort of a meta command. There is some specific
232	* request of information, but we call other functions to provide	279	* request of information, but we call other functions to provide
…		…
245	{	292	{
246	*params++ = 0;	293	*params++ = 0;
247	break;	294	break;
248	}	295	}
249		296
250	if (!strcmp (buf, "image_info"))
251	send_image_info (ns, params);
252	else if (!strcmp (buf, "image_sums"))
253	send_image_sums (ns, params);
254	else if (!strcmp (buf, "skill_info"))	297	if (!strcmp (buf, "skill_info"))
255	send_skill_info (ns, params);	298	send_skill_info (ns, params);
256	else if (!strcmp (buf, "spell_paths"))	299	else if (!strcmp (buf, "spell_paths"))
257	send_spell_paths (ns, params);	300	send_spell_paths (ns, params);
258	else	301	else
259	{	302	{
…		…
275	ExtiCmd (char buf, int len, client ns)	318	ExtiCmd (char buf, int len, client ns)
276	{	319	{
277	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	320	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
278	}	321	}
279		322
		323	//-GPL
		324
280	void	325	void
281	client::mapinfo_queue_clear ()	326	client::mapinfo_queue_clear ()
282	{	327	{
283	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	328	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
284	free (*i);	329	free (*i);
…		…
291	{	336	{
292	char *token = buf;	337	char *token = buf;
293	buf += strlen (buf) + 9;	338	buf += strlen (buf) + 9;
294		339
295	// initial map and its origin	340	// initial map and its origin
296	maptile *map = pl->observe->map;	341	maptile *map = pl->viewpoint->map;
297	int mapx = pl->ns->mapx / 2 - pl->observe->x;	342	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
298	int mapy = pl->ns->mapy / 2 - pl->observe->y;	343	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
299	int max_distance = 8; // limit maximum path length to something generous	344	int max_distance = 8; // limit maximum path length to something generous
300		345
301	while (*buf && map && max_distance)	346	while (*buf && map && max_distance)
302	{	347	{
303	int dir = *buf++ - '1';	348	int dir = *buf++ - '1';
304		349
305	if (dir >= 0 && dir <= 3)	350	// due to historical glitches, the mapinfo index and tile index differs
		351	static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
		352
		353	// maybe we should only allow the four flat directions
		354	if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
306	{	355	{
		356	dir = dirmap [dir];
		357
307	if (!map->tile_path [dir])	358	if (!map->tile_path [dir])
308	map = 0;	359	map = 0;
309	else if (map->tile_available (dir, false))	360	else if (map->tile_available (dir, false))
310	{	361	{
311	maptile *neigh = map->tile_map [dir];	362	maptile *neigh = map->tile_map [dir];
…		…
334	send_packet_printf ("mapinfo %s nomap", token);	385	send_packet_printf ("mapinfo %s nomap", token);
335	else	386	else
336	{	387	{
337	int flags = 0;	388	int flags = 0;
338		389
		390	// due to historical glitches, the bit ordering and map index ordering differs
339	if (map->tile_path[0]) flags \|= 1;	391	if (map->tile_path [TILE_NORTH]) flags \|= 0x01;
340	if (map->tile_path[1]) flags \|= 2;	392	if (map->tile_path [TILE_EAST ]) flags \|= 0x02;
341	if (map->tile_path[2]) flags \|= 4;	393	if (map->tile_path [TILE_SOUTH]) flags \|= 0x04;
342	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;
343		398
344	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);
345	}	400	}
346		401
347	return 1;	402	return 1;
…		…
408	AddMeCmd (char buf, int len, client ns)	463	AddMeCmd (char buf, int len, client ns)
409	{	464	{
410	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	465	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
411	}	466	}
412		467
413	/** Reply to ExtendedInfos command */	468	//+GPL
414	void
415	ToggleExtendedInfos (char buf, int len, client ns)
416	{
417	char cmdback[MAX_BUF];
418	char command[50];
419	int info, nextinfo;
420
421	cmdback[0] = '\0';
422	nextinfo = 0;
423
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
445	/* 2. Interpret info */
446	if (!strcmp ("smooth", command))
447	/* Toggle smoothing */
448	ns->EMI_smooth = !ns->EMI_smooth;
449	else
450	/bad value /;
451
452	/3. Next info /
453	}
454
455	strcpy (cmdback, "ExtendedInfoSet");
456
457	if (ns->EMI_smooth)
458	{
459	strcat (cmdback, " ");
460	strcat (cmdback, "smoothing");
461	}
462
463	ns->send_packet (cmdback);
464	}
465
466	/*
467	#define MSG_TYPE_BOOK 1
468	#define MSG_TYPE_CARD 2
469	#define MSG_TYPE_PAPER 3
470	#define MSG_TYPE_SIGN 4
471	#define MSG_TYPE_MONUMENT 5
472	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
473
474	/** Reply to ExtendedInfos command */
475	void
476	ToggleExtendedText (char buf, int len, client ns)
477	{
478	char cmdback[MAX_BUF];
479	char temp[10];
480	char command[50];
481	int info, nextinfo, i, flag;
482
483	cmdback[0] = '\0';
484
485	nextinfo = 0;
486	while (1)
487	{
488	/* 1. Extract an info */
489	info = nextinfo;
490
491	while ((info < len) && (buf[info] == ' '))
492	info++;
493
494	if (info >= len)
495	break;
496
497	nextinfo = info + 1;
498
499	while ((nextinfo < len) && (buf[nextinfo] != ' '))
500	nextinfo++;
501
502	if (nextinfo - info >= 49) /Erroneous info asked /
503	continue;
504
505	strncpy (command, &(buf[info]), nextinfo - info);
506	command[nextinfo - info] = '\0';
507	/* 2. Interpret info */
508	i = sscanf (command, "%d", &flag);
509
510	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
511	ns->supported_readables \|= (1 << flag);
512	/3. Next info /
513	}
514
515	/* Send resulting state */
516	strcpy (cmdback, "ExtendedTextSet");
517
518	for (i = 0; i <= MSG_TYPE_LAST; i++)
519	if (ns->supported_readables & (1 << i))
520	{
521	strcat (cmdback, " ");
522	snprintf (temp, sizeof (temp), "%d", i);
523	strcat (cmdback, temp);
524	}
525
526	ns->send_packet (cmdback);
527	}
528		469
529	/**	470	/**
530	* 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,
531	* etc.)	472	* etc.)
532	*/	473	*/
…		…
545	return;	486	return;
546		487
547	buf++;	488	buf++;
548	}	489	}
549		490
550	execute_newserver_command (pl->ob, (char *) buf);	491	execute_newserver_command (pl->ob, (char *)buf);
551		492
552	/* Perhaps something better should be done with a left over count.	493	/* Perhaps something better should be done with a left over count.
553	* Cleaning up the input should probably be done first - all actions	494	* Cleaning up the input should probably be done first - all actions
554	* 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
555	* commands.	496	* commands.
…		…
589	* commands.	530	* commands.
590	*/	531	*/
591	pl->count = 0;	532	pl->count = 0;
592		533
593	//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
594	int time = fabs (pl->ob->speed) < 0.001	535	int time = pl->ob->has_active_speed ()
595	? time = MAX_TIME * 100
596	: time = (int) (MAX_TIME / fabs (pl->ob->speed));	536	? (int) (MAX_TIME / pl->ob->speed)
		537	: MAX_TIME * 100;
597		538
598	/* Send confirmation of command execution now */	539	/* Send confirmation of command execution now */
599	packet sl ("comc");	540	packet sl ("comc");
600	sl << uint16 (cmdid) << uint32 (time);	541	sl << uint16 (cmdid) << uint32 (time);
601	pl->ns->send_packet (sl);	542	pl->ns->send_packet (sl);
…		…
643	LOG (llevError, "Unknown input state: %d\n", ns->state);	584	LOG (llevError, "Unknown input state: %d\n", ns->state);
644	}	585	}
645	}	586	}
646		587
647	/**	588	/**
648	* Client tells its version. If there is a mismatch, we close the	589	* Client tells its version info.
649	* socket. In real life, all we should care about is the client having
650	* something older than the server. If we assume the client will be
651	* backwards compatible, having it be a later version should not be a
652	* problem.
653	*/	590	*/
654	void	591	void
655	VersionCmd (char buf, int len, client ns)	592	VersionCmd (char buf, int len, client ns)
656	{	593	{
657	if (!buf)	594	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
658	{
659	LOG (llevError, "CS: received corrupted version command\n");
660	return;
661	}
662
663	ns->cs_version = atoi (buf);
664	ns->sc_version = ns->cs_version;
665
666	LOG (llevDebug, "connection from client <%s>\n", buf);
667
668	//TODO: should log here just for statistics
669
670	//if (VERSION_CS != ns->cs_version)
671	// unchecked;
672
673	char *cp = strchr (buf + 1, ' ');
674	if (!cp)
675	return;
676
677	ns->sc_version = atoi (cp);
678
679	//if (VERSION_SC != ns->sc_version)
680	// unchecked;
681
682	cp = strchr (cp + 1, ' ');
683
684	if (cp)
685	{
686	ns->version = cp + 1;
687
688	if (ns->sc_version < 1026)
689	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
690	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
691	}
692	}	595	}
693		596
694	/** sound related functions. */	597	/** sound related functions. */
695	void	598	void
696	SetSound (char buf, int len, client ns)	599	SetSound (char buf, int len, client ns)
…		…
747	* Get player's current range attack in obuf.	650	* Get player's current range attack in obuf.
748	*/	651	*/
749	static void	652	static void
750	rangetostring (player pl, char obuf)	653	rangetostring (player pl, char obuf)
751	{	654	{
752	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
753		666
754	if (pl->ranged_ob)	667	if (pl->ranged_ob)
755	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;
756		669
757	if (pl->combat_ob)	670	if (pl->combat_ob)
…		…
803	* commands for now.	716	* commands for now.
804	*/	717	*/
805	void	718	void
806	esrv_update_stats (player *pl)	719	esrv_update_stats (player *pl)
807	{	720	{
808	char buf[MAX_BUF];
809	uint16 flags;
810
811	client *ns = pl->ns;	721	client *ns = pl->ns;
812	if (!ns)	722	if (!ns)
813	return;	723	return;
814		724
815	object *ob = pl->observe;	725	object *ob = pl->observe;
…		…
832	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	742	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
833	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	743	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
834	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	744	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
835	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	745	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
836		746
837	for (int s = 0; s < NUM_SKILLS; s++)	747	for (int s = 0; s < CS_NUM_SKILLS; s++)
838	if (object *skill = opl->last_skill_ob[s])	748	if (object *skill = opl->last_skill_ob [s])
839	if (skill->stats.exp != ns->last_skill_exp [s])	749	if (skill->stats.exp != ns->last_skill_exp [s])
840	{	750	{
841	ns->last_skill_exp [s] = skill->stats.exp;	751	ns->last_skill_exp [s] = skill->stats.exp;
842		752
843	/* Always send along the level if exp changes. This is only	753	/* Always send along the level if exp changes. This is only
844	* 1 extra byte, but keeps processing simpler.	754	* 1 extra byte, but keeps processing simpler.
845	*/	755	*/
846	sl << uint8 (s + CS_STAT_SKILLINFO)	756	sl << uint8 (CS_STAT_SKILLINFO + s)
847	<< uint8 (skill->level)	757	<< uint8 (skill->level)
848	<< uint64 (skill->stats.exp);	758	<< uint64 (skill->stats.exp);
849	}	759	}
850		760
851	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	761	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
852	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	762	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
853	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	763	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
854	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	764	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
855	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	765	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
856	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);
857	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	767	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
858	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);
859	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);
860		770
861	flags = 0;	771	int flags = (opl->fire_on ? SF_FIREON : 0)
862		772	\| (opl->run_on ? SF_RUNON : 0);
863	if (opl->fire_on)
864	flags \|= SF_FIREON;
865
866	if (opl->run_on)
867	flags \|= SF_RUNON;
868		773
869	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	774	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
870		775
871	if (ns->sc_version < 1025)
872	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
873	else
874	for (int i = 0; i < NROFATTACKS; i++)	776	for (int i = 0; i < NROFATTACKS; i++)
875	{
876	/* Skip ones we won't send */	777	/* Skip ones we won't send */
877	if (atnr_cs_stat[i] == -1)	778	if (atnr_cs_stat[i] >= 0)
878	continue;
879
880	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]);
881	}
882		780
883	if (pl->ns->monitor_spells)	781	if (pl->ns->monitor_spells)
884	{	782	{
885	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);
886	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);
887	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);
888	}	786	}
889		787
		788	char buf[MAX_BUF];
890	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 */
891	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	790	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
892	set_title (ob, buf);	791	set_title (ob, buf);
893	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	792	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
894		793
…		…
912	<< uint32 (pl->ob->face)	811	<< uint32 (pl->ob->face)
913	<< data8 (pl->ob->name);	812	<< data8 (pl->ob->name);
914		813
915	pl->ns->last_weight = weight;	814	pl->ns->last_weight = weight;
916	pl->ns->send_packet (sl);	815	pl->ns->send_packet (sl);
917	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
918	}	816	}
919		817
920	/******************************************************************************	818	/******************************************************************************
921	*	819	*
922	* Start of map related commands.	820	* Start of map related commands.
…		…
990	/* Nothing changed */	888	/* Nothing changed */
991	return 0;	889	return 0;
992	}	890	}
993		891
994	/**	892	/**
995	* Returns the size of a data for a map square as returned by
996	* mapextended. There are CLIENTMAPXCLIENTMAPYLAYERS entries
997	* available.
998	*/
999	int
1000	getExtendedMapInfoSize (client * ns)
1001	{
1002	int result = 0;
1003
1004	if (ns->ext_mapinfos)
1005	{
1006	if (ns->EMI_smooth)
1007	result += 1; /One byte for smoothlevel /
1008	}
1009
1010	return result;
1011	}
1012
1013	// prefetch (and touch) all maps within a specific distancd
1014	static void
1015	prefetch_surrounding_maps (maptile *map, int distance)
1016	{
1017	map->last_access = runtime;
1018
1019	if (--distance)
1020	for (int dir = 4; --dir; )
1021	if (const shstr &path = map->tile_path [dir])
1022	if (maptile *&neigh = map->tile_map [dir])
1023	prefetch_surrounding_maps (neigh, distance);
1024	else
1025	neigh = maptile::find_async (path, map);
1026	}
1027
1028	// prefetch a generous area around the player
1029	static void
1030	prefetch_surrounding_maps (object *op)
1031	{
1032	prefetch_surrounding_maps (op->map, 3);
1033	}
1034
1035	/**
1036	* Draws client map.	893	* Draws client map.
1037	*/	894	*/
1038	void	895	void
1039	draw_client_map (player *pl)	896	draw_client_map (player *pl)
1040	{	897	{
1041	object *ob = pl->observe;	898	object *ob = pl->viewpoint;
1042	if (!ob->active)	899	if (!pl->observe->active)
1043	return;	900	return;
1044
1045	maptile *plmap = ob->map;
1046		901
1047	/* If player is just joining the game, he isn't here yet, so the map	902	/* If player is just joining the game, he isn't here yet, so the map
1048	* can get swapped out. If so, don't try to send them a map. All will	903	* can get swapped out. If so, don't try to send them a map. All will
1049	* be OK once they really log in.	904	* be OK once they really log in.
1050	*/	905	*/
1051	if (!plmap \|\| plmap->in_memory != MAP_ACTIVE)	906	if (!ob->map \|\| ob->map->state != MAP_ACTIVE)
1052	return;	907	return;
1053		908
1054	int x, y, ax, ay, startlen, max_x, max_y, oldlen;
1055	int estartlen, eoldlen;	909	int startlen, oldlen;
1056	uint8 eentrysize;
1057	uint16 ewhatstart, ewhatflag;
1058	uint8 extendedinfos;
1059		910
1060	check_map_change (pl);	911	check_map_change (pl);
1061	prefetch_surrounding_maps (pl->ob);	912	pl->ob->prefetch_surrounding_maps ();
1062		913
1063	/* do LOS after calls to update_position */	914	/* do LOS after calls to update_position */
1064	if (ob != pl->ob)	915	/* unfortunately, we need to udpate los when observing, currently */
1065	clear_los (pl);	916	if (pl->do_los \|\| pl->viewpoint != pl->ob)
1066	else if (pl->do_los)
1067	{	917	{
1068	update_los (ob);
1069	pl->do_los = 0;	918	pl->do_los = 0;
		919	pl->update_los ();
1070	}	920	}
1071		921
1072	/**	922	/**
1073	* This function uses the new map1 protocol command to send the map	923	* This function uses the new map1 protocol command to send the map
1074	* to the client. It is necessary because the old map command supports	924	* to the client. It is necessary because the old map command supports
…		…
1092	* look like.	942	* look like.
1093	*/	943	*/
1094		944
1095	client &socket = *pl->ns;	945	client &socket = *pl->ns;
1096		946
1097	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	947	packet sl ("map1a");
1098	packet esl;
1099		948
1100	startlen = sl.length ();	949	startlen = sl.length ();
1101		950
1102	/Extendedmapinfo structure initialisation /	951	int hx = socket.mapx / 2;
1103	if (socket.ext_mapinfos)	952	int hy = socket.mapy / 2;
1104	{
1105	extendedinfos = EMI_NOREDRAW;
1106		953
1107	if (socket.EMI_smooth)	954	ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
1108	extendedinfos \|= EMI_SMOOTH;	955	int ax = dx + hx;
		956	int ay = dy + hy;
1109		957
1110	ewhatstart = esl.length ();	958	int mask = (ax << 10) \| (ay << 4);
1111	ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit	959	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1112	could need to be taken away */
1113	eentrysize = getExtendedMapInfoSize (&socket);
1114	esl << "mapextended "
1115	<< uint8 (extendedinfos)
1116	<< uint8 (eentrysize);
1117		960
1118	estartlen = esl.length ();	961	/* If the coordinates are not valid, or it is too dark to see,
1119	}	962	* we tell the client as such
1120
1121	/* x,y are the real map locations. ax, ay are viewport relative
1122	* locations.
1123	*/	963	*/
1124	ay = 0;	964	if (!m)
1125
1126	/* We could do this logic as conditionals in the if statement,
1127	* but that started to get a bit messy to look at.
1128	*/
1129	max_x = ob->x + (socket.mapx + 1) / 2;
1130	max_y = ob->y + (socket.mapy + 1) / 2;
1131
1132	for (y = ob->y - socket.mapy / 2; y < max_y; y++, ay++)
1133	{	965	{
1134	sint16 nx, ny;	966	/* space is out of map. Update space and clear values
1135	maptile *m = 0;	967	* if this hasn't already been done. If the space is out
1136		968	* of the map, it shouldn't have a head.
1137	ax = 0;	969	*/
1138	for (x = ob->x - socket.mapx / 2; x < max_x; x++, ax++)	970	if (lastcell.count != -1)
1139	{	971	{
1140	// check to see if we can simply go one right quickly	972	sl << uint16 (mask);
		973	map_clearcell (&lastcell, -1);
1141	++nx;	974	}
1142	if (m && nx >= m->width)	975
		976	continue;
		977	}
		978
		979	int d = pl->blocked_los_uc (dx, dy);
		980
		981	if (d > 3)
		982	{
		983	/* This block deals with spaces that are not visible for whatever
		984	* reason. Still may need to send the head for this space.
		985	*/
		986	if (lastcell.count != -1
		987	\|\| lastcell.faces[0]
		988	\|\| lastcell.faces[1]
		989	\|\| lastcell.faces[2]
		990	\|\| lastcell.stat_hp
		991	\|\| lastcell.flags
		992	\|\| lastcell.player)
		993	sl << uint16 (mask);
		994
		995	/* properly clear a previously sent big face */
		996	map_clearcell (&lastcell, -1);
		997	}
		998	else
		999	{
		1000	/* In this block, the space is visible.
		1001	*/
		1002
		1003	/* Rather than try to figure out what everything that we might
		1004	* need to send is, then form the packet after that,
		1005	* we presume that we will in fact form a packet, and update
		1006	* the bits by what we do actually send. If we send nothing,
		1007	* we just back out sl.length () to the old value, and no harm
		1008	* is done.
		1009	* I think this is simpler than doing a bunch of checks to see
		1010	* what if anything we need to send, setting the bits, then
		1011	* doing those checks again to add the real data.
		1012	*/
		1013	oldlen = sl.length ();
		1014
		1015	sl << uint16 (mask);
		1016
		1017	unsigned char dummy;
		1018	unsigned char *last_ext = &dummy;
		1019
		1020	/* Darkness changed */
		1021	if (lastcell.count != d)
		1022	{
1143	m = 0;	1023	mask \|= 0x8;
1144		1024
1145	if (!m)	1025	*last_ext \|= 0x80;
		1026	last_ext = &sl[sl.length ()];
		1027	sl << uint8 (d);
		1028	}
		1029
		1030	lastcell.count = d;
		1031
		1032	mapspace &ms = m->at (nx, ny);
		1033	ms.update ();
		1034
		1035	// extmap handling
		1036	uint8 stat_hp = 0;
		1037	uint8 stat_width = 0;
		1038	uint8 flags = 0;
		1039	tag_t player = 0;
		1040
		1041	// send hp information, if applicable
		1042	if (object *op = ms.faces_obj [0])
		1043	if (op->is_head () && !op->invisible)
1146	{	1044	{
1147	nx = x; ny = y; m = plmap;	1045	if (op->stats.maxhp > op->stats.hp
1148		1046	&& op->stats.maxhp > 0
1149	if (xy_normalise (m, nx, ny))	1047	&& (op->type == PLAYER
1150	m->touch ();	1048	\|\| op->type == DOOR // does not work, have maxhp 0
1151	else	1049	\|\| op->flag [FLAG_MONSTER]
		1050	\|\| op->flag [FLAG_ALIVE]
		1051	\|\| op->flag [FLAG_GENERATOR]))
1152	m = 0;	1052	{
		1053	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1054	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1055	}
		1056
		1057	if (expect_false (op->has_dialogue ()))
		1058	flags \|= 1;
		1059
		1060	if (expect_false (op->type == PLAYER))
		1061	player = op == ob ? pl->ob->count
		1062	: op == pl->ob ? ob->count
		1063	: op->count;
1153	}	1064	}
1154		1065
1155	int emask, mask;	1066	if (expect_false (lastcell.stat_hp != stat_hp))
1156	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1157
1158	MapCell &lastcell = socket.lastmap.cells[ax][ay];
1159
1160	/* If the coordinates are not valid, or it is too dark to see,
1161	* we tell the client as such
1162	*/
1163	if (!m)
1164	{	1067	{
1165	/* space is out of map. Update space and clear values	1068	lastcell.stat_hp = stat_hp;
1166	* if this hasn't already been done. If the space is out	1069
1167	* of the map, it shouldn't have a head	1070	mask \|= 0x8;
1168	*/	1071	*last_ext \|= 0x80;
1169	if (lastcell.count != -1)	1072	last_ext = &sl[sl.length ()];
		1073
		1074	sl << uint8 (5) << uint8 (stat_hp);
		1075
		1076	if (stat_width > 1)
1170	{	1077	{
1171	sl << uint16 (mask);
1172	map_clearcell (&lastcell, -1);
1173	}
1174
1175	continue;
1176	}
1177
1178	int d = pl->blocked_los[ax][ay];
1179
1180	if (d > 3)
1181	{
1182	int need_send = 0, count;
1183
1184	/* This block deals with spaces that are not visible for whatever
1185	* reason. Still may need to send the head for this space.
1186	*/
1187
1188	oldlen = sl.length ();
1189
1190	sl << uint16 (mask);
1191
1192	if (lastcell.count != -1)
1193	need_send = 1;
1194
1195	count = -1;
1196
1197	if (lastcell.faces[0] \|\| lastcell.faces[1] \|\| lastcell.faces[2]
1198	\|\| lastcell.stat_hp \|\| lastcell.flags \|\| lastcell.player)
1199	need_send = 1;
1200
1201	/* properly clear a previously sent big face */
1202	map_clearcell (&lastcell, count);
1203
1204	if ((mask & 0xf) \|\| need_send)
1205	sl[oldlen + 1] = mask & 0xff;
1206	else
1207	sl.reset (oldlen);
1208	}
1209	else
1210	{
1211	/* In this block, the space is visible.
1212	*/
1213
1214	/* Rather than try to figure out what everything that we might
1215	* need to send is, then form the packet after that,
1216	* we presume that we will in fact form a packet, and update
1217	* the bits by what we do actually send. If we send nothing,
1218	* we just back out sl.length () to the old value, and no harm
1219	* is done.
1220	* I think this is simpler than doing a bunch of checks to see
1221	* what if anything we need to send, setting the bits, then
1222	* doing those checks again to add the real data.
1223	*/
1224	oldlen = sl.length ();
1225	eoldlen = esl.length ();
1226
1227	sl << uint16 (mask);
1228
1229	unsigned char dummy;
1230	unsigned char *last_ext = &dummy;
1231
1232	/* Darkness changed */
1233	if (lastcell.count != d && socket.darkness)
1234	{
1235	mask \|= 0x8;
1236
1237	if (socket.extmap)
1238	{
1239	*last_ext \|= 0x80;	1078	*last_ext \|= 0x80;
1240	last_ext = &sl[sl.length ()];	1079	last_ext = &sl[sl.length ()];
1241	sl << uint8 (d);	1080
1242	}	1081	sl << uint8 (6) << uint8 (stat_width);
1243	else
1244	sl << uint8 (255 - 64 * d);
1245	}	1082	}
		1083	}
1246		1084
1247	lastcell.count = d;	1085	if (expect_false (lastcell.player != player))
1248
1249	mapspace &ms = m->at (nx, ny);
1250	ms.update ();
1251
1252	if (socket.extmap)
1253	{	1086	{
1254	uint8 stat_hp = 0;	1087	lastcell.player = player;
1255	uint8 stat_width = 0;
1256	uint8 flags = 0;
1257	tag_t player = 0;
1258		1088
1259	// send hp information, if applicable
1260	if (object *op = ms.faces_obj [0])
1261	if (op->is_head () && !op->invisible)
1262	{
1263	if (op->stats.maxhp > op->stats.hp
1264	&& op->stats.maxhp > 0
1265	&& (op->type == PLAYER
1266	\|\| op->type == DOOR // does not work, have maxhp 0
1267	\|\| QUERY_FLAG (op, FLAG_MONSTER) \|\| QUERY_FLAG (op, FLAG_ALIVE) \|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1268	{
1269	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1270	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1271	}
1272
1273	if (op->msg && op->msg[0] == '@')
1274	flags \|= 1;
1275
1276	if (op->type == PLAYER)
1277	player = op->count;
1278	}
1279
1280	if (lastcell.stat_hp != stat_hp)
1281	{
1282	lastcell.stat_hp = stat_hp;
1283
1284	mask \|= 0x8;	1089	mask \|= 0x8;
1285	*last_ext \|= 0x80;	1090	*last_ext \|= 0x80;
1286	last_ext = &sl[sl.length ()];	1091	last_ext = &sl[sl.length ()];
1287		1092
1288	sl << uint8 (5) << uint8 (stat_hp);
1289
1290	if (stat_width > 1)
1291	{
1292	*last_ext \|= 0x80;
1293	last_ext = &sl[sl.length ()];
1294
1295	sl << uint8 (6) << uint8 (stat_width);
1296	}
1297	}
1298
1299	if (lastcell.player != player)
1300	{
1301	lastcell.player = player;
1302
1303	mask \|= 0x8;
1304	*last_ext \|= 0x80;
1305	last_ext = &sl[sl.length ()];
1306
1307	sl << uint8 (0x47) << uint8 (4) << (uint32)player;	1093	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1308	}	1094	}
1309		1095
1310	if (lastcell.flags != flags)	1096	if (expect_false (lastcell.flags != flags))
1311	{	1097	{
1312	lastcell.flags = flags;	1098	lastcell.flags = flags;
1313		1099
1314	mask \|= 0x8;	1100	mask \|= 0x8;
1315	*last_ext \|= 0x80;	1101	*last_ext \|= 0x80;
1316	last_ext = &sl[sl.length ()];	1102	last_ext = &sl[sl.length ()];
1317		1103
1318	sl << uint8 (8) << uint8 (flags);	1104	sl << uint8 (8) << uint8 (flags);
1319	}
1320	}	1105	}
1321		1106
		1107	// faces
		1108
1322	/* Floor face */	1109	/* Floor face */
1323	if (update_space (sl, socket, ms, lastcell, 2))	1110	if (update_space (sl, socket, ms, lastcell, 2))
1324	mask \|= 0x4;	1111	mask \|= 0x4;
1325		1112
1326	/* Middle face */	1113	/* Middle face */
1327	if (update_space (sl, socket, ms, lastcell, 1))	1114	if (update_space (sl, socket, ms, lastcell, 1))
1328	mask \|= 0x2;	1115	mask \|= 0x2;
1329		1116
		1117	if (expect_false (ob->invisible)
		1118	&& ob->invisible & (ob->invisible < 50 ? 1 : 7)
1330	if (ms.player () == ob	1119	&& ms.player () == ob)
1331	&& (ob->invisible & (ob->invisible < 50 ? 1 : 7)))
1332	{	1120	{
1333	// force player to be visible to himself if invisible	1121	// force player to be visible to himself if invisible
1334	if (lastcell.faces[0] != ob->face)	1122	if (lastcell.faces[0] != ob->face)
1335	{	1123	{
1336	lastcell.faces[0] = ob->face;	1124	lastcell.faces[0] = ob->face;
1337		1125
1338	mask \|= 0x1;
1339	sl << uint16 (ob->face);
1340
1341	socket.send_faces (ob);
1342	}
1343	}
1344	/* Top face */
1345	else if (update_space (sl, socket, ms, lastcell, 0))
1346	mask \|= 0x1;	1126	mask \|= 0x1;
		1127	sl << uint16 (ob->face);
1347		1128
		1129	socket.send_faces (ob);
		1130	}
		1131	}
		1132	/* Top face */
		1133	else if (update_space (sl, socket, ms, lastcell, 0))
		1134	mask \|= 0x1;
		1135
1348	/* Check to see if we are in fact sending anything for this	1136	/* Check to see if we are in fact sending anything for this
1349	* space by checking the mask. If so, update the mask.	1137	* space by checking the mask. If so, update the mask.
1350	* if not, reset the len to that from before adding the mask	1138	* if not, reset the len to that from before adding the mask
1351	* value, so we don't send those bits.	1139	* value, so we don't send those bits.
1352	*/	1140	*/
1353	if (mask & 0xf)	1141	if (mask & 0xf)
1354	sl[oldlen + 1] = mask & 0xff;	1142	sl[oldlen + 1] = mask & 0xff;
1355	else	1143	else
1356	sl.reset (oldlen);	1144	sl.reset (oldlen);
1357
1358	if (socket.ext_mapinfos)
1359	esl << uint16 (emask);
1360
1361	if (socket.EMI_smooth)
1362	{
1363	for (int layer = 2+1; layer--; )
1364	{
1365	object *ob = ms.faces_obj [layer];
1366
1367	// If there is no object for this space, or if the face for the object
1368	// is the blank face, set the smoothlevel to zero.
1369	int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 0;
1370
1371	// We've gotten what face we want to use for the object. Now see if
1372	// if it has changed since we last sent it to the client.
1373	if (lastcell.smooth[layer] != smoothlevel)
1374	{
1375	lastcell.smooth[layer] = smoothlevel;
1376	esl << uint8 (smoothlevel);
1377	emask \|= 1 << layer;
1378	}
1379	}
1380
1381	if (emask & 0xf)
1382	esl[eoldlen + 1] = emask & 0xff;
1383	else
1384	esl.reset (eoldlen);
1385	}
1386	} /* else this is a viewable space */	1145	} /* else this is a viewable space */
1387	} /* for x loop */	1146	ordered_mapwalk_end
1388	} /* for y loop */
1389		1147
1390	socket.flush_fx ();	1148	socket.flush_fx ();
1391
1392	/* Verify that we in fact do need to send this */
1393	if (socket.ext_mapinfos)
1394	{
1395	if (!(sl.length () > startlen \|\| socket.sent_scroll))
1396	{
1397	/* No map data will follow, so don't say the client
1398	* it doesn't need draw!
1399	*/
1400	ewhatflag &= ~EMI_NOREDRAW;
1401	esl[ewhatstart + 1] = ewhatflag & 0xff;
1402	}
1403
1404	if (esl.length () > estartlen)
1405	socket.send_packet (esl);
1406	}
1407		1149
1408	if (sl.length () > startlen \|\| socket.sent_scroll)	1150	if (sl.length () > startlen \|\| socket.sent_scroll)
1409	{	1151	{
1410	socket.send_packet (sl);	1152	socket.send_packet (sl);
1411	socket.sent_scroll = 0;	1153	socket.sent_scroll = 0;
1412	}	1154	}
1413	}	1155	}
1414		1156
1415	/*****************************************************************************/
1416	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1417	/* a player. Of course, the client need to know the command to be able to */
1418	/* manage it ! */
1419	/*****************************************************************************/
1420	void
1421	send_plugin_custom_message (object pl, char buf)
1422	{
1423	pl->contr->ns->send_packet (buf);
1424	}
1425
1426	/**
1427	* This sends the skill number to name mapping. We ignore
1428	* the params - we always send the same info no matter what.
1429	*/
1430	void
1431	send_skill_info (client ns, char params)
1432	{
1433	packet sl;
1434	sl << "replyinfo skill_info\n";
1435
1436	for (int i = 1; i < NUM_SKILLS; i++)
1437	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
1438
1439	if (sl.length () > MAXSOCKBUF)
1440	{
1441	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1442	fatal (0);
1443	}
1444
1445	ns->send_packet (sl);
1446	}
1447
1448	/**
1449	* This sends the spell path to name mapping. We ignore
1450	* the params - we always send the same info no matter what.
1451	*/
1452	void
1453	send_spell_paths (client * ns, char *params)
1454	{
1455	packet sl;
1456
1457	sl << "replyinfo spell_paths\n";
1458
1459	for (int i = 0; i < NRSPELLPATHS; i++)
1460	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1461
1462	if (sl.length () > MAXSOCKBUF)
1463	{
1464	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1465	fatal (0);
1466	}
1467
1468	ns->send_packet (sl);
1469	}
1470
1471	/**	1157	/**
1472	* This looks for any spells the player may have that have changed their stats.	1158	* This looks for any spells the player may have that have changed their stats.
1473	* it then sends an updspell packet for each spell that has changed in this way	1159	* it then sends an updspell packet for each spell that has changed in this way
1474	*/	1160	*/
1475	void	1161	void
1476	esrv_update_spells (player *pl)	1162	esrv_update_spells (player *pl)
1477	{	1163	{
1478	if (!pl->ns)	1164	if (!pl->ns)
1479	return;	1165	return;
1480		1166
		1167	pl->ns->update_spells = false;
		1168
1481	if (!pl->ns->monitor_spells)	1169	if (!pl->ns->monitor_spells)
1482	return;	1170	return;
1483		1171
1484	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1172	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1485	{
1486	if (spell->type == SPELL)	1173	if (spell->type == SPELL)
1487	{	1174	{
1488	int flags = 0;	1175	int flags = 0;
		1176	int val;
1489		1177
1490	/* check if we need to update it */	1178	/* check if we need to update it */
1491	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1179	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1180	if (spell->cached_sp != val)
1492	{	1181	{
1493	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1182	spell->cached_sp = val;
1494	flags \|= UPD_SP_MANA;	1183	flags \|= UPD_SP_MANA;
1495	}	1184	}
1496		1185
1497	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1186	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1187	if (spell->cached_grace != val)
1498	{	1188	{
1499	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1189	spell->cached_grace = val;
1500	flags \|= UPD_SP_GRACE;	1190	flags \|= UPD_SP_GRACE;
1501	}	1191	}
1502		1192
1503	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1193	val = casting_level (pl->ob, spell);
		1194	if (spell->cached_eat != val)
1504	{	1195	{
1505	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1196	spell->cached_eat = val;
1506	flags \|= UPD_SP_DAMAGE;	1197	flags \|= UPD_SP_LEVEL;
1507	}	1198	}
1508		1199
1509	if (flags)	1200	if (flags)
1510	{	1201	{
1511	packet sl;	1202	packet sl;
1512		1203
1513	sl << "updspell "	1204	sl << "updspell "
1514	<< uint8 (flags)	1205	<< uint8 (flags)
1515	<< uint32 (spell->count);	1206	<< uint32 (spell->count);
1516		1207
1517	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1208	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1518	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1209	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1519	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1210	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1520		1211
1521	pl->ns->send_packet (sl);	1212	pl->ns->send_packet (sl);
1522	}	1213	}
1523	}	1214	}
1524	}
1525	}	1215	}
1526		1216
1527	void	1217	void
1528	esrv_remove_spell (player pl, object spell)	1218	esrv_remove_spell (player pl, object spell)
1529	{	1219	{
…		…
1545		1235
1546	/* appends the spell spell to the Socklist we will send the data to. /	1236	/* appends the spell spell to the Socklist we will send the data to. /
1547	static void	1237	static void
1548	append_spell (player pl, packet &sl, object spell)	1238	append_spell (player pl, packet &sl, object spell)
1549	{	1239	{
1550	int i, skill = 0;	1240	int skill = 0;
1551		1241
1552	if (!(spell->name))	1242	if (!(spell->name))
1553	{	1243	{
1554	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1244	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1555	return;	1245	return;
1556	}	1246	}
1557		1247
1558	/* store costs and damage in the object struct, to compare to later */	1248	/* store costs and damage in the object struct, to compare to later */
1559	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1249	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1560	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1250	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1561	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1251	spell->cached_eat = casting_level (pl->ob, spell);
1562		1252
1563	/* figure out which skill it uses, if it uses one */	1253	/* figure out which skill it uses, if it uses one */
1564	if (spell->skill)	1254	if (spell->skill)
1565	{	1255	if (object *tmp = pl->find_skill (spell->skill))
1566	for (i = 1; i < NUM_SKILLS; i++)	1256	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1567	if (!strcmp (spell->skill, skill_names[i]))
1568	{
1569	skill = i + CS_STAT_SKILLINFO;
1570	break;
1571	}
1572	}
1573		1257
1574	// spells better have a face	1258	// spells better have a face
1575	if (!spell->face)	1259	if (!spell->face)
1576	{	1260	{
1577	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1261	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1651	}	1335	}
1652	else	1336	else
1653	append_spell (pl, sl, spell);	1337	append_spell (pl, sl, spell);
1654		1338
1655	if (sl.length () > MAXSOCKBUF)	1339	if (sl.length () > MAXSOCKBUF)
1656	{
1657	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1340	cleanup ("buffer overflow in esrv_add_spells!");
1658	fatal (0);
1659	}
1660		1341
1661	/* finally, we can send the packet */	1342	/* finally, we can send the packet */
1662	pl->ns->flush_fx ();	1343	pl->ns->flush_fx ();
1663	pl->ns->send_packet (sl);	1344	pl->ns->send_packet (sl);
1664	}	1345	}
1665		1346
		1347	//-GPL
		1348

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.133 by root, Sun Jul 13 11:57:25 2008 UTC vs. Revision 1.188 by root, Mon Oct 29 23:55:57 2012 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.133 by root, Sun Jul 13 11:57:25 2008 UTC vs.
Revision 1.188 by root, Mon Oct 29 23:55:57 2012 UTC