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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.145 by root, Fri Dec 26 10:44:17 2008 UTC vs.
Revision 1.195 by root, Sat Nov 17 23:40:05 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel	6	* Copyright (©) 2001 Mark Wedel
6	* Copyright (©) 1992,2007 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7	*	8	*
8	* Deliantra is free software: you can redistribute it and/or modify	9	* 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	10	* 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	11	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	12	* option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	17	* GNU General Public License for more details.
17	*	18	*
18	* You should have received a copy of the GNU General Public License	19	* 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/>.	20	* and the GNU General Public License along with this program. If not, see
		21	* <http://www.gnu.org/licenses/>.
20	*	22	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	23	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	24	*/
		25
		26	//+GPL
23		27
24	/**	28	/**
25	* \file	29	* \file
26	* Client handling.	30	* Client handling.
27	*	31	*
28	* \date 2003-12-02	32	* \date 2003-12-02
29	*	33	*
30	* This file implements all of the goo on the server side for handling	34	* This file implements all of the goo on the server side for handling
31	* clients. It's got a bunch of global variables for keeping track of	35	* clients. It's got a bunch of global variables for keeping track of
32	* each of the clients.	36	* each of the clients.
33	*	37	*
34	* Note: All functions that are used to process data from the client	38	* Note: All functions that are used to process data from the client
35	* have the prototype of (char *data, int datalen, int client_num). This	39	* have the prototype of (char *data, int datalen, int client_num). This
36	* way, we can use one dispatch table.	40	* way, we can use one dispatch table.
37	*	41	*
41		45
42	#include <global.h>	46	#include <global.h>
43	#include <sproto.h>	47	#include <sproto.h>
44		48
45	#include <living.h>	49	#include <living.h>
46	#include <commands.h>
47		50
48	/* This block is basically taken from socket.c - I assume if it works there,	51	/* This block is basically taken from socket.c - I assume if it works there,
49	* it should work here.	52	* it should work here.
50	*/	53	*/
51	#include <sys/types.h>	54	#include <sys/types.h>
…		…
63	* This table translates the attack numbers as used within the	66	* This table translates the attack numbers as used within the
64	* program to the value we use when sending STATS command to the	67	* 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	68	* client. If a value is -1, then we don't send that to the
66	* client.	69	* client.
67	*/	70	*/
68	short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,	71	static short atnr_cs_stat[NROFATTACKS] =
69	CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,	72	{
70	CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,	73	CS_STAT_RES_PHYS,
71	CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,	74	CS_STAT_RES_MAG,
72	CS_STAT_RES_GHOSTHIT, CS_STAT_RES_POISON,	75	CS_STAT_RES_FIRE,
73	CS_STAT_RES_SLOW, CS_STAT_RES_PARA, CS_STAT_TURN_UNDEAD,	76	CS_STAT_RES_ELEC,
74	CS_STAT_RES_FEAR, -1 /* Cancellation */ ,	77	CS_STAT_RES_COLD,
75	CS_STAT_RES_DEPLETE, CS_STAT_RES_DEATH,	78	CS_STAT_RES_CONF,
76	-1 /* Chaos / , -1 / Counterspell */ ,	79	CS_STAT_RES_ACID,
77	-1 /* Godpower */ , CS_STAT_RES_HOLYWORD,	80	CS_STAT_RES_DRAIN,
		81	-1 /* weaponmagic */,
		82	CS_STAT_RES_GHOSTHIT,
		83	CS_STAT_RES_POISON,
		84	CS_STAT_RES_SLOW,
		85	CS_STAT_RES_PARA,
		86	CS_STAT_TURN_UNDEAD,
		87	CS_STAT_RES_FEAR,
		88	-1 /* Cancellation */,
		89	CS_STAT_RES_DEPLETE,
		90	CS_STAT_RES_DEATH,
		91	-1 /* Chaos */,
		92	-1 /* Counterspell */,
		93	-1 /* Godpower */,
		94	CS_STAT_RES_HOLYWORD,
78	CS_STAT_RES_BLIND,	95	CS_STAT_RES_BLIND,
79	-1, /* Internal */	96	-1, /* Internal */
80	-1, /* life stealing */	97	-1, /* life stealing */
81	-1 /* Disease - not fully done yet */	98	-1 /* Disease - not fully done yet */
82	};	99	};
…		…
130	pl->ns->mapinfo_queue_clear ();	147	pl->ns->mapinfo_queue_clear ();
131		148
132	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));	149	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
133		150
134	pl->ns->force_newmap = false;	151	pl->ns->force_newmap = false;
135
136	if (pl->ns->newmapcmd == 1)
137	pl->ns->send_packet ("newmap");	152	pl->ns->send_packet ("newmap");
138
139	pl->ns->floorbox_reset ();	153	pl->ns->floorbox_reset ();
140	}	154	}
141		155
142	static void	156	static void
143	send_map_info (player *pl)	157	send_map_info (player *pl)
144	{	158	{
145	client &socket = *pl->ns;	159	client &socket = *pl->ns;
146	object *ob = pl->observe;	160	object *ob = pl->viewpoint;
147		161
148	if (socket.mapinfocmd)	162	if (socket.mapinfocmd)
149	{	163	{
150	if (ob->map && ob->map->path[0])	164	if (ob->map && ob->map->path)
151	{	165	{
152	int flags = 0;	166	int flags = 0;
153		167
		168	// due to historical glitches, the bit ordering and map index ordering differs
154	if (ob->map->tile_path[0]) flags \|= 1;	169	if (ob->map->tile_path [TILE_NORTH]) flags \|= 0x01;
155	if (ob->map->tile_path[1]) flags \|= 2;	170	if (ob->map->tile_path [TILE_EAST ]) flags \|= 0x02;
156	if (ob->map->tile_path[2]) flags \|= 4;	171	if (ob->map->tile_path [TILE_SOUTH]) flags \|= 0x04;
157	if (ob->map->tile_path[3]) flags \|= 8;	172	if (ob->map->tile_path [TILE_WEST ]) flags \|= 0x08;
		173	// these two are debatable
		174	if (ob->map->tile_path [TILE_UP ]) flags \|= 0x10;
		175	if (ob->map->tile_path [TILE_DOWN ]) flags \|= 0x20;
158		176
159	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",	177	socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
160	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,	178	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
161	ob->map->width, ob->map->height, &ob->map->path);	179	ob->map->width, ob->map->height, &ob->map->path);
162	}	180	}
…		…
168	/** check for map/region change and send new map data */	186	/** check for map/region change and send new map data */
169	static void	187	static void
170	check_map_change (player *pl)	188	check_map_change (player *pl)
171	{	189	{
172	client &socket = *pl->ns;	190	client &socket = *pl->ns;
173	object *ob = pl->observe;	191	object *ob = pl->viewpoint;
174		192
175	region *reg = ob->region ();	193	region *reg = ob->region ();
176	if (socket.current_region != reg)	194	if (socket.current_region != reg)
177	{	195	{
178	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));	196	INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
179	socket.current_region = reg;	197	socket.current_region = reg;
180	}	198	}
181		199
182	// first try to aovid a full newmap on tiled map scrolls	200	// first try to avoid a full newmap on tiled map scrolls
183	if (socket.current_map != ob->map && !socket.force_newmap)	201	if (socket.current_map != ob->map && !socket.force_newmap)
184	{	202	{
185	rv_vector rv;	203	rv_vector rv;
186		204
187	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);	205	get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
…		…
208	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)	226	else if (socket.current_x != ob->x \|\| socket.current_y != ob->y)
209	{	227	{
210	int dx = ob->x - socket.current_x;	228	int dx = ob->x - socket.current_x;
211	int dy = ob->y - socket.current_y;	229	int dy = ob->y - socket.current_y;
212		230
213	if (socket.buggy_mapscroll && (abs (dx) > 8 \|\| abs (dy) > 8))
214	clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
215	else
216	{
217	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);	231	socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
218	socket.floorbox_reset ();	232	socket.floorbox_reset ();
219	}
220	}	233	}
221		234
222	socket.current_x = ob->x;	235	socket.current_x = ob->x;
223	socket.current_y = ob->y;	236	socket.current_y = ob->y;
		237	}
		238
		239	/**
		240	* This sends the skill number to name mapping. We ignore
		241	* the params - we always send the same info no matter what.
		242	*/
		243	static void
		244	send_skill_info (client ns, char params)
		245	{
		246	packet sl;
		247	sl << "replyinfo skill_info\n";
		248
		249	for (int i = 0; i < skillvec.size (); ++i)
		250	sl.printf ("%d:%s\n", CS_STAT_SKILLINFO + i, &skillvec [i]->name);
		251
		252	if (sl.length () > MAXSOCKBUF)
		253	cleanup ("buffer overflow in send_skill_info!");
		254
		255	ns->send_packet (sl);
		256	}
		257
		258	/**
		259	* This sends the spell path to name mapping. We ignore
		260	* the params - we always send the same info no matter what.
		261	*/
		262	static void
		263	send_spell_paths (client * ns, char *params)
		264	{
		265	packet sl;
		266
		267	sl << "replyinfo spell_paths\n";
		268
		269	for (int i = 0; i < NRSPELLPATHS; i++)
		270	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
		271
		272	if (sl.length () > MAXSOCKBUF)
		273	cleanup ("buffer overflow in send_spell_paths!");
		274
		275	ns->send_packet (sl);
224	}	276	}
225		277
226	/**	278	/**
227	* RequestInfo is sort of a meta command. There is some specific	279	* RequestInfo is sort of a meta command. There is some specific
228	* request of information, but we call other functions to provide	280	* request of information, but we call other functions to provide
229	* that information.	281	* that information.
		282	* requestinfo is completely deprecated, use resource exti request
		283	* and the fxix or http protocols.
230	*/	284	*/
231	void	285	void
232	RequestInfo (char buf, int len, client ns)	286	RequestInfo (char buf, int len, client ns)
233	{	287	{
234	char *params;	288	char *params;
…		…
241	{	295	{
242	*params++ = 0;	296	*params++ = 0;
243	break;	297	break;
244	}	298	}
245		299
246	if (!strcmp (buf, "image_info"))
247	send_image_info (ns, params);
248	else if (!strcmp (buf, "image_sums"))
249	send_image_sums (ns, params);
250	else if (!strcmp (buf, "skill_info"))	300	if (!strcmp (buf, "skill_info"))
251	send_skill_info (ns, params);	301	send_skill_info (ns, params);
252	else if (!strcmp (buf, "spell_paths"))	302	else if (!strcmp (buf, "spell_paths"))
253	send_spell_paths (ns, params);	303	send_spell_paths (ns, params);
254	else	304	else
255	{	305	{
…		…
271	ExtiCmd (char buf, int len, client ns)	321	ExtiCmd (char buf, int len, client ns)
272	{	322	{
273	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	323	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
274	}	324	}
275		325
		326	//-GPL
		327
276	void	328	void
277	client::mapinfo_queue_clear ()	329	client::mapinfo_queue_clear ()
278	{	330	{
279	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	331	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
280	free (*i);	332	free (*i);
…		…
287	{	339	{
288	char *token = buf;	340	char *token = buf;
289	buf += strlen (buf) + 9;	341	buf += strlen (buf) + 9;
290		342
291	// initial map and its origin	343	// initial map and its origin
292	maptile *map = pl->observe->map;	344	maptile *map = pl->viewpoint->map;
293	int mapx = pl->ns->mapx / 2 - pl->observe->x;	345	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
294	int mapy = pl->ns->mapy / 2 - pl->observe->y;	346	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
295	int max_distance = 8; // limit maximum path length to something generous	347	int max_distance = 8; // limit maximum path length to something generous
296		348
297	while (*buf && map && max_distance)	349	while (*buf && map && max_distance)
298	{	350	{
299	int dir = *buf++ - '1';	351	int dir = *buf++ - '1';
300		352
301	if (dir >= 0 && dir <= 3)	353	// due to historical glitches, the mapinfo index and tile index differs
		354	static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
		355
		356	// maybe we should only allow the four flat directions
		357	if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
302	{	358	{
		359	dir = dirmap [dir];
		360
303	if (!map->tile_path [dir])	361	if (!map->tile_path [dir])
304	map = 0;	362	map = 0;
305	else if (map->tile_available (dir, false))	363	else if (map->tile_available (dir, false))
306	{	364	{
307	maptile *neigh = map->tile_map [dir];	365	maptile *neigh = map->tile_map [dir];
…		…
330	send_packet_printf ("mapinfo %s nomap", token);	388	send_packet_printf ("mapinfo %s nomap", token);
331	else	389	else
332	{	390	{
333	int flags = 0;	391	int flags = 0;
334		392
		393	// due to historical glitches, the bit ordering and map index ordering differs
335	if (map->tile_path[0]) flags \|= 1;	394	if (map->tile_path [TILE_NORTH]) flags \|= 0x01;
336	if (map->tile_path[1]) flags \|= 2;	395	if (map->tile_path [TILE_EAST ]) flags \|= 0x02;
337	if (map->tile_path[2]) flags \|= 4;	396	if (map->tile_path [TILE_SOUTH]) flags \|= 0x04;
338	if (map->tile_path[3]) flags \|= 8;	397	if (map->tile_path [TILE_WEST ]) flags \|= 0x08;
		398	// these two are debatable
		399	if (map->tile_path [TILE_UP ]) flags \|= 0x10;
		400	if (map->tile_path [TILE_DOWN ]) flags \|= 0x20;
339		401
340	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);	402	send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
341	}	403	}
342		404
343	return 1;	405	return 1;
…		…
404	AddMeCmd (char buf, int len, client ns)	466	AddMeCmd (char buf, int len, client ns)
405	{	467	{
406	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	468	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
407	}	469	}
408		470
409	/*	471	//+GPL
410	#define MSG_TYPE_BOOK 1
411	#define MSG_TYPE_CARD 2
412	#define MSG_TYPE_PAPER 3
413	#define MSG_TYPE_SIGN 4
414	#define MSG_TYPE_MONUMENT 5
415	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
416
417	/** Reply to ExtendedInfos command */
418	void
419	ToggleExtendedText (char buf, int len, client ns)
420	{
421	char cmdback[MAX_BUF];
422	char temp[10];
423	char command[50];
424	int info, nextinfo, i, flag;
425
426	cmdback[0] = '\0';
427
428	nextinfo = 0;
429	while (1)
430	{
431	/* 1. Extract an info */
432	info = nextinfo;
433
434	while ((info < len) && (buf[info] == ' '))
435	info++;
436
437	if (info >= len)
438	break;
439
440	nextinfo = info + 1;
441
442	while ((nextinfo < len) && (buf[nextinfo] != ' '))
443	nextinfo++;
444
445	if (nextinfo - info >= 49) /Erroneous info asked /
446	continue;
447
448	strncpy (command, &(buf[info]), nextinfo - info);
449	command[nextinfo - info] = '\0';
450	/* 2. Interpret info */
451	i = sscanf (command, "%d", &flag);
452
453	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
454	ns->supported_readables \|= (1 << flag);
455	/3. Next info /
456	}
457
458	/* Send resulting state */
459	strcpy (cmdback, "ExtendedTextSet");
460
461	for (i = 0; i <= MSG_TYPE_LAST; i++)
462	if (ns->supported_readables & (1 << i))
463	{
464	strcat (cmdback, " ");
465	snprintf (temp, sizeof (temp), "%d", i);
466	strcat (cmdback, temp);
467	}
468
469	ns->send_packet (cmdback);
470	}
471		472
472	/**	473	/**
473	* This handles the general commands from the client (ie, north, fire, cast,	474	* This handles the general commands from the client (ie, north, fire, cast,
474	* etc.)	475	* etc.)
475	*/	476	*/
…		…
488	return;	489	return;
489		490
490	buf++;	491	buf++;
491	}	492	}
492		493
493	execute_newserver_command (pl->ob, (char *) buf);	494	execute_newserver_command (pl->ob, (char *)buf);
494		495
495	/* Perhaps something better should be done with a left over count.	496	/* Perhaps something better should be done with a left over count.
496	* Cleaning up the input should probably be done first - all actions	497	* Cleaning up the input should probably be done first - all actions
497	* for the command that issued the count should be done before any other	498	* for the command that issued the count should be done before any other
498	* commands.	499	* commands.
499	*/	500	*/
500	pl->count = 0;	501	pl->count = 0;
501	}
502
503	/**
504	* This handles the general commands from the client (ie, north, fire, cast,
505	* etc.). It is a lot like PlayerCmd above, but is called with the
506	* 'ncom' method which gives more information back to the client so it
507	* can throttle.
508	*/
509	void
510	NewPlayerCmd (char buf, int len, player pl)
511	{
512	if (len <= 6)
513	{
514	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
515	return;
516	}
517
518	uint16 cmdid = net_uint16 ((uint8 *)buf);
519	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
520
521	/* -1 is special - no repeat, but don't update */
522	if (repeat != -1)
523	pl->count = repeat;
524
525	buf += 6; //len -= 6;
526
527	execute_newserver_command (pl->ob, buf);
528
529	/* Perhaps something better should be done with a left over count.
530	* Cleaning up the input should probably be done first - all actions
531	* for the command that issued the count should be done before any other
532	* commands.
533	*/
534	pl->count = 0;
535
536	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
537	int time = fabs (pl->ob->speed) < 0.001
538	? time = MAX_TIME * 100
539	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
540
541	/* Send confirmation of command execution now */
542	packet sl ("comc");
543	sl << uint16 (cmdid) << uint32 (time);
544	pl->ns->send_packet (sl);
545	}	502	}
546		503
547	/** This is a reply to a previous query. */	504	/** This is a reply to a previous query. */
548	void	505	void
549	ReplyCmd (char buf, int len, client ns)	506	ReplyCmd (char buf, int len, client ns)
…		…
586	LOG (llevError, "Unknown input state: %d\n", ns->state);	543	LOG (llevError, "Unknown input state: %d\n", ns->state);
587	}	544	}
588	}	545	}
589		546
590	/**	547	/**
591	* Client tells its version. If there is a mismatch, we close the	548	* Client tells its version info.
592	* socket. In real life, all we should care about is the client having
593	* something older than the server. If we assume the client will be
594	* backwards compatible, having it be a later version should not be a
595	* problem.
596	*/	549	*/
597	void	550	void
598	VersionCmd (char buf, int len, client ns)	551	VersionCmd (char buf, int len, client ns)
599	{	552	{
600	if (!buf)	553	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
601	{
602	LOG (llevError, "CS: received corrupted version command\n");
603	return;
604	}
605
606	ns->cs_version = atoi (buf);
607	ns->sc_version = ns->cs_version;
608
609	LOG (llevDebug, "connection from client <%s>\n", buf);
610
611	//TODO: should log here just for statistics
612
613	//if (VERSION_CS != ns->cs_version)
614	// unchecked;
615
616	char *cp = strchr (buf + 1, ' ');
617	if (!cp)
618	return;
619
620	ns->sc_version = atoi (cp);
621
622	//if (VERSION_SC != ns->sc_version)
623	// unchecked;
624
625	cp = strchr (cp + 1, ' ');
626
627	if (cp)
628	{
629	ns->version = cp + 1;
630
631	if (ns->sc_version < 1026)
632	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
633	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
634	}
635	}	554	}
636		555
637	/** sound related functions. */	556	/** sound related functions. */
638	void	557	void
639	SetSound (char buf, int len, client ns)	558	SetSound (char buf, int len, client ns)
…		…
690	* Get player's current range attack in obuf.	609	* Get player's current range attack in obuf.
691	*/	610	*/
692	static void	611	static void
693	rangetostring (player pl, char obuf)	612	rangetostring (player pl, char obuf)
694	{	613	{
695	dynbuf_text buf;	614	dynbuf_text &buf = msg_dynbuf; buf.clear ();
		615
		616	#if 0
		617	// print ranged/chosen_skill etc. objects every call
		618	printf ("%s %s => %s (%s)\n",
		619	pl->ranged_ob ? &pl->ranged_ob->name : "-",
		620	pl->combat_ob ? &pl->combat_ob->name : "-",
		621	pl->ob->current_weapon ? &pl->ob->current_weapon->name : "-",
		622	pl->ob->chosen_skill ? &pl->ob->chosen_skill->name : "-"
		623	);
		624	#endif
696		625
697	if (pl->ranged_ob)	626	if (pl->ranged_ob)
698	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;	627	buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
699		628
700	if (pl->combat_ob)	629	if (pl->combat_ob)
…		…
746	* commands for now.	675	* commands for now.
747	*/	676	*/
748	void	677	void
749	esrv_update_stats (player *pl)	678	esrv_update_stats (player *pl)
750	{	679	{
751	char buf[MAX_BUF];
752	uint16 flags;
753
754	client *ns = pl->ns;	680	client *ns = pl->ns;
755	if (!ns)	681	if (!ns)
756	return;	682	return;
757		683
758	object *ob = pl->observe;	684	object *ob = pl->observe;
…		…
775	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	701	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
776	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	702	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
777	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	703	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
778	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	704	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
779		705
780	for (int s = 0; s < NUM_SKILLS; s++)	706	for (int s = 0; s < CS_NUM_SKILLS; s++)
781	if (object *skill = opl->last_skill_ob [s])	707	if (object *skill = opl->last_skill_ob [s])
782	if (skill->stats.exp != ns->last_skill_exp [s])	708	if (skill->stats.exp != ns->last_skill_exp [s])
783	{	709	{
784	ns->last_skill_exp [s] = skill->stats.exp;	710	ns->last_skill_exp [s] = skill->stats.exp;
785		711
786	/* Always send along the level if exp changes. This is only	712	/* Always send along the level if exp changes. This is only
787	* 1 extra byte, but keeps processing simpler.	713	* 1 extra byte, but keeps processing simpler.
788	*/	714	*/
789	sl << uint8 (s + CS_STAT_SKILLINFO)	715	sl << uint8 (CS_STAT_SKILLINFO + s)
790	<< uint8 (skill->level)	716	<< uint8 (skill->level)
791	<< uint64 (skill->stats.exp);	717	<< uint64 (skill->stats.exp);
792	}	718	}
793		719
794	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	720	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
795	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	721	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
796	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	722	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
797	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	723	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
798	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	724	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
799	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f/TICK);	725	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
800	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	726	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
801	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	727	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
802	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	728	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
803		729
804	flags = 0;	730	int flags = (opl->fire_on ? SF_FIREON : 0)
805		731	\| (opl->run_on ? SF_RUNON : 0);
806	if (opl->fire_on)
807	flags \|= SF_FIREON;
808
809	if (opl->run_on)
810	flags \|= SF_RUNON;
811		732
812	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	733	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
813		734
814	if (ns->sc_version < 1025)
815	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
816	else
817	for (int i = 0; i < NROFATTACKS; i++)	735	for (int i = 0; i < NROFATTACKS; i++)
818	{
819	/* Skip ones we won't send */	736	/* Skip ones we won't send */
820	if (atnr_cs_stat[i] == -1)	737	if (atnr_cs_stat[i] >= 0)
821	continue;
822
823	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);	738	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
824	}
825		739
826	if (pl->ns->monitor_spells)	740	if (pl->ns->monitor_spells)
827	{	741	{
828	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);	742	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
829	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);	743	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
830	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);	744	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
831	}	745	}
832		746
		747	char buf[MAX_BUF];
833	rangetostring (opl, buf); /* we want use the new fire & run system in new client */	748	rangetostring (opl, buf); /* we want use the new fire & run system in new client */
834	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	749	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
835	set_title (ob, buf);	750	set_title (ob, buf);
836	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	751	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
837		752
…		…
931		846
932	/* Nothing changed */	847	/* Nothing changed */
933	return 0;	848	return 0;
934	}	849	}
935		850
936	// prefetch (and touch) all maps within a specific distancd
937	static void
938	prefetch_surrounding_maps (maptile *map, int distance)
939	{
940	map->last_access = runtime;
941
942	if (--distance)
943	for (int dir = 4; --dir; )
944	if (const shstr &path = map->tile_path [dir])
945	if (maptile *&neigh = map->tile_map [dir])
946	prefetch_surrounding_maps (neigh, distance);
947	else
948	neigh = maptile::find_async (path, map);
949	}
950
951	// prefetch a generous area around the player
952	static void
953	prefetch_surrounding_maps (object *op)
954	{
955	prefetch_surrounding_maps (op->map, 3);
956	}
957
958	/**	851	/**
959	* Draws client map.	852	* Draws client map.
960	*/	853	*/
961	void	854	void
962	draw_client_map (player *pl)	855	draw_client_map (player *pl)
963	{	856	{
964	object *ob = pl->observe;	857	object *ob = pl->viewpoint;
965	if (!ob->active)	858	if (!pl->observe->active)
966	return;	859	return;
967		860
968	/* If player is just joining the game, he isn't here yet, so the map	861	/* If player is just joining the game, he isn't here yet, so the map
969	* can get swapped out. If so, don't try to send them a map. All will	862	* can get swapped out. If so, don't try to send them a map. All will
970	* be OK once they really log in.	863	* be OK once they really log in.
971	*/	864	*/
972	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	865	if (!ob->map \|\| ob->map->state != MAP_ACTIVE)
973	return;	866	return;
974		867
975	int startlen, oldlen;	868	int startlen, oldlen;
976		869
977	check_map_change (pl);	870	check_map_change (pl);
978	prefetch_surrounding_maps (pl->ob);	871	pl->ob->prefetch_surrounding_maps ();
979		872
980	/* do LOS after calls to update_position */	873	/* do LOS after calls to update_position */
981	/* unfortunately, we need to udpate los when observing, currently */	874	/* unfortunately, we need to udpate los when observing, currently */
982	if (pl->do_los \|\| pl->observe != pl->ob)	875	if (pl->do_los \|\| pl->viewpoint != pl->ob)
983	{	876	{
984	pl->do_los = 0;	877	pl->do_los = 0;
985	pl->update_los ();	878	pl->update_los ();
986	}	879	}
987		880
…		…
1008	* look like.	901	* look like.
1009	*/	902	*/
1010		903
1011	client &socket = *pl->ns;	904	client &socket = *pl->ns;
1012		905
1013	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	906	packet sl ("map1a");
1014		907
1015	startlen = sl.length ();	908	startlen = sl.length ();
1016		909
1017	int hx = socket.mapx / 2;	910	int hx = socket.mapx / 2;
1018	int hy = socket.mapy / 2;	911	int hy = socket.mapy / 2;
…		…
1039	map_clearcell (&lastcell, -1);	932	map_clearcell (&lastcell, -1);
1040	}	933	}
1041		934
1042	continue;	935	continue;
1043	}	936	}
1044		937
1045	int d = pl->blocked_los_uc (dx, dy);	938	int d = pl->blocked_los_uc (dx, dy);
1046		939
1047	if (d > 3)	940	if (d > 3)
1048	{	941	{
1049	/* This block deals with spaces that are not visible for whatever	942	/* This block deals with spaces that are not visible for whatever
1050	* reason. Still may need to send the head for this space.	943	* reason. Still may need to send the head for this space.
1051	*/	944	*/
1052	if (lastcell.count != -1	945	if (lastcell.count != -1
1053	\|\| lastcell.faces[0]	946	\|\| lastcell.faces[0]
1054	\|\| lastcell.faces[1]	947	\|\| lastcell.faces[1]
1055	\|\| lastcell.faces[2]	948	\|\| lastcell.faces[2]
1056	\|\| lastcell.stat_hp	949	\|\| lastcell.stat_hp
1057	\|\| lastcell.flags	950	\|\| lastcell.flags
1058	\|\| lastcell.player)	951	\|\| lastcell.player)
1059	sl << uint16 (mask);	952	sl << uint16 (mask);
1060		953
1061	/* properly clear a previously sent big face */	954	/* properly clear a previously sent big face */
1062	map_clearcell (&lastcell, -1);	955	map_clearcell (&lastcell, -1);
…		…
1082		975
1083	unsigned char dummy;	976	unsigned char dummy;
1084	unsigned char *last_ext = &dummy;	977	unsigned char *last_ext = &dummy;
1085		978
1086	/* Darkness changed */	979	/* Darkness changed */
1087	if (lastcell.count != d && socket.darkness)	980	if (lastcell.count != d)
1088	{	981	{
1089	mask \|= 0x8;	982	mask \|= 0x8;
1090		983
1091	if (socket.extmap)	984	*last_ext \|= 0x80;
		985	last_ext = &sl[sl.length ()];
		986	sl << uint8 (d);
		987	}
		988
		989	lastcell.count = d;
		990
		991	mapspace &ms = m->at (nx, ny);
		992	ms.update ();
		993
		994	// extmap handling
		995	uint8 stat_hp = 0;
		996	uint8 stat_width = 0;
		997	uint8 flags = 0;
		998	tag_t player = 0;
		999
		1000	// send hp information, if applicable
		1001	if (object *op = ms.faces_obj [0])
		1002	if (op->is_head () && !op->invisible)
		1003	{
		1004	if (op->stats.maxhp > op->stats.hp
		1005	&& op->stats.maxhp > 0
		1006	&& (op->type == PLAYER
		1007	\|\| op->type == DOOR // does not work, have maxhp 0
		1008	\|\| op->flag [FLAG_MONSTER]
		1009	\|\| op->flag [FLAG_ALIVE]
		1010	\|\| op->flag [FLAG_GENERATOR]))
		1011	{
		1012	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
		1013	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
		1014	}
		1015
		1016	if (expect_false (op->has_dialogue ()))
		1017	flags \|= 1;
		1018
		1019	if (expect_false (op->type == PLAYER))
		1020	player = op == ob ? pl->ob->count
		1021	: op == pl->ob ? ob->count
		1022	: op->count;
		1023	}
		1024
		1025	if (expect_false (lastcell.stat_hp != stat_hp))
		1026	{
		1027	lastcell.stat_hp = stat_hp;
		1028
		1029	mask \|= 0x8;
		1030	*last_ext \|= 0x80;
		1031	last_ext = &sl[sl.length ()];
		1032
		1033	sl << uint8 (5) << uint8 (stat_hp);
		1034
		1035	if (stat_width > 1)
1092	{	1036	{
1093	*last_ext \|= 0x80;	1037	*last_ext \|= 0x80;
1094	last_ext = &sl[sl.length ()];	1038	last_ext = &sl[sl.length ()];
1095	sl << uint8 (d);
1096	}
1097	else
1098	sl << uint8 (255 - 64 * d);
1099	}
1100		1039
1101	lastcell.count = d;
1102
1103	mapspace &ms = m->at (nx, ny);
1104	ms.update ();
1105
1106	if (expect_true (socket.extmap))
1107	{
1108	uint8 stat_hp = 0;
1109	uint8 stat_width = 0;
1110	uint8 flags = 0;
1111	tag_t player = 0;
1112
1113	// send hp information, if applicable
1114	if (object *op = ms.faces_obj [0])
1115	if (op->is_head () && !op->invisible)
1116	{
1117	if (op->stats.maxhp > op->stats.hp
1118	&& op->stats.maxhp > 0
1119	&& (op->type == PLAYER
1120	\|\| op->type == DOOR // does not work, have maxhp 0
1121	\|\| QUERY_FLAG (op, FLAG_MONSTER)
1122	\|\| QUERY_FLAG (op, FLAG_ALIVE)
1123	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1124	{
1125	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1126	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1127	}
1128
1129	if (expect_false (op->has_dialogue ()))
1130	flags \|= 1;
1131
1132	if (expect_false (op->type == PLAYER))
1133	player = op == ob ? pl->ob->count
1134	: op == pl->ob ? ob->count
1135	: op->count;
1136	}
1137
1138	if (expect_false (lastcell.stat_hp != stat_hp))
1139	{
1140	lastcell.stat_hp = stat_hp;
1141
1142	mask \|= 0x8;
1143	*last_ext \|= 0x80;
1144	last_ext = &sl[sl.length ()];
1145
1146	sl << uint8 (5) << uint8 (stat_hp);
1147
1148	if (stat_width > 1)
1149	{
1150	*last_ext \|= 0x80;
1151	last_ext = &sl[sl.length ()];
1152
1153	sl << uint8 (6) << uint8 (stat_width);	1040	sl << uint8 (6) << uint8 (stat_width);
1154	}
1155	}
1156
1157	if (expect_false (lastcell.player != player))
1158	{
1159	lastcell.player = player;
1160
1161	mask \|= 0x8;
1162	*last_ext \|= 0x80;
1163	last_ext = &sl[sl.length ()];
1164
1165	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1166	}
1167
1168	if (expect_false (lastcell.flags != flags))
1169	{
1170	lastcell.flags = flags;
1171
1172	mask \|= 0x8;
1173	*last_ext \|= 0x80;
1174	last_ext = &sl[sl.length ()];
1175
1176	sl << uint8 (8) << uint8 (flags);
1177	}	1041	}
1178	}	1042	}
		1043
		1044	if (expect_false (lastcell.player != player))
		1045	{
		1046	lastcell.player = player;
		1047
		1048	mask \|= 0x8;
		1049	*last_ext \|= 0x80;
		1050	last_ext = &sl[sl.length ()];
		1051
		1052	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
		1053	}
		1054
		1055	if (expect_false (lastcell.flags != flags))
		1056	{
		1057	lastcell.flags = flags;
		1058
		1059	mask \|= 0x8;
		1060	*last_ext \|= 0x80;
		1061	last_ext = &sl[sl.length ()];
		1062
		1063	sl << uint8 (8) << uint8 (flags);
		1064	}
		1065
		1066	// faces
1179		1067
1180	/* Floor face */	1068	/* Floor face */
1181	if (update_space (sl, socket, ms, lastcell, 2))	1069	if (update_space (sl, socket, ms, lastcell, 2))
1182	mask \|= 0x4;	1070	mask \|= 0x4;
1183		1071
…		…
1223	socket.send_packet (sl);	1111	socket.send_packet (sl);
1224	socket.sent_scroll = 0;	1112	socket.sent_scroll = 0;
1225	}	1113	}
1226	}	1114	}
1227		1115
1228	/*****************************************************************************/
1229	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1230	/* a player. Of course, the client need to know the command to be able to */
1231	/* manage it ! */
1232	/*****************************************************************************/
1233	void
1234	send_plugin_custom_message (object pl, char buf)
1235	{
1236	pl->contr->ns->send_packet (buf);
1237	}
1238
1239	/**
1240	* This sends the skill number to name mapping. We ignore
1241	* the params - we always send the same info no matter what.
1242	*/
1243	void
1244	send_skill_info (client ns, char params)
1245	{
1246	packet sl;
1247	sl << "replyinfo skill_info\n";
1248
1249	for (int i = 1; i < NUM_SKILLS; i++)
1250	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1251
1252	if (sl.length () > MAXSOCKBUF)
1253	{
1254	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1255	fatal (0);
1256	}
1257
1258	ns->send_packet (sl);
1259	}
1260
1261	/**
1262	* This sends the spell path to name mapping. We ignore
1263	* the params - we always send the same info no matter what.
1264	*/
1265	void
1266	send_spell_paths (client * ns, char *params)
1267	{
1268	packet sl;
1269
1270	sl << "replyinfo spell_paths\n";
1271
1272	for (int i = 0; i < NRSPELLPATHS; i++)
1273	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1274
1275	if (sl.length () > MAXSOCKBUF)
1276	{
1277	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1278	fatal (0);
1279	}
1280
1281	ns->send_packet (sl);
1282	}
1283
1284	/**	1116	/**
1285	* This looks for any spells the player may have that have changed their stats.	1117	* This looks for any spells the player may have that have changed their stats.
1286	* it then sends an updspell packet for each spell that has changed in this way	1118	* it then sends an updspell packet for each spell that has changed in this way
1287	*/	1119	*/
1288	void	1120	void
1289	esrv_update_spells (player *pl)	1121	esrv_update_spells (player *pl)
1290	{	1122	{
1291	if (!pl->ns)	1123	if (!pl->ns)
1292	return;	1124	return;
1293		1125
		1126	pl->ns->update_spells = false;
		1127
1294	if (!pl->ns->monitor_spells)	1128	if (!pl->ns->monitor_spells)
1295	return;	1129	return;
1296		1130
1297	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1131	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1298	{
1299	if (spell->type == SPELL)	1132	if (spell->type == SPELL)
1300	{	1133	{
1301	int flags = 0;	1134	int flags = 0;
		1135	int val;
1302		1136
1303	/* check if we need to update it */	1137	/* check if we need to update it */
1304	if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))	1138	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
		1139	if (spell->cached_sp != val)
1305	{	1140	{
1306	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1141	spell->cached_sp = val;
1307	flags \|= UPD_SP_MANA;	1142	flags \|= UPD_SP_MANA;
1308	}	1143	}
1309		1144
1310	if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))	1145	val = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
		1146	if (spell->cached_grace != val)
1311	{	1147	{
1312	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1148	spell->cached_grace = val;
1313	flags \|= UPD_SP_GRACE;	1149	flags \|= UPD_SP_GRACE;
1314	}	1150	}
1315		1151
1316	if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))	1152	val = casting_level (pl->ob, spell);
		1153	if (spell->cached_eat != val)
1317	{	1154	{
1318	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1155	spell->cached_eat = val;
1319	flags \|= UPD_SP_DAMAGE;	1156	flags \|= UPD_SP_LEVEL;
1320	}	1157	}
1321		1158
1322	if (flags)	1159	if (flags)
1323	{	1160	{
1324	packet sl;	1161	packet sl;
1325		1162
1326	sl << "updspell "	1163	sl << "updspell "
1327	<< uint8 (flags)	1164	<< uint8 (flags)
1328	<< uint32 (spell->count);	1165	<< uint32 (spell->count);
1329		1166
1330	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1167	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1331	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1168	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1332	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1169	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1333		1170
1334	pl->ns->send_packet (sl);	1171	pl->ns->send_packet (sl);
1335	}	1172	}
1336	}	1173	}
1337	}
1338	}	1174	}
1339		1175
1340	void	1176	void
1341	esrv_remove_spell (player pl, object spell)	1177	esrv_remove_spell (player pl, object spell)
1342	{	1178	{
…		…
1358		1194
1359	/* appends the spell spell to the Socklist we will send the data to. /	1195	/* appends the spell spell to the Socklist we will send the data to. /
1360	static void	1196	static void
1361	append_spell (player pl, packet &sl, object spell)	1197	append_spell (player pl, packet &sl, object spell)
1362	{	1198	{
1363	int i, skill = 0;	1199	int skill = 0;
1364		1200
1365	if (!(spell->name))	1201	if (!(spell->name))
1366	{	1202	{
1367	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);	1203	LOG (llevError, "item number %d is a spell with no name.\n", spell->count);
1368	return;	1204	return;
1369	}	1205	}
1370		1206
1371	/* store costs and damage in the object struct, to compare to later */	1207	/* store costs and damage in the object struct, to compare to later */
1372	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1208	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
1373	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1209	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
1374	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1210	spell->cached_eat = casting_level (pl->ob, spell);
1375		1211
1376	/* figure out which skill it uses, if it uses one */	1212	/* figure out which skill it uses, if it uses one */
1377	if (spell->skill)	1213	if (spell->skill)
1378	if (object *tmp = pl->find_skill (spell->skill))	1214	if (object *tmp = pl->find_skill (spell->skill))
1379	skill = tmp->subtype + CS_STAT_SKILLINFO;	1215	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1380		1216
1381	// spells better have a face	1217	// spells better have a face
1382	if (!spell->face)	1218	if (!spell->face)
1383	{	1219	{
1384	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);	1220	LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
…		…
1395	<< uint16 (spell->cached_grace)	1231	<< uint16 (spell->cached_grace)
1396	<< uint16 (spell->cached_eat)	1232	<< uint16 (spell->cached_eat)
1397	<< uint8 (skill)	1233	<< uint8 (skill)
1398	<< uint32 (spell->path_attuned)	1234	<< uint32 (spell->path_attuned)
1399	<< uint32 (spell->face)	1235	<< uint32 (spell->face)
1400	<< data8 (spell->name)	1236	<< data8 (spell->name);
		1237
		1238	if (pl->ns->monitor_spells < 2)
1401	<< data16 (spell->msg);	1239	sl << data16 (spell->msg);
1402	}	1240	}
1403		1241
1404	/**	1242	/**
1405	* This tells the client to add the spell ob, if ob is NULL, then add	1243	* This tells the client to add the spell ob, if ob is NULL, then add
1406	* all spells in the player's inventory.	1244	* all spells in the player's inventory.
1407	*/	1245	*/
1408	void	1246	void
1409	esrv_add_spells (player pl, object spell)	1247	esrv_add_spells (player pl, object spell)
1410	{	1248	{
…		…
1421		1259
1422	if (!spell)	1260	if (!spell)
1423	{	1261	{
1424	for (spell = pl->ob->inv; spell; spell = spell->below)	1262	for (spell = pl->ob->inv; spell; spell = spell->below)
1425	{	1263	{
1426	/* were we to simply keep appending data here, we could exceed	1264	/* were we to simply keep appending data here, we could exceed
1427	* MAXSOCKBUF if the player has enough spells to add, we know that	1265	* MAXSOCKBUF if the player has enough spells to add, we know that
1428	* append_spells will always append 19 data bytes, plus 4 length	1266	* append_spells will always append 19 data bytes, plus 4 length
1429	* bytes and 3 strings (because that is the spec) so we need to	1267	* bytes and 3 strings (because that is the spec) so we need to
1430	* check that the length of those 3 strings, plus the 23 bytes,	1268	* check that the length of those 3 strings, plus the 23 bytes,
1431	* won't take us over the length limit for the socket, if it does,	1269	* won't take us over the length limit for the socket, if it does,
1432	* we need to send what we already have, and restart packet formation	1270	* we need to send what we already have, and restart packet formation
1433	*/	1271	*/
1434	if (spell->type != SPELL)	1272	if (spell->type != SPELL)
1435	continue;	1273	continue;
1436		1274
1437	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1275	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
…		…
1458	}	1296	}
1459	else	1297	else
1460	append_spell (pl, sl, spell);	1298	append_spell (pl, sl, spell);
1461		1299
1462	if (sl.length () > MAXSOCKBUF)	1300	if (sl.length () > MAXSOCKBUF)
1463	{
1464	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1301	cleanup ("buffer overflow in esrv_add_spells!");
1465	fatal (0);
1466	}
1467		1302
1468	/* finally, we can send the packet */	1303	/* finally, we can send the packet */
1469	pl->ns->flush_fx ();	1304	pl->ns->flush_fx ();
1470	pl->ns->send_packet (sl);	1305	pl->ns->send_packet (sl);
1471	}	1306	}
1472		1307
		1308	//-GPL
		1309

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.145 by root, Fri Dec 26 10:44:17 2008 UTC vs. Revision 1.195 by root, Sat Nov 17 23:40:05 2018 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.145 by root, Fri Dec 26 10:44:17 2008 UTC vs.
Revision 1.195 by root, Sat Nov 17 23:40:05 2018 UTC