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.197 by root, Mon May 5 16:02:20 2008 UTC vs.
Revision 1.298 by root, Sun Jan 29 03:59:15 2017 UTC

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

Diff Legend

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