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.237 by root, Thu Nov 5 15:18:26 2009 UTC vs.
Revision 1.294 by root, Wed Nov 16 23:42:03 2016 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,2009 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 it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* 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 Affero GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* and the GNU General Public License along with this program. If not, see	19	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* 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>
23	*/	23	*/
		24
		25	//+GPL
		26
		27	#include <algorithm>
		28	#include <functional>
24		29
25	#include <global.h>	30	#include <global.h>
26	#include <sproto.h>	31	#include <sproto.h>
27	#include <sounds.h>	32	#include <sounds.h>
28	#include <living.h>	33	#include <living.h>
29	#include <object.h>	34	#include <object.h>
30	#include <spells.h>	35	#include <spells.h>
31	#include <skills.h>	36	#include <skills.h>
32		37
33	#include <algorithm>
34	#include <functional>
35
36	playervec players;	38	playervec players;
37		39
38	/* This loads the first map an puts the player on it. */	40	/* This loads the first map an puts the player on it. */
39	static void	41	static void
40	set_first_map (object *op)	42	set_first_map (object *op)
…		…
52		54
53	players.insert (this);	55	players.insert (this);
54	ob->remove ();	56	ob->remove ();
55	ob->map = 0;	57	ob->map = 0;
56	ob->activate_recursive ();	58	ob->activate_recursive ();
57	CLEAR_FLAG (ob, FLAG_FRIENDLY);	59	ob->clr_flag (FLAG_FRIENDLY);
58	add_friendly_object (ob);	60	add_friendly_object (ob);
59	}	61	}
60		62
61	void	63	void
62	player::deactivate ()	64	player::deactivate ()
…		…
74	ob->remove ();	76	ob->remove ();
75	ob->enemy = 0; // sometimes keeps an extra refcount on itself	77	ob->enemy = 0; // sometimes keeps an extra refcount on itself
76	ob->map = 0;	78	ob->map = 0;
77	party = 0;	79	party = 0;
78		80
79	combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
80
81	players.erase (this);	81	players.erase (this);
82	}	82	}
83		83
84	// connect the player with a specific client	84	// connect the player with a specific client
85	// also changes, rationalises, and fixes some incorrect settings	85	// also changes, rationalises, and fixes some incorrect settings
…		…
105	ob->race = ob->arch->race;	105	ob->race = ob->arch->race;
106		106
107	ob->update_weight ();	107	ob->update_weight ();
108	link_skills ();	108	link_skills ();
109		109
110	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
111
112	assign (title, ob->arch->object::name);	110	assign (title, ob->arch->object::name);
113		111
114	/* if it's a dragon player, set the correct title here */	112	/* if it's a dragon player, set the correct title here */
115	if (is_dragon_pl (ob))	113	if (ob->is_dragon ())
116	{	114	{
117	object *tmp, *abil = 0, *skin = 0;	115	object *tmp, *abil = 0, *skin = 0;
118		116
119	for (tmp = ob->inv; tmp; tmp = tmp->below)	117	for (tmp = ob->inv; tmp; tmp = tmp->below)
120	if (tmp->type == FORCE)	118	if (tmp->type == FORCE)
…		…
128		126
129	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	127	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
130		128
131	esrv_new_player (this);	129	esrv_new_player (this);
132		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
133	ob->update_stats ();	136	ob->update_stats ();
134		137
135	ns->floorbox_update ();	138	ns->floorbox_update ();
136	esrv_send_inventory (ob, ob);	139	esrv_send_inventory (ob, ob);
137	esrv_add_spells (this, 0);	140	esrv_add_spells (this, 0);
…		…
167	// when ns = 0	170	// when ns = 0
168	observe = viewpoint = ob;	171	observe = viewpoint = ob;
169		172
170	deactivate ();	173	deactivate ();
171	}	174	}
		175
		176	//-GPL
172		177
173	// the need for this function can be explained	178	// the need for this function can be explained
174	// by load_object not returning the object	179	// by load_object not returning the object
175	void	180	void
176	player::set_object (object *op)	181	player::set_object (object *op)
177	{	182	{
178	ob = observe = viewpoint = op;	183	ob = observe = viewpoint = op;
179	ob->contr = this; /* this aren't yet in archetype */	184	ob->contr = this; /* this aren't yet in archetype */
180		185
181	ob->speed = 1.0f;	186	ob->speed = 1.0f; // object still inactive, keep it that way
182	ob->speed_left = 0.5f;	187	ob->speed_left = 0.5f;
183		188
184	ob->direction = 5; /* So player faces south */	189	ob->direction = 5; /* So player faces south */
185
186	ob->flag [FLAG_READY_WEAPON] = false;
187	ob->flag [FLAG_READY_SKILL] = false;
188	ob->flag [FLAG_READY_BOW] = false;
189
190	for (object *op = ob->inv; op; op = op->below)
191	if (op->flag [FLAG_APPLIED])
192	switch (op->type)
193	{
194	case SKILL:
195	ob->flag [FLAG_APPLIED] = false;
196	break;
197
198	case WAND:
199	case ROD:
200	case HORN:
201	case BOW:
202	ranged_ob = op;
203	break;
204
205	case WEAPON:
206	combat_ob = op;
207	break;
208	}
209
210	ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
211	ob->deactivate (); // change_weapon activates, fix this better
212	}	190	}
213		191
214	void	192	void
215	player::set_observe (object *op)	193	player::set_observe (object *op)
216	{	194	{
…		…
222	player::set_viewpoint (object *op)	200	player::set_viewpoint (object *op)
223	{	201	{
224	viewpoint = op ? op : (object *)observe;	202	viewpoint = op ? op : (object *)observe;
225	do_los = 1;	203	do_los = 1;
226	}	204	}
		205
		206	//+GPL
227		207
228	player::player ()	208	player::player ()
229	{	209	{
230	/* There are some elements we want initialised to non zero value -	210	/* There are some elements we want initialised to non zero value -
231	* we deal with that below this point.	211	* we deal with that below this point.
…		…
253	disconnect ();	233	disconnect ();
254		234
255	attachable::do_destroy ();	235	attachable::do_destroy ();
256		236
257	if (ob)	237	if (ob)
258	{
259	ob->destroy_inv (false);
260	ob->destroy ();	238	ob->destroy ();
261	}
262		239
263	ob = observe = viewpoint = 0;	240	ob = observe = viewpoint = 0;
264	}	241	}
265		242
266	player::~player ()	243	player::~player ()
267	{	244	{
268	/* Clear item stack */	245	/* Clear item stack */
269	free (stack_items);	246	free (stack_items);
		247	}
		248
		249	/*
		250	* get_player_archetype() return next player archetype from archetype
		251	* list. Not very efficient routine, but used only creating new players.
		252	* Note: there MUST be at least one player archetype!
		253	*/
		254	static archetype *
		255	get_player_archetype (archetype *at)
		256	{
		257	// archetypes could have been reloaded
		258	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
		259
		260	if (!nat)
		261	return at;
		262
		263	archvec::iterator i = archetypes.find (nat);
		264
		265	for (;;)
		266	{
		267	if (++i == archetypes.end ())
		268	i = archetypes.begin ();
		269	else if (*i == at)
		270	cleanup ("not a single player archetype found");
		271
		272	if ((*i)->type == PLAYER)
		273	return *i;
		274	}
270	}	275	}
271		276
272	/* Tries to add player on the connection passed in ns.	277	/* Tries to add player on the connection passed in ns.
273	* All we can really get in this is some settings like host and display	278	* All we can really get in this is some settings like host and display
274	* mode.	279	* mode.
…		…
276	player *	281	player *
277	player::create ()	282	player::create ()
278	{	283	{
279	player *pl = new player;	284	player *pl = new player;
280		285
281	pl->set_object (arch_to_object (get_player_archetype (0)));	286	pl->set_object (get_player_archetype (0)->instance ());
282		287
283	pl->ob->roll_stats ();	288	pl->ob->roll_stats ();
284	pl->ob->stats.wc = 2;	289	pl->ob->stats.wc = 2;
285	pl->ob->run_away = 25; /* Then we panick... */	290	pl->ob->run_away = 25; /* Then we panick... */
286		291
287	set_first_map (pl->ob);	292	set_first_map (pl->ob);
288		293
289	return pl;	294	return pl;
290	}
291
292	/*
293	* get_player_archetype() return next player archetype from archetype
294	* list. Not very efficient routine, but used only creating new players.
295	* Note: there MUST be at least one player archetype!
296	*/
297	archetype *
298	get_player_archetype (archetype *at)
299	{
300	// archetypes could have been reloaded
301	archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
302
303	if (!nat)
304	return at;
305
306	archvec::iterator i = archetypes.find (nat);
307
308	for (;;)
309	{
310	if (++i == archetypes.end ())
311	i = archetypes.begin ();
312	else if (*i == at)
313	cleanup ("not a single player archetype found");
314
315	if ((*i)->type == PLAYER)
316	return *i;
317	}
318	}	295	}
319		296
320	object *	297	object *
321	get_nearest_player (object *mon)	298	get_nearest_player (object *mon)
322	{	299	{
…		…
396	*/	373	*/
397	int	374	int
398	path_to_player (object *mon, object *pl, unsigned mindiff)	375	path_to_player (object *mon, object *pl, unsigned mindiff)
399	{	376	{
400	rv_vector rv;	377	rv_vector rv;
401	sint16 x, y;
402	int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;	378	int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES;
403	maptile *m, *lastmap;
404		379
405	get_rangevector (mon, pl, &rv, 0);	380	get_rangevector (mon, pl, &rv, 0);
406		381
407	if (rv.distance < mindiff)	382	if (rv.distance < mindiff)
408	return 0;	383	return 0;
409		384
410	x = mon->x;	385	mapxy pos (mon);
411	y = mon->y;
412	m = mon->map;
413	dir = rv.direction;	386	dir = rv.direction;
414	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	387	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
415	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	388	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
416		389
417	/* If we can't solve it within the search distance, return now. */	390	/* If we can't solve it within the search distance, return now. */
418	if (diff > max)	391	if (diff > max)
419	return 0;	392	return 0;
420		393
421	while (diff > 1 && max > 0)	394	while (diff > 1 && max > 0)
422	{	395	{
423	lastx = x;	396	mapxy lastpos = pos;
424	lasty = y;
425	lastmap = m;
426	x = lastx + freearr_x[dir];
427	y = lasty + freearr_y[dir];
428		397
429	mflags = get_map_flags (m, &m, x, y, &x, &y);	398	pos.move (dir);
430	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
431		399
432	/* Space is blocked - try changing direction a little */	400	/* Space is blocked - try changing direction a little */
433	if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW))	401	if (!pos.normalise ()
434	&& (m == mon->map && blocked_link (mon, m, x, y))))	402	|| (((pos->flags () & P_BLOCKSVIEW) || OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
		403	&& blocked_link (mon, pos.m, pos.x, pos.y)))
435	{	404	{
436	/* recalculate direction from last good location. Possible	405	/* recalculate direction from last good location. Possible
437	* we were not traversing ideal location before.	406	* we were not traversing ideal location before.
438	*/	407	*/
439	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	408	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
440	if (rv.direction != dir)	409	if (rv.direction != dir)
441	{	410	{
442	/* OK - says direction should be different - lets reset the	411	/* OK - says direction should be different - lets reset the
443	* the values so it will try again.	412	* the values so it will try again.
444	*/	413	*/
445	x = lastx;
446	y = lasty;
447	m = lastmap;	414	pos = lastpos;
448	dir = firstdir = rv.direction;	415	dir = firstdir = rv.direction;
449	}	416	}
450	else	417	else
451	{	418	{
452	/* direct path is blocked - try taking a side step to	419	/* direct path is blocked - try taking a side step to
…		…
459	*/	426	*/
460	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	427	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
461	{	428	{
462	if (i == 0)	429	if (i == 0)
463	continue; /* already did this, so skip it */	430	continue; /* already did this, so skip it */
		431
464	/* Use lastdir here - otherwise,	432	/* Use lastdir here - otherwise,
465	* since the direction that the creature should move in	433	* since the direction that the creature should move in
466	* may change, you could get infinite loops.	434	* may change, you could get infinite loops.
467	* ie, player is northwest, but monster can only	435	* ie, player is northwest, but monster can only
468	* move west, so it does that. It goes some distance,	436	* move west, so it does that. It goes some distance,
…		…
470	* can't do that, but now finds it can move east, and	438	* can't do that, but now finds it can move east, and
471	* gets back to its original point. lastdir contains	439	* gets back to its original point. lastdir contains
472	* the last direction the creature has successfully	440	* the last direction the creature has successfully
473	* moved.	441	* moved.
474	*/	442	*/
475
476	x = lastx + freearr_x[absdir (lastdir + i)];
477	y = lasty + freearr_y[absdir (lastdir + i)];
478	m = lastmap;	443	pos = lastpos;
479	mflags = get_map_flags (m, &m, x, y, &x, &y);	444	pos.move (absdir (lastdir + i));
480	if (mflags & P_OUT_OF_MAP)	445
		446	if (!pos.normalise ())
481	continue;	447	continue;
482	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	448
483	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	449	mapspace &ms = *pos;
		450
		451	if (ms.flags () & P_BLOCKSVIEW)
484	continue;	452	continue;
485	if (mflags & P_BLOCKSVIEW)	453
		454	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
486	continue;	455	continue;
487		456
488	if (m == mon->map && blocked_link (mon, m, x, y))	457	if (blocked_link (mon, pos.m, pos.x, pos.y))
489	break;	458	break;
490	}	459	}
		460
491	/* go through entire loop without finding a valid	461	/* go through entire loop without finding a valid
492	* sidestep to take - thus, no valid path.	462	* sidestep to take - thus, no valid path.
493	*/	463	*/
494	if (i == (DETOUR_AMOUNT + 1))	464	if (i == DETOUR_AMOUNT + 1)
495	return 0;	465	return 0;
		466
496	diff--;	467	diff--;
497	lastdir = dir;	468	lastdir = dir;
498	max--;	469	max--;
499	if (!firstdir)	470	if (!firstdir)
500	firstdir = dir + i;	471	firstdir = dir + i;
…		…
504	{	475	{
505	/* we moved towards creature, so diff is less */	476	/* we moved towards creature, so diff is less */
506	diff--;	477	diff--;
507	max--;	478	max--;
508	lastdir = dir;	479	lastdir = dir;
		480
509	if (!firstdir)	481	if (!firstdir)
510	firstdir = dir;	482	firstdir = dir;
511	}	483	}
512		484
513	if (diff <= 1)	485	if (diff <= 1)
514	{	486	{
515	/* Recalculate diff (distance) because we may not have actually	487	/* Recalculate diff (distance) because we may not have actually
516	* headed toward player for entire distance.	488	* headed toward player for entire distance.
517	*/	489	*/
518	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	490	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
519	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	491	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
520	}	492	}
521		493
522	if (diff > max)	494	if (diff > max)
523	return 0;	495	return 0;
…		…
541	next = op->below;	513	next = op->below;
542		514
543	/* Forces get applied per default, unless they have the	515	/* Forces get applied per default, unless they have the
544	* flag "neutral" set. Sorry but I can't think of a better way	516	* flag "neutral" set. Sorry but I can't think of a better way
545	*/	517	*/
546	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	518	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
547	SET_FLAG (op, FLAG_APPLIED);	519	op->set_flag (FLAG_APPLIED);
548		520
549	/* we never give weapons/armour if these cannot be used	521	/* we never give weapons/armour if these cannot be used
550	* by this player due to race restrictions	522	* by this player due to race restrictions
551	*/	523	*/
552	if (pl->type == PLAYER)	524	if (pl->type == PLAYER)
553	{	525	{
554	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)	526	if ((!pl->flag [FLAG_USE_ARMOUR]
555	&&	527	&&
556	(op->type == ARMOUR || op->type == BOOTS	528	(op->type == ARMOUR || op->type == BOOTS
557	|| op->type == CLOAK || op->type == HELMET	529	|| op->type == CLOAK || op->type == HELMET
558	|| op->type == SHIELD || op->type == GLOVES	530	|| op->type == SHIELD || op->type == GLOVES
559	|| op->type == BRACERS || op->type == GIRDLE))	531	|| op->type == BRACERS || op->type == GIRDLE))
560	|| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	532	|| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
561	{	533	{
562	op->destroy ();	534	op->destroy ();
563	continue;	535	continue;
564	}	536	}
565	}	537	}
566		538
567	/* Here we remove duplicated skills (as duplicated spell objects have	539	/* Here we remove duplicated skills (as duplicated spell objects have
568	* _very_ confusing effects for players), which could for instance be	540	* _very_ confusing effects for players), which could for instance be
569	* generated by bad treasurelists. - elmex	541	* generated by multiple treasurelists specifying the same skills.
570	*/	542	*/
571	if (op->type == SKILL)	543	if (op->type == SKILL)
572	{	544	{
573	for (object *tmp = op->below; tmp; tmp = tmp->below)	545	for (object *tmp = op->below; tmp; tmp = tmp->below)
574	if (tmp->type == op->type && tmp->name == op->name)	546	if (tmp->type == op->type && tmp->name == op->name)
575	{	547	{
576	op->destroy ();	548	op->destroy ();
577	LOG (llevError,
578	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
579	break;	549	break;
580	}	550	}
581		551
582	if (op->nrof > 1)	552	if (op->nrof > 1)
583	op->nrof = 1;	553	op->nrof = 1;
584	}	554	}
585		555
586	if (op->type == SPELLBOOK && op->inv)	556	if (op->type == SPELLBOOK && op->inv)
587	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	557	op->inv->clr_flag (FLAG_STARTEQUIP);
588		558
589	/* Give starting characters identified, uncursed, and undamned	559	/* Give starting characters identified, uncursed, and undamned
590	* items. Just don't identify gold or silver, or it won't be	560	* items. Just don't identify gold or silver, or it won't be
591	* merged properly.	561	* merged properly.
592	*/	562	*/
593	if (need_identify (op))	563	if (op->need_identify ())
594	{	564	{
595	SET_FLAG (op, FLAG_IDENTIFIED);	565	op->set_flag (FLAG_IDENTIFIED);
596	CLEAR_FLAG (op, FLAG_CURSED);	566	op->clr_flag (FLAG_CURSED);
597	CLEAR_FLAG (op, FLAG_DAMNED);	567	op->clr_flag (FLAG_DAMNED);
598	}	568	}
599		569
600	if (op->type == SPELL)	570	if (op->type == SPELL)
601	{	571	{
602	op->destroy ();	572	op->destroy ();
603	continue;	573	continue;
604	}	574	}
605	else if (op->type == SKILL)	575	else if (op->type == SKILL)
606	{	576	{
607	SET_FLAG (op, FLAG_CAN_USE_SKILL);	577	op->set_flag (FLAG_CAN_USE_SKILL);
608	op->stats.exp = 0;	578	op->stats.exp = 0;
609	op->level = 1;	579	op->level = 1;
610	}	580	}
611	else /* lock all 'normal items by default */	581	else /* lock all 'normal items by default */
612	SET_FLAG (op, FLAG_INV_LOCKED);	582	op->set_flag (FLAG_INV_LOCKED);
613	} /* for loop of objects in player inv */	583	} /* for loop of objects in player inv */
614		584
615	/* Need to set up the skill pointers */	585	/* Need to set up the skill pointers */
616	pl->contr->link_skills ();	586	pl->contr->link_skills ();
617	}	587	}
…		…
631	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");	601	send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
632	}	602	}
633		603
634	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */	604	/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
635	static int	605	static int
636	roll_stat (void)	606	roll_stat ()
637	{	607	{
638	int a[4], i, j, k;	608	int a[4], i, j, k;
639		609
640	for (i = 0; i < 4; i++)	610	for (i = 0; i < 4; i++)
641	a[i] = (int) rndm (6) + 1;	611	a[i] = rndm (1, 6);
642		612
643	for (i = 0, j = 0, k = 7; i < 4; i++)	613	for (i = 0, j = 0, k = 7; i < 4; i++)
644	if (a[i] < k)	614	if (a[i] < k)
645	k = a[i], j = i;	615	k = a[i], j = i;
646		616
…		…
738	player::chargen_race_done ()	708	player::chargen_race_done ()
739	{	709	{
740	/* this must before then initial items are given */	710	/* this must before then initial items are given */
741	esrv_new_player (ob->contr);	711	esrv_new_player (ob->contr);
742		712
743	treasurelist *tl = treasurelist::find ("starting_wealth");	713	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
744	if (tl)	714	if (tl)
745	create_treasure (tl, ob, 0, 0, 0);	715	create_treasure (tl, ob, 0, 0, 0);
746		716
747	INVOKE_PLAYER (BIRTH, ob->contr);	717	INVOKE_PLAYER (BIRTH, ob->contr);
748	INVOKE_PLAYER (LOGIN, ob->contr);
749		718
750	ob->contr->ns->state = ST_PLAYING;	719	ob->contr->ns->state = ST_PLAYING;
751		720
752	if (ob->msg)	721	if (ob->msg)
753	ob->msg = 0;	722	ob->msg = 0;
754		723
755	start_info (ob);	724	start_info (ob);
756	CLEAR_FLAG (ob, FLAG_WIZ);	725	ob->clr_flag (FLAG_WIZ);
757	give_initial_items (ob, ob->randomitems);	726	give_initial_items (ob, ob->randomitems);
758	esrv_send_inventory (ob, ob);	727	esrv_send_inventory (ob, ob);
759	ob->update_stats ();	728	ob->update_stats ();
760		729
761	/* This moves the player to a different start map, if there	730	/* This moves the player to a different start map, if there
…		…
763	*/	732	*/
764	if (*first_map_ext_path)	733	if (*first_map_ext_path)
765	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);	734	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
766	else	735	else
767	LOG (llevDebug, "first_map_ext_path not set\n");	736	LOG (llevDebug, "first_map_ext_path not set\n");
		737	}
		738
		739	/*
		740	* Returns true if the given player is a legal class.
		741	* The function to add and remove class-bonuses to the stats doesn't
		742	* check if the stat becomes negative, thus this function
		743	* merely checks that all stats are 1 or more, and returns
		744	* false otherwise.
		745	*/
		746	static int
		747	allowed_class (const object *op)
		748	{
		749	return op->stats.Dex > 0
		750	&& op->stats.Str > 0
		751	&& op->stats.Con > 0
		752	&& op->stats.Int > 0
		753	&& op->stats.Wis > 0
		754	&& op->stats.Pow > 0
		755	&& op->stats.Cha > 0;
768	}	756	}
769		757
770	void	758	void
771	player::chargen_race_next ()	759	player::chargen_race_next ()
772	{	760	{
…		…
801	ob->stats.hp = ob->stats.maxhp;	789	ob->stats.hp = ob->stats.maxhp;
802	ob->stats.sp = ob->stats.maxsp;	790	ob->stats.sp = ob->stats.maxsp;
803	ob->stats.grace = 0;	791	ob->stats.grace = 0;
804	}	792	}
805		793
806	void	794	static void
807	flee_player (object *op)	795	flee_player (object *op)
808	{	796	{
809	int dir, diff;	797	int dir, diff;
810	rv_vector rv;	798	rv_vector rv;
811		799
812	if (op->stats.hp < 0)	800	if (op->stats.hp < 0)
813	{	801	{
814	LOG (llevDebug, "Fleeing player is dead.\n");	802	LOG (llevDebug, "Fleeing player is dead.\n");
815	CLEAR_FLAG (op, FLAG_SCARED);	803	op->clr_flag (FLAG_SCARED);
816	return;	804	return;
817	}	805	}
818		806
819	if (!op->enemy)	807	if (!op->enemy)
820	{	808	{
821	LOG (llevDebug, "Fleeing player had no enemy.\n");	809	LOG (llevDebug, "Fleeing player had no enemy.\n");
822	CLEAR_FLAG (op, FLAG_SCARED);	810	op->clr_flag (FLAG_SCARED);
823	return;	811	return;
824	}	812	}
825		813
826	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	814	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
827	{	815	{
828	op->enemy = NULL;	816	op->enemy = NULL;
829	CLEAR_FLAG (op, FLAG_SCARED);	817	op->clr_flag (FLAG_SCARED);
830	return;	818	return;
831	}	819	}
832		820
833	get_rangevector (op, op->enemy, &rv, 0);	821	get_rangevector (op, op->enemy, &rv, 0);
834		822
835	dir = absdir (4 + rv.direction);	823	dir = absdir (4 + rv.direction);
836	for (diff = 0; diff < 3; diff++)	824	for (diff = 0; diff < 3; diff++)
837	{	825	{
838	int m = 1 - rndm (2) * 2;	826	int m = 1 - rndm (2) * 2;
839		827
840	if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))	828	if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
841	return;	829	return;
842	}	830	}
843		831
844	/* Cornered, get rid of scared */	832	/* Cornered, get rid of scared */
845	CLEAR_FLAG (op, FLAG_SCARED);	833	op->clr_flag (FLAG_SCARED);
846	op->enemy = NULL;	834	op->enemy = NULL;
847	}	835	}
848		836
849	/* check_pick sees if there is stuff to be picked up/picks up stuff.	837	/* check_pick sees if there is stuff to be picked up/picks up stuff.
850	* It returns 1 if the player should keep on moving, 0 if he should	838	* It returns 1 if the player should keep on moving, 0 if he should
…		…
855	{	843	{
856	object *tmp, *next;	844	object *tmp, *next;
857	int stop = 0;	845	int stop = 0;
858	int wvratio;	846	int wvratio;
859		847
860	/* if you're flying, you cna't pick up anything */	848	/* if you're flying, you can't pick up anything */
861	if (op->move_type & MOVE_FLYING)	849	if (op->move_type & MOVE_FLYING)
862	return 1;	850	return 1;
863		851
864	next = op->below;	852	next = op->below;
865		853
866	int cnt = MAX_ITEM_PER_DROP;	854	int cnt = MAX_ITEM_PER_ACTION;
867	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)	855	#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
868		856
869	/* loop while there are items on the floor that are not marked as	857	/* loop while there are items on the floor that are not marked as
870	* destroyed */	858	* destroyed */
871	while (next && !next->destroyed ())	859	while (next && !next->destroyed ())
…		…
897	if (op->contr->mode & PU_DEBUG)	885	if (op->contr->mode & PU_DEBUG)
898	{	886	{
899	/* some debugging code to figure out item information */	887	/* some debugging code to figure out item information */
900	const char *str = tmp->name	888	const char *str = tmp->name
901	? format ("item name: %s item type: %d weight/value: %d",	889	? format ("item name: %s item type: %d weight/value: %d",
902	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))))	890	&tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
903	: format ("item name: %s item type: %d weight/value: %d",	891	: format ("item name: %s item type: %d weight/value: %d",
904	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	892	&tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
905		893
906	new_draw_info (NDI_UNIQUE, 0, op, str);	894	new_draw_info (NDI_UNIQUE, 0, op, str);
907	}	895	}
908		896
909	if (op->contr->mode & PU_INHIBIT)	897	if (op->contr->mode & PU_INHIBIT)
…		…
942	* fighting */	930	* fighting */
943	if (op->contr->mode & PU_INHIBIT)	931	if (op->contr->mode & PU_INHIBIT)
944	return 1;	932	return 1;
945		933
946	/* prevent us from turning into auto-thieves :) */	934	/* prevent us from turning into auto-thieves :) */
947	if (QUERY_FLAG (tmp, FLAG_UNPAID))	935	if (tmp->flag [FLAG_UNPAID])
948	continue;	936	continue;
949		937
950	/* ignore known cursed objects */	938	/* ignore known cursed objects */
951	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	939	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
952	continue;	940	continue;
953		941
954	/* all food and drink if desired */	942	/* all food and drink if desired */
955	/* question: don't pick up known-poisonous stuff? */	943	/* question: don't pick up known-poisonous stuff? */
956	if (op->contr->mode & PU_FOOD)	944	if (op->contr->mode & PU_FOOD)
…		…
959	CHK_PICK_PICKUP;	947	CHK_PICK_PICKUP;
960	continue;	948	continue;
961	}	949	}
962		950
963	if (op->contr->mode & PU_DRINK)	951	if (op->contr->mode & PU_DRINK)
964	if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	952	if (tmp->type == DRINK || (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
965	{	953	{
966	CHK_PICK_PICKUP;	954	CHK_PICK_PICKUP;
967	continue;	955	continue;
968	}	956	}
969		957
…		…
996	continue;	984	continue;
997	}	985	}
998		986
999	/* wands/staves/rods/horns */	987	/* wands/staves/rods/horns */
1000	if (op->contr->mode & PU_MAGIC_DEVICE)	988	if (op->contr->mode & PU_MAGIC_DEVICE)
1001	if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)	989	if (tmp->type == WAND
		990	|| tmp->type == ROD
		991	|| tmp->type == HORN
		992	|| tmp->type == POWER_CRYSTAL)
1002	{	993	{
1003	CHK_PICK_PICKUP;	994	CHK_PICK_PICKUP;
1004	continue;	995	continue;
1005	}	996	}
1006		997
1007	/* pick up all magical items */	998	/* pick up all magical items */
1008	if (op->contr->mode & PU_MAGICAL)	999	if (op->contr->mode & PU_MAGICAL)
1009	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1000	if (tmp->flag [FLAG_KNOWN_MAGICAL]
		1001	&& !tmp->flag [FLAG_KNOWN_CURSED])
1010	{	1002	{
1011	CHK_PICK_PICKUP;	1003	CHK_PICK_PICKUP;
1012	continue;	1004	continue;
1013	}	1005	}
1014		1006
…		…
1021	}	1013	}
1022	}	1014	}
1023		1015
1024	/* rings & amulets - talismans seems to be typed AMULET */	1016	/* rings & amulets - talismans seems to be typed AMULET */
1025	if (op->contr->mode & PU_JEWELS)	1017	if (op->contr->mode & PU_JEWELS)
1026	if (tmp->type == RING || tmp->type == AMULET)	1018	if (tmp->type == RING
		1019	|| tmp->type == AMULET
		1020	|| tmp->type == GIRDLE
		1021	|| tmp->type == SKILL_TOOL)
1027	{	1022	{
1028	CHK_PICK_PICKUP;	1023	CHK_PICK_PICKUP;
1029	continue;	1024	continue;
1030	}	1025	}
1031		1026
…		…
1080	CHK_PICK_PICKUP;	1075	CHK_PICK_PICKUP;
1081	continue;	1076	continue;
1082	}	1077	}
1083		1078
1084	if (op->contr->mode & PU_GLOVES)	1079	if (op->contr->mode & PU_GLOVES)
1085	if (tmp->type == GLOVES)	1080	if (tmp->type == GLOVES || tmp->type == BRACERS)
1086	{	1081	{
1087	CHK_PICK_PICKUP;	1082	CHK_PICK_PICKUP;
1088	continue;	1083	continue;
1089	}	1084	}
1090		1085
…		…
1095	continue;	1090	continue;
1096	}	1091	}
1097		1092
1098	/* hoping to catch throwing daggers here */	1093	/* hoping to catch throwing daggers here */
1099	if (op->contr->mode & PU_MISSILEWEAPON)	1094	if (op->contr->mode & PU_MISSILEWEAPON)
1100	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1095	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1101	{	1096	{
1102	CHK_PICK_PICKUP;	1097	CHK_PICK_PICKUP;
1103	continue;	1098	continue;
1104	}	1099	}
1105		1100
…		…
1140	fprintf (stderr, "%s", tmp->name);	1135	fprintf (stderr, "%s", tmp->name);
1141	}	1136	}
1142	else	1137	else
1143	fprintf (stderr, "%s", tmp->arch->archname);	1138	fprintf (stderr, "%s", tmp->arch->archname);
1144	fprintf (stderr, ",%d] = ", tmp->type);	1139	fprintf (stderr, ",%d] = ", tmp->type);
1145	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));	1140	fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1146	#endif	1141	#endif
1147	CHK_PICK_PICKUP;	1142	CHK_PICK_PICKUP;
1148	continue;	1143	continue;
1149	}	1144	}
1150	} /* the new pickup model */	1145	} /* the new pickup model */
1151	}	1146	}
1152		1147
1153	return !stop;	1148	return !stop;
1154	}	1149	}
1155		1150
		1151	/* routine for both players and monsters. We call this when
		1152	* there is a possibility for our action distrubing our hiding
		1153	* place or invisiblity spell. Artefact invisiblity causes
		1154	* "noise" instead. If we arent invisible to begin with, we
		1155	* return 0.
		1156	*/
		1157	static int
		1158	action_makes_visible (object *op)
		1159	{
		1160	if (op->invisible && op->flag [FLAG_ALIVE])
		1161	{
		1162	if (op->flag [FLAG_MAKE_INVIS])
		1163	{
		1164	// artefact invisibility is permanent, but we still make noise
		1165	// this is important for game-balance.
		1166	if (op->contr)
		1167	op->make_noise ();
		1168
		1169	return 0;
		1170	}
		1171
		1172	if (op->contr && op->contr->tmp_invis == 0)
		1173	return 0;
		1174
		1175	/* If monsters, they should become visible */
		1176	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
		1177	{
		1178	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
		1179	return 1;
		1180	}
		1181	}
		1182
		1183	return 0;
		1184	}
		1185
1156	/*	1186	/*
1157	* Find an arrow in the inventory and after that	1187	* Find an arrow in the inventory and after that
1158	* in the right type container (quiver). Pointer to the	1188	* in the right type container (quiver). Pointer to the
1159	* found object is returned.	1189	* found object is returned.
1160	*/	1190	*/
1161	object *	1191	static object *
1162	find_arrow (object *op, const char *type)	1192	find_arrow (object *op, const char *type)
1163	{	1193	{
1164	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1194	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1165	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1195	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1166	return splay (tmp);	1196	return splay (tmp);
1167		1197
1168	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1198	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1169	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))	1199	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1170	if (object *arrow = find_arrow (tmp, type))	1200	if (object *arrow = find_arrow (tmp, type))
1171	{	1201	{
1172	splay (tmp);	1202	splay (tmp);
1173	return arrow;	1203	return arrow;
1174	}	1204	}
…		…
1180	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1210	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1181	* against the target. A full test is not performed, simply a basic test	1211	* against the target. A full test is not performed, simply a basic test
1182	* of resistances. The archer is making a quick guess at what he sees down	1212	* of resistances. The archer is making a quick guess at what he sees down
1183	* the hall. Failing that it does it's best to pick the highest plus arrow.	1213	* the hall. Failing that it does it's best to pick the highest plus arrow.
1184	*/	1214	*/
1185	object *	1215	static object *
1186	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)	1216	find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1187	{	1217	{
1188	object *tmp = NULL, *arrow, *ntmp;	1218	object *tmp = NULL, *arrow, *ntmp;
1189	int attacknum, attacktype, betterby = 0, i;	1219	int attacknum, attacktype, betterby = 0, i;
1190		1220
1191	if (!type)	1221	if (!type)
1192	return NULL;	1222	return NULL;
1193		1223
1194	for (arrow = op->inv; arrow; arrow = arrow->below)	1224	for (arrow = op->inv; arrow; arrow = arrow->below)
1195	{	1225	{
1196	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1226	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1197	{	1227	{
1198	i = 0;	1228	i = 0;
1199	ntmp = find_better_arrow (arrow, target, type, &i);	1229	ntmp = find_better_arrow (arrow, target, type, &i);
1200		1230
1201	if (i > betterby)	1231	if (i > betterby)
…		…
1259	* find_better_arrow to find a decent arrow to use.	1289	* find_better_arrow to find a decent arrow to use.
1260	* op = the shooter	1290	* op = the shooter
1261	* type = bow->race	1291	* type = bow->race
1262	* dir = fire direction	1292	* dir = fire direction
1263	*/	1293	*/
1264	object *	1294	static object *
1265	pick_arrow_target (object *op, shstr_cmp type, int dir)	1295	pick_arrow_target (object *op, shstr_cmp type, int dir)
1266	{	1296	{
1267	object *tmp = NULL;	1297	object *tmp = NULL;
1268	maptile *m;	1298	maptile *m;
1269	int i, mflags, found, number;	1299	int i, mflags, found, number;
…		…
1302	break;	1332	break;
1303	}	1333	}
1304		1334
1305	if (mflags & P_IS_ALIVE)	1335	if (mflags & P_IS_ALIVE)
1306	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1336	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1307	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1337	if (tmp->flag [FLAG_ALIVE])
1308	break;	1338	break;
1309	}	1339	}
1310		1340
1311	if (!tmp)	1341	if (!tmp)
1312	return find_arrow (op, type);	1342	return find_arrow (op, type);
…		…
1373	{	1403	{
1374	if (op->type == PLAYER)	1404	if (op->type == PLAYER)
1375	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1405	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1376	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1406	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1377	else	1407	else
1378	CLEAR_FLAG (op, FLAG_READY_BOW);	1408	op->clr_flag (FLAG_READY_BOW);
1379		1409
1380	return 0;	1410	return 0;
1381	}	1411	}
1382	}	1412	}
1383		1413
…		…
1432	#endif	1462	#endif
1433		1463
1434	SET_ANIMATION (arrow, arrow->direction);	1464	SET_ANIMATION (arrow, arrow->direction);
1435		1465
1436	/* update the speed */	1466	/* update the speed */
1437	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1438	+ bow->stats.dam / 7.f;
1439		1467
1440	arrow->set_speed (max (arrow->speed, 2.f));
1441	arrow->speed_left = 0;	1468	arrow->speed_left = 0;
		1469	arrow->set_speed (max (2.f,
		1470	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1471	+ bow->stats.dam / 7.f
		1472	));
1442		1473
1443	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1474	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1444		1475
1445	if (op->type == PLAYER)	1476	if (op->type == PLAYER)
1446	{	1477	{
…		…
1484	* but monsters can't. Putting that code here	1515	* but monsters can't. Putting that code here
1485	* makes the fire_bow code much cleaner.	1516	* makes the fire_bow code much cleaner.
1486	* this function should only be called if 'op' is a player,	1517	* this function should only be called if 'op' is a player,
1487	* hence the function name.	1518	* hence the function name.
1488	*/	1519	*/
1489	int	1520	static int
1490	player_fire_bow (object *op, int dir)	1521	player_fire_bow (object *op, int dir)
1491	{	1522	{
1492	int ret;	1523	int ret;
1493		1524
1494	if (op->contr->bowtype == bow_bestarrow)	1525	if (op->contr->bowtype == bow_bestarrow)
…		…
1522	}	1553	}
1523		1554
1524	/* Fires a misc (wand/rod/horn) object in 'dir'.	1555	/* Fires a misc (wand/rod/horn) object in 'dir'.
1525	* Broken apart from 'fire' to keep it more readable.	1556	* Broken apart from 'fire' to keep it more readable.
1526	*/	1557	*/
1527	void	1558	static void
1528	fire_misc_object (object *op, int dir)	1559	fire_misc_object (object *op, int dir)
1529	{	1560	{
1530	object *item = op->contr->ranged_ob;	1561	object *item = op->contr->ranged_ob;
1531		1562
1532	if (!item)	1563	if (!item)
…		…
1539	{	1570	{
1540	LOG (llevError, "Object %s lacks a spell\n", &item->name);	1571	LOG (llevError, "Object %s lacks a spell\n", &item->name);
1541	return;	1572	return;
1542	}	1573	}
1543		1574
1544	if (!op->change_weapon (item))	1575	if (!op->apply (item))
1545	return;	1576	return;
1546		1577
1547	if (item->type == WAND)	1578	if (item->type == WAND)
1548	{	1579	{
1549	if (item->stats.food <= 0)	1580	if (item->stats.food <= 0)
…		…
1554	return;	1585	return;
1555	}	1586	}
1556	}	1587	}
1557	else if (item->type == ROD || item->type == HORN)	1588	else if (item->type == ROD || item->type == HORN)
1558	{	1589	{
1559	sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);	1590	sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1560		1591
1561	// using the maximum of the rods charge allows at least one spell cast	1592	// using the maximum of the rods charge allows at least one spell cast
1562	// for a rod or horn, this fixes some broken rods.	1593	// for a rod or horn, this fixes some broken rods.
1563	if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))	1594	if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1564	{	1595	{
1565	op->contr->play_sound (sound_find ("wand_poof"));	1596	op->contr->play_sound (sound_find ("wand_poof"));
1566		1597
1567	if (item->type == ROD)	1598	if (item->type == ROD)
1568	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));	1599	new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
…		…
1579		1610
1580	if (item->type == WAND)	1611	if (item->type == WAND)
1581	{	1612	{
1582	if (!(--item->stats.food))	1613	if (!(--item->stats.food))
1583	{	1614	{
1584	object *tmp;
1585
1586	if (item->arch)	1615	if (item->arch)
1587	{	1616	{
1588	CLEAR_FLAG (item, FLAG_ANIMATE);	1617	item->clr_flag (FLAG_ANIMATE);
1589	item->face = item->arch->face;	1618	item->face = item->arch->face;
1590	item->set_speed (0);	1619	item->set_speed (0);
1591	}	1620	}
1592		1621
1593	if (object *pl = item->visible_to ())	1622	if (object *pl = item->visible_to ())
…		…
1600	}	1629	}
1601		1630
1602	/* Received a fire command for the player - go and do it.	1631	/* Received a fire command for the player - go and do it.
1603	*/	1632	*/
1604	bool	1633	bool
1605	fire (object *op, int dir)	1634	fire (object *who, int dir)
1606	{	1635	{
1607	int spellcost = 0;	1636	int spellcost = 0;
1608		1637
1609	player *pl = op->contr;	1638	player *pl = who->contr;
1610		1639
1611	if (pl->golem)	1640	if (pl->golem)
1612	{	1641	{
1613	control_golem (op->contr->golem, dir);	1642	control_golem (who->contr->golem, dir);
1614	return false;	1643	return false;
1615	}	1644	}
1616		1645
1617	object *ob = pl->ranged_ob;	1646	object *ob = pl->ranged_ob;
1618		1647
1619	if (!ob)	1648	if (!ob)
1620	return false;	1649	return false;
1621		1650
1622	if (op->speed_left > 0.f)	1651	if (who->speed_left > 0.f)
1623	--op->speed_left;	1652	--who->speed_left;
1624	else	1653	else
1625	return false;	1654	return false;
1626		1655
1627	if (!op->change_weapon (ob))	1656	if (!who->apply (ob))
1628	return false;	1657	return false;
1629		1658
1630	/* check for loss of invisiblity/hide */	1659	/* check for loss of invisiblity/hide */
1631	if (action_makes_visible (op))	1660	if (action_makes_visible (who))
1632	make_visible (op);	1661	make_visible (who);
1633		1662
1634	switch (ob->type)	1663	switch (ob->type)
1635	{	1664	{
1636	case BOW:	1665	case BOW:
1637	player_fire_bow (op, dir);	1666	player_fire_bow (who, dir);
1638	break;	1667	break;
1639		1668
1640	case SPELL:	1669	case SPELL:
1641	spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0);	1670	spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1642	break;	1671	break;
1643		1672
1644	case BUILDER:	1673	case BUILDER:
1645	apply_map_builder (op, dir);	1674	apply_map_builder (who, dir);
1646	break;	1675	break;
1647		1676
1648	case SKILL:	1677	case SKILL:
1649	do_skill (op, op, ob, dir, 0);	1678	do_skill (who, who, ob, dir, 0);
1650	break;	1679	break;
1651		1680
		1681	case RANGED:
		1682	do_skill (who, ob, who->chosen_skill, dir, 0);
		1683	break;
		1684
1652	default:	1685	default:
1653	fire_misc_object (op, dir);	1686	fire_misc_object (who, dir);
1654	break;	1687	break;
1655	}	1688	}
1656		1689
1657	return true;	1690	return true;
1658	}	1691	}
…		…
1717	*	1750	*
1718	* Change the color so that the message doesn't disappear with	1751	* Change the color so that the message doesn't disappear with
1719	* all the others.	1752	* all the others.
1720	*/	1753	*/
1721	if (pl->contr->usekeys == key_inventory	1754	if (pl->contr->usekeys == key_inventory
1722	|| !QUERY_FLAG (container, FLAG_APPLIED)	1755	|| !container->flag [FLAG_APPLIED]
1723	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))	1756	|| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1724	{	1757	{
1725	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,	1758	new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1726	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1759	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1727	return NULL;	1760	return NULL;
…		…
1811	* going to try and move (not fire weapons).	1844	* going to try and move (not fire weapons).
1812	*/	1845	*/
1813	bool	1846	bool
1814	move_player_attack (object *op, int dir)	1847	move_player_attack (object *op, int dir)
1815	{	1848	{
1816	if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))	1849	if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1817	{	1850	{
1818	--op->speed_left;	1851	--op->speed_left;
1819	return true;	1852	return true;
1820	}	1853	}
1821		1854
1822	int on_battleground;
1823
1824	sint16 nx = freearr_x[dir] + op->x;	1855	sint16 nx = freearr_x[dir] + op->x;
1825	sint16 ny = freearr_y[dir] + op->y;	1856	sint16 ny = freearr_y[dir] + op->y;
1826
1827	on_battleground = op_on_battleground (op, 0, 0);
1828		1857
1829	if (out_of_map (op->map, nx, ny))	1858	if (out_of_map (op->map, nx, ny))
1830	return false;	1859	return false;
1831		1860
1832	/* If braced, or can't move to the square, and it is not out of the	1861	/* If braced, or can't move to the square, and it is not out of the
…		…
1853	|| mon->flag [FLAG_CAN_ROLL])	1882	|| mon->flag [FLAG_CAN_ROLL])
1854	&& mon != op)	1883	&& mon != op)
1855	break;	1884	break;
1856	}	1885	}
1857		1886
1858	if (!mon) /* This happens anytime the player tries to move */	1887	/* no monster == player tries to move into a wall or so */
1859	return false; /* into a wall */	1888	if (!mon)
		1889	{
		1890	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1891	if (op->move_type & ob->move_block)
		1892	{
		1893	if (ob->move_block == MOVE_ALL)
		1894	move_into_wall (op, ob);
		1895	else
		1896	{
		1897	if (op->contr->ns->bumpmsg)
		1898	{
		1899	op->play_sound (sound_find ("blocked_move"));
		1900
		1901	op->statusmsg (ob->invisible
		1902	? "Something blocks you."
		1903	: format ("Something blocks you from entering the %s.", query_name (ob))
		1904	);
		1905	}
		1906	}
		1907
		1908	break;
		1909	}
		1910
		1911	return false;
		1912	}
1860		1913
1861	mon = mon->head_ ();	1914	mon = mon->head_ ();
1862		1915
1863	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))	1916	if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
1864	if (op->contr->weapon_sp_left > 0.f)	1917	if (op->contr->weapon_sp_left > 0.f)
…		…
1882	*/	1935	*/
1883	if (op->type == PLAYER	1936	if (op->type == PLAYER
1884	&& ((mon->owner && mon->owner->contr	1937	&& ((mon->owner && mon->owner->contr
1885	&& same_party (mon->owner->contr->party, op->contr->party))	1938	&& same_party (mon->owner->contr->party, op->contr->party))
1886	|| mon->owner == op)	1939	|| mon->owner == op)
1887	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))	1940	&& (mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY]))
1888	{	1941	{
1889	/* If we're braced, we don't want to switch places with it */	1942	/* If we're braced, we don't want to switch places with it */
1890	if (op->contr->braced)	1943	if (op->contr->braced)
1891	return false;	1944	return false;
1892		1945
…		…
1903	return true;	1956	return true;
1904	}	1957	}
1905	else	1958	else
1906	return false;	1959	return false;
1907	}	1960	}
		1961
		1962	bool on_battleground = op_on_battleground (op, 0, 0);
1908		1963
1909	/* in certain circumstances, you shouldn't attack friendly	1964	/* in certain circumstances, you shouldn't attack friendly
1910	* creatures. Note that if you are braced, you can't push	1965	* creatures. Note that if you are braced, you can't push
1911	* someone, but put it inside this loop so that you won't	1966	* someone, but put it inside this loop so that you won't
1912	* attack them either.	1967	* attack them either.
1913	*/	1968	*/
1914	if ((mon->type == PLAYER || mon->enemy != op)	1969	if ((mon->type == PLAYER || mon->enemy != op)
1915	&& (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))	1970	&& (mon->type == PLAYER || mon->flag [FLAG_UNAGGRESSIVE] || mon->flag [FLAG_FRIENDLY])
1916	&& ((op->contr->peaceful	1971	&& ((op->contr->peaceful
1917	|| (mon->type == PLAYER && mon->contr->peaceful))	1972	|| (mon->type == PLAYER && mon->contr->peaceful))
1918	&& !on_battleground))	1973	&& !on_battleground))
1919	{	1974	{
1920	if (op->speed_left > 0.f)	1975	if (op->speed_left > 0.f)
…		…
1936	}	1991	}
1937	}	1992	}
1938	/* If the object is a boulder or other rollable object, then	1993	/* If the object is a boulder or other rollable object, then
1939	* roll it if not braced. You can't roll it if you are braced.	1994	* roll it if not braced. You can't roll it if you are braced.
1940	*/	1995	*/
1941	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	1996	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1942	{	1997	{
1943	if (op->speed_left > 0.f)	1998	if (op->speed_left > 0.f)
1944	{	1999	{
1945	--op->speed_left;	2000	--op->speed_left;
1946		2001
…		…
1955	* Way it works is like this: First, it must have some hit points	2010	* Way it works is like this: First, it must have some hit points
1956	* and be living. Then, it must be one of the following:	2011	* and be living. Then, it must be one of the following:
1957	* 1) Not a player, 2) A player, but of a different party. Note	2012	* 1) Not a player, 2) A player, but of a different party. Note
1958	* that party_number -1 is no party, so attacks can still happen.	2013	* that party_number -1 is no party, so attacks can still happen.
1959	*/	2014	*/
1960	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2015	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
1961	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))	2016	((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
1962	{	2017	{
1963	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	2018	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
1964	{	2019	{
1965	--op->contr->weapon_sp_left;	2020	--op->contr->weapon_sp_left;
…		…
1977	}	2032	}
1978		2033
1979	bool	2034	bool
1980	move_player (object *op, int dir)	2035	move_player (object *op, int dir)
1981	{	2036	{
1982	int pick;
1983
1984	if (!op->map || op->map->in_memory != MAP_ACTIVE)	2037	if (!op->map || op->map->state != MAP_ACTIVE)
1985	return 0;	2038	return 0;
1986		2039
1987	/* Sanity check: make sure dir is valid */	2040	/* Sanity check: make sure dir is valid */
1988	if ((dir < 0) || (dir >= 9))	2041	if (dir < 0 || dir > 8)
1989	{	2042	{
1990	LOG (llevError, "move_player: invalid direction %d\n", dir);	2043	LOG (llevError, "move_player: invalid direction %d\n", dir);
1991	return 0;	2044	return 0;
1992	}	2045	}
1993		2046
1994	/* peterm: added following line */	2047	/* peterm: added following line */
1995	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2048	if (op->flag [FLAG_CONFUSED] && dir)
1996	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2049	dir = absdir (dir + rndm (3) + rndm (3) - 2);
1997		2050
1998	op->facing = dir;	2051	op->facing = dir;
1999		2052
2000	if (op->flag [FLAG_HIDDEN])	2053	if (op->flag [FLAG_HIDDEN])
2001	do_hidden_move (op);	2054	do_hidden_move (op);
2002		2055
2003	bool retval;	2056	bool retval;
		2057	int pick = 0;
2004		2058
2005	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))	2059	if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2006	retval = RESULT_INT (0);	2060	retval = RESULT_INT (0);
2007	else if (op->contr->fire_on)	2061	else if (op->contr->fire_on)
2008	retval = fire (op, dir);	2062	retval = fire (op, dir);
…		…
2039	* players.	2093	* players.
2040	*/	2094	*/
2041	bool	2095	bool
2042	handle_newcs_player (object *op)	2096	handle_newcs_player (object *op)
2043	{	2097	{
2044	if (QUERY_FLAG (op, FLAG_SCARED))	2098	if (op->flag [FLAG_SCARED])
2045	{	2099	{
2046	if (op->speed_left > 0.f)	2100	if (op->speed_left > 0.f)
2047	{	2101	{
2048	--op->speed_left;	2102	--op->speed_left;
2049	flee_player (op);	2103	flee_player (op);
…		…
2065	return move_player (op, op->direction);	2119	return move_player (op, op->direction);
2066		2120
2067	return false;	2121	return false;
2068	}	2122	}
2069		2123
2070	int	2124	static int
2071	save_life (object *op)	2125	save_life (object *op)
2072	{	2126	{
2073	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2127	if (!op->flag [FLAG_LIFESAVE])
2074	return 0;	2128	return 0;
2075		2129
2076	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2130	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2077	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2131	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2078	{	2132	{
2079	op->play_sound (sound_find ("ob_evaporate"));	2133	op->play_sound (sound_find ("ob_evaporate"));
2080	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2134	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2081		2135
2082	tmp->destroy ();	2136	tmp->destroy ();
2083	CLEAR_FLAG (op, FLAG_LIFESAVE);	2137	op->clr_flag (FLAG_LIFESAVE);
2084		2138
2085	if (op->stats.hp < 0)	2139	if (op->stats.hp < 0)
2086	op->stats.hp = op->stats.maxhp;	2140	op->stats.hp = op->stats.maxhp;
2087		2141
2088	if (op->stats.food < 0)	2142	if (op->stats.food < 0)
2089	op->stats.food = 999;	2143	op->stats.food = MAX_FOOD;
2090		2144
2091	op->update_stats ();	2145	op->update_stats ();
2092	return 1;	2146	return 1;
2093	}	2147	}
2094		2148
2095	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2149	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2096	CLEAR_FLAG (op, FLAG_LIFESAVE);	2150	op->clr_flag (FLAG_LIFESAVE);
2097	enter_player_savebed (op); /* bring him home. */	2151	enter_player_savebed (op); /* bring him home. */
2098	return 0;	2152	return 0;
2099	}	2153	}
2100		2154
2101	/* This goes throws the inventory and removes unpaid objects, and puts them	2155	/* This goes throws the inventory and removes unpaid objects, and puts them
…		…
2108	{	2162	{
2109	while (op)	2163	while (op)
2110	{	2164	{
2111	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */	2165	object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2112		2166
2113	if (QUERY_FLAG (op, FLAG_UNPAID))	2167	if (op->flag [FLAG_UNPAID])
2114	op->insert_at (env);	2168	op->insert_at (env);
2115	else if (op->inv)	2169	else if (op->inv)
2116	drop_unpaid_items (op->inv, env);	2170	drop_unpaid_items (op->inv, env);
2117		2171
2118	op = next;	2172	op = next;
…		…
2124	{	2178	{
2125	if (!flag [FLAG_REMOVED])	2179	if (!flag [FLAG_REMOVED])
2126	::drop_unpaid_items (inv, this);	2180	::drop_unpaid_items (inv, this);
2127	}	2181	}
2128		2182
2129	/*
2130	* Returns pointer a static string containing gravestone text
2131	* Moved from apply.c to player.c - player.c is what
2132	* actually uses this function. player.c may not be quite the
2133	* best, a misc file for object actions is probably better,
2134	* but there isn't one in the server directory.
2135	*/
2136	const char *
2137	gravestone_text (object *op)
2138	{
2139	static dynbuf_text buf;
2140
2141	buf << "---- R.I.P. ----\n\n"
2142	<< op->name;
2143
2144	if (op->type == PLAYER)
2145	buf << " the " << op->contr->title;
2146
2147	buf << "\n\n";
2148
2149	buf << "who was level ";
2150	buf << (sint32)op->level << "\n\n" // OO breakdown
2151	<< " when " << (op->contr ? "killed" : "died") << "\n\n";
2152
2153	if (op->type == PLAYER)
2154	buf << "by " << op->contr->killer_name () << ".\n\n";
2155
2156	{
2157	static char buf2[128];
2158	time_t now = time (NULL);
2159	strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2160	buf << buf2;
2161	}
2162
2163	return buf;
2164	}
2165
2166	void	2183	void
2167	do_some_living (object *op)	2184	do_some_living (object *op)
2168	{	2185	{
2169	int last_food = op->stats.food;	2186	int last_food = op->stats.food;
2170	int gen_hp, gen_sp, gen_grace;	2187	int gen_hp, gen_sp, gen_grace;
2171	int over_hp, over_sp, over_grace;
2172	int i;
2173	int rate_hp = 1200;	2188	int rate_hp = 1200;
2174	int rate_sp = 2500;	2189	int rate_sp = 2500;
2175	int rate_grace = 2000;	2190	int rate_grace = 2000;
2176	const int max_hp = 1;	2191	const int max_hp = 1;
2177	const int max_sp = 1;	2192	const int max_sp = 1;
2178	const int max_grace = 1;	2193	const int max_grace = 1;
2179		2194
		2195	#if 0
2180	if (op->contr->hidden)	2196	if (op->contr->hidden)
2181	{	2197	{
2182	op->invisible = 1000;	2198	op->invisible = 1000;
2183	/* the socket code flashes the player visible/invisible	2199	/* the socket code flashes the player visible/invisible
2184	* depending on the value of invisible, so we need to	2200	* depending on the value of invisible, so we need to
2185	* alternate it here for it to work correctly.	2201	* alternate it here for it to work correctly.
2186	*/	2202	*/
2187	if (pticks & 2)	2203	if (server_tick & 2)
2188	op->invisible--;	2204	op->invisible--;
2189	}	2205	}
		2206	else
		2207	#endif
2190	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2208	if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2191	{	2209	{
2192	if (!op->invisible--)	2210	if (!op->invisible--)
2193	{	2211	{
2194	make_visible (op);	2212	make_visible (op);
2195	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2213	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2229	if (--op->last_grace < 0)	2247	if (--op->last_grace < 0)
2230	{	2248	{
2231	if (op->stats.grace < op->stats.maxgrace / 2)	2249	if (op->stats.grace < op->stats.maxgrace / 2)
2232	op->stats.grace++; /* no penalty in food for regaining grace */	2250	op->stats.grace++; /* no penalty in food for regaining grace */
2233		2251
		2252	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2253
2234	if (max_grace > 1)	2254	if (max_grace > 1)
2235	{	2255	{
2236	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2256	int over_grace = temp / rate_grace;
		2257
2237	if (over_grace > 0)	2258	if (over_grace > 0)
2238	{	2259	{
2239	op->stats.sp += over_grace	2260	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2240	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2241	op->last_grace = 0;	2261	op->last_grace = 0;
2242	}	2262	}
2243	else	2263	else
2244	{	2264	op->last_grace = rate_grace / temp;
2245	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2246	}
2247	}	2265	}
2248	else	2266	else
2249	{	2267	op->last_grace = rate_grace / temp;
2250	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2268
2251	}
2252	/* wearing stuff doesn't detract from grace generation. */	2269	/* wearing stuff doesn't detract from grace generation. */
2253	}	2270	}
2254		2271
2255	if (op->stats.food > 0)	2272	if (op->stats.food > 0)
2256	{	2273	{
…		…
2262	if (op->stats.sp < op->stats.maxsp)	2279	if (op->stats.sp < op->stats.maxsp)
2263	{	2280	{
2264	op->stats.sp++;	2281	op->stats.sp++;
2265		2282
2266	/* dms do not consume food */	2283	/* dms do not consume food */
2267	if (!QUERY_FLAG (op, FLAG_WIZ))	2284	if (!op->flag [FLAG_WIZ])
2268	{	2285	{
2269	op->stats.food--;	2286	op->stats.food--;
2270		2287
2271	if (op->contr->digestion < 0)	2288	if (op->contr->digestion < 0)
2272	op->stats.food += op->contr->digestion;	2289	op->stats.food += op->contr->digestion;
…		…
2275	}	2292	}
2276	}	2293	}
2277		2294
2278	if (max_sp > 1)	2295	if (max_sp > 1)
2279	{	2296	{
2280	over_sp = (gen_sp + 10) / rate_sp;	2297	int over_sp = (gen_sp + 10) / rate_sp;
2281	if (over_sp > 0)	2298	if (over_sp > 0)
2282	{	2299	{
2283	if (op->stats.sp < op->stats.maxsp)	2300	if (op->stats.sp < op->stats.maxsp)
2284	{	2301	{
2285	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2302	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2306	if (op->stats.hp < op->stats.maxhp)	2323	if (op->stats.hp < op->stats.maxhp)
2307	{	2324	{
2308	op->stats.hp++;	2325	op->stats.hp++;
2309		2326
2310	/* dms do not consume food */	2327	/* dms do not consume food */
2311	if (!QUERY_FLAG (op, FLAG_WIZ))	2328	if (!op->flag [FLAG_WIZ])
2312	{	2329	{
2313	op->stats.food--;	2330	op->stats.food--;
2314		2331
2315	if (op->contr->digestion < 0)	2332	if (op->contr->digestion < 0)
2316	op->stats.food += op->contr->digestion;	2333	op->stats.food += op->contr->digestion;
2317	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2334	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2318	op->stats.food = last_food;	2335	op->stats.food = last_food;
2319	}	2336	}
2320	}	2337	}
2321		2338
		2339	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2340
2322	if (max_hp > 1)	2341	if (max_hp > 1)
2323	{	2342	{
2324	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2343	int over_hp = temp / rate_hp;
2325		2344
2326	if (over_hp > 0)	2345	if (over_hp > 0)
2327	{	2346	{
2328	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2347	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2329	op->last_heal = 0;	2348	op->last_heal = 0;
2330	}	2349	}
2331	else	2350	else
2332	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2351	op->last_heal = rate_hp / temp;
2333	}	2352	}
2334	else	2353	else
2335	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2354	op->last_heal = rate_hp / temp;
2336	}	2355	}
2337	}	2356	}
2338		2357
2339	/* Digestion */	2358	/* Digestion */
2340	if (--op->last_eat < 0)	2359	if (--op->last_eat < 0)
…		…
2343	penalty = max (0, -op->contr->digestion);	2362	penalty = max (0, -op->contr->digestion);
2344		2363
2345	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);	2364	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2346		2365
2347	/* dms do not consume food */	2366	/* dms do not consume food */
2348	if (!QUERY_FLAG (op, FLAG_WIZ))	2367	if (!op->flag [FLAG_WIZ])
2349	op->stats.food--;	2368	op->stats.food--;
2350	}	2369	}
2351		2370
2352	if (op->stats.food < 0 && op->stats.hp >= 0)	2371	if (op->stats.food < 0 && op->stats.hp >= 0)
2353	{	2372	{
2354	object *flesh = 0;	2373	object *flesh = 0;
2355		2374
2356	for_inv_removable (op, tmp)	2375	for_inv_removable (op, tmp)
2357	{	2376	{
2358	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2377	if (tmp->flag [FLAG_UNPAID])
2359	continue;	2378	continue;
2360		2379
2361	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)	2380	if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2362	{	2381	{
2363	op->statusmsg ("You blindly grab for a bite of food. "	2382	op->statusmsg ("You blindly grab for a bite of food. "
2364	"H<To prevent you from starving, you ate some random item from your backpack.>");	2383	"H<To prevent you from starving, you ate some random item from your backpack.>");
2365	manual_apply (op, tmp, 0);	2384	op->apply (tmp);
2366		2385
2367	if (op->stats.food >= 0 || op->stats.hp < 0)	2386	if (op->stats.food >= 0 || op->stats.hp < 0)
2368	break;	2387	break;
2369	}	2388	}
2370	else if (tmp->type == FLESH)	2389	else if (tmp->type == FLESH)
…		…
2376	*/	2395	*/
2377	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)	2396	if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2378	{	2397	{
2379	op->statusmsg ("You blindly grab for a bite of food. "	2398	op->statusmsg ("You blindly grab for a bite of food. "
2380	"H<To prevent you from starving, you ate some random item from your backpack.>");	2399	"H<To prevent you from starving, you ate some random item from your backpack.>");
2381	manual_apply (op, flesh, 0);	2400	op->apply (flesh);
2382	}	2401	}
2383		2402
2384	// If player is still starving, alert him!	2403	// If player is still starving, alert him!
2385	if (op->stats.food < 0)	2404	if (op->stats.food < 0)
2386	op->failmsg ("You are starving! "	2405	op->failmsg ("You are starving! "
…		…
2398	op->contr->killer->destroy ();	2417	op->contr->killer->destroy ();
2399	}	2418	}
2400	}	2419	}
2401		2420
2402	/* killer should be set here already */	2421	/* killer should be set here already */
2403	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2422	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2404	kill_player (op);	2423	kill_player (op);
2405	}	2424	}
2406	}	2425	}
2407		2426
2408	/* If the player should die (lack of hp, food, etc), we call this.	2427	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2423	return;	2442	return;
2424		2443
2425	dynbuf_text deathtab;	2444	dynbuf_text deathtab;
2426		2445
2427	/* restore player */	2446	/* restore player */
2428	at = archetype::find ("poisoning");	2447	at = archetype::find (shstr_poisoning);
2429	if (object *tmp = present_arch_in_ob (at, op))	2448	if (object *tmp = present_arch_in_ob (at, op))
2430	{	2449	{
2431	tmp->destroy ();	2450	tmp->destroy ();
2432	deathtab << "Your body feels cleansed...\r";	2451	deathtab << "Your body feels cleansed...\r";
2433	}	2452	}
2434		2453
2435	at = archetype::find ("confusion");	2454	at = archetype::find (shstr_confusion);
2436	if (object *tmp = present_arch_in_ob (at, op))	2455	if (object *tmp = present_arch_in_ob (at, op))
2437	{	2456	{
2438	tmp->destroy ();	2457	tmp->destroy ();
2439	deathtab << "Your mind feels clearer...\r";	2458	deathtab << "Your mind feels clearer...\r";
2440	}	2459	}
…		…
2442	cure_disease (op, 0, 0); /* remove any disease */	2461	cure_disease (op, 0, 0); /* remove any disease */
2443		2462
2444	max_it (op->stats.hp , op->stats.maxhp);	2463	max_it (op->stats.hp , op->stats.maxhp);
2445	max_it (op->stats.sp , op->stats.maxsp);	2464	max_it (op->stats.sp , op->stats.maxsp);
2446	max_it (op->stats.grace, op->stats.maxgrace);	2465	max_it (op->stats.grace, op->stats.maxgrace);
2447
2448	if (op->stats.food <= 0)	2466	max_it (op->stats.food , 200);
2449	op->stats.food = 999;
2450		2467
2451	// remove all spell effects that are active	2468	// remove all spell effects that are active
2452	// to avoid long-term effects such as word-of-recall	2469	// to avoid long-term effects such as word-of-recall
2453	for (object *item = op->inv; item; )	2470	for (object *item = op->inv; item; )
2454	{	2471	{
…		…
2467	if (op_on_battleground (op, &x, &y))	2484	if (op_on_battleground (op, &x, &y))
2468	{	2485	{
2469	deathtab << "You almost died in combat, but local medics have saved your life...\r";	2486	deathtab << "You almost died in combat, but local medics have saved your life...\r";
2470		2487
2471	/* create a bodypart-trophy to make the winner happy */	2488	/* create a bodypart-trophy to make the winner happy */
2472	if (object *tmp = arch_to_object (archetype::find ("finger")))	2489	object *tmp = archetype::find (shstr_finger)->instance ();
2473	{	2490
2474	tmp->name = format ("%s's finger" , &op->name);	2491	tmp->name = format ("%s's finger" , &op->name);
2475	tmp->name_pl = format ("%s's fingers", &op->name);	2492	tmp->name_pl = format ("%s's fingers", &op->name);
2476	tmp->msg = format (	2493	tmp->msg = format (
2477	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",	2494	"This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2478	&op->name, op->contr->title,	2495	&op->name, op->contr->title,
2479	(int)op->level,	2496	(int)op->level,
2480	op->contr->killer_name ()	2497	op->contr->killer_name ()
2481	);	2498	);
2482	tmp->value = 0, tmp->type = 0;	2499	tmp->value = 0, tmp->type = 0;
2483	tmp->materialname = "organics";	2500	tmp->material = name_to_material (shstr_organic);
2484	tmp->insert_at (op, tmp);	2501	tmp->insert_at (op, tmp);
2485	}
2486		2502
2487	/* teleport defeated player to new destination */	2503	/* teleport defeated player to new destination */
2488	transfer_ob (op, x, y, 0, NULL);	2504	transfer_ob (op, x, y, 0, NULL);
2489	op->contr->braced = 0;	2505	op->contr->braced = 0;
2490		2506
…		…
2552	lost_a_stat = 1;	2568	lost_a_stat = 1;
2553	}	2569	}
2554	else	2570	else
2555	{	2571	{
2556	/* deplete a stat */	2572	/* deplete a stat */
2557	archetype *deparch = archetype::find ("depletion");	2573	archetype *deparch = archetype::find (shstr_depletion);
2558	object *dep;	2574	object *dep;
2559		2575
2560	dep = present_arch_in_ob (deparch, op);	2576	dep = present_arch_in_ob (deparch, op);
2561	if (!dep)	2577	if (!dep)
2562	{	2578	{
2563	dep = arch_to_object (deparch);	2579	dep = deparch->instance ();
2564	insert_ob_in_ob (dep, op);	2580	insert_ob_in_ob (dep, op);
2565	}	2581	}
2566	lose_this_stat = 1;	2582	lose_this_stat = 1;
2567	if (settings.balanced_stat_loss)	2583	if (settings.balanced_stat_loss)
2568	{	2584	{
…		…
2606	* difference.	2622	* difference.
2607	*/	2623	*/
2608	if (this_stat >= -50)	2624	if (this_stat >= -50)
2609	{	2625	{
2610	change_attr_value (&(dep->stats), i, -1);	2626	change_attr_value (&(dep->stats), i, -1);
2611	SET_FLAG (dep, FLAG_APPLIED);	2627	dep->set_flag (FLAG_APPLIED);
2612	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2628	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2613	op->update_stats ();	2629	op->update_stats ();
2614	lost_a_stat = 1;	2630	lost_a_stat = 1;
2615	}	2631	}
2616	}	2632	}
…		…
2634	#endif	2650	#endif
2635		2651
2636	/* Put a gravestone up where the character 'almost' died. List the	2652	/* Put a gravestone up where the character 'almost' died. List the
2637	* exp loss on the stone.	2653	* exp loss on the stone.
2638	*/	2654	*/
2639	tmp = arch_to_object (archetype::find ("gravestone"));	2655	tmp = archetype::find (shstr_gravestone)->instance ();
2640	tmp->name = format ("%s's gravestone", &op->name);	2656	tmp->name = format ("%s's gravestone", &op->name);
2641	tmp->name_pl = format ("%s's gravestones", &op->name);	2657	tmp->name_pl = format ("%s's gravestones", &op->name);
2642	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",	2658	tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2643	&op->name, op->contr->title, op->contr->killer_name ());	2659	&op->name, op->contr->title, op->contr->killer_name ());
2644	tmp->x = op->x, tmp->y = op->y;	2660	tmp->x = op->x, tmp->y = op->y;
…		…
2683	if (will_kill_again)	2699	if (will_kill_again)
2684	{	2700	{
2685	object *force;	2701	object *force;
2686	int at;	2702	int at;
2687		2703
2688	force = get_archetype (FORCE_NAME);	2704	force = archetype::get (FORCE_NAME);
2689	/* 50 ticks should be enough time for the spell to abate */	2705	/* 50 ticks should be enough time for the spell to abate */
2690	force->speed = 0.1f;
2691	force->speed_left = -5.f;	2706	force->speed_left = -5.f;
2692	SET_FLAG (force, FLAG_APPLIED);	2707	force->set_speed (0.1f);
		2708	force->set_flag (FLAG_APPLIED);
		2709
2693	for (at = 0; at < NROFATTACKS; at++)	2710	for (at = 0; at < NROFATTACKS; at++)
2694	if (will_kill_again & (1 << at))	2711	if (will_kill_again & (1 << at))
2695	force->resist[at] = 100;	2712	force->resist[at] = 100;
2696		2713
2697	insert_ob_in_ob (force, op);	2714	insert_ob_in_ob (force, op);
…		…
2699	}	2716	}
2700		2717
2701	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);	2718	op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2702	}	2719	}
2703		2720
2704	void	2721	static void
2705	loot_object (object *op)	2722	loot_object (object *op)
2706	{ /* Grab and destroy some treasure */	2723	{ /* Grab and destroy some treasure */
2707	object *tmp, *tmp2, *next;	2724	object *tmp, *next;
2708		2725
2709	op->close_container (); /* close open sack first */	2726	op->close_container (); /* close open sack first */
2710		2727
2711	for (tmp = op->inv; tmp; tmp = next)	2728	for (tmp = op->inv; tmp; tmp = next)
2712	{	2729	{
…		…
2719	tmp->x = op->x, tmp->y = op->y;	2736	tmp->x = op->x, tmp->y = op->y;
2720		2737
2721	if (tmp->type == CONTAINER)	2738	if (tmp->type == CONTAINER)
2722	loot_object (tmp); /* empty container to ground */	2739	loot_object (tmp); /* empty container to ground */
2723		2740
2724	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))	2741	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP] || !(rndm (3))))
2725	{	2742	{
2726	if (tmp->nrof > 1)	2743	if (tmp->nrof > 1)
2727	{	2744	{
2728	tmp->decrease (rndm (1, tmp->nrof - 1));	2745	tmp->decrease (rndm (1, tmp->nrof - 1));
2729	insert_ob_in_map (tmp, op->map, NULL, 0);	2746	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2740	* fix_weight(): Check recursively the weight of all players, and fix	2757	* fix_weight(): Check recursively the weight of all players, and fix
2741	* what needs to be fixed. Refresh windows and fix speed if anything	2758	* what needs to be fixed. Refresh windows and fix speed if anything
2742	* was changed.	2759	* was changed.
2743	*/	2760	*/
2744	void	2761	void
2745	fix_weight (void)	2762	fix_weight ()
2746	{	2763	{
2747	for_all_players (pl)	2764	for_all_players (pl)
2748	{	2765	{
2749	sint32 old = pl->ob->carrying;	2766	weight_t old = pl->ob->carrying;
2750		2767
2751	pl->ob->update_weight ();	2768	pl->ob->update_weight ();
2752		2769
2753	if (old != pl->ob->carrying)	2770	if (old != pl->ob->carrying)
2754	{	2771	{
…		…
2757	}	2774	}
2758	}	2775	}
2759	}	2776	}
2760		2777
2761	void	2778	void
2762	fix_luck (void)	2779	fix_luck ()
2763	{	2780	{
2764	for_all_players (pl)	2781	for_all_players (pl)
2765	if (!pl->ob->contr->ns->state)	2782	if (!pl->ob->contr->ns->state)
2766	pl->ob->change_luck (0);	2783	pl->ob->change_luck (0);
2767	}	2784	}
…		…
2819	}	2836	}
2820		2837
2821	int	2838	int
2822	is_true_undead (object *op)	2839	is_true_undead (object *op)
2823	{	2840	{
2824	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2841	if (op->arch->flag [FLAG_UNDEAD])
2825	return 1;	2842	return 1;
2826		2843
2827	return 0;	2844	return 0;
2828	}	2845	}
2829		2846
…		…
2927		2944
2928	if (who->type == PLAYER)	2945	if (who->type == PLAYER)
2929	player = 1;	2946	player = 1;
2930		2947
2931	else	2948	else
2932	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2949	friendly = who->flag [FLAG_FRIENDLY];
2933		2950
2934	/* search adjacent squares */	2951	/* search adjacent squares */
2935	for (i = 1; i < 9; i++)	2952	for (i = 1; i < 9; i++)
2936	{	2953	{
2937	x = who->x + freearr_x[i];	2954	x = who->x + freearr_x[i];
…		…
2946	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2963	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
2947	continue;	2964	continue;
2948		2965
2949	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2966	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
2950	{	2967	{
2951	if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2968	if ((player ||friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
2952	return 1;	2969	return 1;
2953	else if (tmp->type == PLAYER)	2970	else if (tmp->type == PLAYER)
2954	{
2955	/*don't let a hidden DM prevent you from hiding */
2956	if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
2957	return 1;	2971	return 1;
2958	}
2959	}	2972	}
2960	}	2973	}
2961	return 0;	2974	return 0;
2962	}	2975	}
2963		2976
2964	/* check the player los field for viewability of the	2977	/* check the player los field for viewability of the
2965	* object op. This function works fine for monsters,	2978	* object op. This function works fine for monsters,
2966	* but we dont worry if the object isnt the top one in	2979	* but we dont worry if the object isnt the top one in
2967	* a pile (say a coin under a table would return "viewable"	2980	* a pile (say a coin under a table would return "viewable"
2968	* by this routine). Another question, should we be	2981	* by this routine). Another question, should we be
2969	* concerned with the direction the player is looking	2982	* concerned with the direction the player is looking
2970	* in? Realistically, most of us can't see stuff behind	2983	* in? Realistically, most of us can't see stuff behind
2971	* our backs...on the other hand, does the "facing" direction	2984	* our backs...on the other hand, does the "facing" direction
2972	* imply the way your head, or body is facing? It's possible	2985	* imply the way your head, or body is facing? It's possible
2973	* for them to differ. Sigh, this fctn could get a bit more complex.	2986	* for them to differ. Sigh, this fctn could get a bit more complex.
2974	* -b.t.	2987	* -b.t.
2975	* This function is now map tiling safe.	2988	* This function is now map tiling safe.
2976	*/	2989	*/
2977	int	2990	int
2978	player_can_view (object *pl, object *op)	2991	player_can_view (object *pl, object *op)
2979	{	2992	{
…		…
3006		3019
3007	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)	3020	if (pl->contr->blocked_los (dx, dy) != LOS_BLOCKED)
3008	return 1;	3021	return 1;
3009		3022
3010	op = op->more;	3023	op = op->more;
3011	}
3012
3013	return 0;
3014	}
3015
3016	/* routine for both players and monsters. We call this when
3017	* there is a possibility for our action distrubing our hiding
3018	* place or invisiblity spell. Artefact invisiblity causes
3019	* "noise" instead. If we arent invisible to begin with, we
3020	* return 0.
3021	*/
3022	int
3023	action_makes_visible (object *op)
3024	{
3025	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3026	{
3027	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3028	{
3029	// artefact invisibility is permanent, but we still make noise
3030	// this is important for game-balance.
3031	if (op->contr)
3032	op->make_noise ();
3033
3034	return 0;
3035	}
3036
3037	if (op->contr && op->contr->tmp_invis == 0)
3038	return 0;
3039
3040	/* If monsters, they should become visible */
3041	if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3042	{
3043	new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3044	return 1;
3045	}
3046	}	3024	}
3047		3025
3048	return 0;	3026	return 0;
3049	}	3027	}
3050		3028
…		…
3065	* and the exit-coordinates sp/hp must both be > 0.	3043	* and the exit-coordinates sp/hp must both be > 0.
3066	* => The intention here is to prevent abuse of the battleground-	3044	* => The intention here is to prevent abuse of the battleground-
3067	* feature (like pickable or hidden battleground tiles). */	3045	* feature (like pickable or hidden battleground tiles). */
3068	for (object *tmp = op->below; tmp; tmp = tmp->below)	3046	for (object *tmp = op->below; tmp; tmp = tmp->below)
3069	{	3047	{
3070	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3048	if (tmp->flag [FLAG_IS_FLOOR])
3071	{	3049	{
3072	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3050	if (tmp->flag [FLAG_NO_PICK]
3073	&& tmp->type == BATTLEGROUND	3051	&& tmp->type == BATTLEGROUND
3074	&& tmp->name == shstr_battleground	3052	&& tmp->name == shstr_battleground
3075	&& EXIT_X (tmp) && EXIT_Y (tmp))	3053	&& EXIT_X (tmp) && EXIT_Y (tmp))
3076	{	3054	{
3077	/* before we assign the exit, check if this is a teambattle */	3055	/* before we assign the exit, check if this is a teambattle */
3078	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))	3056	if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3079	{
3080	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)	3057	for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
		3058	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3081	{	3059	{
3082	if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3083	{
3084	if (x && y)	3060	if (x && y)
3085	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);	3061	*x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3086		3062
3087	return 1;	3063	return 1;
3088	}
3089	}	3064	}
3090	}
3091		3065
3092	if (x && y)	3066	if (x && y)
3093	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);	3067	*x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3094		3068
3095	return 1;	3069	return 1;
…		…
3233	else	3207	else
3234	j = 1;	3208	j = 1;
3235	strcat (buf, spellpathnames[i]);	3209	strcat (buf, spellpathnames[i]);
3236	}	3210	}
3237	}	3211	}
		3212
3238	strcat (buf, ".");	3213	strcat (buf, ".");
3239	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);	3214	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3240	}	3215	}
3241		3216
3242	/* evtl. adding flags: */	3217	/* evtl. adding flags: */
3243	if (QUERY_FLAG (item, FLAG_XRAYS))	3218	if (item->flag [FLAG_XRAYS])
3244	SET_FLAG (skin, FLAG_XRAYS);	3219	skin->set_flag (FLAG_XRAYS);
3245	if (QUERY_FLAG (item, FLAG_STEALTH))	3220	if (item->flag [FLAG_STEALTH])
3246	SET_FLAG (skin, FLAG_STEALTH);	3221	skin->set_flag (FLAG_STEALTH);
3247	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3222	if (item->flag [FLAG_SEE_IN_DARK])
3248	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3223	skin->set_flag (FLAG_SEE_IN_DARK);
3249		3224
3250	/* print message if there is one */	3225	/* print message if there is one */
3251	if (item->msg != NULL)	3226	if (item->msg != NULL)
3252	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);	3227	new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3253	}	3228	}
3254	else	3229	else
3255	{	3230	{
3256	/* generate misc. treasure */	3231	/* generate misc. treasure */
3257	tmp = arch_to_object (tr->item);	3232	tmp = tr->item->instance ();
3258	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));	3233	new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3259	who->insert (tmp);	3234	who->insert (tmp);
3260	}	3235	}
3261	}	3236	}
3262		3237
3263	/**	3238	//-GPL
3264	* Unready an object for a player. This function does nothing if the object was
3265	* not readied.
3266	*/
3267	void
3268	player_unready_range_ob (player *pl, object *ob)
3269	{
3270	if (pl->ob->current_weapon == ob)
3271	pl->ob->current_weapon = 0;
3272
3273	if (pl->combat_ob == ob)
3274	pl->combat_ob = 0;
3275
3276	if (pl->ranged_ob == ob)
3277	pl->ranged_ob = 0;
3278	}
3279		3239
3280	sint8	3240	sint8
3281	player::darkness_at (maptile *map, int x, int y) const	3241	player::darkness_at (maptile *map, int x, int y) const
3282	{	3242	{
3283	if (!ns)	3243	if (!ns)
…		…
3310	{	3270	{
3311	play_sound (sound_find ("generic_failure"));	3271	play_sound (sound_find ("generic_failure"));
3312	statusmsg (msg, color);	3272	statusmsg (msg, color);
3313	}	3273	}
3314		3274
		3275	void
		3276	object::failmsgf (const char *format, ...)
		3277	{
		3278	if (!contr)
		3279	return;
		3280
		3281	va_list ap;
		3282	va_start (ap, format);
		3283	contr->failmsg (vformat (format, ap));
		3284	va_end (ap);
		3285	}
		3286
		3287	void
		3288	player::failmsgf (const char *format, ...)
		3289	{
		3290	va_list ap;
		3291	va_start (ap, format);
		3292	failmsg (vformat (format, ap));
		3293	va_end (ap);
		3294	}
		3295

Diff Legend

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