ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.156 by root, Thu Jul 26 00:27:09 2007 UTC vs.
Revision 1.301 by root, Sat Nov 17 23:40:04 2018 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2017,2018 Marc Alexander Lehmann / 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 (©) 2002,2007 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7	*	8	*
8	* Crossfire TRT 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 <crossfire@schmorp.de>	23	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	24	*/
		25
		26	//+GPL
		27
		28	#include <algorithm>
		29	#include <functional>
23		30
24	#include <global.h>	31	#include <global.h>
25	#include <sproto.h>	32	#include <sproto.h>
26	#include <sounds.h>	33	#include <sounds.h>
27	#include <living.h>	34	#include <living.h>
28	#include <object.h>	35	#include <object.h>
29	#include <spells.h>	36	#include <spells.h>
30	#include <skills.h>	37	#include <skills.h>
31		38
32	#include <algorithm>
33	#include <functional>
34
35	playervec players;	39	playervec players;
36
37	void
38	display_motd (const object *op)
39	{
40	char buf[MAX_BUF];
41	char motd[HUGE_BUF];
42	FILE *fp;
43	int comp;
44	int size;
45
46	sprintf (buf, "%s/%s", settings.confdir, settings.motd);
47	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
48	return;
49
50	motd[0] = '\0';
51	size = 0;
52
53	while (fgets (buf, MAX_BUF, fp))
54	{
55	if (*buf == '#')
56	continue;
57
58	strncat (motd + size, buf, HUGE_BUF - size);
59	size += strlen (buf);
60	}
61
62	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
63	close_and_delete (fp, comp);
64	}
65
66	void
67	send_rules (const object *op)
68	{
69	char buf[MAX_BUF];
70	char rules[HUGE_BUF];
71	FILE *fp;
72	int comp;
73	int size;
74
75	sprintf (buf, "%s/%s", settings.confdir, settings.rules);
76	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
77	return;
78
79	rules[0] = '\0';
80	size = 0;
81
82	while (fgets (buf, MAX_BUF, fp))
83	{
84	if (*buf == '#')
85	continue;
86
87	if (size + strlen (buf) >= HUGE_BUF)
88	{
89	LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
90	break;
91	}
92
93	strncat (rules + size, buf, HUGE_BUF - size);
94	size += strlen (buf);
95	}
96
97	draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
98	close_and_delete (fp, comp);
99	}
100
101	void
102	send_news (const object *op)
103	{
104	char buf[MAX_BUF];
105	char news[HUGE_BUF];
106	char subject[MAX_BUF];
107	FILE *fp;
108	int comp;
109	int size;
110
111	sprintf (buf, "%s/%s", settings.confdir, settings.news);
112	if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
113	return;
114
115	news[0] = '\0';
116	subject[0] = '\0';
117	size = 0;
118
119	while (fgets (buf, MAX_BUF, fp))
120	{
121	if (*buf == '#')
122	continue;
123
124	if (*buf == '%')
125	{ /* send one news */
126	if (size > 0)
127	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
128
129	strcpy (subject, buf + 1);
130	strip_endline (subject);
131	size = 0;
132	news[0] = '\0';
133	}
134	else
135	{
136	if (size + strlen (buf) >= HUGE_BUF)
137	{
138	LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
139	break;
140	}
141	strncat (news + size, buf, HUGE_BUF - size);
142	size += strlen (buf);
143	}
144	}
145
146	draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
147	MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
148	close_and_delete (fp, comp);
149	}
150		40
151	/* This loads the first map an puts the player on it. */	41	/* This loads the first map an puts the player on it. */
152	static void	42	static void
153	set_first_map (object *op)	43	set_first_map (object *op)
154	{	44	{
…		…
165		55
166	players.insert (this);	56	players.insert (this);
167	ob->remove ();	57	ob->remove ();
168	ob->map = 0;	58	ob->map = 0;
169	ob->activate_recursive ();	59	ob->activate_recursive ();
170	CLEAR_FLAG (ob, FLAG_FRIENDLY);	60	ob->clr_flag (FLAG_FRIENDLY);
171	add_friendly_object (ob);	61	add_friendly_object (ob);
172	}	62	}
173		63
174	void	64	void
175	player::deactivate ()	65	player::deactivate ()
…		…
183		73
184	if (ob->map)	74	if (ob->map)
185	maplevel = ob->map->path;	75	maplevel = ob->map->path;
186		76
187	ob->remove ();	77	ob->remove ();
		78	ob->enemy = 0; // sometimes keeps an extra refcount on itself
188	ob->map = 0;	79	ob->map = 0;
189	party = 0;	80	party = 0;
190
191	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
192		81
193	players.erase (this);	82	players.erase (this);
194	}	83	}
195		84
196	// connect the player with a specific client	85	// connect the player with a specific client
…		…
206	ob->close_container (); //TODO: client-specific	95	ob->close_container (); //TODO: client-specific
207		96
208	ns->update_look = 0;	97	ns->update_look = 0;
209	ns->look_position = 0;	98	ns->look_position = 0;
210		99
211	clear_los (this);	100	clear_los ();
212		101
213	ns->reset_stats ();	102	ns->reset_stats ();
214		103
215	/* make sure he's a player -- needed because of class change. */	104	/* make sure he's a player -- needed because of class change. */
216	ob->type = PLAYER; // we are paranoid	105	ob->type = PLAYER; // we are paranoid
217	ob->race = ob->arch->race;	106	ob->race = ob->arch->race;
218		107
219	ob->carrying = sum_weight (ob);	108	ob->update_weight ();
220	link_player_skills (ob);	109	link_skills ();
221
222	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
223		110
224	assign (title, ob->arch->object::name);	111	assign (title, ob->arch->object::name);
225		112
226	/* if it's a dragon player, set the correct title here */	113	/* if it's a dragon player, set the correct title here */
227	if (is_dragon_pl (ob))	114	if (ob->is_dragon ())
228	{	115	{
229	object *tmp, *abil = 0, *skin = 0;	116	object *tmp, *abil = 0, *skin = 0;
230		117
231	for (tmp = ob->inv; tmp; tmp = tmp->below)	118	for (tmp = ob->inv; tmp; tmp = tmp->below)
232	if (tmp->type == FORCE)	119	if (tmp->type == FORCE)
…		…
238	set_dragon_name (ob, abil, skin);	125	set_dragon_name (ob, abil, skin);
239	}	126	}
240		127
241	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	128	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
242		129
243	esrv_new_player (this, ob->weight + ob->carrying);	130	esrv_new_player (this);
244		131
245	ob->flag [FLAG_READY_WEAPON] = false;	132	ob->flag [FLAG_READY_WEAPON] = false;
246	ob->flag [FLAG_READY_SKILL] = false;	133	ob->flag [FLAG_READY_SKILL] = false;
		134	ob->flag [FLAG_READY_RANGE] = false;
247	ob->flag [FLAG_READY_BOW] = false;	135	ob->flag [FLAG_READY_BOW] = false;
248		136
249	for (object *op = ob->inv; op; op = op->below)
250	if (op->flag [FLAG_APPLIED])
251	switch (op->type)
252	{
253	case SKILL:
254	ob->flag [FLAG_APPLIED] = false;
255	break;
256
257	case WAND:
258	case ROD:
259	case HORN:
260	case BOW:
261	ranged_ob = op;
262	break;
263
264	case WEAPON:
265	combat_ob = op;
266	break;
267	}
268
269	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
270	ob->update_stats ();	137	ob->update_stats ();
271		138
272	ns->floorbox_update ();	139	ns->floorbox_update ();
273	esrv_send_inventory (ob, ob);	140	esrv_send_inventory (ob, ob);
274	esrv_add_spells (this, 0);	141	esrv_add_spells (this, 0);
275		142
276	activate ();	143	activate ();
277		144
278	send_rules (ob);
279	send_news (ob);
280	display_motd (ob);
281
282	INVOKE_PLAYER (CONNECT, this);	145	INVOKE_PLAYER (CONNECT, this);
283	INVOKE_PLAYER (LOGIN, this);	146	INVOKE_PLAYER (LOGIN, this);
284	}	147	}
285		148
286	void	149	void
287	player::disconnect ()	150	player::disconnect ()
288	{	151	{
		152	if (ob)
		153	{
		154	ob->close_container (); //TODO: client-specific
		155	ob->drop_unpaid_items ();
		156	}
		157
289	if (ns)	158	if (ns)
290	{	159	{
291	if (active)	160	if (active)
292	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));	161	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
293		162
…		…
296	ns->reset_stats ();	165	ns->reset_stats ();
297	ns->pl = 0;	166	ns->pl = 0;
298	ns = 0;	167	ns = 0;
299	}	168	}
300		169
301	if (ob)	170	// this is important for the player scheduler to get the correct refcount
302	{	171	// when ns = 0
303	ob->close_container (); //TODO: client-specific	172	observe = viewpoint = ob;
304	ob->drop_unpaid_items ();
305	}
306
307	observe = ob;
308		173
309	deactivate ();	174	deactivate ();
310	}	175	}
		176
		177	//-GPL
311		178
312	// the need for this function can be explained	179	// the need for this function can be explained
313	// by load_object not returning the object	180	// by load_object not returning the object
314	void	181	void
315	player::set_object (object *op)	182	player::set_object (object *op)
316	{	183	{
317	ob = observe = op;	184	ob = observe = viewpoint = op;
318	ob->contr = this; /* this aren't yet in archetype */	185	ob->contr = this; /* this aren't yet in archetype */
319		186
320	ob->speed = 1.0f;	187	ob->speed = 1.0f; // object still inactive, keep it that way
321	ob->speed_left = 0.5f;	188	ob->speed_left = 0.5f;
322		189
323	ob->direction = 5; /* So player faces south */	190	ob->direction = 5; /* So player faces south */
324	}	191	}
325		192
326	void	193	void
327	player::set_observe (object *op)	194	player::set_observe (object *op)
328	{	195	{
329	observe = op ? op : ob;	196	observe = viewpoint = op ? op : ob;
330	do_los = 1;	197	do_los = 1;
331	}	198	}
		199
		200	void
		201	player::set_viewpoint (object *op)
		202	{
		203	viewpoint = op ? op : (object *)observe;
		204	do_los = 1;
		205	}
		206
		207	//+GPL
332		208
333	player::player ()	209	player::player ()
334	{	210	{
335	/* There are some elements we want initialised to non zero value -	211	/* There are some elements we want initialised to non zero value -
336	* we deal with that below this point.	212	* we deal with that below this point.
…		…
342	savebed_map = first_map_path; /* Init. respawn position */	218	savebed_map = first_map_path; /* Init. respawn position */
343		219
344	gen_sp_armour = 10;	220	gen_sp_armour = 10;
345	bowtype = bow_normal;	221	bowtype = bow_normal;
346	petmode = pet_normal;	222	petmode = pet_normal;
347	listening = 10;
348	usekeys = containers;	223	usekeys = containers;
349	peaceful = 1; /* default peaceful */	224	peaceful = 1; /* default peaceful */
350	do_los = 1;	225	do_los = 1;
351		226
352	weapon_sp = 1.0f;	227	weapon_sp = 1.0f;
…		…
360		235
361	attachable::do_destroy ();	236	attachable::do_destroy ();
362		237
363	if (ob)	238	if (ob)
364	{	239	{
365	ob->destroy_inv (false);	240	// potentially fix a bug where ob->contr is non-null while ob->contr->ob is null, causing a segfault.
		241	// temporarily backed out patchset 4025 to see if THIS change causes crashes
		242	//ob->contr = 0;
366	ob->destroy ();	243	ob->destroy ();
367	}	244	}
368		245
369	ob = observe = 0;	246	ob = observe = viewpoint = 0;
370	}	247	}
371		248
372	player::~player ()	249	player::~player ()
373	{	250	{
374	/* Clear item stack */	251	/* Clear item stack */
375	free (stack_items);	252	free (stack_items);
		253	}
		254
		255	/*
		256	* get_player_archetype() return next player archetype from archetype
		257	* list. Not very efficient routine, but used only creating new players.
		258	* Note: there MUST be at least one player archetype!
		259	*/
		260	static archetype *
		261	get_player_archetype (archetype *at)
		262	{
		263	// archetypes could have been reloaded
		264	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		265
		266	if (!nat)
		267	return at;
		268
		269	archvec::iterator i = archetypes.find (nat);
		270
		271	for (;;)
		272	{
		273	if (++i == archetypes.end ())
		274	i = archetypes.begin ();
		275	else if (*i == at)
		276	cleanup ("not a single player archetype found");
		277
		278	if ((*i)->type == PLAYER)
		279	return *i;
		280	}
376	}	281	}
377		282
378	/* Tries to add player on the connection passed in ns.	283	/* Tries to add player on the connection passed in ns.
379	* All we can really get in this is some settings like host and display	284	* All we can really get in this is some settings like host and display
380	* mode.	285	* mode.
…		…
382	player *	287	player *
383	player::create ()	288	player::create ()
384	{	289	{
385	player *pl = new player;	290	player *pl = new player;
386		291
387	pl->set_object (arch_to_object (get_player_archetype (0)));	292	pl->set_object (get_player_archetype (0)->instance ());
388		293
389	pl->ob->roll_stats ();	294	pl->ob->roll_stats ();
390	pl->ob->stats.wc = 2;	295	pl->ob->stats.wc = 2;
391	pl->ob->run_away = 25; /* Then we panick... */	296	pl->ob->run_away = 25; /* Then we panick... */
392		297
393	set_first_map (pl->ob);	298	set_first_map (pl->ob);
394		299
395	return pl;	300	return pl;
396	}
397
398	/*
399	* get_player_archetype() return next player archetype from archetype
400	* list. Not very efficient routine, but used only creating new players.
401	* Note: there MUST be at least one player archetype!
402	*/
403	archetype *
404	get_player_archetype (archetype *at)
405	{
406	archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
407
408	for (;;)
409	{
410	if (++i == archetypes.end ())
411	i = archetypes.begin ();
412	else if (*i == at)
413	cleanup ("not a single player archetype found");
414
415	if ((*i)->type == PLAYER)
416	return *i;
417	}
418	}	301	}
419		302
420	object *	303	object *
421	get_nearest_player (object *mon)	304	get_nearest_player (object *mon)
422	{	305	{
…		…
425	unsigned lastdist;	308	unsigned lastdist;
426	rv_vector rv;	309	rv_vector rv;
427		310
428	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)	311	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
429	{	312	{
430	/* We should not find free objects on this friendly list, but it
431	* does periodically happen. Given that, lets deal with it.
432	* While unlikely, it is possible the next object on the friendly
433	* list is also free, so encapsulate this in a while loop.
434	*/
435	while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
436	{
437	object *tmp = ol->ob;
438
439	/* Can't do much more other than log the fact, because the object
440	* itself will have been cleared.
441	*/
442	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
443	tmp->debug_desc ());
444	ol = ol->next;
445	remove_friendly_object (tmp);
446	if (!ol)
447	return op;
448	}
449
450	/* Remove special check for player from this. First, it looks to cause
451	* some crashes (ol->ob->contr not set properly?), but secondly, a more
452	* complicated method of state checking would be needed in any case -
453	* as it was, a clever player could type quit, and the function would
454	* skip them over while waiting for confirmation. Remove
455	* on_same_map check, as can_detect_enemy also does this
456	*/
457	if (!can_detect_enemy (mon, ol->ob, &rv))	313	if (!can_detect_enemy (mon, ol->ob, &rv))
458	continue;	314	continue;
459		315
460	if (lastdist > rv.distance)	316	if (lastdist > rv.distance)
461	{	317	{
…		…
477	#endif	333	#endif
478	return op;	334	return op;
479	}	335	}
480		336
481	/* I believe this can safely go to 2, 3 is questionable, 4 will likely	337	/* I believe this can safely go to 2, 3 is questionable, 4 will likely
482	* result in a monster paths backtracking. It basically determines how large a	338	* result in a monster paths backtracking. It basically determines how large a
483	* detour a monster will take from the direction path when looking	339	* detour a monster will take from the direction path when looking
484	* for a path to the player. The values are in the amount of direction	340	* for a path to the player. The values are in the amount of direction
485	* the deviation is	341	* the deviation is
486	*/	342	*/
487	#define DETOUR_AMOUNT 2	343	#define DETOUR_AMOUNT 2
…		…
523	*/	379	*/
524	int	380	int
525	path_to_player (object *mon, object *pl, unsigned mindiff)	381	path_to_player (object *mon, object *pl, unsigned mindiff)
526	{	382	{
527	rv_vector rv;	383	rv_vector rv;
528	sint16 x, y;
529	int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;	384	int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES;
530	maptile *m, *lastmap;
531		385
532	get_rangevector (mon, pl, &rv, 0);	386	get_rangevector (mon, pl, &rv, 0);
533		387
534	if (rv.distance < mindiff)	388	if (rv.distance < mindiff)
535	return 0;	389	return 0;
536		390
537	x = mon->x;	391	mapxy pos (mon);
538	y = mon->y;
539	m = mon->map;
540	dir = rv.direction;	392	dir = rv.direction;
541	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	393	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
542	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	394	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
543		395
544	/* If we can't solve it within the search distance, return now. */	396	/* If we can't solve it within the search distance, return now. */
545	if (diff > max)	397	if (diff > max)
546	return 0;	398	return 0;
547		399
548	while (diff > 1 && max > 0)	400	while (diff > 1 && max > 0)
549	{	401	{
550	lastx = x;	402	mapxy lastpos = pos;
551	lasty = y;
552	lastmap = m;
553	x = lastx + freearr_x[dir];
554	y = lasty + freearr_y[dir];
555		403
556	mflags = get_map_flags (m, &m, x, y, &x, &y);	404	pos.move (dir);
557	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
558		405
559	/* Space is blocked - try changing direction a little */	406	/* Space is blocked - try changing direction a little */
560	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW))	407	if (!pos.normalise ()
561	&& (m == mon->map && blocked_link (mon, m, x, y))))	408	|| (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
		409	&& blocked_link (mon, pos.m, pos.x, pos.y)))
562	{	410	{
563	/* recalculate direction from last good location. Possible	411	/* recalculate direction from last good location. Possible
564	* we were not traversing ideal location before.	412	* we were not traversing ideal location before.
565	*/	413	*/
566	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	414	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
567	if (rv.direction != dir)	415	if (rv.direction != dir)
568	{	416	{
569	/* OK - says direction should be different - lets reset the	417	/* OK - says direction should be different - lets reset the
570	* the values so it will try again.	418	* the values so it will try again.
571	*/	419	*/
572	x = lastx;
573	y = lasty;
574	m = lastmap;	420	pos = lastpos;
575	dir = firstdir = rv.direction;	421	dir = firstdir = rv.direction;
576	}	422	}
577	else	423	else
578	{	424	{
579	/* direct path is blocked - try taking a side step to	425	/* direct path is blocked - try taking a side step to
580	* either the left or right.	426	* either the left or right.
581	* Note increase the values in the loop below to be	427	* Note increase the values in the loop below to be
582	* more than -1/1 respectively will mean the monster takes	428	* more than -1/1 respectively will mean the monster takes
583	* bigger detour. Have to be careful about these values getting	429	* bigger detour. Have to be careful about these values getting
584	* too big (3 or maybe 4 or higher) as the monster may just try	430	* too big (3 or maybe 4 or higher) as the monster may just try
585	* stepping back and forth	431	* stepping back and forth
586	*/	432	*/
587	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	433	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
588	{	434	{
589	if (i == 0)	435	if (i == 0)
590	continue; /* already did this, so skip it */	436	continue; /* already did this, so skip it */
		437
591	/* Use lastdir here - otherwise,	438	/* Use lastdir here - otherwise,
592	* since the direction that the creature should move in	439	* since the direction that the creature should move in
593	* may change, you could get infinite loops.	440	* may change, you could get infinite loops.
594	* ie, player is northwest, but monster can only	441	* ie, player is northwest, but monster can only
595	* move west, so it does that. It goes some distance,	442	* move west, so it does that. It goes some distance,
…		…
597	* can't do that, but now finds it can move east, and	444	* can't do that, but now finds it can move east, and
598	* gets back to its original point. lastdir contains	445	* gets back to its original point. lastdir contains
599	* the last direction the creature has successfully	446	* the last direction the creature has successfully
600	* moved.	447	* moved.
601	*/	448	*/
602
603	x = lastx + freearr_x[absdir (lastdir + i)];
604	y = lasty + freearr_y[absdir (lastdir + i)];
605	m = lastmap;	449	pos = lastpos;
606	mflags = get_map_flags (m, &m, x, y, &x, &y);	450	pos.move (absdir (lastdir + i));
607	if (mflags & P_OUT_OF_MAP)	451
		452	if (!pos.normalise ())
608	continue;	453	continue;
609	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	454
610	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	455	mapspace &ms = *pos;
		456
		457	if (ms.flags () & P_BLOCKSVIEW)
611	continue;	458	continue;
612	if (mflags & P_BLOCKSVIEW)	459
		460	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
613	continue;	461	continue;
614		462
615	if (m == mon->map && blocked_link (mon, m, x, y))	463	if (blocked_link (mon, pos.m, pos.x, pos.y))
616	break;	464	break;
617	}	465	}
		466
618	/* go through entire loop without finding a valid	467	/* go through entire loop without finding a valid
619	* sidestep to take - thus, no valid path.	468	* sidestep to take - thus, no valid path.
620	*/	469	*/
621	if (i == (DETOUR_AMOUNT + 1))	470	if (i == DETOUR_AMOUNT + 1)
622	return 0;	471	return 0;
		472
623	diff--;	473	diff--;
624	lastdir = dir;	474	lastdir = dir;
625	max--;	475	max--;
626	if (!firstdir)	476	if (!firstdir)
627	firstdir = dir + i;	477	firstdir = dir + i;
…		…
631	{	481	{
632	/* we moved towards creature, so diff is less */	482	/* we moved towards creature, so diff is less */
633	diff--;	483	diff--;
634	max--;	484	max--;
635	lastdir = dir;	485	lastdir = dir;
		486
636	if (!firstdir)	487	if (!firstdir)
637	firstdir = dir;	488	firstdir = dir;
638	}	489	}
639		490
640	if (diff <= 1)	491	if (diff <= 1)
641	{	492	{
642	/* Recalculate diff (distance) because we may not have actually	493	/* Recalculate diff (distance) because we may not have actually
643	* headed toward player for entire distance.	494	* headed toward player for entire distance.
644	*/	495	*/
645	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	496	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
646	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	497	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
647	}	498	}
648		499
649	if (diff > max)	500	if (diff > max)
650	return 0;	501	return 0;
…		…
656		507
657	return firstdir;	508	return firstdir;
658	}	509	}
659		510
660	void	511	void
661	give_initial_items (object *pl, treasurelist * items)	512	give_initial_items (object *pl, treasurelist *items)
662	{	513	{
663	object *op, *next = NULL;
664
665	if (pl->randomitems != NULL)	514	if (pl->randomitems)
666	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);	515	create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
667		516
668	for (op = pl->inv; op; op = next)	517	for (object *next, *op = pl->inv; op; op = next)
669	{	518	{
670	next = op->below;	519	next = op->below;
671		520
672	/* Forces get applied per default, unless they have the	521	/* Forces get applied per default, unless they have the
673	* flag "neutral" set. Sorry but I can't think of a better way	522	* flag "neutral" set. Sorry but I can't think of a better way
674	*/	523	*/
675	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	524	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
676	SET_FLAG (op, FLAG_APPLIED);	525	op->set_flag (FLAG_APPLIED);
677		526
678	/* we never give weapons/armour if these cannot be used	527	/* we never give weapons/armour if these cannot be used
679	* by this player due to race restrictions	528	* by this player due to race restrictions
680	*/	529	*/
681	if (pl->type == PLAYER)	530	if (pl->type == PLAYER)
682	{	531	{
683	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&	532	if ((!pl->flag [FLAG_USE_ARMOUR]
		533	&&
684	(op->type == ARMOUR || op->type == BOOTS ||	534	(op->type == ARMOUR || op->type == BOOTS
685	op->type == CLOAK || op->type == HELMET ||	535	|| op->type == CLOAK || op->type == HELMET
686	op->type == SHIELD || op->type == GLOVES ||	536	|| op->type == SHIELD || op->type == GLOVES
687	op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	537	|| op->type == BRACERS || op->type == GIRDLE))
		538	|| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
688	{	539	{
689	op->destroy ();	540	op->destroy ();
690	continue;	541	continue;
691	}	542	}
692	}	543	}
693		544
694	/* This really needs to be better - we should really give	545	/* Here we remove duplicated skills (as duplicated spell objects have
695	* a substitute spellbook. The problem is that we don't really	546	* _very_ confusing effects for players), which could for instance be
696	* have a good idea what to replace it with (need something like	547	* generated by multiple treasurelists specifying the same skills.
697	* a first level treasurelist for each skill.)
698	* remove duplicate skills also
699	*/	548	*/
700	if (op->type == SPELLBOOK || op->type == SKILL)	549	if (op->type == SKILL)
701	{	550	{
702	object *tmp;
703
704	for (tmp = op->below; tmp; tmp = tmp->below)	551	for (object *tmp = op->below; tmp; tmp = tmp->below)
705	if (tmp->type == op->type && tmp->name == op->name)	552	if (tmp->type == op->type && tmp->name == op->name)
706	break;
707
708	if (tmp)
709	{	553	{
710	op->destroy ();	554	op->destroy ();
711	LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);	555	break;
712	continue;
713	}	556	}
714		557
715	if (op->nrof > 1)	558	if (op->nrof > 1)
716	op->nrof = 1;	559	op->nrof = 1;
717	}	560	}
718		561
719	if (op->type == SPELLBOOK && op->inv)	562	if (op->type == SPELLBOOK && op->inv)
720	{	563	op->inv->clr_flag (FLAG_STARTEQUIP);
721	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
722	}
723		564
724	/* Give starting characters identified, uncursed, and undamned	565	/* Give starting characters identified, uncursed, and undamned
725	* items. Just don't identify gold or silver, or it won't be	566	* items. Just don't identify gold or silver, or it won't be
726	* merged properly.	567	* merged properly.
727	*/	568	*/
728	if (need_identify (op))	569	if (op->need_identify ())
729	{
730	SET_FLAG (op, FLAG_IDENTIFIED);
731	CLEAR_FLAG (op, FLAG_CURSED);
732	CLEAR_FLAG (op, FLAG_DAMNED);
733	}	570	{
		571	op->set_flag (FLAG_IDENTIFIED);
		572	op->clr_flag (FLAG_CURSED);
		573	op->clr_flag (FLAG_DAMNED);
		574	}
		575
734	if (op->type == SPELL)	576	if (op->type == SPELL)
735	{	577	{
736	op->destroy ();	578	op->destroy ();
737	continue;	579	continue;
738	}	580	}
739	else if (op->type == SKILL)	581	else if (op->type == SKILL)
740	{	582	{
741	SET_FLAG (op, FLAG_CAN_USE_SKILL);	583	op->set_flag (FLAG_CAN_USE_SKILL);
742	op->stats.exp = 0;	584	op->stats.exp = 0;
743	op->level = 1;	585	op->level = 1;
744	}	586	}
745	/* lock all 'normal items by default */	587	else /* lock all 'normal items by default */
746	else	588	op->set_flag (FLAG_INV_LOCKED);
747	SET_FLAG (op, FLAG_INV_LOCKED);
748	} /* for loop of objects in player inv */	589	} /* for loop of objects in player inv */
749		590
750	/* Need to set up the skill pointers */	591	/* Need to set up the skill pointers */
751	link_player_skills (pl);	592	pl->contr->link_skills ();
752	}	593	}
753		594
754	void	595	void
755	get_party_password (object *op, partylist *party)	596	get_party_password (object *op, partylist *party)
756	{	597	{
…		…
766	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	607	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
767	}	608	}
768		609
769	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	610	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
770	static int	611	static int
771	roll_stat (void)	612	roll_stat ()
772	{	613	{
773	int a[4], i, j, k;	614	int a[4], i, j, k;
774		615
775	for (i = 0; i < 4; i++)	616	for (i = 0; i < 4; i++)
776	a[i] = (int) rndm (6) + 1;	617	a[i] = rndm (1, 6);
777		618
778	for (i = 0, j = 0, k = 7; i < 4; i++)	619	for (i = 0, j = 0, k = 7; i < 4; i++)
779	if (a[i] < k)	620	if (a[i] < k)
780	k = a[i], j = i;	621	k = a[i], j = i;
781		622
…		…
857	static void	698	static void
858	start_info (object *op)	699	start_info (object *op)
859	{	700	{
860	char buf[MAX_BUF];	701	char buf[MAX_BUF];
861		702
862	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);	703	sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
863	new_draw_info (NDI_UNIQUE, 0, op, buf);	704	new_draw_info (NDI_UNIQUE, 0, op, buf);
864	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
865	//new_draw_info (NDI_UNIQUE, 0, op, " ");
866	}	705	}
867		706
868	/* This function takes the key that is passed, and does the	707	/* This function takes the key that is passed, and does the
869	* appropriate action with it (change race, or other things).	708	* appropriate action with it (change race, or other things).
870	* The function name is for historical reasons - now we have	709	* The function name is for historical reasons - now we have
…		…
873	*/	712	*/
874	void	713	void
875	player::chargen_race_done ()	714	player::chargen_race_done ()
876	{	715	{
877	/* this must before then initial items are given */	716	/* this must before then initial items are given */
878	esrv_new_player (ob->contr, ob->weight + ob->carrying);	717	esrv_new_player (ob->contr);
879		718
880	treasurelist *tl = treasurelist::find ("starting_wealth");	719	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
881	if (tl)	720	if (tl)
882	create_treasure (tl, ob, 0, 0, 0);	721	create_treasure (tl, ob, 0, 0, 0);
883		722
884	INVOKE_PLAYER (BIRTH, ob->contr);	723	INVOKE_PLAYER (BIRTH, ob->contr);
885	INVOKE_PLAYER (LOGIN, ob->contr);
886		724
887	ob->contr->ns->state = ST_PLAYING;	725	ob->contr->ns->state = ST_PLAYING;
888		726
889	if (ob->msg)	727	if (ob->msg)
890	ob->msg = 0;	728	ob->msg = 0;
891		729
892	/* We create this now because some of the unique maps will need it
893	* to save here.
894	*/
895	{
896	char buf[MAX_BUF];
897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
898	make_path_to_file (buf);
899	}
900
901	start_info (ob);	730	start_info (ob);
902	CLEAR_FLAG (ob, FLAG_WIZ);	731	ob->clr_flag (FLAG_WIZ);
903	give_initial_items (ob, ob->randomitems);	732	give_initial_items (ob, ob->randomitems);
904	link_player_skills (ob);
905	esrv_send_inventory (ob, ob);	733	esrv_send_inventory (ob, ob);
906	ob->update_stats ();	734	ob->update_stats ();
907		735
908	/* This moves the player to a different start map, if there	736	/* This moves the player to a different start map, if there
909	* is one for this race	737	* is one for this race
910	*/	738	*/
911	if (*first_map_ext_path)	739	if (*first_map_ext_path)
912	{	740	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
913	object *tmp;
914	char mapname[MAX_BUF];
915
916	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
917	tmp = object::create ();
918	EXIT_PATH (tmp) = mapname;
919	EXIT_X (tmp) = ob->x;
920	EXIT_Y (tmp) = ob->y;
921	ob->enter_exit (tmp); /* we don't really care if it succeeded;
922	* if the map isn't there, then stay on the
923	* default initial map */
924	tmp->destroy ();
925	}
926	else	741	else
927	LOG (llevDebug, "first_map_ext_path not set\n");	742	LOG (llevDebug, "first_map_ext_path not set\n");
		743	}
		744
		745	/*
		746	* Returns true if the given player is a legal class.
		747	* The function to add and remove class-bonuses to the stats doesn't
		748	* check if the stat becomes negative, thus this function
		749	* merely checks that all stats are 1 or more, and returns
		750	* false otherwise.
		751	*/
		752	static int
		753	allowed_class (const object *op)
		754	{
		755	return op->stats.Dex > 0
		756	&& op->stats.Str > 0
		757	&& op->stats.Con > 0
		758	&& op->stats.Int > 0
		759	&& op->stats.Wis > 0
		760	&& op->stats.Pow > 0
		761	&& op->stats.Cha > 0;
928	}	762	}
929		763
930	void	764	void
931	player::chargen_race_next ()	765	player::chargen_race_next ()
932	{	766	{
…		…
961	ob->stats.hp = ob->stats.maxhp;	795	ob->stats.hp = ob->stats.maxhp;
962	ob->stats.sp = ob->stats.maxsp;	796	ob->stats.sp = ob->stats.maxsp;
963	ob->stats.grace = 0;	797	ob->stats.grace = 0;
964	}	798	}
965		799
966	void	800	static void
967	flee_player (object *op)	801	flee_player (object *op)
968	{	802	{
969	int dir, diff;	803	int dir, diff;
970	rv_vector rv;	804	rv_vector rv;
971		805
972	if (op->stats.hp < 0)	806	if (op->stats.hp < 0)
973	{	807	{
974	LOG (llevDebug, "Fleeing player is dead.\n");	808	LOG (llevDebug, "Fleeing player is dead.\n");
975	CLEAR_FLAG (op, FLAG_SCARED);	809	op->clr_flag (FLAG_SCARED);
976	return;	810	return;
977	}	811	}
978		812
979	if (op->enemy == NULL)	813	if (!op->enemy)
980	{	814	{
981	LOG (llevDebug, "Fleeing player had no enemy.\n");	815	LOG (llevDebug, "Fleeing player had no enemy.\n");
982	CLEAR_FLAG (op, FLAG_SCARED);	816	op->clr_flag (FLAG_SCARED);
983	return;	817	return;
984	}	818	}
985		819
986	/* Seen some crashes here. Since we don't store an	820	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
987	* op->enemy_count, it is possible that something destroys the
988	* actual enemy, and the object is recycled.
989	*/
990	if (op->enemy->map == NULL)
991	{	821	{
992	CLEAR_FLAG (op, FLAG_SCARED);
993	op->enemy = NULL;	822	op->enemy = NULL;
994	return;	823	op->clr_flag (FLAG_SCARED);
995	}
996
997	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
998	{
999	op->enemy = NULL;
1000	CLEAR_FLAG (op, FLAG_SCARED);
1001	return;	824	return;
1002	}	825	}
1003		826
1004	get_rangevector (op, op->enemy, &rv, 0);	827	get_rangevector (op, op->enemy, &rv, 0);
1005		828
1006	dir = absdir (4 + rv.direction);	829	dir = absdir (4 + rv.direction);
1007	for (diff = 0; diff < 3; diff++)	830	for (diff = 0; diff < 3; diff++)
1008	{	831	{
1009	int m = 1 - (RANDOM () & 2);	832	int m = 1 - rndm (2) * 2;
1010		833
1011	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	834	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
1012	return;	835	return;
1013	}	836	}
1014		837
1015	/* Cornered, get rid of scared */	838	/* Cornered, get rid of scared */
1016	CLEAR_FLAG (op, FLAG_SCARED);	839	op->clr_flag (FLAG_SCARED);
1017	op->enemy = NULL;	840	op->enemy = NULL;
1018	}	841	}
1019		842
1020	/* check_pick sees if there is stuff to be picked up/picks up stuff.	843	/* check_pick sees if there is stuff to be picked up/picks up stuff.
1021	* It returns 1 if the player should keep on moving, 0 if he should	844	* It returns 1 if the player should keep on moving, 0 if he should
…		…
1025	check_pick (object *op)	848	check_pick (object *op)
1026	{	849	{
1027	object *tmp, *next;	850	object *tmp, *next;
1028	int stop = 0;	851	int stop = 0;
1029	int wvratio;	852	int wvratio;
1030	char putstring[128];
1031		853
1032	/* if you're flying, you cna't pick up anything */	854	/* if you're flying, you can't pick up anything */
1033	if (op->move_type & MOVE_FLYING)	855	if (op->move_type & MOVE_FLYING)
1034	return 1;	856	return 1;
1035		857
1036	next = op->below;	858	next = op->below;
		859
		860	int cnt = MAX_ITEM_PER_ACTION;
		861	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
1037		862
1038	/* loop while there are items on the floor that are not marked as	863	/* loop while there are items on the floor that are not marked as
1039	* destroyed */	864	* destroyed */
1040	while (next && !next->destroyed ())	865	while (next && !next->destroyed ())
1041	{	866	{
1042	tmp = next;	867	tmp = next;
1043	next = tmp->below;	868	next = tmp->below;
1044		869
		870	if (cnt <= 0)
		871	{
		872	op->failmsg ("Couldn't pickup all items at once.");
		873	return 0;
		874	}
		875
1045	if (op->destroyed ())	876	if (op->destroyed ())
1046	return 0;	877	return 0;
1047		878
1048	if (!can_pick (op, tmp))	879	if (!can_pick (op, tmp))
1049	continue;	880	continue;
1050		881
1051	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)	882	if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1052	{	883	{
1053	if (item_matched_string (op, tmp, op->contr->search_str))	884	if (item_matched_string (op, tmp, op->contr->search_str))
1054	pick_up (op, tmp);	885	CHK_PICK_PICKUP;
		886
1055	continue;	887	continue;
1056	}	888	}
1057		889
1058	/* high not bit set? We're using the old autopickup model */	890	/* pickup handling */
		891	if (op->contr->mode & PU_DEBUG)
		892	{
		893	/* some debugging code to figure out item information */
		894	const char *str = tmp->name
		895	? format ("item name: %s item type: %d weight/value: %d",
		896	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
		897	: format ("item name: %s item type: %d weight/value: %d",
		898	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
		899
		900	new_draw_info (NDI_UNIQUE, 0, op, str);
		901	}
		902
		903	if (op->contr->mode & PU_INHIBIT)
		904	return 1;
		905
		906	if (!(op->contr->mode & PU_ENABLE)) // TODO: fix client
		907	return 1;
		908
		909	/* philosophy:
		910	* It's easy to grab an item type from a pile, as long as it's
		911	* generic. This takes no game-time. For more detailed pickups
		912	* and selections, select-items should be used. This is a
		913	* grab-as-you-run type mode that's really useful for arrows for
		914	* example.
		915	* The drawback: right now it has no frontend, so you need to
		916	* stick the bits you want into a calculator in hex mode and then
		917	* convert to decimal and then 'pickup <#>
		918	*/
		919
		920	/* the first two modes are exclusive: if NOTHING we return, if
		921	* STOP then we stop. All the rest are applied sequentially,
		922	* meaning if any test passes, the item gets picked up. */
		923
		924	/* if mode is set to pick nothing up, return */
		925	if (op->contr->mode == PU_NOTHING)
		926	return 1;
		927
		928	/* if mode is set to stop when encountering objects, return */
		929	/* take STOP before INHIBIT since it doesn't actually pick
		930	* anything up */
		931	if (op->contr->mode & PU_STOP)
		932	return 0;
		933
		934	/* useful for going into stores and not losing your settings... */
		935	/* and for battles wher you don't want to get loaded down while
		936	* fighting */
		937	if (op->contr->mode & PU_INHIBIT)
		938	return 1;
		939
		940	/* prevent us from turning into auto-thieves :) */
		941	if (tmp->flag [FLAG_UNPAID])
		942	continue;
		943
		944	/* ignore known cursed objects */
		945	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
		946	continue;
		947
		948	/* all food and drink if desired */
		949	/* question: don't pick up known-poisonous stuff? */
1059	if (!(op->contr->mode & PU_NEWMODE))	950	if (op->contr->mode & PU_FOOD)
		951	if (tmp->type == FOOD)
1060	{	952	{
1061	switch (op->contr->mode)	953	CHK_PICK_PICKUP;
		954	continue;
		955	}
		956
		957	if (op->contr->mode & PU_DRINK)
		958	if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
		959	{
		960	CHK_PICK_PICKUP;
		961	continue;
		962	}
		963
		964	if (op->contr->mode & PU_POTION)
		965	if (tmp->type == POTION)
		966	{
		967	CHK_PICK_PICKUP;
		968	continue;
		969	}
		970
		971	/* spellbooks, skillscrolls and normal books/scrolls */
		972	if (op->contr->mode & PU_SPELLBOOK)
		973	if (tmp->type == SPELLBOOK)
		974	{
		975	CHK_PICK_PICKUP;
		976	continue;
		977	}
		978
		979	if (op->contr->mode & PU_SKILLSCROLL)
		980	if (tmp->type == SKILLSCROLL)
		981	{
		982	CHK_PICK_PICKUP;
		983	continue;
		984	}
		985
		986	if (op->contr->mode & PU_READABLES)
		987	if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
		988	{
		989	CHK_PICK_PICKUP;
		990	continue;
		991	}
		992
		993	/* wands/staves/rods/horns */
		994	if (op->contr->mode & PU_MAGIC_DEVICE)
		995	if (tmp->type == WAND
		996	|| tmp->type == ROD
		997	|| tmp->type == HORN
		998	|| tmp->type == POWER_CRYSTAL)
		999	{
		1000	CHK_PICK_PICKUP;
		1001	continue;
		1002	}
		1003
		1004	/* pick up all magical items */
		1005	if (op->contr->mode & PU_MAGICAL)
		1006	if (tmp->flag [FLAG_KNOWN_MAGICAL]
		1007	&& !tmp->flag [FLAG_KNOWN_CURSED])
		1008	{
		1009	CHK_PICK_PICKUP;
		1010	continue;
		1011	}
		1012
		1013	if (op->contr->mode & PU_VALUABLES)
		1014	{
		1015	if (tmp->type == MONEY || tmp->type == GEM)
1062	{	1016	{
1063	case 0:	1017	CHK_PICK_PICKUP;
1064	return 1; /* don't pick up */	1018	continue;
1065	case 1:
1066	pick_up (op, tmp);
1067	return 1;
1068	case 2:
1069	pick_up (op, tmp);
1070	return 0;
1071	case 3:
1072	return 0; /* stop before pickup */
1073	case 4:
1074	pick_up (op, tmp);
1075	break;
1076	case 5:
1077	pick_up (op, tmp);
1078	stop = 1;
1079	break;
1080	case 6:
1081	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1082	pick_up (op, tmp);
1083	break;
1084
1085	case 7:
1086	if (tmp->type == MONEY || tmp->type == GEM)
1087	pick_up (op, tmp);
1088	break;
1089
1090	default:
1091	/* use value density */
1092	if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1093	&& (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1094	pick_up (op, tmp);
1095	}	1019	}
1096	}	1020	}
1097	else	1021
1098	{ /* old model */	1022	/* rings & amulets - talismans seems to be typed AMULET */
1099	/* NEW pickup handling */
1100	if (op->contr->mode & PU_DEBUG)	1023	if (op->contr->mode & PU_JEWELS)
		1024	if (tmp->type == RING
		1025	|| tmp->type == AMULET
		1026	|| tmp->type == GIRDLE
		1027	|| tmp->type == SKILL_TOOL)
1101	{	1028	{
1102	/* some debugging code to figure out item information */	1029	CHK_PICK_PICKUP;
1103	if (tmp->name != NULL)
1104	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1105	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1106	else
1107	sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109
1110	new_draw_info (NDI_UNIQUE, 0, op, putstring);
1111	}
1112
1113	/* philosophy:
1114	* It's easy to grab an item type from a pile, as long as it's
1115	* generic. This takes no game-time. For more detailed pickups
1116	* and selections, select-items should be used. This is a
1117	* grab-as-you-run type mode that's really useful for arrows for
1118	* example.
1119	* The drawback: right now it has no frontend, so you need to
1120	* stick the bits you want into a calculator in hex mode and then
1121	* convert to decimal and then 'pickup <#>
1122	*/
1123
1124	/* the first two modes are exclusive: if NOTHING we return, if
1125	* STOP then we stop. All the rest are applied sequentially,
1126	* meaning if any test passes, the item gets picked up. */
1127
1128	/* if mode is set to pick nothing up, return */
1129
1130	if (op->contr->mode & PU_NOTHING)
1131	return 1;
1132
1133	/* if mode is set to stop when encountering objects, return */
1134	/* take STOP before INHIBIT since it doesn't actually pick
1135	* anything up */
1136
1137	if (op->contr->mode & PU_STOP)
1138	return 0;
1139
1140	/* useful for going into stores and not losing your settings... */
1141	/* and for battles wher you don't want to get loaded down while
1142	* fighting */
1143	if (op->contr->mode & PU_INHIBIT)
1144	return 1;
1145
1146	/* prevent us from turning into auto-thieves :) */
1147	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1148	continue;	1030	continue;
		1031	}
1149		1032
1150	/* ignore known cursed objects */	1033	/* we don't forget dragon food */
1151	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	1034	if (op->contr->mode & PU_FLESH)
		1035	if (tmp->type == FLESH)
		1036	{
		1037	CHK_PICK_PICKUP;
1152	continue;	1038	continue;
		1039	}
1153		1040
1154	/* all food and drink if desired */	1041	/* bows and arrows. Bows are good for selling! */
1155	/* question: don't pick up known-poisonous stuff? */	1042	if (op->contr->mode & PU_BOW)
		1043	if (tmp->type == BOW)
		1044	{
		1045	CHK_PICK_PICKUP;
		1046	continue;
		1047	}
		1048
		1049	if (op->contr->mode & PU_ARROW)
		1050	if (tmp->type == ARROW)
		1051	{
		1052	CHK_PICK_PICKUP;
		1053	continue;
		1054	}
		1055
		1056	/* all kinds of armor etc. */
		1057	if (op->contr->mode & PU_ARMOUR)
		1058	if (tmp->type == ARMOUR)
		1059	{
		1060	CHK_PICK_PICKUP;
		1061	continue;
		1062	}
		1063
		1064	if (op->contr->mode & PU_HELMET)
		1065	if (tmp->type == HELMET)
		1066	{
		1067	CHK_PICK_PICKUP;
		1068	continue;
		1069	}
		1070
		1071	if (op->contr->mode & PU_SHIELD)
		1072	if (tmp->type == SHIELD)
		1073	{
		1074	CHK_PICK_PICKUP;
		1075	continue;
		1076	}
		1077
1156	if (op->contr->mode & PU_FOOD)	1078	if (op->contr->mode & PU_BOOTS)
1157	if (tmp->type == FOOD)	1079	if (tmp->type == BOOTS)
		1080	{
		1081	CHK_PICK_PICKUP;
		1082	continue;
		1083	}
		1084
		1085	if (op->contr->mode & PU_GLOVES)
		1086	if (tmp->type == GLOVES || tmp->type == BRACERS)
		1087	{
		1088	CHK_PICK_PICKUP;
		1089	continue;
		1090	}
		1091
		1092	if (op->contr->mode & PU_CLOAK)
		1093	if (tmp->type == CLOAK)
		1094	{
		1095	CHK_PICK_PICKUP;
		1096	continue;
		1097	}
		1098
		1099	/* hoping to catch throwing daggers here */
		1100	if (op->contr->mode & PU_MISSILEWEAPON)
		1101	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
		1102	{
		1103	CHK_PICK_PICKUP;
		1104	continue;
		1105	}
		1106
		1107	/* careful: chairs and tables are weapons! */
		1108	if (op->contr->mode & PU_ALLWEAPON)
		1109	{
		1110	if (tmp->type == WEAPON)
		1111	if (!tmp->arch->archname.contains ("table") && !tmp->arch->archname.contains ("chair"))
1158	{	1112	{
1159	pick_up (op, tmp);	1113	CHK_PICK_PICKUP;
1160	continue;	1114	continue;
1161	}	1115	}
		1116	}
1162		1117
		1118	/* misc stuff that's useful */
1163	if (op->contr->mode & PU_DRINK)	1119	if (op->contr->mode & PU_KEY)
1164	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	1120	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1165	{	1121	{
1166	pick_up (op, tmp);	1122	CHK_PICK_PICKUP;
1167	continue;	1123	continue;
1168	}	1124	}
1169		1125
		1126	/* any of the last 4 bits set means we use the ratio for value
		1127	* pickups */
1170	if (op->contr->mode & PU_POTION)	1128	if (op->contr->mode & PU_RATIO)
1171	if (tmp->type == POTION)	1129	{
		1130	/* use value density to decide what else to grab */
		1131	/* >=7 was >= op->contr->mode */
		1132	/* >=7 is the old standard setting. Now we take the last 4 bits
1172	{	1133	*/
1173	pick_up (op, tmp);
1174	continue;
1175	}
1176
1177	/* spellbooks, skillscrolls and normal books/scrolls */
1178	if (op->contr->mode & PU_SPELLBOOK)
1179	if (tmp->type == SPELLBOOK)
1180	{
1181	pick_up (op, tmp);
1182	continue;
1183	}
1184
1185	if (op->contr->mode & PU_SKILLSCROLL)
1186	if (tmp->type == SKILLSCROLL)
1187	{
1188	pick_up (op, tmp);
1189	continue;
1190	}
1191
1192	if (op->contr->mode & PU_READABLES)
1193	if (tmp->type == BOOK || tmp->type == SCROLL)
1194	{
1195	pick_up (op, tmp);
1196	continue;
1197	}
1198
1199	/* wands/staves/rods/horns */
1200	if (op->contr->mode & PU_MAGIC_DEVICE)
1201	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1202	{
1203	pick_up (op, tmp);
1204	continue;
1205	}
1206
1207	/* pick up all magical items */
1208	if (op->contr->mode & PU_MAGICAL)	1134	wvratio = op->contr->mode & PU_RATIO;
1209	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1135	if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100)
1210	{
1211	pick_up (op, tmp);
1212	continue;
1213	}
1214
1215	if (op->contr->mode & PU_VALUABLES)
1216	{	1136	{
1217	if (tmp->type == MONEY || tmp->type == GEM)	1137	#if 0
		1138	fprintf (stderr, "HIGH WEIGHT/VALUE [");
		1139	if (tmp->name != NULL)
1218	{	1140	{
1219	pick_up (op, tmp);	1141	fprintf (stderr, "%s", tmp->name);
1220	continue;
1221	}	1142	}
1222	}
1223
1224	/* rings & amulets - talismans seems to be typed AMULET */
1225	if (op->contr->mode & PU_JEWELS)
1226	if (tmp->type == RING || tmp->type == AMULET)
1227	{
1228	pick_up (op, tmp);
1229	continue;
1230	}
1231
1232	/* we don't forget dragon food */
1233	if (op->contr->mode & PU_FLESH)
1234	if (tmp->type == FLESH)
1235	{
1236	pick_up (op, tmp);
1237	continue;
1238	}
1239
1240	/* bows and arrows. Bows are good for selling! */
1241	if (op->contr->mode & PU_BOW)
1242	if (tmp->type == BOW)
1243	{
1244	pick_up (op, tmp);
1245	continue;
1246	}
1247
1248	if (op->contr->mode & PU_ARROW)
1249	if (tmp->type == ARROW)
1250	{
1251	pick_up (op, tmp);
1252	continue;
1253	}
1254
1255	/* all kinds of armor etc. */
1256	if (op->contr->mode & PU_ARMOUR)
1257	if (tmp->type == ARMOUR)
1258	{
1259	pick_up (op, tmp);
1260	continue;
1261	}
1262
1263	if (op->contr->mode & PU_HELMET)
1264	if (tmp->type == HELMET)
1265	{
1266	pick_up (op, tmp);
1267	continue;
1268	}
1269
1270	if (op->contr->mode & PU_SHIELD)
1271	if (tmp->type == SHIELD)
1272	{
1273	pick_up (op, tmp);
1274	continue;
1275	}
1276
1277	if (op->contr->mode & PU_BOOTS)
1278	if (tmp->type == BOOTS)
1279	{
1280	pick_up (op, tmp);
1281	continue;
1282	}
1283
1284	if (op->contr->mode & PU_GLOVES)
1285	if (tmp->type == GLOVES)
1286	{
1287	pick_up (op, tmp);
1288	continue;
1289	}
1290
1291	if (op->contr->mode & PU_CLOAK)
1292	if (tmp->type == CLOAK)
1293	{
1294	pick_up (op, tmp);
1295	continue;
1296	}
1297
1298	/* hoping to catch throwing daggers here */
1299	if (op->contr->mode & PU_MISSILEWEAPON)
1300	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1301	{
1302	pick_up (op, tmp);
1303	continue;
1304	}
1305
1306	/* careful: chairs and tables are weapons! */
1307	if (op->contr->mode & PU_ALLWEAPON)
1308	{
1309	if (tmp->type == WEAPON && tmp->name != NULL)
1310	{
1311	if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1312	strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1313	{
1314	pick_up (op, tmp);
1315	continue;
1316	}
1317	}
1318
1319	if (tmp->type == WEAPON && tmp->name == NULL)
1320	{
1321	if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1322	{
1323	pick_up (op, tmp);
1324	continue;
1325	}
1326	}
1327	}
1328
1329	/* misc stuff that's useful */
1330	if (op->contr->mode & PU_KEY)
1331	if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1332	{
1333	pick_up (op, tmp);
1334	continue;
1335	}
1336
1337	/* any of the last 4 bits set means we use the ratio for value
1338	* pickups */
1339	if (op->contr->mode & PU_RATIO)
1340	{
1341	/* use value density to decide what else to grab */
1342	/* >=7 was >= op->contr->mode */
1343	/* >=7 is the old standard setting. Now we take the last 4 bits
1344	* and multiply them by 5, giving 0..15*5== 5..75 */
1345	wvratio = (op->contr->mode & PU_RATIO) * 5;
1346	if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1347	{
1348	pick_up (op, tmp);
1349	#if 0
1350	fprintf (stderr, "HIGH WEIGHT/VALUE [");
1351	if (tmp->name != NULL)
1352	{
1353	fprintf (stderr, "%s", tmp->name);
1354	}
1355	else	1143	else
1356	fprintf (stderr, "%s", tmp->arch->archname);	1144	fprintf (stderr, "%s", tmp->arch->archname);
1357	fprintf (stderr, ",%d] = ", tmp->type);	1145	fprintf (stderr, ",%d] = ", tmp->type);
1358	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1146	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1359	#endif	1147	#endif
		1148	CHK_PICK_PICKUP;
1360	continue;	1149	continue;
1361	}
1362	}	1150	}
1363	} /* the new pickup model */	1151	} /* the new pickup model */
1364	}	1152	}
1365		1153
1366	return !stop;	1154	return !stop;
1367	}	1155	}
1368		1156
		1157	/* routine for both players and monsters. We call this when
		1158	* there is a possibility for our action distrubing our hiding
		1159	* place or invisiblity spell. Artefact invisiblity causes
		1160	* "noise" instead. If we arent invisible to begin with, we
		1161	* return 0.
		1162	*/
		1163	static int
		1164	action_makes_visible (object *op)
		1165	{
		1166	if (op->invisible && op->flag [FLAG_ALIVE])
		1167	{
		1168	if (op->flag [FLAG_MAKE_INVIS])
		1169	{
		1170	// artefact invisibility is permanent, but we still make noise
		1171	// this is important for game-balance.
		1172	if (op->contr)
		1173	op->make_noise ();
		1174
		1175	return 0;
		1176	}
		1177
		1178	if (op->contr && op->contr->tmp_invis == 0)
		1179	return 0;
		1180
		1181	/* If monsters, they should become visible */
		1182	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1183	{
		1184	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1185	return 1;
		1186	}
		1187	}
		1188
		1189	return 0;
		1190	}
		1191
1369	/*	1192	/*
1370	* Find an arrow in the inventory and after that	1193	* Find an arrow in the inventory and after that
1371	* in the right type container (quiver). Pointer to the	1194	* in the right type container (quiver). Pointer to the
1372	* found object is returned.	1195	* found object is returned.
1373	*/	1196	*/
1374	object *	1197	static object *
1375	find_arrow (object *op, const char *type)	1198	find_arrow (object *op, const char *type)
1376	{	1199	{
1377	object *tmp = 0;
1378
1379	for (op = op->inv; op; op = op->below)	1200	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1380	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1381	tmp = find_arrow (op, type);
1382	else if (op->type == ARROW && op->race == type)	1201	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
		1202	return splay (tmp);
		1203
		1204	for (object *tmp = op->inv; tmp; tmp = tmp->below)
		1205	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
		1206	if (object *arrow = find_arrow (tmp, type))
		1207	{
		1208	splay (tmp);
1383	return op;	1209	return arrow;
		1210	}
1384		1211
1385	return tmp;	1212	return 0;
1386	}	1213	}
1387		1214
1388	/*	1215	/*
1389	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1216	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1390	* against the target. A full test is not performed, simply a basic test	1217	* against the target. A full test is not performed, simply a basic test
1391	* of resistances. The archer is making a quick guess at what he sees down	1218	* of resistances. The archer is making a quick guess at what he sees down
1392	* the hall. Failing that it does it's best to pick the highest plus arrow.	1219	* the hall. Failing that it does it's best to pick the highest plus arrow.
1393	*/	1220	*/
1394	object *	1221	static object *
1395	find_better_arrow (object *op, object *target, const char *type, int *better)	1222	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1396	{	1223	{
1397	object *tmp = NULL, *arrow, *ntmp;	1224	object *tmp = NULL, *arrow, *ntmp;
1398	int attacknum, attacktype, betterby = 0, i;	1225	int attacknum, attacktype, betterby = 0, i;
1399		1226
1400	if (!type)	1227	if (!type)
1401	return NULL;	1228	return NULL;
1402		1229
1403	for (arrow = op->inv; arrow; arrow = arrow->below)	1230	for (arrow = op->inv; arrow; arrow = arrow->below)
1404	{	1231	{
1405	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1232	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1406	{	1233	{
1407	i = 0;	1234	i = 0;
1408	ntmp = find_better_arrow (arrow, target, type, &i);	1235	ntmp = find_better_arrow (arrow, target, type, &i);
		1236
1409	if (i > betterby)	1237	if (i > betterby)
1410	{	1238	{
1411	tmp = ntmp;	1239	tmp = ntmp;
1412	betterby = i;	1240	betterby = i;
1413	}	1241	}
1414	}	1242	}
1415	else if (arrow->type == ARROW && arrow->race == type)	1243	else if (arrow->type == ARROW && arrow->race == type)
1416	{	1244	{
1417	/* allways prefer assasination/slaying */	1245	/* allways prefer assasination/slaying */
1418	if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))	1246	if (target->race && arrow->slaying.contains (target->race))
1419	{	1247	{
1420	if (arrow->attacktype & AT_DEATH)	1248	if (arrow->attacktype & AT_DEATH)
1421	{	1249	{
1422	*better = 100;	1250	*better = 100;
1423	return arrow;	1251	return arrow;
…		…
1438	{	1266	{
1439	tmp = arrow;	1267	tmp = arrow;
1440	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;	1268	betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1441	}	1269	}
1442	}	1270	}
		1271
1443	if ((2 + arrow->magic + arrow->stats.dam) > betterby)	1272	if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1444	{	1273	{
1445	tmp = arrow;	1274	tmp = arrow;
1446	betterby = 2 + arrow->magic + arrow->stats.dam;	1275	betterby = 2 + arrow->magic + arrow->stats.dam;
1447	}	1276	}
		1277
1448	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)	1278	if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1449	{	1279	{
1450	tmp = arrow;	1280	tmp = arrow;
1451	betterby = 1 + arrow->magic + arrow->stats.dam;	1281	betterby = 1 + arrow->magic + arrow->stats.dam;
1452	}	1282	}
1453	}	1283	}
1454	}	1284	}
1455	}	1285	}
		1286
1456	if (tmp == NULL && arrow == NULL)	1287	if (tmp == NULL && arrow == NULL)
1457	return find_arrow (op, type);	1288	return find_arrow (op, type);
1458		1289
1459	*better = betterby;	1290	*better = betterby;
1460	return tmp;	1291	return tmp;
…		…
1464	* find_better_arrow to find a decent arrow to use.	1295	* find_better_arrow to find a decent arrow to use.
1465	* op = the shooter	1296	* op = the shooter
1466	* type = bow->race	1297	* type = bow->race
1467	* dir = fire direction	1298	* dir = fire direction
1468	*/	1299	*/
1469	object *	1300	static object *
1470	pick_arrow_target (object *op, const char *type, int dir)	1301	pick_arrow_target (object *op, shstr_cmp type, int dir)
1471	{	1302	{
1472	object *tmp = NULL;	1303	object *tmp = NULL;
1473	maptile *m;	1304	maptile *m;
1474	int i, mflags, found, number;	1305	int i, mflags, found, number;
1475	sint16 x, y;	1306	sint16 x, y;
…		…
1487	y = op->y;	1318	y = op->y;
1488		1319
1489	/* find the first target */	1320	/* find the first target */
1490	for (i = 0, found = 0; i < 20; i++)	1321	for (i = 0, found = 0; i < 20; i++)
1491	{	1322	{
1492	x += freearr_x[dir];	1323	x += DIRX (dir);
1493	y += freearr_y[dir];	1324	y += DIRY (dir);
1494	mflags = get_map_flags (m, &m, x, y, &x, &y);	1325	mflags = get_map_flags (m, &m, x, y, &x, &y);
		1326
1495	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)	1327	if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1496	{	1328	{
1497	tmp = NULL;	1329	tmp = 0;
1498	break;	1330	break;
1499	}	1331	}
1500	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)	1332	else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1501	{	1333	{
1502	/* This block presumes arrows and the like are MOVE_FLY_SLOW -	1334	/* This block presumes arrows and the like are MOVE_FLY_SLOW -
1503	* perhaps a bad assumption.	1335	* perhaps a bad assumption.
1504	*/	1336	*/
1505	tmp = NULL;	1337	tmp = 0;
1506	break;	1338	break;
1507	}	1339	}
		1340
1508	if (mflags & P_IS_ALIVE)	1341	if (mflags & P_IS_ALIVE)
1509	{
1510	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1342	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1511	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1343	if (tmp->flag [FLAG_ALIVE])
1512	{
1513	found++;
1514	break;
1515	}
1516	if (found)
1517	break;	1344	break;
1518	}
1519	}	1345	}
1520	if (tmp == NULL)	1346
		1347	if (!tmp)
1521	return find_arrow (op, type);	1348	return find_arrow (op, type);
1522		1349
1523	if (tmp->head)	1350	if (tmp->head)
1524	tmp = tmp->head;	1351	tmp = tmp->head;
1525		1352
1526	return find_better_arrow (op, tmp, type, &i);	1353	return find_better_arrow (op, tmp, type, &i);
1527	}	1354	}
1528		1355
1529	/*	1356	/*
1530	* Creature fires a bow - op can be monster or player. Returns	1357	* Creature fires a bow - op can be monster or player. Returns
1531	* 1 if bow was actually fired, 0 otherwise.	1358	* 1 if bow was actually fired, 0 otherwise.
1532	* op is the object firing the bow.	1359	* op is the object firing the bow.
1533	* part is for multipart creatures - the part firing the bow.	1360	* part is for multipart creatures - the part firing the bow.
1534	* dir is the direction of fire.	1361	* dir is the direction of fire.
1535	* wc_mod is any special modifier to give (used in special player fire modes)	1362	* wc_mod is any special modifier to give (used in special player fire modes)
…		…
1565	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);	1392	LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1566	return 0;	1393	return 0;
1567	}	1394	}
1568		1395
1569	// optimisation: move object to top so we will find it quickly again	1396	// optimisation: move object to top so we will find it quickly again
1570	if (bow->below)	1397	splay (bow);
1571	{
1572	bow->remove ();
1573	op->insert (bow);
1574	}
1575
1576	}	1398	}
1577		1399
1578	if (!bow->race || !bow->skill)	1400	if (!bow->race || !bow->skill)
1579	{	1401	{
1580	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);	1402	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
…		…
1587	{	1409	{
1588	if (op->type == PLAYER)	1410	if (op->type == PLAYER)
1589	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1411	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1590	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1412	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1591	else	1413	else
1592	CLEAR_FLAG (op, FLAG_READY_BOW);	1414	op->clr_flag (FLAG_READY_BOW);
1593		1415
1594	return 0;	1416	return 0;
1595	}	1417	}
1596	}	1418	}
1597		1419
…		…
1606	}	1428	}
1607		1429
1608	/* this should not happen, but sometimes does */	1430	/* this should not happen, but sometimes does */
1609	if (arrow->nrof == 0)	1431	if (arrow->nrof == 0)
1610	{	1432	{
		1433	LOG (llevError | logBacktrace, "arrow (%s) has nrof 0\n", arrow->debug_desc ());
1611	arrow->destroy ();	1434	arrow->destroy ();
1612	return 0;	1435	return 0;
1613	}	1436	}
1614		1437
1615	left = arrow; /* these are arrows left to the player */	1438	left = arrow; /* these are arrows left to the player */
1616	arrow = get_split_ob (arrow, 1);	1439	arrow = arrow->split ();
1617	if (!arrow)	1440	if (!arrow)
1618	{	1441	{
1619	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1442	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1620	return 0;	1443	return 0;
1621	}	1444	}
…		…
1625	arrow->direction = dir;	1448	arrow->direction = dir;
1626		1449
1627	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */	1450	arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1628	arrow->stats.hp = arrow->stats.dam;	1451	arrow->stats.hp = arrow->stats.dam;
1629	arrow->stats.grace = arrow->attacktype;	1452	arrow->stats.grace = arrow->attacktype;
1630		1453	arrow->custom_name = arrow->slaying;
1631	if (arrow->slaying)
1632	arrow->spellarg = strdup (arrow->slaying);
1633		1454
1634	#if 0	1455	#if 0
1635	if (player *pl = op->contr)	1456	if (player *pl = op->contr)
1636	{	1457	{
1637	float speed = pl->weapon_sp;	1458	float speed = pl->weapon_sp;
…		…
1647	#endif	1468	#endif
1648		1469
1649	SET_ANIMATION (arrow, arrow->direction);	1470	SET_ANIMATION (arrow, arrow->direction);
1650		1471
1651	/* update the speed */	1472	/* update the speed */
1652	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1653	+ bow->stats.dam / 7.f;
1654		1473
1655	arrow->set_speed (max (arrow->speed, 2.f));
1656	arrow->speed_left = 0;	1474	arrow->speed_left = 0;
		1475	arrow->set_speed (max (2.f,
		1476	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1477	+ bow->stats.dam / 7.f
		1478	));
1657		1479
1658	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1480	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1659		1481
1660	if (op->type == PLAYER)	1482	if (op->type == PLAYER)
1661	{	1483	{
…		…
1682	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);	1504	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1683		1505
1684	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1506	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1685	arrow->move_type = MOVE_FLY_LOW;	1507	arrow->move_type = MOVE_FLY_LOW;
1686	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;	1508	arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
		1509	arrow->set_flag (FLAG_NO_PICK);
1687		1510
1688	op->play_sound (sound_find ("fire_arrow"));	1511	op->play_sound (sound_find ("fire_arrow"));
1689	m->insert (arrow, sx, sy, op);	1512	m->insert (arrow, sx, sy, op);
1690		1513
1691	if (!arrow->destroyed ())	1514	if (!arrow->destroyed ())
1692	move_arrow (arrow);	1515	move_arrow (arrow);
1693
1694	if (op->type == PLAYER)
1695	{
1696	if (left->destroyed ())
1697	esrv_del_item (op->contr, left->count);
1698	else
1699	esrv_send_item (op, left);
1700	}
1701		1516
1702	return 1;	1517	return 1;
1703	}	1518	}
1704		1519
1705	/* Special fire code for players - this takes into	1520	/* Special fire code for players - this takes into
…		…
1707	* but monsters can't. Putting that code here	1522	* but monsters can't. Putting that code here
1708	* makes the fire_bow code much cleaner.	1523	* makes the fire_bow code much cleaner.
1709	* this function should only be called if 'op' is a player,	1524	* this function should only be called if 'op' is a player,
1710	* hence the function name.	1525	* hence the function name.
1711	*/	1526	*/
1712	int	1527	static int
1713	player_fire_bow (object *op, int dir)	1528	player_fire_bow (object *op, int dir)
1714	{	1529	{
1715	int ret = 0, wcmod = 0;	1530	int ret;
1716		1531
1717	if (op->contr->bowtype == bow_bestarrow)	1532	if (op->contr->bowtype == bow_bestarrow)
1718	{	1533	{
1719	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);	1534	ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1720	}	1535	}
1721	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1536	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1722	{	1537	{
1723	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1538	int wcmod = similar_direction (dir, op->contr->bowtype - bow_n + 1) ? 0 : -1;
1724	wcmod = -1;
1725
1726	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1539	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1727	}	1540	}
1728	else if (op->contr->bowtype == bow_threewide)	1541	else if (op->contr->bowtype == bow_threewide)
1729	{	1542	{
1730	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1543	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1731	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1544	ret |= fire_bow (op, op, NULL, dir, -5, op->x + DIRX (absdir (dir + 2)), op->y + DIRY (absdir (dir + 2)));
1732	ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1545	ret |= fire_bow (op, op, NULL, dir, -5, op->x + DIRX (absdir (dir - 2)), op->y + DIRY (absdir (dir - 2)));
1733	}	1546	}
1734	else if (op->contr->bowtype == bow_spreadshot)	1547	else if (op->contr->bowtype == bow_spreadshot)
1735	{	1548	{
1736	ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1549	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1737	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1550	ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1738	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);	1551	ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1739	}	1552	}
1740	else	1553	else
1741	{	1554	{
…		…
1747	}	1560	}
1748		1561
1749	/* Fires a misc (wand/rod/horn) object in 'dir'.	1562	/* Fires a misc (wand/rod/horn) object in 'dir'.
1750	* Broken apart from 'fire' to keep it more readable.	1563	* Broken apart from 'fire' to keep it more readable.
1751	*/	1564	*/
1752	void	1565	static void
1753	fire_misc_object (object *op, int dir)	1566	fire_misc_object (object *op, int dir)
1754	{	1567	{
1755	object *item = op->contr->ranged_ob;	1568	object *item = op->contr->ranged_ob;
1756		1569
1757	if (!item)	1570	if (!item)
…		…
1764	{	1577	{
1765	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1578	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1766	return;	1579	return;
1767	}	1580	}
1768		1581
1769	if (!op->change_weapon (item))	1582	if (!op->apply (item))
1770	return;	1583	return;
1771		1584
1772	if (item->type == WAND)	1585	if (item->type == WAND)
1773	{	1586	{
1774	if (item->stats.food <= 0)	1587	if (item->stats.food <= 0)
…		…
1779	return;	1592	return;
1780	}	1593	}
1781	}	1594	}
1782	else if (item->type == ROD || item->type == HORN)	1595	else if (item->type == ROD || item->type == HORN)
1783	{	1596	{
1784	if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))	1597	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
		1598
		1599	// using the maximum of the rods charge allows at least one spell cast
		1600	// for a rod or horn, this fixes some broken rods.
		1601	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1785	{	1602	{
1786	op->contr->play_sound (sound_find ("wand_poof"));	1603	op->contr->play_sound (sound_find ("wand_poof"));
1787		1604
1788	if (item->type == ROD)	1605	if (item->type == ROD)
1789	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1606	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1794	}	1611	}
1795	}	1612	}
1796		1613
1797	if (cast_spell (op, item, dir, item->inv, NULL))	1614	if (cast_spell (op, item, dir, item->inv, NULL))
1798	{	1615	{
1799	SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */	1616	item->flag [FLAG_BEEN_APPLIED] = true; /* You now know something about it */
		1617
1800	if (item->type == WAND)	1618	if (item->type == WAND)
1801	{	1619	{
1802	if (!(--item->stats.food))	1620	if (!(--item->stats.food))
1803	{	1621	{
1804	object *tmp;
1805
1806	if (item->arch)	1622	if (item->arch)
1807	{	1623	{
1808	CLEAR_FLAG (item, FLAG_ANIMATE);	1624	item->clr_flag (FLAG_ANIMATE);
1809	item->face = item->arch->face;	1625	item->face = item->arch->face;
1810	item->set_speed (0);	1626	item->set_speed (0);
1811	}	1627	}
1812		1628
1813	if ((tmp = item->in_player ()))	1629	if (object *pl = item->visible_to ())
1814	esrv_update_item (UPD_ANIM, tmp, item);	1630	esrv_update_item (UPD_ANIM, pl, item);
1815	}	1631	}
1816	}	1632	}
1817	else if (item->type == ROD || item->type == HORN)	1633	else if (item->type == ROD || item->type == HORN)
1818	drain_rod_charge (item);	1634	drain_rod_charge (item);
1819	}	1635	}
1820	}	1636	}
1821		1637
1822	/* Received a fire command for the player - go and do it.	1638	/* Received a fire command for the player - go and do it.
1823	*/	1639	*/
1824	bool	1640	bool
1825	fire (object *op, int dir)	1641	fire (object *who, int dir)
1826	{	1642	{
1827	int spellcost = 0;	1643	int spellcost = 0;
1828		1644
1829	/* check for loss of invisiblity/hide */
1830	if (action_makes_visible (op))
1831	make_visible (op);
1832
1833	player *pl = op->contr;	1645	player *pl = who->contr;
1834		1646
1835	if (pl->golem)	1647	if (pl->golem)
1836	{	1648	{
1837	control_golem (op->contr->golem, dir);	1649	control_golem (who->contr->golem, dir);
1838	return false;	1650	return false;
1839	}	1651	}
1840		1652
1841	object *ob = pl->ranged_ob;	1653	object *ob = pl->ranged_ob;
1842		1654
1843	if (!ob)	1655	if (!ob)
1844	return false;	1656	return false;
1845		1657
1846	if (!op->change_weapon (ob))
1847	return false;
1848
1849	if (op->speed_left > 0.f)	1658	if (who->speed_left > 0.f)
1850	--op->speed_left;	1659	--who->speed_left;
1851	else	1660	else
1852	return false;	1661	return false;
1853		1662
		1663	if (!who->apply (ob))
		1664	return false;
		1665
		1666	/* check for loss of invisiblity/hide */
		1667	if (action_makes_visible (who))
		1668	make_visible (who);
		1669
1854	switch (ob->type)	1670	switch (ob->type)
1855	{	1671	{
1856	case BOW:	1672	case BOW:
1857	player_fire_bow (op, dir);	1673	player_fire_bow (who, dir);
1858	break;	1674	break;
1859		1675
1860	case SPELL:	1676	case SPELL:
1861	spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);	1677	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1862	break;	1678	break;
1863		1679
1864	case BUILDER:	1680	case BUILDER:
1865	apply_map_builder (op, dir);	1681	apply_map_builder (who, dir);
1866	break;	1682	break;
1867		1683
1868	case SKILL:	1684	case SKILL:
1869	do_skill (op, op, ob, dir, 0);	1685	do_skill (who, who, ob, dir, 0);
1870	break;	1686	break;
1871		1687
		1688	case RANGED:
		1689	do_skill (who, ob, who->chosen_skill, dir, 0);
		1690	break;
		1691
1872	default:	1692	default:
1873	fire_misc_object (op, dir);	1693	fire_misc_object (who, dir);
1874	break;	1694	break;
1875	}	1695	}
1876		1696
1877	return true;	1697	return true;
1878	}	1698	}
1879		1699
1880	/* find_key	1700	static object *
1881	* We try to find a key for the door as passed. If we find a key
1882	* and successfully use it, we return the key, otherwise NULL
1883	* This function merges both normal and locked door, since the logic
1884	* for both is the same - just the specific key is different.
1885	* pl is the player,
1886	* inv is the objects inventory to searched
1887	* door is the door we are trying to match against.
1888	* This function can be called recursively to search containers.
1889	*/
1890	object *
1891	find_key (object *pl, object *container, object *door)	1701	find_key_ (object *pl, object *container, object *door)
1892	{	1702	{
1893	object *tmp, *key;	1703	object *tmp, *key;
1894		1704
1895	/* Should not happen, but sanity checking is never bad */	1705	/* Should not happen, but sanity checking is never bad */
1896	if (!container->inv)	1706	if (!container->inv)
…		…
1899	/* First, lets try to find a key in the top level inventory */	1709	/* First, lets try to find a key in the top level inventory */
1900	for (tmp = container->inv; tmp; tmp = tmp->below)	1710	for (tmp = container->inv; tmp; tmp = tmp->below)
1901	{	1711	{
1902	if (door->type == DOOR && tmp->type == KEY)	1712	if (door->type == DOOR && tmp->type == KEY)
1903	break;	1713	break;
		1714
1904	/* For sanity, we should really check door type, but other stuff	1715	/* For sanity, we should really check door type, but other stuff
1905	* (like containers) can be locked with special keys	1716	* (like containers) can be locked with special keys
1906	*/	1717	*/
1907	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1718	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1908	break;	1719	break;
1909	}	1720	}
…		…
1914	* a key, return	1725	* a key, return
1915	*/	1726	*/
1916	if (!tmp)	1727	if (!tmp)
1917	{	1728	{
1918	for (tmp = container->inv; tmp; tmp = tmp->below)	1729	for (tmp = container->inv; tmp; tmp = tmp->below)
1919	{
1920	/* No reason to search empty containers */	1730	/* No reason to search empty containers */
1921	if (tmp->type == CONTAINER && tmp->inv)	1731	if (tmp->type == CONTAINER && tmp->inv)
1922	{
1923	if ((key = find_key (pl, tmp, door)))	1732	if ((key = find_key_ (pl, tmp, door)))
1924	return key;	1733	return key;
1925	}
1926	}
1927		1734
1928	if (!tmp)	1735	if (!tmp)
1929	return NULL;	1736	return 0;
1930	}	1737	}
1931		1738
1932	/* We get down here if we have found a key. Now if its in a container,	1739	/* We get down here if we have found a key. Now if its in a container,
1933	* see if we actually want to use it	1740	* see if we actually want to use it
1934	*/	1741	*/
1935	if (pl != container)	1742	if (pl != container)
1936	{	1743	{
1937	/* Only let players use keys in containers */	1744	/* Only let players use keys in containers */
1938	if (!pl->contr)	1745	if (!pl->contr)
1939	return NULL;	1746	return 0;
		1747
1940	/* cases where this fails:	1748	/* cases where this fails:
1941	* If we only search the player inventory, return now since we	1749	* If we only search the player inventory, return now since we
1942	* are not in the players inventory.	1750	* are not in the players inventory.
1943	* If the container is not active, return now since only active	1751	* If the container is not active, return now since only active
1944	* containers can be used.	1752	* containers can be used.
…		…
1948	* inv must have been an container and must have been active.	1756	* inv must have been an container and must have been active.
1949	*	1757	*
1950	* Change the color so that the message doesn't disappear with	1758	* Change the color so that the message doesn't disappear with
1951	* all the others.	1759	* all the others.
1952	*/	1760	*/
1953	if (pl->contr->usekeys == key_inventory ||	1761	if (pl->contr->usekeys == key_inventory
1954	!QUERY_FLAG (container, FLAG_APPLIED) ||	1762	|| !container->flag [FLAG_APPLIED]
1955	(pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))	1763	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1956	{	1764	{
1957	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1765	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1958	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1766	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1959	return NULL;	1767	return NULL;
1960	}	1768	}
1961	}	1769	}
1962		1770
1963	return tmp;	1771	return tmp;
		1772	}
		1773
		1774	/* find_key
		1775	* We try to find a key for the door as passed. If we find a key
		1776	* and successfully use it, we return the key, otherwise NULL
		1777	* This function merges both normal and locked door, since the logic
		1778	* for both is the same - just the specific key is different.
		1779	* pl is the player,
		1780	* inv is the objects inventory to searched
		1781	* door is the door we are trying to match against.
		1782	* This function can be called recursively to search containers.
		1783	*/
		1784	object *
		1785	find_key (object *pl, object *container, object *door)
		1786	{
		1787	if (door->slaying && is_match_expr (door->slaying))
		1788	{
		1789	// for match expressions, we try to find the key by applying the match
		1790	// to the op itself, which is supposed to find the "key", instead
		1791	// of searching through containers ourselves.
		1792
		1793	return match_one (door->slaying, container, door, pl, pl);
		1794	}
		1795	else
		1796	return find_key_ (pl, container, door);
1964	}	1797	}
1965		1798
1966	/* moved door processing out of move_player_attack.	1799	/* moved door processing out of move_player_attack.
1967	* returns 1 if player has opened the door with a key	1800	* returns 1 if player has opened the door with a key
1968	* such that the caller should not do anything more,	1801	* such that the caller should not do anything more,
…		…
1980	/* If we found a key, do some extra work */	1813	/* If we found a key, do some extra work */
1981	if (key)	1814	if (key)
1982	{	1815	{
1983	object *container = key->env;	1816	object *container = key->env;
1984		1817
1985	op->play_sound (sound_find ("open_door"));
1986
1987	if (action_makes_visible (op))	1818	if (action_makes_visible (op))
1988	make_visible (op);	1819	make_visible (op);
1989		1820
1990	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))	1821	if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
1991	spring_trap (door->inv, op);	1822	spring_trap (door->inv, op);
1992		1823
1993	if (door->type == DOOR)	1824	if (door->type == DOOR)
1994	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1825	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1995	else if (door->type == LOCKED_DOOR)	1826	else if (door->type == LOCKED_DOOR)
1996	{	1827	{
1997	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1828	op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
1998	remove_door2 (door); /* remove door without violence ;-) */	1829	remove_door2 (door); /* remove door without violence ;-) */
1999	}	1830	}
2000		1831
2001	/* Do this after we print the message */	1832	/* Do this after we print the message */
2002	decrease_ob (key); /* Use up one of the keys */	1833	key->decrease (); /* Use up one of the keys */
2003	/* Need to update the weight the container the key was in */
2004	if (container != op)
2005	esrv_update_item (UPD_WEIGHT, op, container);
2006		1834
2007	return 1; /* Nothing more to do below */	1835	return 1; /* Nothing more to do below */
2008	}	1836	}
2009	else if (door->type == LOCKED_DOOR)	1837	else if (door->type == LOCKED_DOOR)
2010	{	1838	{
2011	/* Might as well return now - no other way to open this */	1839	/* Might as well return now - no other way to open this */
2012	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);	1840	op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2013	return 1;	1841	return 1;
2014	}	1842	}
2015		1843
2016	return 0;	1844	return 0;
2017	}	1845	}
…		…
2023	* going to try and move (not fire weapons).	1851	* going to try and move (not fire weapons).
2024	*/	1852	*/
2025	bool	1853	bool
2026	move_player_attack (object *op, int dir)	1854	move_player_attack (object *op, int dir)
2027	{	1855	{
2028	int on_battleground;	1856	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
		1857	{
		1858	--op->speed_left;
		1859	return true;
		1860	}
2029		1861
2030	sint16 nx = freearr_x[dir] + op->x;	1862	sint16 nx = DIRX (dir) + op->x;
2031	sint16 ny = freearr_y[dir] + op->y;	1863	sint16 ny = DIRY (dir) + op->y;
2032
2033	on_battleground = op_on_battleground (op, 0, 0);
2034		1864
2035	if (out_of_map (op->map, nx, ny))	1865	if (out_of_map (op->map, nx, ny))
2036	return false;	1866	return false;
2037
2038	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2039	{
2040	--op->speed_left;
2041	return true;
2042	}
2043		1867
2044	/* If braced, or can't move to the square, and it is not out of the	1868	/* If braced, or can't move to the square, and it is not out of the
2045	* map, attack it. Note order of if statement is important - don't	1869	* map, attack it. Note order of if statement is important - don't
2046	* want to be calling move_ob if braced, because move_ob will move the	1870	* want to be calling move_ob if braced, because move_ob will move the
2047	* player. This is a pretty nasty hack, because if we could	1871	* player. This is a pretty nasty hack, because if we could
…		…
2065	|| mon->flag [FLAG_CAN_ROLL])	1889	|| mon->flag [FLAG_CAN_ROLL])
2066	&& mon != op)	1890	&& mon != op)
2067	break;	1891	break;
2068	}	1892	}
2069		1893
2070	if (!mon) /* This happens anytime the player tries to move */	1894	/* no monster == player tries to move into a wall or so */
2071	return false; /* into a wall */	1895	if (!mon)
		1896	{
		1897	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1898	if (op->move_type & ob->move_block)
		1899	{
		1900	if (ob->move_block == MOVE_ALL)
		1901	move_into_wall (op, ob);
		1902	else
		1903	{
		1904	if (op->contr->ns->bumpmsg)
		1905	{
		1906	op->play_sound (sound_find ("blocked_move"));
		1907
		1908	op->statusmsg (ob->invisible
		1909	? "Something blocks you."
		1910	: format ("Something blocks you from entering the %s.", query_name (ob))
		1911	);
		1912	}
		1913	}
		1914
		1915	break;
		1916	}
		1917
		1918	return false;
		1919	}
2072		1920
2073	mon = mon->head_ ();	1921	mon = mon->head_ ();
2074		1922
2075	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	1923	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2076	if (op->contr->weapon_sp_left > 0.f)	1924	if (op->contr->weapon_sp_left > 0.f)
…		…
2094	*/	1942	*/
2095	if (op->type == PLAYER	1943	if (op->type == PLAYER
2096	&& ((mon->owner && mon->owner->contr	1944	&& ((mon->owner && mon->owner->contr
2097	&& same_party (mon->owner->contr->party, op->contr->party))	1945	&& same_party (mon->owner->contr->party, op->contr->party))
2098	|| mon->owner == op)	1946	|| mon->owner == op)
2099	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	1947	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
2100	{	1948	{
2101	/* If we're braced, we don't want to switch places with it */	1949	/* If we're braced, we don't want to switch places with it */
2102	if (op->contr->braced)	1950	if (op->contr->braced)
2103	return false;	1951	return false;
2104		1952
…		…
2107	--op->speed_left;	1955	--op->speed_left;
2108		1956
2109	op->play_sound (sound_find ("push_player"));	1957	op->play_sound (sound_find ("push_player"));
2110	push_ob (mon, dir, op);	1958	push_ob (mon, dir, op);
2111		1959
2112	if (op->contr->tmp_invis || op->hide)	1960	if (action_makes_visible (op))
2113	make_visible (op);	1961	make_visible (op);
2114		1962
2115	return true;	1963	return true;
2116	}	1964	}
2117	else	1965	else
2118	return false;	1966	return false;
2119	}	1967	}
		1968
		1969	bool on_battleground = op_on_battleground (op, 0, 0);
2120		1970
2121	/* in certain circumstances, you shouldn't attack friendly	1971	/* in certain circumstances, you shouldn't attack friendly
2122	* creatures. Note that if you are braced, you can't push	1972	* creatures. Note that if you are braced, you can't push
2123	* someone, but put it inside this loop so that you won't	1973	* someone, but put it inside this loop so that you won't
2124	* attack them either.	1974	* attack them either.
2125	*/	1975	*/
2126	if ((mon->type == PLAYER || mon->enemy != op)	1976	if ((mon->type == PLAYER || mon->enemy != op)
2127	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))	1977	&& (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
2128	&& ((op->contr->peaceful	1978	&& ((op->contr->peaceful
2129	|| (mon->type == PLAYER && mon->contr->peaceful))	1979	|| (mon->type == PLAYER && mon->contr->peaceful))
2130	&& !on_battleground))	1980	&& !on_battleground))
2131	{	1981	{
2132	if (op->speed_left > 0.f)	1982	if (op->speed_left > 0.f)
…		…
2137	{	1987	{
2138	op->play_sound (sound_find ("push_player"));	1988	op->play_sound (sound_find ("push_player"));
2139	push_ob (mon, dir, op);	1989	push_ob (mon, dir, op);
2140	}	1990	}
2141	else	1991	else
2142	new_draw_info (0, 0, op, "You withhold your attack");	1992	op->statusmsg ("You withhold your attack");
2143		1993
2144	if (op->contr->tmp_invis || op->hide)	1994	if (op->contr->tmp_invis || op->flag [FLAG_HIDDEN])
2145	make_visible (op);	1995	make_visible (op);
2146		1996
2147	return true;	1997	return true;
2148	}	1998	}
2149	}	1999	}
2150	/* If the object is a boulder or other rollable object, then	2000	/* If the object is a boulder or other rollable object, then
2151	* roll it if not braced. You can't roll it if you are braced.	2001	* roll it if not braced. You can't roll it if you are braced.
2152	*/	2002	*/
2153	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2003	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
2154	{	2004	{
2155	if (op->speed_left > 0.f)	2005	if (op->speed_left > 0.f)
2156	{	2006	{
2157	--op->speed_left;	2007	--op->speed_left;
2158		2008
…		…
2167	* Way it works is like this: First, it must have some hit points	2017	* Way it works is like this: First, it must have some hit points
2168	* and be living. Then, it must be one of the following:	2018	* and be living. Then, it must be one of the following:
2169	* 1) Not a player, 2) A player, but of a different party. Note	2019	* 1) Not a player, 2) A player, but of a different party. Note
2170	* that party_number -1 is no party, so attacks can still happen.	2020	* that party_number -1 is no party, so attacks can still happen.
2171	*/	2021	*/
2172	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2022	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
2173	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2023	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2174	{	2024	{
2175	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	2025	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2176	{	2026	{
2177	--op->contr->weapon_sp_left;	2027	--op->contr->weapon_sp_left;
…		…
2189	}	2039	}
2190		2040
2191	bool	2041	bool
2192	move_player (object *op, int dir)	2042	move_player (object *op, int dir)
2193	{	2043	{
2194	int pick;
2195
2196	if (!op->map || op->map->in_memory != MAP_IN_MEMORY)	2044	if (!op->map || op->map->state != MAP_ACTIVE)
2197	return 0;	2045	return 0;
2198		2046
2199	/* Sanity check: make sure dir is valid */	2047	/* Sanity check: make sure dir is valid */
2200	if ((dir < 0) || (dir >= 9))	2048	if (dir < 0 || dir > 8)
2201	{	2049	{
2202	LOG (llevError, "move_player: invalid direction %d\n", dir);	2050	LOG (llevError, "move_player: invalid direction %d\n", dir);
2203	return 0;	2051	return 0;
2204	}	2052	}
2205		2053
2206	/* peterm: added following line */	2054	/* peterm: added following line */
2207	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2055	if (op->flag [FLAG_CONFUSED] && dir)
2208	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2056	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2209		2057
2210	op->facing = dir;	2058	op->facing = dir;
2211		2059
2212	if (op->hide)	2060	if (op->flag [FLAG_HIDDEN])
2213	do_hidden_move (op);	2061	do_hidden_move (op);
2214		2062
2215	bool retval;	2063	bool retval;
		2064	int pick = 0;
2216		2065
2217	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2066	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2218	retval = RESULT_INT (0);	2067	retval = RESULT_INT (0);
2219	else if (op->contr->fire_on)	2068	else if (op->contr->fire_on)
2220	retval = fire (op, dir);	2069	retval = fire (op, dir);
…		…
2251	* players.	2100	* players.
2252	*/	2101	*/
2253	bool	2102	bool
2254	handle_newcs_player (object *op)	2103	handle_newcs_player (object *op)
2255	{	2104	{
2256	if (QUERY_FLAG (op, FLAG_SCARED))	2105	if (op->flag [FLAG_SCARED])
2257	{	2106	{
2258	if (op->speed_left > 0.f)	2107	if (op->speed_left > 0.f)
2259	{	2108	{
2260	--op->speed_left;	2109	--op->speed_left;
2261	flee_player (op);	2110	flee_player (op);
…		…
2277	return move_player (op, op->direction);	2126	return move_player (op, op->direction);
2278		2127
2279	return false;	2128	return false;
2280	}	2129	}
2281		2130
2282	int	2131	static int
2283	save_life (object *op)	2132	save_life (object *op)
2284	{	2133	{
2285	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2134	if (!op->flag [FLAG_LIFESAVE])
2286	return 0;	2135	return 0;
2287		2136
2288	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2137	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2289	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2138	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2290	{	2139	{
2291	op->play_sound (sound_find ("ob_evaporate"));	2140	op->play_sound (sound_find ("ob_evaporate"));
2292	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2141	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2293		2142
2294	if (op->contr)
2295	esrv_del_item (op->contr, tmp->count);
2296
2297	tmp->destroy ();	2143	tmp->destroy ();
2298	CLEAR_FLAG (op, FLAG_LIFESAVE);	2144	op->clr_flag (FLAG_LIFESAVE);
2299		2145
2300	if (op->stats.hp < 0)	2146	if (op->stats.hp < 0)
2301	op->stats.hp = op->stats.maxhp;	2147	op->stats.hp = op->stats.maxhp;
2302		2148
2303	if (op->stats.food < 0)	2149	if (op->stats.food < 0)
2304	op->stats.food = 999;	2150	op->stats.food = MAX_FOOD;
2305		2151
2306	op->update_stats ();	2152	op->update_stats ();
2307	return 1;	2153	return 1;
2308	}	2154	}
2309		2155
2310	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2156	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2311	CLEAR_FLAG (op, FLAG_LIFESAVE);	2157	op->clr_flag (FLAG_LIFESAVE);
2312	enter_player_savebed (op); /* bring him home. */	2158	enter_player_savebed (op); /* bring him home. */
2313	return 0;	2159	return 0;
2314	}	2160	}
2315		2161
2316	/* This goes throws the inventory and removes unpaid objects, and puts them	2162	/* This goes throws the inventory and removes unpaid objects, and puts them
2317	* back in the map (location and map determined by values of env). This	2163	* back in the map (location and map determined by values of env). This
2318	* function will descend into containers. op is the object to start the search	2164	* function will descend into containers. op is the object to start the search
2319	* from.	2165	* from.
2320	*/	2166	*/
2321	static void	2167	static void
2322	drop_unpaid_items (object *op, object *env)	2168	drop_unpaid_items (object *op, object *env)
2323	{	2169	{
2324	while (op)	2170	while (op)
2325	{	2171	{
2326	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2172	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2327		2173
2328	if (QUERY_FLAG (op, FLAG_UNPAID))	2174	if (op->flag [FLAG_UNPAID])
2329	{
2330	if (env->type == PLAYER)
2331	esrv_del_item (env->contr, op->count);
2332
2333	op->insert_at (env);	2175	op->insert_at (env);
2334	}
2335	else if (op->inv)	2176	else if (op->inv)
2336	drop_unpaid_items (op->inv, env);	2177	drop_unpaid_items (op->inv, env);
2337		2178
2338	op = next;	2179	op = next;
2339	}	2180	}
…		…
2344	{	2185	{
2345	if (!flag [FLAG_REMOVED])	2186	if (!flag [FLAG_REMOVED])
2346	::drop_unpaid_items (inv, this);	2187	::drop_unpaid_items (inv, this);
2347	}	2188	}
2348		2189
2349	/*
2350	* Returns pointer a static string containing gravestone text
2351	* Moved from apply.c to player.c - player.c is what
2352	* actually uses this function. player.c may not be quite the
2353	* best, a misc file for object actions is probably better,
2354	* but there isn't one in the server directory.
2355	*/
2356	char *
2357	gravestone_text (object *op)
2358	{
2359	static char buf2[MAX_BUF];
2360	char buf[MAX_BUF];
2361	time_t now = time (NULL);
2362
2363	strcpy (buf2, " R.I.P.\n\n");
2364	if (op->type == PLAYER)
2365	sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2366	else
2367	sprintf (buf, "%s\n", &op->name);
2368
2369	strncat (buf2, " ", 20 - strlen (buf) / 2);
2370	strcat (buf2, buf);
2371	if (op->type == PLAYER)
2372	sprintf (buf, "who was in level %d when killed\n", op->level);
2373	else
2374	sprintf (buf, "who was in level %d when died.\n\n", op->level);
2375
2376	strncat (buf2, " ", 20 - strlen (buf) / 2);
2377	strcat (buf2, buf);
2378	if (op->type == PLAYER)
2379	{
2380	sprintf (buf, "by %s.\n\n", op->contr->killer);
2381	strncat (buf2, " ", 21 - strlen (buf) / 2);
2382	strcat (buf2, buf);
2383	}
2384
2385	strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2386	strncat (buf2, " ", 20 - strlen (buf) / 2);
2387	strcat (buf2, buf);
2388
2389	return buf2;
2390	}
2391
2392	void	2190	void
2393	do_some_living (object *op)	2191	do_some_living (object *op)
2394	{	2192	{
2395	int last_food = op->stats.food;	2193	int last_food = op->stats.food;
2396	int gen_hp, gen_sp, gen_grace;	2194	int gen_hp, gen_sp, gen_grace;
2397	int over_hp, over_sp, over_grace;
2398	int i;
2399	int rate_hp = 1200;	2195	int rate_hp = 1200;
2400	int rate_sp = 2500;	2196	int rate_sp = 2500;
2401	int rate_grace = 2000;	2197	int rate_grace = 2000;
2402	const int max_hp = 1;	2198	const int max_hp = 1;
2403	const int max_sp = 1;	2199	const int max_sp = 1;
2404	const int max_grace = 1;	2200	const int max_grace = 1;
2405		2201
		2202	#if 0
2406	if (op->contr->hidden)	2203	if (op->contr->hidden)
2407	{	2204	{
2408	op->invisible = 1000;	2205	op->invisible = 1000;
2409	/* the socket code flashes the player visible/invisible	2206	/* the socket code flashes the player visible/invisible
2410	* depending on the value of invisible, so we need to	2207	* depending on the value of invisible, so we need to
2411	* alternate it here for it to work correctly.	2208	* alternate it here for it to work correctly.
2412	*/	2209	*/
2413	if (pticks & 2)	2210	if (server_tick & 2)
2414	op->invisible--;	2211	op->invisible--;
2415	}	2212	}
		2213	else
		2214	#endif
2416	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2215	if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2417	{	2216	{
2418	if (!op->invisible--)	2217	if (!op->invisible--)
2419	{	2218	{
2420	make_visible (op);	2219	make_visible (op);
2421	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2220	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2448	{	2247	{
2449	gen_grace = op->stats.maxgrace;	2248	gen_grace = op->stats.maxgrace;
2450	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2249	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2451	}	2250	}
2452		2251
2453	/* Regenerate Spell Points */	2252	/* Regenerate Grace */
2454	if (!op->contr->golem && --op->last_sp < 0)	2253	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
		2254	if (--op->last_grace < 0)
2455	{	2255	{
2456	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2457	if (op->stats.sp < op->stats.maxsp)	2256	if (op->stats.grace < op->stats.maxgrace / 2)
		2257	op->stats.grace++; /* no penalty in food for regaining grace */
		2258
		2259	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2260
		2261	if (max_grace > 1)
2458	{	2262	{
2459	op->stats.sp++;	2263	int over_grace = temp / rate_grace;
2460	/* dms do not consume food */	2264
2461	if (!QUERY_FLAG (op, FLAG_WIZ))	2265	if (over_grace > 0)
2462	{	2266	{
2463	op->stats.food--;	2267	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2464	if (op->contr->digestion < 0)	2268	op->last_grace = 0;
2465	op->stats.food += op->contr->digestion;
2466	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2467	op->stats.food = last_food;
2468	}	2269	}
		2270	else
		2271	op->last_grace = rate_grace / temp;
2469	}	2272	}
		2273	else
		2274	op->last_grace = rate_grace / temp;
2470		2275
2471	if (max_sp > 1)	2276	/* wearing stuff doesn't detract from grace generation. */
		2277	}
		2278
		2279	if (op->stats.food > 0)
		2280	{
		2281	/* Regenerate Spell Points */
		2282	if (!op->contr->golem && --op->last_sp < 0)
2472	{	2283	{
2473	over_sp = (gen_sp + 10) / rate_sp;	2284	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2474	if (over_sp > 0)	2285
		2286	if (op->stats.sp < op->stats.maxsp)
2475	{	2287	{
2476	if (op->stats.sp < op->stats.maxsp)	2288	op->stats.sp++;
		2289
		2290	/* dms do not consume food */
		2291	if (!op->flag [FLAG_WIZ])
2477	{	2292	{
2478	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2479
2480	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2481	op->stats.sp--;	2293	op->stats.food--;
2482		2294
2483	if (op->stats.sp > op->stats.maxsp)	2295	if (op->contr->digestion < 0)
		2296	op->stats.food += op->contr->digestion;
		2297	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2484	op->stats.sp = op->stats.maxsp;	2298	op->stats.food = last_food;
2485	}	2299	}
		2300	}
		2301
		2302	if (max_sp > 1)
		2303	{
		2304	int over_sp = (gen_sp + 10) / rate_sp;
		2305	if (over_sp > 0)
		2306	{
		2307	if (op->stats.sp < op->stats.maxsp)
		2308	{
		2309	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
		2310
		2311	if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
		2312	op->stats.sp--;
		2313
		2314	if (op->stats.sp > op->stats.maxsp)
		2315	op->stats.sp = op->stats.maxsp;
		2316	}
		2317
2486	op->last_sp = 0;	2318	op->last_sp = 0;
		2319	}
		2320	else
		2321	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2487	}	2322	}
2488	else	2323	else
2489	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);	2324	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2490	}	2325	}
2491	else
2492	op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2493	}
2494		2326
2495	/* Regenerate Grace */	2327	/* Regenerate Hit Points */
2496	/* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2497	if (--op->last_grace < 0)	2328	if (--op->last_heal < 0)
2498	{
2499	if (op->stats.grace < op->stats.maxgrace / 2)
2500	op->stats.grace++; /* no penalty in food for regaining grace */
2501
2502	if (max_grace > 1)
2503	{	2329	{
2504	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2330	if (op->stats.hp < op->stats.maxhp)
2505	if (over_grace > 0)
2506	{	2331	{
2507	op->stats.sp += over_grace	2332	op->stats.hp++;
2508	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;	2333
		2334	/* dms do not consume food */
		2335	if (!op->flag [FLAG_WIZ])
		2336	{
		2337	op->stats.food--;
		2338
		2339	if (op->contr->digestion < 0)
		2340	op->stats.food += op->contr->digestion;
		2341	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
		2342	op->stats.food = last_food;
		2343	}
		2344	}
		2345
		2346	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2347
		2348	if (max_hp > 1)
		2349	{
		2350	int over_hp = temp / rate_hp;
		2351
		2352	if (over_hp > 0)
		2353	{
		2354	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2509	op->last_grace = 0;	2355	op->last_heal = 0;
		2356	}
		2357	else
		2358	op->last_heal = rate_hp / temp;
2510	}	2359	}
2511	else	2360	else
2512	{
2513	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2514	}
2515	}
2516	else
2517	{
2518	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2519	}
2520	/* wearing stuff doesn't detract from grace generation. */
2521	}
2522
2523	/* Regenerate Hit Points */
2524	if (--op->last_heal < 0)
2525	{
2526	if (op->stats.hp < op->stats.maxhp)
2527	{
2528	op->stats.hp++;
2529	/* dms do not consume food */
2530	if (!QUERY_FLAG (op, FLAG_WIZ))
2531	{
2532	op->stats.food--;
2533	if (op->contr->digestion < 0)
2534	op->stats.food += op->contr->digestion;
2535	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2536	op->stats.food = last_food;
2537	}
2538	}
2539
2540	if (max_hp > 1)
2541	{
2542	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2543	if (over_hp > 0)
2544	{
2545	op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2546	op->last_heal = 0;	2361	op->last_heal = rate_hp / temp;
2547	}
2548	else
2549	{
2550	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2551	}
2552	}
2553	else
2554	{
2555	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2556	}	2362	}
2557	}	2363	}
2558		2364
2559	/* Digestion */	2365	/* Digestion */
2560	if (--op->last_eat < 0)	2366	if (--op->last_eat < 0)
…		…
2563	penalty = max (0, -op->contr->digestion);	2369	penalty = max (0, -op->contr->digestion);
2564		2370
2565	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);	2371	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2566		2372
2567	/* dms do not consume food */	2373	/* dms do not consume food */
2568	if (!QUERY_FLAG (op, FLAG_WIZ))	2374	if (!op->flag [FLAG_WIZ])
2569	op->stats.food--;	2375	op->stats.food--;
2570	}	2376	}
2571		2377
2572	if (op->stats.food < 0 && op->stats.hp >= 0)	2378	if (op->stats.food < 0 && op->stats.hp >= 0)
2573	{	2379	{
2574	object *tmp, *flesh = 0;	2380	object *flesh = 0;
2575		2381
2576	for (tmp = op->inv; tmp; tmp = tmp->below)	2382	for_inv_removable (op, tmp)
2577	{	2383	{
2578	if (!QUERY_FLAG (tmp, FLAG_UNPAID))	2384	if (tmp->flag [FLAG_UNPAID])
		2385	continue;
		2386
		2387	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2579	{	2388	{
2580	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2389	op->statusmsg ("You blindly grab for a bite of food. "
2581	{	2390	"H<To prevent you from starving, you ate some random item from your backpack.>");
2582	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2391	op->apply (tmp);
2583	manual_apply (op, tmp, 0);	2392
2584	if (op->stats.food >= 0 || op->stats.hp < 0)	2393	if (op->stats.food >= 0 || op->stats.hp < 0)
2585	break;	2394	break;
2586	}	2395	}
2587	else if (tmp->type == FLESH)	2396	else if (tmp->type == FLESH)
2588	flesh = tmp;	2397	flesh = tmp;
2589	} /* End if paid for object */	2398	}
2590	} /* end of for loop */
2591		2399
2592	/* If player is still starving, it means they don't have any food, so	2400	/* If player is still starving, it means they don't have any food, so
2593	* eat flesh instead.	2401	* eat flesh instead.
2594	*/	2402	*/
2595	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2403	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2596	{	2404	{
2597	new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");	2405	op->statusmsg ("You blindly grab for a bite of food. "
		2406	"H<To prevent you from starving, you ate some random item from your backpack.>");
2598	manual_apply (op, flesh, 0);	2407	op->apply (flesh);
2599	}	2408	}
		2409
		2410	// If player is still starving, alert him!
		2411	if (op->stats.food < 0)
		2412	op->failmsg ("You are starving! "
		2413	"H<Eat some food to increase your food and prevent you from an untimely death.>");
		2414	}
		2415
		2416	if (op->stats.food < 0)
2600	}	2417	{
		2418	op->stats.hp += op->stats.food;
		2419	op->stats.food = 0;
2601		2420
2602	while (op->stats.food < 0 && op->stats.hp >= 0)	2421	if (op->stats.hp < 0)
2603	op->stats.food++, op->stats.hp--;	2422	{
		2423	op->contr->killer = archetype::get ("killer_starvation");
		2424	op->contr->killer->destroy ();
		2425	}
		2426	}
2604		2427
		2428	/* killer should be set here already */
2605	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2429	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2606	kill_player (op);	2430	kill_player (op);
2607	}	2431	}
2608	}	2432	}
2609		2433
2610	/* If the player should die (lack of hp, food, etc), we call this.	2434	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2613	* file.	2437	* file.
2614	*/	2438	*/
2615	void	2439	void
2616	kill_player (object *op)	2440	kill_player (object *op)
2617	{	2441	{
2618	char buf[MAX_BUF];
2619	int x, y;	2442	int x, y;
2620
2621	//int i;
2622	maptile *map; /* this is for resurrection */	2443	maptile *map; /* this is for resurrection */
2623
2624	/* int z;
2625	int num_stats_lose;
2626	int lost_a_stat;
2627	int lose_this_stat;
2628	int this_stat; */
2629	int will_kill_again;	2444	int will_kill_again;
2630	archetype *at;	2445	archetype *at;
2631	object *tmp;	2446	object *tmp;
2632		2447
2633	if (save_life (op))	2448	if (save_life (op))
2634	return;	2449	return;
		2450
		2451	dynbuf_text deathtab;
		2452
		2453	/* restore player */
		2454	at = archetype::find (shstr_poisoning);
		2455	if (object *tmp = present_arch_in_ob (at, op))
		2456	{
		2457	tmp->destroy ();
		2458	deathtab << "Your body feels cleansed...\r";
		2459	}
		2460
		2461	at = archetype::find (shstr_confusion);
		2462	if (object *tmp = present_arch_in_ob (at, op))
		2463	{
		2464	tmp->destroy ();
		2465	deathtab << "Your mind feels clearer...\r";
		2466	}
		2467
		2468	cure_disease (op, 0, 0); /* remove any disease */
		2469
		2470	max_it (op->stats.hp , op->stats.maxhp);
		2471	max_it (op->stats.sp , op->stats.maxsp);
		2472	max_it (op->stats.grace, op->stats.maxgrace);
		2473	max_it (op->stats.food , 200);
		2474
		2475	// remove all spell effects that are active
		2476	// to avoid long-term effects such as word-of-recall
		2477	for (object *item = op->inv; item; )
		2478	{
		2479	object *next = item->below;
		2480
		2481	if (item->type == SPELL_EFFECT && item->active)
		2482	item->destroy ();
		2483
		2484	item = next;
		2485	}
2635		2486
2636	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas	2487	/* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2637	* in cities ONLY!!! It is very important that this doesn't get abused.	2488	* in cities ONLY!!! It is very important that this doesn't get abused.
2638	* Look at op_on_battleground() for more info --AndreasV	2489	* Look at op_on_battleground() for more info --AndreasV
2639	*/	2490	*/
2640	if (op_on_battleground (op, &x, &y))	2491	if (op_on_battleground (op, &x, &y))
2641	{	2492	{
2642	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");	2493	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2643	new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2644
2645	/* restore player */
2646	at = archetype::find ("poisoning");
2647	if (object *tmp = present_arch_in_ob (at, op))
2648	{
2649	tmp->destroy ();
2650	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2651	}
2652
2653	at = archetype::find ("confusion");
2654	if (object *tmp = present_arch_in_ob (at, op))
2655	{
2656	tmp->destroy ();
2657	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2658	}
2659
2660	cure_disease (op, 0); /* remove any disease */
2661	op->stats.hp = op->stats.maxhp;
2662	if (op->stats.food <= 0)
2663	op->stats.food = 999;
2664		2494
2665	/* create a bodypart-trophy to make the winner happy */	2495	/* create a bodypart-trophy to make the winner happy */
2666	if (object *tmp = arch_to_object (archetype::find ("finger")))	2496	object *tmp = archetype::find (shstr_finger)->instance ();
2667	{	2497
2668	sprintf (buf, "%s's finger", &op->name);	2498	tmp->name = format ("%s's finger" , &op->name);
2669	tmp->name = buf;	2499	tmp->name_pl = format ("%s's fingers", &op->name);
2670	sprintf (buf, " This finger has been cut off %s\n"	2500	tmp->msg = format (
2671	" the %s, when he was defeated at\n level %d by %s.\n",	2501	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2672	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2502	&op->name, op->contr->title,
2673	tmp->msg = buf;	2503	(int)op->level,
		2504	op->contr->killer_name ()
		2505	);
2674	tmp->value = 0, tmp->type = 0;	2506	tmp->value = 0, tmp->type = 0;
2675	tmp->materialname = "organics";	2507	tmp->material = name_to_material (shstr_organic);
2676	tmp->insert_at (op, tmp);	2508	tmp->insert_at (op, tmp);
2677	}
2678		2509
2679	/* teleport defeated player to new destination */	2510	/* teleport defeated player to new destination */
2680	transfer_ob (op, x, y, 0, NULL);	2511	transfer_ob (op, x, y, 0, NULL);
2681	op->contr->braced = 0;	2512	op->contr->braced = 0;
		2513
		2514	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2682	return;	2515	return;
2683	}	2516	}
2684		2517
		2518	deathtab << "You were killed by " << op->contr->killer_name () << ".\n\n";
		2519	deathtab << "T<YOU HAVE DIED>\n\n";
		2520
2685	INVOKE_PLAYER (DEATH, op->contr);	2521	INVOKE_PLAYER (DEATH, op->contr);
2686		2522
2687	command_kill_pets (op, 0);	2523	command_kill_pets (op, 0);
2688
2689	if (op->stats.food < 0)
2690	{
2691	sprintf (buf, "%s starved to death.", &op->name);
2692	strcpy (op->contr->killer, "starvation");
2693	}
2694	else
2695	sprintf (buf, "%s died.", &op->name);
2696		2524
2697	op->contr->play_sound (sound_find ("player_dies"));	2525	op->contr->play_sound (sound_find ("player_dies"));
2698		2526
2699	/* save the map location for corpse, gravestone */	2527	/* save the map location for corpse, gravestone */
2700	x = op->x;	2528	x = op->x;
…		…
2730		2558
2731	lost_a_stat = 0;	2559	lost_a_stat = 0;
2732		2560
2733	for (z = 0; z < num_stats_lose; z++)	2561	for (z = 0; z < num_stats_lose; z++)
2734	{	2562	{
2735	i = RANDOM () % NUM_STATS;	2563	i = rndm (NUM_STATS);
2736		2564
2737	if (settings.stat_loss_on_death)	2565	if (settings.stat_loss_on_death)
2738	{	2566	{
2739	/* Pick a random stat and take a point off it. Tell the player	2567	/* Pick a random stat and take a point off it. Tell the player
2740	* what he lost.	2568	* what he lost.
…		…
2747	lost_a_stat = 1;	2575	lost_a_stat = 1;
2748	}	2576	}
2749	else	2577	else
2750	{	2578	{
2751	/* deplete a stat */	2579	/* deplete a stat */
2752	archetype *deparch = archetype::find ("depletion");	2580	archetype *deparch = archetype::find (shstr_depletion);
2753	object *dep;	2581	object *dep;
2754		2582
2755	dep = present_arch_in_ob (deparch, op);	2583	dep = present_arch_in_ob (deparch, op);
2756	if (!dep)	2584	if (!dep)
2757	{	2585	{
2758	dep = arch_to_object (deparch);	2586	dep = deparch->instance ();
2759	insert_ob_in_ob (dep, op);	2587	insert_ob_in_ob (dep, op);
2760	}	2588	}
2761	lose_this_stat = 1;	2589	lose_this_stat = 1;
2762	if (settings.balanced_stat_loss)	2590	if (settings.balanced_stat_loss)
2763	{	2591	{
…		…
2775		2603
2776	/* There is a maximum depletion total per level. */	2604	/* There is a maximum depletion total per level. */
2777	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)	2605	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
2778	{	2606	{
2779	lose_this_stat = 0;	2607	lose_this_stat = 0;
2780	/* Take loss chance vs keep chance to see if we	2608	/* Take loss chance vs keep chance to see if we
2781	retain the stat. */	2609	retain the stat. */
2782	}	2610	}
2783	else	2611	else
2784	{	2612	{
2785	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)	2613	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
…		…
2791	}	2619	}
2792	}	2620	}
2793		2621
2794	if (lose_this_stat)	2622	if (lose_this_stat)
2795	{	2623	{
2796	this_stat = get_attr_value (&(dep->stats), i);	2624	this_stat = get_attr_value (&dep->stats, i);
2797	/* We could try to do something clever like find another	2625	/* We could try to do something clever like find another
2798	* stat to reduce if this fails. But chances are, if	2626	* stat to reduce if this fails. But chances are, if
2799	* stats have been depleted to -50, all are pretty low	2627	* stats have been depleted to -50, all are pretty low
2800	* and should be roughly the same, so it shouldn't make a	2628	* and should be roughly the same, so it shouldn't make a
2801	* difference.	2629	* difference.
2802	*/	2630	*/
2803	if (this_stat >= -50)	2631	if (this_stat >= -50)
2804	{	2632	{
2805	change_attr_value (&(dep->stats), i, -1);	2633	change_attr_value (&(dep->stats), i, -1);
2806	SET_FLAG (dep, FLAG_APPLIED);	2634	dep->set_flag (FLAG_APPLIED);
2807	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2635	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2808	op->update_stats ();	2636	op->update_stats ();
2809	lost_a_stat = 1;	2637	lost_a_stat = 1;
2810	}	2638	}
2811	}	2639	}
2812	}	2640	}
2813	}	2641	}
		2642
2814	/* If no stat lost, tell the player. */	2643	/* If no stat lost, tell the player. */
2815	if (!lost_a_stat)	2644	if (!lost_a_stat)
2816	{	2645	{
2817	/* determine_god() seems to not work sometimes... why is this?	2646	/* determine_god() seems to not work sometimes... why is this?
2818	Should I be using something else? GD */	2647	Should I be using something else? GD */
2819	const char *god = determine_god (op);	2648	shstr_tmp god = determine_god (op);
2820		2649
2821	if (god && (strcmp (god, "none")))	2650	if (god != shstr_none)
2822	new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);	2651	deathtab << "For a brief moment you feel the holy presence of " << god << " protecting you.\r";
2823	else	2652	else
2824	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");	2653	deathtab << "For a brief moment you feel a holy presence protecting you.\r";
2825	}	2654	}
2826	#else	2655	#else
2827	new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");	2656	deathtab << "For a brief moment you feel a holy presence protecting you from losing yourself completely.";
2828	#endif	2657	#endif
2829		2658
2830	/* Put a gravestone up where the character 'almost' died. List the	2659	/* Put a gravestone up where the character 'almost' died. List the
2831	* exp loss on the stone.	2660	* exp loss on the stone.
2832	*/	2661	*/
2833	tmp = arch_to_object (archetype::find ("gravestone"));	2662	tmp = archetype::find (shstr_gravestone)->instance ();
2834	sprintf (buf, "%s's gravestone", &op->name);	2663	tmp->name = format ("%s's gravestone", &op->name);
2835	tmp->name = buf;	2664	tmp->name_pl = format ("%s's gravestones", &op->name);
2836	sprintf (buf, "%s's gravestones", &op->name);	2665	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2837	tmp->name_pl = buf;	2666	&op->name, op->contr->title, op->contr->killer_name ());
2838	sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
2839	tmp->msg = buf;
2840	tmp->x = op->x, tmp->y = op->y;	2667	tmp->x = op->x, tmp->y = op->y;
2841	insert_ob_in_map (tmp, op->map, NULL, 0);	2668	insert_ob_in_map (tmp, op->map, NULL, 0);
2842		2669
2843	/**************************************/	2670	/**************************************/
2844	/* */	2671	/* */
2845	/* Subtract the experience points, */	2672	/* Subtract the experience points, */
2846	/* if we died cause of food, give us */
2847	/* food, and reset HP's... */
2848	/* */	2673	/* */
2849	/**************************************/	2674	/**************************************/
2850		2675
2851	/* remove any poisoning and confusion the character may be suffering. */
2852	/* restore player */
2853	at = archetype::find ("poisoning");
2854	tmp = present_arch_in_ob (at, op);
2855
2856	if (tmp)
2857	{
2858	tmp->destroy ();
2859	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2860	}
2861
2862	at = archetype::find ("confusion");
2863	tmp = present_arch_in_ob (at, op);
2864	if (tmp)
2865	{
2866	tmp->destroy ();
2867	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2868	}
2869
2870	cure_disease (op, 0); /* remove any disease */
2871
2872	/*add_exp(op, (op->stats.exp * -0.20)); */	2676	/*add_exp(op, (op->stats.exp * -0.20)); */
2873	apply_death_exp_penalty (op);	2677	apply_death_exp_penalty (op);
2874	if (op->stats.food < 100)
2875	op->stats.food = 900;
2876	op->stats.hp = op->stats.maxhp;
2877	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2878	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2879		2678
2880	/*	2679	/*
2881	* Check to see if the player has any unpaid items. If so, remove them	2680	* Check to see if the player has any unpaid items. If so, remove them
2882	* and put them back in the map.	2681	* and put them back in the map.
2883	*/	2682	*/
…		…
2907	if (will_kill_again)	2706	if (will_kill_again)
2908	{	2707	{
2909	object *force;	2708	object *force;
2910	int at;	2709	int at;
2911		2710
2912	force = get_archetype (FORCE_NAME);	2711	force = archetype::get (FORCE_NAME);
2913	/* 50 ticks should be enough time for the spell to abate */	2712	/* 50 ticks should be enough time for the spell to abate */
2914	force->speed = 0.1f;
2915	force->speed_left = -5.f;	2713	force->speed_left = -5.f;
2916	SET_FLAG (force, FLAG_APPLIED);	2714	force->set_speed (0.1f);
		2715	force->set_flag (FLAG_APPLIED);
		2716
2917	for (at = 0; at < NROFATTACKS; at++)	2717	for (at = 0; at < NROFATTACKS; at++)
2918	if (will_kill_again & (1 << at))	2718	if (will_kill_again & (1 << at))
2919	force->resist[at] = 100;	2719	force->resist[at] = 100;
2920		2720
2921	insert_ob_in_ob (force, op);	2721	insert_ob_in_ob (force, op);
2922	op->update_stats ();	2722	op->update_stats ();
2923
2924	}	2723	}
2925		2724
2926	new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");	2725	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2927	}	2726	}
2928		2727
2929	void	2728	static void
2930	loot_object (object *op)	2729	loot_object (object *op)
2931	{ /* Grab and destroy some treasure */	2730	{ /* Grab and destroy some treasure */
2932	object *tmp, *tmp2, *next;	2731	object *tmp, *next;
2933		2732
2934	op->close_container (); /* close open sack first */	2733	op->close_container (); /* close open sack first */
2935		2734
2936	for (tmp = op->inv; tmp; tmp = next)	2735	for (tmp = op->inv; tmp; tmp = next)
2937	{	2736	{
…		…
2944	tmp->x = op->x, tmp->y = op->y;	2743	tmp->x = op->x, tmp->y = op->y;
2945		2744
2946	if (tmp->type == CONTAINER)	2745	if (tmp->type == CONTAINER)
2947	loot_object (tmp); /* empty container to ground */	2746	loot_object (tmp); /* empty container to ground */
2948		2747
2949	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2748	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2950	{	2749	{
2951	if (tmp->nrof > 1)	2750	if (tmp->nrof > 1)
2952	{	2751	{
2953	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2752	tmp->decrease (rndm (1, tmp->nrof - 1));
2954	tmp2->destroy ();
2955	insert_ob_in_map (tmp, op->map, NULL, 0);	2753	insert_ob_in_map (tmp, op->map, NULL, 0);
2956	}	2754	}
2957	else	2755	else
2958	tmp->destroy ();	2756	tmp->destroy ();
2959	}	2757	}
…		…
2966	* fix_weight(): Check recursively the weight of all players, and fix	2764	* fix_weight(): Check recursively the weight of all players, and fix
2967	* what needs to be fixed. Refresh windows and fix speed if anything	2765	* what needs to be fixed. Refresh windows and fix speed if anything
2968	* was changed.	2766	* was changed.
2969	*/	2767	*/
2970	void	2768	void
2971	fix_weight (void)	2769	fix_weight ()
2972	{	2770	{
2973	for_all_players (pl)	2771	for_all_players (pl)
2974	{	2772	{
2975	int old = pl->ob->carrying, sum = sum_weight (pl->ob);	2773	weight_t old = pl->ob->carrying;
2976		2774
2977	if (old == sum)	2775	pl->ob->update_weight ();
2978	continue;	2776
		2777	if (old != pl->ob->carrying)
		2778	{
2979	pl->ob->update_stats ();	2779	pl->ob->update_stats ();
2980	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);	2780	LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
		2781	}
2981	}	2782	}
2982	}	2783	}
2983		2784
2984	void	2785	void
2985	fix_luck (void)	2786	fix_luck ()
2986	{	2787	{
2987	for_all_players (pl)	2788	for_all_players (pl)
2988	if (!pl->ob->contr->ns->state)	2789	if (!pl->ob->contr->ns->state)
2989	pl->ob->change_luck (0);	2790	pl->ob->change_luck (0);
2990	}	2791	}
…		…
3027	}	2828	}
3028		2829
3029	void	2830	void
3030	make_visible (object *op)	2831	make_visible (object *op)
3031	{	2832	{
3032	op->hide = 0;	2833	op->flag [FLAG_HIDDEN] = 0;
3033	op->invisible = 0;	2834	op->invisible = 0;
		2835
3034	if (op->type == PLAYER)	2836	if (op->type == PLAYER)
3035	{	2837	{
3036	op->contr->tmp_invis = 0;	2838	op->contr->tmp_invis = 0;
3037	op->contr->invis_race = 0;	2839	op->contr->invis_race = 0;
3038	}	2840	}
…		…
3041	}	2843	}
3042		2844
3043	int	2845	int
3044	is_true_undead (object *op)	2846	is_true_undead (object *op)
3045	{	2847	{
3046	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2848	if (op->arch->flag [FLAG_UNDEAD])
3047	return 1;	2849	return 1;
3048		2850
3049	return 0;	2851	return 0;
3050	}	2852	}
3051		2853
3052	/* look at the surrounding terrain to determine	2854	/* look at the surrounding terrain to determine
3053	* the hideability of this object. Positive levels	2855	* the hideability of this object. Positive levels
3054	* indicate greater hideability.	2856	* indicate greater hideability.
3055	*/	2857	*/
3056
3057	int	2858	int
3058	hideability (object *ob)	2859	hideability (object *ob)
3059	{	2860	{
3060	int i, level = 0, mflag;	2861	int i, level = 0, mflag;
3061	sint16 x, y;	2862	sint16 x, y;
3062		2863
3063	if (!ob || !ob->map)	2864	if (!ob || !ob->map)
3064	return 0;	2865	return 0;
3065		2866
3066	/* so, on normal lighted maps, its hard to hide */	2867	/* so, on normal lighted maps, its hard to hide */
3067	level = ob->map->darkness - 2;	2868	level = ob->map->darklevel () - 2;
3068		2869
3069	/* this also picks up whether the object is glowing.	2870	/* this also picks up whether the object is glowing.
3070	* If you carry a light on a non-dark map, its not	2871	* If you carry a light on a non-dark map, its not
3071	* as bad as carrying a light on a pitch dark map */	2872	* as bad as carrying a light on a pitch dark map */
3072	if (has_carried_lights (ob))	2873	if (ob->has_carried_lights ())
3073	level = -(10 + (2 * ob->map->darkness));	2874	level = -(10 + (2 * ob->map->darklevel ()));
3074		2875
3075	/* scan through all nearby squares for terrain to hide in */	2876	/* scan through all nearby squares for terrain to hide in */
3076	for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2877	for (i = 0, x = ob->x, y = ob->y;
		2878	i <= SIZEOFFREE1;
		2879	i++, x = ob->x + DIRX (i), y = ob->y + DIRY (i))
3077	{	2880	{
3078	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2881	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3079	if (mflag & P_OUT_OF_MAP)	2882	if (mflag & P_OUT_OF_MAP)
3080	{
3081	continue;	2883	continue;
3082	}	2884
3083	if (mflag & P_BLOCKSVIEW) /* something to hide near! */	2885	if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3084	level += 2;	2886	level += 2;
3085	else /* open terrain! */	2887	else /* open terrain! */
3086	level -= 1;	2888	level -= 1;
3087	}	2889	}
…		…
3098	* spot (surrounded by clear terrain in broad daylight). -b.t.	2900	* spot (surrounded by clear terrain in broad daylight). -b.t.
3099	*/	2901	*/
3100	void	2902	void
3101	do_hidden_move (object *op)	2903	do_hidden_move (object *op)
3102	{	2904	{
3103	int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);	2905	int hide = 0;
3104	object *skop;
3105		2906
3106	if (!op || !op->map)	2907	if (!op || !op->map)
3107	return;	2908	return;
3108		2909
3109	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	2910	object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
		2911	int num = random_roll (0, 19, op, PREFER_LOW);
3110		2912
3111	/* its *extremely* hard to run and sneak/hide at the same time! */	2913	/* its *extremely* hard to run and sneak/hide at the same time! */
3112	if (op->type == PLAYER && op->contr->run_on)	2914	if (op->type == PLAYER && op->contr->run_on)
3113	if (!skop || num >= skop->level)	2915	if (!skop || num >= skop->level)
3114	{	2916	{
…		…
3124	num -= hide;	2926	num -= hide;
3125		2927
3126	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))	2928	if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3127	{	2929	{
3128	make_visible (op);	2930	make_visible (op);
		2931
3129	if (op->type == PLAYER)	2932	if (op->type == PLAYER)
3130	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	2933	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3131	}	2934	}
3132	else if (op->type == PLAYER && skop)	2935	else if (op->type == PLAYER && skop)
3133	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	2936	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
…		…
3148		2951
3149	if (who->type == PLAYER)	2952	if (who->type == PLAYER)
3150	player = 1;	2953	player = 1;
3151		2954
3152	else	2955	else
3153	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2956	friendly = who->flag [FLAG_FRIENDLY];
3154		2957
3155	/* search adjacent squares */	2958	/* search adjacent squares */
3156	for (i = 1; i < 9; i++)	2959	for (i = 1; i < 9; i++)
3157	{	2960	{
3158	x = who->x + freearr_x[i];	2961	x = who->x + DIRX (i);
3159	y = who->y + freearr_y[i];	2962	y = who->y + DIRY (i);
3160	m = who->map;	2963	m = who->map;
3161	mflags = get_map_flags (m, &m, x, y, &x, &y);	2964	mflags = get_map_flags (m, &m, x, y, &x, &y);
3162	/* space must be blocked if there is a monster. If not	2965	/* space must be blocked if there is a monster. If not
3163	* blocked, don't need to check this space.	2966	* blocked, don't need to check this space.
3164	*/	2967	*/
…		…
3167	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2970	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3168	continue;	2971	continue;
3169		2972
3170	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2973	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3171	{	2974	{
3172	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2975	if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
3173	return 1;	2976	return 1;
3174	else if (tmp->type == PLAYER)	2977	else if (tmp->type == PLAYER)
3175	{
3176	/*don't let a hidden DM prevent you from hiding */
3177	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3178	return 1;	2978	return 1;
3179	}
3180	}	2979	}
3181	}	2980	}
3182	return 0;	2981	return 0;
3183	}	2982	}
3184		2983
3185	/* check the player los field for viewability of the	2984	/* check the player los field for viewability of the
3186	* object op. This function works fine for monsters,	2985	* object op. This function works fine for monsters,
3187	* but we dont worry if the object isnt the top one in	2986	* but we dont worry if the object isnt the top one in
3188	* a pile (say a coin under a table would return "viewable"	2987	* a pile (say a coin under a table would return "viewable"
3189	* by this routine). Another question, should we be	2988	* by this routine). Another question, should we be
3190	* concerned with the direction the player is looking	2989	* concerned with the direction the player is looking
3191	* in? Realistically, most of use cant see stuff behind	2990	* in? Realistically, most of us can't see stuff behind
3192	* our backs...on the other hand, does the "facing" direction	2991	* our backs...on the other hand, does the "facing" direction
3193	* imply the way your head, or body is facing? Its possible	2992	* imply the way your head, or body is facing? It's possible
3194	* for them to differ. Sigh, this fctn could get a bit more complex.	2993	* for them to differ. Sigh, this fctn could get a bit more complex.
3195	* -b.t.	2994	* -b.t.
3196	* This function is now map tiling safe.	2995	* This function is now map tiling safe.
3197	*/	2996	*/
3198
3199	int	2997	int
3200	player_can_view (object *pl, object *op)	2998	player_can_view (object *pl, object *op)
3201	{	2999	{
3202	rv_vector rv;	3000	rv_vector rv;
3203	int dx, dy;	3001	int dx, dy;
…		…
3215		3013
3216	get_rangevector (pl, op, &rv, 0x1);	3014	get_rangevector (pl, op, &rv, 0x1);
3217		3015
3218	/* starting with the 'head' part, lets loop	3016	/* starting with the 'head' part, lets loop
3219	* through the object and find if it has any	3017	* through the object and find if it has any
3220	* part that is in the los array but isnt on	3018	* part that is in the los array but isn't on
3221	* a blocked los square.	3019	* a blocked los square.
3222	* we use the archetype to figure out offsets.	3020	* we use the archetype to figure out offsets.
3223	*/	3021	*/
3224	while (op)	3022	while (op)
3225	{	3023	{
3226	dx = rv.distance_x + op->arch->x;	3024	dx = rv.distance_x + op->arch->x;
3227	dy = rv.distance_y + op->arch->y;	3025	dy = rv.distance_y + op->arch->y;
3228		3026
3229	/* only the viewable area the player sees is updated by LOS	3027	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3230	* code, so we need to restrict ourselves to that range of values
3231	* for any meaningful values.
3232	*/
3233	if (FABS (dx) <= (pl->contr->ns->mapx / 2) &&
3234	FABS (dy) <= (pl->contr->ns->mapy / 2) &&
3235	!pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3236	return 1;	3028	return 1;
		3029
3237	op = op->more;	3030	op = op->more;
3238	}	3031	}
3239	return 0;
3240	}
3241		3032
3242	/* routine for both players and monsters. We call this when
3243	* there is a possibility for our action distrubing our hiding
3244	* place or invisiblity spell. Artefact invisiblity is not
3245	* effected by this. If we arent invisible to begin with, we
3246	* return 0.
3247	*/
3248	int
3249	action_makes_visible (object *op)
3250	{
3251
3252	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3253	{
3254	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3255	return 0;
3256
3257	if (op->contr && op->contr->tmp_invis == 0)
3258	return 0;
3259
3260	/* If monsters, they should become visible */
3261	if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3262	{
3263	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3264	return 1;
3265	}
3266	}
3267	return 0;	3033	return 0;
3268	}	3034	}
3269		3035
3270	/* op_on_battleground - checks if the given object op (usually	3036	/* op_on_battleground - checks if the given object op (usually
3271	* a player) is standing on a valid battleground-tile,	3037	* a player) is standing on a valid battleground-tile,
…		…
3276	* Default is to do the same as before, so only people wanting to have different points need worry about this	3042	* Default is to do the same as before, so only people wanting to have different points need worry about this
3277	*/	3043	*/
3278	int	3044	int
3279	op_on_battleground (object *op, int *x, int *y)	3045	op_on_battleground (object *op, int *x, int *y)
3280	{	3046	{
3281	object *tmp;
3282
3283	/* A battleground-tile needs the following attributes to be valid:	3047	/* A battleground-tile needs the following attributes to be valid:
3284	* is_floor 1 (has to be the FIRST floor beneath the player's feet),	3048	* is_floor 1 (has to be the FIRST floor beneath the player's feet),
3285	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)	3049	* name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3286	* and the exit-coordinates sp/hp must both be > 0.	3050	* and the exit-coordinates sp/hp must both be > 0.
3287	* => The intention here is to prevent abuse of the battleground-	3051	* => The intention here is to prevent abuse of the battleground-
3288	* feature (like pickable or hidden battleground tiles). */	3052	* feature (like pickable or hidden battleground tiles). */
3289	for (tmp = op->below; tmp != NULL; tmp = tmp->below)	3053	for (object *tmp = op->below; tmp; tmp = tmp->below)
3290	{	3054	{
3291	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3055	if (tmp->flag [FLAG_IS_FLOOR])
3292	{	3056	{
3293	if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&	3057	if (tmp->flag [FLAG_NO_PICK]
3294	strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))	3058	&& tmp->type == BATTLEGROUND
		3059	&& tmp->name == shstr_battleground
		3060	&& EXIT_X (tmp) && EXIT_Y (tmp))
3295	{	3061	{
3296	/*before we assign the exit, check if this is a teambattle */	3062	/* before we assign the exit, check if this is a teambattle */
3297	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3063	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3298	{
3299	object *invtmp;
3300
3301	for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)	3064	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3065	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3302	{	3066	{
3303	if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))
3304	{
3305	if (x != NULL && y != NULL)	3067	if (x && y)
3306	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3068	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
		3069
3307	return 1;	3070	return 1;
3308	}
3309	}	3071	}
3310	}	3072
3311	if (x != NULL && y != NULL)	3073	if (x && y)
3312	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3074	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
		3075
3313	return 1;	3076	return 1;
3314	}	3077	}
3315	}	3078	}
3316	}	3079	}
		3080
3317	/* If we got here, did not find a battleground */	3081	/* If we got here, did not find a battleground */
3318	return 0;	3082	return 0;
3319	}	3083	}
3320		3084
3321	/*	3085	/*
…		…
3337	char buf[MAX_BUF]; /* tmp. string buffer */	3101	char buf[MAX_BUF]; /* tmp. string buffer */
3338	int i = 0, j = 0;	3102	int i = 0, j = 0;
3339		3103
3340	/* get the appropriate treasurelist */	3104	/* get the appropriate treasurelist */
3341	if (atnr == ATNR_FIRE)	3105	if (atnr == ATNR_FIRE)
3342	trlist = treasurelist::find ("dragon_ability_fire");	3106	trlist = treasurelist::find (shstr_dragon_ability_fire);
3343	else if (atnr == ATNR_COLD)	3107	else if (atnr == ATNR_COLD)
3344	trlist = treasurelist::find ("dragon_ability_cold");	3108	trlist = treasurelist::find (shstr_dragon_ability_cold);
3345	else if (atnr == ATNR_ELECTRICITY)	3109	else if (atnr == ATNR_ELECTRICITY)
3346	trlist = treasurelist::find ("dragon_ability_elec");	3110	trlist = treasurelist::find (shstr_dragon_ability_elec);
3347	else if (atnr == ATNR_POISON)	3111	else if (atnr == ATNR_POISON)
3348	trlist = treasurelist::find ("dragon_ability_poison");	3112	trlist = treasurelist::find (shstr_dragon_ability_poison);
3349		3113
3350	if (trlist == NULL || who->type != PLAYER)	3114	if (trlist == NULL || who->type != PLAYER)
3351	return;	3115	return;
3352		3116
3353	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3117	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3450	else	3214	else
3451	j = 1;	3215	j = 1;
3452	strcat (buf, spellpathnames[i]);	3216	strcat (buf, spellpathnames[i]);
3453	}	3217	}
3454	}	3218	}
		3219
3455	strcat (buf, ".");	3220	strcat (buf, ".");
3456	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3221	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3457	}	3222	}
3458		3223
3459	/* evtl. adding flags: */	3224	/* evtl. adding flags: */
3460	if (QUERY_FLAG (item, FLAG_XRAYS))	3225	if (item->flag [FLAG_XRAYS])
3461	SET_FLAG (skin, FLAG_XRAYS);	3226	skin->set_flag (FLAG_XRAYS);
3462	if (QUERY_FLAG (item, FLAG_STEALTH))	3227	if (item->flag [FLAG_STEALTH])
3463	SET_FLAG (skin, FLAG_STEALTH);	3228	skin->set_flag (FLAG_STEALTH);
3464	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3229	if (item->flag [FLAG_SEE_IN_DARK])
3465	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3230	skin->set_flag (FLAG_SEE_IN_DARK);
3466		3231
3467	/* print message if there is one */	3232	/* print message if there is one */
3468	if (item->msg != NULL)	3233	if (item->msg != NULL)
3469	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3234	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3470	}	3235	}
3471	else	3236	else
3472	{	3237	{
3473	/* generate misc. treasure */	3238	/* generate misc. treasure */
3474	tmp = arch_to_object (tr->item);	3239	tmp = tr->item->instance ();
3475	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3240	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3476	tmp = insert_ob_in_ob (tmp, who);	3241	who->insert (tmp);
3477	if (who->type == PLAYER)
3478	esrv_send_item (who, tmp);
3479	}	3242	}
3480	}	3243	}
3481		3244
3482	/**	3245	//-GPL
3483	* Unready an object for a player. This function does nothing if the object was
3484	* not readied.
3485	*/
3486	void
3487	player_unready_range_ob (player *pl, object *ob)
3488	{
3489	if (pl->ob->current_weapon == ob)
3490	pl->ob->current_weapon = 0;
3491
3492	if (pl->combat_ob == ob)
3493	pl->combat_ob = 0;
3494
3495	if (pl->ranged_ob == ob)
3496	pl->ranged_ob = 0;
3497	}
3498		3246
3499	sint8	3247	sint8
3500	player::visibility_at (maptile *map, int x, int y) const	3248	player::darkness_at (maptile *map, int x, int y) const
3501	{	3249	{
3502	if (!ns)	3250	if (!ns)
3503	return 0;	3251	return LOS_BLOCKED;
3504		3252
3505	int dx, dy;	3253	int dx, dy;
3506	if (!adjacent_map (map, ns->current_map, &dx, &dy))	3254	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3255	return LOS_BLOCKED;
		3256
		3257	x += dx - ns->current_x;
		3258	y += dy - ns->current_y;
		3259
		3260	return blocked_los (x, y);
		3261	}
		3262
		3263	void
		3264	player::infobox (const char *title, const char *msg, int color)
		3265	{
		3266	send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
		3267	}
		3268
		3269	void
		3270	player::statusmsg (const char *msg, int color)
		3271	{
		3272	send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
		3273	}
		3274
		3275	void
		3276	player::failmsg (const char *msg, int color)
		3277	{
		3278	play_sound (sound_find ("generic_failure"));
		3279	statusmsg (msg, color);
		3280	}
		3281
		3282	void
		3283	object::failmsgf (const char *format, ...)
		3284	{
		3285	if (!contr)
3507	return 0;	3286	return;
3508		3287
3509	x += dx - ns->current_x + ns->mapx / 2;	3288	va_list ap;
3510	y += dy - ns->current_y + ns->mapy / 2;	3289	va_start (ap, format);
3511		3290	contr->failmsg (vformat (format, ap));
3512	if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))	3291	va_end (ap);
3513	return 0;
3514
3515	return 100 - blocked_los [x][y];
3516	}	3292	}
		3293
		3294	void
		3295	player::failmsgf (const char *format, ...)
		3296	{
		3297	va_list ap;
		3298	va_start (ap, format);
		3299	failmsg (vformat (format, ap));
		3300	va_end (ap);
		3301	}
		3302

Diff Legend

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