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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.147 by root, Sat Dec 27 08:41:44 2008 UTC vs.
Revision 1.197 by root, Sat Dec 1 20:22:13 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);
…		…
217	socket.current_x = ob->x;	235	socket.current_x = ob->x;
218	socket.current_y = ob->y;	236	socket.current_y = ob->y;
219	}	237	}
220		238
221	/**	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);
		276	}
		277
		278	/**
222	* RequestInfo is sort of a meta command. There is some specific	279	* RequestInfo is sort of a meta command. There is some specific
223	* request of information, but we call other functions to provide	280	* request of information, but we call other functions to provide
224	* that information.	281	* that information.
		282	* requestinfo is completely deprecated, use resource exti request
		283	* and the fxix or http protocols.
225	*/	284	*/
226	void	285	void
227	RequestInfo (char buf, int len, client ns)	286	RequestInfo (char buf, int len, client ns)
228	{	287	{
229	char *params;	288	char *params;
…		…
236	{	295	{
237	*params++ = 0;	296	*params++ = 0;
238	break;	297	break;
239	}	298	}
240		299
241	if (!strcmp (buf, "image_info"))
242	send_image_info (ns, params);
243	else if (!strcmp (buf, "image_sums"))
244	send_image_sums (ns, params);
245	else if (!strcmp (buf, "skill_info"))	300	if (!strcmp (buf, "skill_info"))
246	send_skill_info (ns, params);	301	send_skill_info (ns, params);
247	else if (!strcmp (buf, "spell_paths"))	302	else if (!strcmp (buf, "spell_paths"))
248	send_spell_paths (ns, params);	303	send_spell_paths (ns, params);
249	else	304	else
250	{	305	{
…		…
266	ExtiCmd (char buf, int len, client ns)	321	ExtiCmd (char buf, int len, client ns)
267	{	322	{
268	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));	323	INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
269	}	324	}
270		325
		326	//-GPL
		327
271	void	328	void
272	client::mapinfo_queue_clear ()	329	client::mapinfo_queue_clear ()
273	{	330	{
274	for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)	331	for (auto &&i : mapinfo_queue)
275	free (*i);	332	free (i);
276		333
277	mapinfo_queue.clear ();	334	mapinfo_queue.clear ();
278	}	335	}
279		336
280	bool	337	bool
…		…
282	{	339	{
283	char *token = buf;	340	char *token = buf;
284	buf += strlen (buf) + 9;	341	buf += strlen (buf) + 9;
285		342
286	// initial map and its origin	343	// initial map and its origin
287	maptile *map = pl->observe->map;	344	maptile *map = pl->viewpoint->map;
288	int mapx = pl->ns->mapx / 2 - pl->observe->x;	345	int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
289	int mapy = pl->ns->mapy / 2 - pl->observe->y;	346	int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
290	int max_distance = 8; // limit maximum path length to something generous	347	int max_distance = 8; // limit maximum path length to something generous
291		348
292	while (*buf && map && max_distance)	349	while (*buf && map && max_distance)
293	{	350	{
294	int dir = *buf++ - '1';	351	int dir = *buf++ - '1';
295		352
296	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, ecb_array_length (dirmap)))
297	{	358	{
		359	dir = dirmap [dir];
		360
298	if (!map->tile_path [dir])	361	if (!map->tile_path [dir])
299	map = 0;	362	map = 0;
300	else if (map->tile_available (dir, false))	363	else if (map->tile_available (dir, false))
301	{	364	{
302	maptile *neigh = map->tile_map [dir];	365	maptile *neigh = map->tile_map [dir];
…		…
325	send_packet_printf ("mapinfo %s nomap", token);	388	send_packet_printf ("mapinfo %s nomap", token);
326	else	389	else
327	{	390	{
328	int flags = 0;	391	int flags = 0;
329		392
		393	// due to historical glitches, the bit ordering and map index ordering differs
330	if (map->tile_path[0]) flags \|= 1;	394	if (map->tile_path [TILE_NORTH]) flags \|= 0x01;
331	if (map->tile_path[1]) flags \|= 2;	395	if (map->tile_path [TILE_EAST ]) flags \|= 0x02;
332	if (map->tile_path[2]) flags \|= 4;	396	if (map->tile_path [TILE_SOUTH]) flags \|= 0x04;
333	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;
334		401
335	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);
336	}	403	}
337		404
338	return 1;	405	return 1;
…		…
399	AddMeCmd (char buf, int len, client ns)	466	AddMeCmd (char buf, int len, client ns)
400	{	467	{
401	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));	468	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
402	}	469	}
403		470
404	/*	471	//+GPL
405	#define MSG_TYPE_BOOK 1
406	#define MSG_TYPE_CARD 2
407	#define MSG_TYPE_PAPER 3
408	#define MSG_TYPE_SIGN 4
409	#define MSG_TYPE_MONUMENT 5
410	#define MSG_TYPE_SCRIPTED_DIALOG 6*/
411
412	/** Reply to ExtendedInfos command */
413	void
414	ToggleExtendedText (char buf, int len, client ns)
415	{
416	char cmdback[MAX_BUF];
417	char temp[10];
418	char command[50];
419	int info, nextinfo, i, flag;
420
421	cmdback[0] = '\0';
422
423	nextinfo = 0;
424	while (1)
425	{
426	/* 1. Extract an info */
427	info = nextinfo;
428
429	while ((info < len) && (buf[info] == ' '))
430	info++;
431
432	if (info >= len)
433	break;
434
435	nextinfo = info + 1;
436
437	while ((nextinfo < len) && (buf[nextinfo] != ' '))
438	nextinfo++;
439
440	if (nextinfo - info >= 49) /Erroneous info asked /
441	continue;
442
443	strncpy (command, &(buf[info]), nextinfo - info);
444	command[nextinfo - info] = '\0';
445	/* 2. Interpret info */
446	i = sscanf (command, "%d", &flag);
447
448	if ((i == 1) && (flag > 0) && (flag <= MSG_TYPE_LAST))
449	ns->supported_readables \|= (1 << flag);
450	/3. Next info /
451	}
452
453	/* Send resulting state */
454	strcpy (cmdback, "ExtendedTextSet");
455
456	for (i = 0; i <= MSG_TYPE_LAST; i++)
457	if (ns->supported_readables & (1 << i))
458	{
459	strcat (cmdback, " ");
460	snprintf (temp, sizeof (temp), "%d", i);
461	strcat (cmdback, temp);
462	}
463
464	ns->send_packet (cmdback);
465	}
466		472
467	/**	473	/**
468	* 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,
469	* etc.)	475	* etc.)
470	*/	476	*/
…		…
483	return;	489	return;
484		490
485	buf++;	491	buf++;
486	}	492	}
487		493
488	execute_newserver_command (pl->ob, (char *) buf);	494	execute_newserver_command (pl->ob, (char *)buf);
489		495
490	/* Perhaps something better should be done with a left over count.	496	/* Perhaps something better should be done with a left over count.
491	* Cleaning up the input should probably be done first - all actions	497	* Cleaning up the input should probably be done first - all actions
492	* for the command that issued the count should be done before any other	498	* for the command that issued the count should be done before any other
493	* commands.	499	* commands.
494	*/	500	*/
495	pl->count = 0;	501	pl->count = 0;
496	}
497
498	/**
499	* This handles the general commands from the client (ie, north, fire, cast,
500	* etc.). It is a lot like PlayerCmd above, but is called with the
501	* 'ncom' method which gives more information back to the client so it
502	* can throttle.
503	*/
504	void
505	NewPlayerCmd (char buf, int len, player pl)
506	{
507	if (len <= 6)
508	{
509	LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
510	return;
511	}
512
513	uint16 cmdid = net_uint16 ((uint8 *)buf);
514	sint32 repeat = net_sint32 ((uint8 *)buf + 2);
515
516	/* -1 is special - no repeat, but don't update */
517	if (repeat != -1)
518	pl->count = repeat;
519
520	buf += 6; //len -= 6;
521
522	execute_newserver_command (pl->ob, buf);
523
524	/* Perhaps something better should be done with a left over count.
525	* Cleaning up the input should probably be done first - all actions
526	* for the command that issued the count should be done before any other
527	* commands.
528	*/
529	pl->count = 0;
530
531	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
532	int time = fabs (pl->ob->speed) < 0.001
533	? time = MAX_TIME * 100
534	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
535
536	/* Send confirmation of command execution now */
537	packet sl ("comc");
538	sl << uint16 (cmdid) << uint32 (time);
539	pl->ns->send_packet (sl);
540	}	502	}
541		503
542	/** This is a reply to a previous query. */	504	/** This is a reply to a previous query. */
543	void	505	void
544	ReplyCmd (char buf, int len, client ns)	506	ReplyCmd (char buf, int len, client ns)
…		…
581	LOG (llevError, "Unknown input state: %d\n", ns->state);	543	LOG (llevError, "Unknown input state: %d\n", ns->state);
582	}	544	}
583	}	545	}
584		546
585	/**	547	/**
586	* Client tells its version. If there is a mismatch, we close the	548	* Client tells its version info.
587	* socket. In real life, all we should care about is the client having
588	* something older than the server. If we assume the client will be
589	* backwards compatible, having it be a later version should not be a
590	* problem.
591	*/	549	*/
592	void	550	void
593	VersionCmd (char buf, int len, client ns)	551	VersionCmd (char buf, int len, client ns)
594	{	552	{
595	if (!buf)	553	INVOKE_CLIENT (VERSION, ns, ARG_DATA (buf, len));
596	{
597	LOG (llevError, "CS: received corrupted version command\n");
598	return;
599	}
600
601	ns->cs_version = atoi (buf);
602	ns->sc_version = ns->cs_version;
603
604	LOG (llevDebug, "connection from client <%s>\n", buf);
605
606	//TODO: should log here just for statistics
607
608	//if (VERSION_CS != ns->cs_version)
609	// unchecked;
610
611	char *cp = strchr (buf + 1, ' ');
612	if (!cp)
613	return;
614
615	ns->sc_version = atoi (cp);
616
617	//if (VERSION_SC != ns->sc_version)
618	// unchecked;
619
620	cp = strchr (cp + 1, ' ');
621
622	if (cp)
623	{
624	ns->version = cp + 1;
625
626	if (ns->sc_version < 1026)
627	ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
628	"** VERSION WARNING \n CLIENT IS TOO OLD!! UPDATE THE CLIENT!! **");
629	}
630	}	554	}
631		555
632	/** sound related functions. */	556	/** sound related functions. */
633	void	557	void
634	SetSound (char buf, int len, client ns)	558	SetSound (char buf, int len, client ns)
…		…
685	* Get player's current range attack in obuf.	609	* Get player's current range attack in obuf.
686	*/	610	*/
687	static void	611	static void
688	rangetostring (player pl, char obuf)	612	rangetostring (player pl, char obuf)
689	{	613	{
690	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
691		625
692	if (pl->ranged_ob)	626	if (pl->ranged_ob)
693	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;
694		628
695	if (pl->combat_ob)	629	if (pl->combat_ob)
…		…
741	* commands for now.	675	* commands for now.
742	*/	676	*/
743	void	677	void
744	esrv_update_stats (player *pl)	678	esrv_update_stats (player *pl)
745	{	679	{
746	char buf[MAX_BUF];
747	uint16 flags;
748
749	client *ns = pl->ns;	680	client *ns = pl->ns;
750	if (!ns)	681	if (!ns)
751	return;	682	return;
752		683
753	object *ob = pl->observe;	684	object *ob = pl->observe;
…		…
770	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);	701	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
771	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);	702	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
772	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);	703	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
773	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);	704	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
774		705
775	for (int s = 0; s < NUM_SKILLS; s++)	706	for (int s = 0; s < CS_NUM_SKILLS; s++)
776	if (object *skill = opl->last_skill_ob [s])	707	if (object *skill = opl->last_skill_ob [s])
777	if (skill->stats.exp != ns->last_skill_exp [s])	708	if (skill->stats.exp != ns->last_skill_exp [s])
778	{	709	{
779	ns->last_skill_exp [s] = skill->stats.exp;	710	ns->last_skill_exp [s] = skill->stats.exp;
780		711
781	/* Always send along the level if exp changes. This is only	712	/* Always send along the level if exp changes. This is only
782	* 1 extra byte, but keeps processing simpler.	713	* 1 extra byte, but keeps processing simpler.
783	*/	714	*/
784	sl << uint8 (s + CS_STAT_SKILLINFO)	715	sl << uint8 (CS_STAT_SKILLINFO + s)
785	<< uint8 (skill->level)	716	<< uint8 (skill->level)
786	<< uint64 (skill->stats.exp);	717	<< uint64 (skill->stats.exp);
787	}	718	}
788		719
789	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);	720	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
790	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);	721	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
791	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);	722	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
792	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);	723	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
793	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);	724	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
794	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);
795	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);	726	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
796	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f/TICK);	727	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
797	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);	728	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
798		729
799	flags = 0;	730	int flags = (opl->fire_on ? SF_FIREON : 0)
800		731	\| (opl->run_on ? SF_RUNON : 0);
801	if (opl->fire_on)
802	flags \|= SF_FIREON;
803
804	if (opl->run_on)
805	flags \|= SF_RUNON;
806		732
807	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);	733	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
808		734
809	if (ns->sc_version < 1025)
810	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
811	else
812	for (int i = 0; i < NROFATTACKS; i++)	735	for (int i = 0; i < NROFATTACKS; i++)
813	{
814	/* Skip ones we won't send */	736	/* Skip ones we won't send */
815	if (atnr_cs_stat[i] == -1)	737	if (atnr_cs_stat[i] >= 0)
816	continue;
817
818	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]);
819	}
820		739
821	if (pl->ns->monitor_spells)	740	if (pl->ns->monitor_spells)
822	{	741	{
823	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);
824	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);
825	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);
826	}	745	}
827		746
		747	char buf[MAX_BUF];
828	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 */
829	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);	749	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
830	set_title (ob, buf);	750	set_title (ob, buf);
831	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);	751	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
832		752
…		…
926		846
927	/* Nothing changed */	847	/* Nothing changed */
928	return 0;	848	return 0;
929	}	849	}
930		850
931	// prefetch (and touch) all maps within a specific distancd
932	static void
933	prefetch_surrounding_maps (maptile *map, int distance)
934	{
935	map->touch ();
936
937	if (--distance)
938	for (int dir = 4; --dir; )
939	if (const shstr &path = map->tile_path [dir])
940	if (maptile *&neigh = map->tile_map [dir])
941	prefetch_surrounding_maps (neigh, distance);
942	else
943	neigh = maptile::find_async (path, map);
944	}
945
946	// prefetch a generous area around the player
947	static void
948	prefetch_surrounding_maps (object *op)
949	{
950	prefetch_surrounding_maps (op->map, 3);
951	}
952
953	/**	851	/**
954	* Draws client map.	852	* Draws client map.
955	*/	853	*/
956	void	854	void
957	draw_client_map (player *pl)	855	draw_client_map (player *pl)
958	{	856	{
959	object *ob = pl->observe;	857	object *ob = pl->viewpoint;
960	if (!ob->active)	858	if (!pl->observe->active)
961	return;	859	return;
962		860
963	/* 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
964	* 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
965	* be OK once they really log in.	863	* be OK once they really log in.
966	*/	864	*/
967	if (!ob->map \|\| ob->map->in_memory != MAP_ACTIVE)	865	if (!ob->map \|\| ob->map->state != MAP_ACTIVE)
968	return;	866	return;
969		867
970	int startlen, oldlen;	868	int startlen, oldlen;
971		869
972	check_map_change (pl);	870	check_map_change (pl);
973	prefetch_surrounding_maps (pl->ob);	871	pl->ob->prefetch_surrounding_maps ();
974		872
975	/* do LOS after calls to update_position */	873	/* do LOS after calls to update_position */
976	/* unfortunately, we need to udpate los when observing, currently */	874	/* unfortunately, we need to udpate los when observing, currently */
977	if (pl->do_los \|\| pl->observe != pl->ob)	875	if (pl->do_los \|\| pl->viewpoint != pl->ob)
978	{	876	{
979	pl->do_los = 0;	877	pl->do_los = 0;
980	pl->update_los ();	878	pl->update_los ();
981	}	879	}
982		880
…		…
1003	* look like.	901	* look like.
1004	*/	902	*/
1005		903
1006	client &socket = *pl->ns;	904	client &socket = *pl->ns;
1007		905
1008	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	906	packet sl ("map1a");
1009		907
1010	startlen = sl.length ();	908	startlen = sl.length ();
1011		909
1012	int hx = socket.mapx / 2;	910	int hx = socket.mapx / 2;
1013	int hy = socket.mapy / 2;	911	int hy = socket.mapy / 2;
…		…
1034	map_clearcell (&lastcell, -1);	932	map_clearcell (&lastcell, -1);
1035	}	933	}
1036		934
1037	continue;	935	continue;
1038	}	936	}
1039		937
1040	int d = pl->blocked_los_uc (dx, dy);	938	int d = pl->blocked_los_uc (dx, dy);
1041		939
1042	if (d > 3)	940	if (d > 3)
1043	{	941	{
1044	/* This block deals with spaces that are not visible for whatever	942	/* This block deals with spaces that are not visible for whatever
1045	* reason. Still may need to send the head for this space.	943	* reason. Still may need to send the head for this space.
1046	*/	944	*/
1047	if (lastcell.count != -1	945	if (lastcell.count != -1
1048	\|\| lastcell.faces[0]	946	\|\| lastcell.faces[0]
1049	\|\| lastcell.faces[1]	947	\|\| lastcell.faces[1]
1050	\|\| lastcell.faces[2]	948	\|\| lastcell.faces[2]
1051	\|\| lastcell.stat_hp	949	\|\| lastcell.stat_hp
1052	\|\| lastcell.flags	950	\|\| lastcell.flags
1053	\|\| lastcell.player)	951	\|\| lastcell.player)
1054	sl << uint16 (mask);	952	sl << uint16 (mask);
1055		953
1056	/* properly clear a previously sent big face */	954	/* properly clear a previously sent big face */
1057	map_clearcell (&lastcell, -1);	955	map_clearcell (&lastcell, -1);
…		…
1081	/* Darkness changed */	979	/* Darkness changed */
1082	if (lastcell.count != d)	980	if (lastcell.count != d)
1083	{	981	{
1084	mask \|= 0x8;	982	mask \|= 0x8;
1085		983
1086	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)
1087	{	1036	{
1088	*last_ext \|= 0x80;	1037	*last_ext \|= 0x80;
1089	last_ext = &sl[sl.length ()];	1038	last_ext = &sl[sl.length ()];
1090	sl << uint8 (d);
1091	}
1092	else
1093	sl << uint8 (255 - 64 * d);
1094	}
1095		1039
1096	lastcell.count = d;
1097
1098	mapspace &ms = m->at (nx, ny);
1099	ms.update ();
1100
1101	if (expect_true (socket.extmap))
1102	{
1103	uint8 stat_hp = 0;
1104	uint8 stat_width = 0;
1105	uint8 flags = 0;
1106	tag_t player = 0;
1107
1108	// send hp information, if applicable
1109	if (object *op = ms.faces_obj [0])
1110	if (op->is_head () && !op->invisible)
1111	{
1112	if (op->stats.maxhp > op->stats.hp
1113	&& op->stats.maxhp > 0
1114	&& (op->type == PLAYER
1115	\|\| op->type == DOOR // does not work, have maxhp 0
1116	\|\| QUERY_FLAG (op, FLAG_MONSTER)
1117	\|\| QUERY_FLAG (op, FLAG_ALIVE)
1118	\|\| QUERY_FLAG (op, FLAG_GENERATOR)))
1119	{
1120	stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
1121	stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
1122	}
1123
1124	if (expect_false (op->has_dialogue ()))
1125	flags \|= 1;
1126
1127	if (expect_false (op->type == PLAYER))
1128	player = op == ob ? pl->ob->count
1129	: op == pl->ob ? ob->count
1130	: op->count;
1131	}
1132
1133	if (expect_false (lastcell.stat_hp != stat_hp))
1134	{
1135	lastcell.stat_hp = stat_hp;
1136
1137	mask \|= 0x8;
1138	*last_ext \|= 0x80;
1139	last_ext = &sl[sl.length ()];
1140
1141	sl << uint8 (5) << uint8 (stat_hp);
1142
1143	if (stat_width > 1)
1144	{
1145	*last_ext \|= 0x80;
1146	last_ext = &sl[sl.length ()];
1147
1148	sl << uint8 (6) << uint8 (stat_width);	1040	sl << uint8 (6) << uint8 (stat_width);
1149	}
1150	}
1151
1152	if (expect_false (lastcell.player != player))
1153	{
1154	lastcell.player = player;
1155
1156	mask \|= 0x8;
1157	*last_ext \|= 0x80;
1158	last_ext = &sl[sl.length ()];
1159
1160	sl << uint8 (0x47) << uint8 (4) << (uint32)player;
1161	}
1162
1163	if (expect_false (lastcell.flags != flags))
1164	{
1165	lastcell.flags = flags;
1166
1167	mask \|= 0x8;
1168	*last_ext \|= 0x80;
1169	last_ext = &sl[sl.length ()];
1170
1171	sl << uint8 (8) << uint8 (flags);
1172	}	1041	}
1173	}	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
1174		1067
1175	/* Floor face */	1068	/* Floor face */
1176	if (update_space (sl, socket, ms, lastcell, 2))	1069	if (update_space (sl, socket, ms, lastcell, 2))
1177	mask \|= 0x4;	1070	mask \|= 0x4;
1178		1071
…		…
1218	socket.send_packet (sl);	1111	socket.send_packet (sl);
1219	socket.sent_scroll = 0;	1112	socket.sent_scroll = 0;
1220	}	1113	}
1221	}	1114	}
1222		1115
1223	/*****************************************************************************/
1224	/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
1225	/* a player. Of course, the client need to know the command to be able to */
1226	/* manage it ! */
1227	/*****************************************************************************/
1228	void
1229	send_plugin_custom_message (object pl, char buf)
1230	{
1231	pl->contr->ns->send_packet (buf);
1232	}
1233
1234	/**
1235	* This sends the skill number to name mapping. We ignore
1236	* the params - we always send the same info no matter what.
1237	*/
1238	void
1239	send_skill_info (client ns, char params)
1240	{
1241	packet sl;
1242	sl << "replyinfo skill_info\n";
1243
1244	for (int i = 1; i < NUM_SKILLS; i++)
1245	sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
1246
1247	if (sl.length () > MAXSOCKBUF)
1248	{
1249	LOG (llevError, "Buffer overflow in send_skill_info!\n");
1250	fatal (0);
1251	}
1252
1253	ns->send_packet (sl);
1254	}
1255
1256	/**
1257	* This sends the spell path to name mapping. We ignore
1258	* the params - we always send the same info no matter what.
1259	*/
1260	void
1261	send_spell_paths (client * ns, char *params)
1262	{
1263	packet sl;
1264
1265	sl << "replyinfo spell_paths\n";
1266
1267	for (int i = 0; i < NRSPELLPATHS; i++)
1268	sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
1269
1270	if (sl.length () > MAXSOCKBUF)
1271	{
1272	LOG (llevError, "Buffer overflow in send_spell_paths!\n");
1273	fatal (0);
1274	}
1275
1276	ns->send_packet (sl);
1277	}
1278
1279	/**	1116	/**
1280	* 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.
1281	* 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
1282	*/	1119	*/
1283	void	1120	void
1284	esrv_update_spells (player *pl)	1121	esrv_update_spells (player *pl)
1285	{	1122	{
1286	if (!pl->ns)	1123	if (!pl->ns)
1287	return;	1124	return;
1288		1125
		1126	pl->ns->update_spells = false;
		1127
1289	if (!pl->ns->monitor_spells)	1128	if (!pl->ns->monitor_spells)
1290	return;	1129	return;
1291		1130
1292	for (object *spell = pl->ob->inv; spell; spell = spell->below)	1131	for (object *spell = pl->ob->inv; spell; spell = spell->below)
1293	{
1294	if (spell->type == SPELL)	1132	if (spell->type == SPELL)
1295	{	1133	{
1296	int flags = 0;	1134	int flags = 0;
		1135	int val;
1297		1136
1298	/* check if we need to update it */	1137	/* check if we need to update it */
1299	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)
1300	{	1140	{
1301	spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);	1141	spell->cached_sp = val;
1302	flags \|= UPD_SP_MANA;	1142	flags \|= UPD_SP_MANA;
1303	}	1143	}
1304		1144
1305	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)
1306	{	1147	{
1307	spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);	1148	spell->cached_grace = val;
1308	flags \|= UPD_SP_GRACE;	1149	flags \|= UPD_SP_GRACE;
1309	}	1150	}
1310		1151
1311	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)
1312	{	1154	{
1313	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1155	spell->cached_eat = val;
1314	flags \|= UPD_SP_DAMAGE;	1156	flags \|= UPD_SP_LEVEL;
1315	}	1157	}
1316		1158
1317	if (flags)	1159	if (flags)
1318	{	1160	{
1319	packet sl;	1161	packet sl;
1320		1162
1321	sl << "updspell "	1163	sl << "updspell "
1322	<< uint8 (flags)	1164	<< uint8 (flags)
1323	<< uint32 (spell->count);	1165	<< uint32 (spell->count);
1324		1166
1325	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);	1167	if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
1326	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);	1168	if (flags & UPD_SP_GRACE) sl << uint16 (spell->cached_grace);
1327	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);	1169	if (flags & UPD_SP_LEVEL) sl << uint16 (spell->cached_eat);
1328		1170
1329	pl->ns->send_packet (sl);	1171	pl->ns->send_packet (sl);
1330	}	1172	}
1331	}	1173	}
1332	}
1333	}	1174	}
1334		1175
1335	void	1176	void
1336	esrv_remove_spell (player pl, object spell)	1177	esrv_remove_spell (player pl, object spell)
1337	{	1178	{
…		…
1353		1194
1354	/* 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. /
1355	static void	1196	static void
1356	append_spell (player pl, packet &sl, object spell)	1197	append_spell (player pl, packet &sl, object spell)
1357	{	1198	{
1358	int i, skill = 0;	1199	int skill = 0;
1359		1200
1360	if (!(spell->name))	1201	if (!(spell->name))
1361	{	1202	{
1362	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);
1363	return;	1204	return;
1364	}	1205	}
1365		1206
1366	/* 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 */
1367	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);
1368	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);
1369	spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);	1210	spell->cached_eat = casting_level (pl->ob, spell);
1370		1211
1371	/* figure out which skill it uses, if it uses one */	1212	/* figure out which skill it uses, if it uses one */
1372	if (spell->skill)	1213	if (spell->skill)
1373	if (object *tmp = pl->find_skill (spell->skill))	1214	if (object *tmp = pl->find_skill (spell->skill))
1374	skill = tmp->subtype + CS_STAT_SKILLINFO;	1215	skill = CS_STAT_SKILLINFO + SKILL_INDEX (tmp);
1375		1216
1376	// spells better have a face	1217	// spells better have a face
1377	if (!spell->face)	1218	if (!spell->face)
1378	{	1219	{
1379	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);
…		…
1390	<< uint16 (spell->cached_grace)	1231	<< uint16 (spell->cached_grace)
1391	<< uint16 (spell->cached_eat)	1232	<< uint16 (spell->cached_eat)
1392	<< uint8 (skill)	1233	<< uint8 (skill)
1393	<< uint32 (spell->path_attuned)	1234	<< uint32 (spell->path_attuned)
1394	<< uint32 (spell->face)	1235	<< uint32 (spell->face)
1395	<< data8 (spell->name)	1236	<< data8 (spell->name);
		1237
		1238	if (pl->ns->monitor_spells < 2)
1396	<< data16 (spell->msg);	1239	sl << data16 (spell->msg);
1397	}	1240	}
1398		1241
1399	/**	1242	/**
1400	* 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
1401	* all spells in the player's inventory.	1244	* all spells in the player's inventory.
1402	*/	1245	*/
1403	void	1246	void
1404	esrv_add_spells (player pl, object spell)	1247	esrv_add_spells (player pl, object spell)
1405	{	1248	{
…		…
1416		1259
1417	if (!spell)	1260	if (!spell)
1418	{	1261	{
1419	for (spell = pl->ob->inv; spell; spell = spell->below)	1262	for (spell = pl->ob->inv; spell; spell = spell->below)
1420	{	1263	{
1421	/* were we to simply keep appending data here, we could exceed	1264	/* were we to simply keep appending data here, we could exceed
1422	* 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
1423	* append_spells will always append 19 data bytes, plus 4 length	1266	* append_spells will always append 19 data bytes, plus 4 length
1424	* 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
1425	* 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,
1426	* 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,
1427	* 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
1428	*/	1271	*/
1429	if (spell->type != SPELL)	1272	if (spell->type != SPELL)
1430	continue;	1273	continue;
1431		1274
1432	/* Seeing crashes by overflowed buffers. Quick arithemetic seems	1275	/* Seeing crashes by overflowed buffers. Quick arithemetic seems
…		…
1453	}	1296	}
1454	else	1297	else
1455	append_spell (pl, sl, spell);	1298	append_spell (pl, sl, spell);
1456		1299
1457	if (sl.length () > MAXSOCKBUF)	1300	if (sl.length () > MAXSOCKBUF)
1458	{
1459	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	1301	cleanup ("buffer overflow in esrv_add_spells!");
1460	fatal (0);
1461	}
1462		1302
1463	/* finally, we can send the packet */	1303	/* finally, we can send the packet */
1464	pl->ns->flush_fx ();	1304	pl->ns->flush_fx ();
1465	pl->ns->send_packet (sl);	1305	pl->ns->send_packet (sl);
1466	}	1306	}
1467		1307
		1308	//-GPL
		1309

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.147 by root, Sat Dec 27 08:41:44 2008 UTC vs. Revision 1.197 by root, Sat Dec 1 20:22:13 2018 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.147 by root, Sat Dec 27 08:41:44 2008 UTC vs.
Revision 1.197 by root, Sat Dec 1 20:22:13 2018 UTC