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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.268 by root, Wed Apr 7 19:54:45 2010 UTC vs.
Revision 1.301 by root, Sat Nov 17 23:40:04 2018 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
		4	* Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7	*	8	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	9	* 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	10	* 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	11	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	12	* option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	17	* GNU General Public License for more details.
17	*	18	*
18	* You should have received a copy of the Affero GNU General Public License	19	* 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	20	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	21	* <http://www.gnu.org/licenses/>.
21	*	22	*
22	* The authors can be reached via e-mail to <support@deliantra.net>	23	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	24	*/
24		25
25	//+GPL	26	//+GPL
		27
		28	#include <algorithm>
		29	#include <functional>
26		30
27	#include <global.h>	31	#include <global.h>
28	#include <sproto.h>	32	#include <sproto.h>
29	#include <sounds.h>	33	#include <sounds.h>
30	#include <living.h>	34	#include <living.h>
31	#include <object.h>	35	#include <object.h>
32	#include <spells.h>	36	#include <spells.h>
33	#include <skills.h>	37	#include <skills.h>
34		38
35	#include <algorithm>
36	#include <functional>
37
38	playervec players;	39	playervec players;
39		40
40	/* This loads the first map an puts the player on it. */	41	/* This loads the first map an puts the player on it. */
41	static void	42	static void
42	set_first_map (object *op)	43	set_first_map (object *op)
54		55
55	players.insert (this);	56	players.insert (this);
56	ob->remove ();	57	ob->remove ();
57	ob->map = 0;	58	ob->map = 0;
58	ob->activate_recursive ();	59	ob->activate_recursive ();
59	CLEAR_FLAG (ob, FLAG_FRIENDLY);	60	ob->clr_flag (FLAG_FRIENDLY);
60	add_friendly_object (ob);	61	add_friendly_object (ob);
61	}	62	}
62		63
63	void	64	void
64	player::deactivate ()	65	player::deactivate ()
…		…
126		127
127	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	128	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
128		129
129	esrv_new_player (this);	130	esrv_new_player (this);
130		131
131	ob->update_stats ();
132
133	ns->floorbox_update ();
134	esrv_send_inventory (ob, ob);
135	esrv_add_spells (this, 0);
136
137	ob->flag [FLAG_READY_WEAPON] = false;	132	ob->flag [FLAG_READY_WEAPON] = false;
138	ob->flag [FLAG_READY_SKILL] = false;	133	ob->flag [FLAG_READY_SKILL] = false;
139	ob->flag [FLAG_READY_RANGE] = false;	134	ob->flag [FLAG_READY_RANGE] = false;
140	ob->flag [FLAG_READY_BOW] = false;	135	ob->flag [FLAG_READY_BOW] = false;
141		136
142	ob->update_stats (); // we unapplied stuff above	137	ob->update_stats ();
		138
		139	ns->floorbox_update ();
		140	esrv_send_inventory (ob, ob);
		141	esrv_add_spells (this, 0);
		142
143	activate ();	143	activate ();
144		144
145	INVOKE_PLAYER (CONNECT, this);	145	INVOKE_PLAYER (CONNECT, this);
146	INVOKE_PLAYER (LOGIN, this);	146	INVOKE_PLAYER (LOGIN, this);
147	}	147	}
…		…
182	player::set_object (object *op)	182	player::set_object (object *op)
183	{	183	{
184	ob = observe = viewpoint = op;	184	ob = observe = viewpoint = op;
185	ob->contr = this; /* this aren't yet in archetype */	185	ob->contr = this; /* this aren't yet in archetype */
186		186
187	ob->speed = 1.0f;	187	ob->speed = 1.0f; // object still inactive, keep it that way
188	ob->speed_left = 0.5f;	188	ob->speed_left = 0.5f;
189		189
190	ob->direction = 5; /* So player faces south */	190	ob->direction = 5; /* So player faces south */
191	}	191	}
192		192
…		…
234	disconnect ();	234	disconnect ();
235		235
236	attachable::do_destroy ();	236	attachable::do_destroy ();
237		237
238	if (ob)	238	if (ob)
		239	{
		240	// potentially fix a bug where ob->contr is non-null while ob->contr->ob is null, causing a segfault.
		241	// temporarily backed out patchset 4025 to see if THIS change causes crashes
		242	//ob->contr = 0;
239	ob->destroy ();	243	ob->destroy ();
		244	}
240		245
241	ob = observe = viewpoint = 0;	246	ob = observe = viewpoint = 0;
242	}	247	}
243		248
244	player::~player ()	249	player::~player ()
…		…
328	#endif	333	#endif
329	return op;	334	return op;
330	}	335	}
331		336
332	/* I believe this can safely go to 2, 3 is questionable, 4 will likely	337	/* I believe this can safely go to 2, 3 is questionable, 4 will likely
333	* result in a monster paths backtracking. It basically determines how large a	338	* result in a monster paths backtracking. It basically determines how large a
334	* detour a monster will take from the direction path when looking	339	* detour a monster will take from the direction path when looking
335	* for a path to the player. The values are in the amount of direction	340	* for a path to the player. The values are in the amount of direction
336	* the deviation is	341	* the deviation is
337	*/	342	*/
338	#define DETOUR_AMOUNT 2	343	#define DETOUR_AMOUNT 2
…		…
374	*/	379	*/
375	int	380	int
376	path_to_player (object mon, object pl, unsigned mindiff)	381	path_to_player (object mon, object pl, unsigned mindiff)
377	{	382	{
378	rv_vector rv;	383	rv_vector rv;
379	sint16 x, y;
380	int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;	384	int dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES;
381	maptile m, lastmap;
382		385
383	get_rangevector (mon, pl, &rv, 0);	386	get_rangevector (mon, pl, &rv, 0);
384		387
385	if (rv.distance < mindiff)	388	if (rv.distance < mindiff)
386	return 0;	389	return 0;
387		390
388	x = mon->x;	391	mapxy pos (mon);
389	y = mon->y;
390	m = mon->map;
391	dir = rv.direction;	392	dir = rv.direction;
392	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	393	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
393	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	394	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
394		395
395	/* If we can't solve it within the search distance, return now. */	396	/* If we can't solve it within the search distance, return now. */
396	if (diff > max)	397	if (diff > max)
397	return 0;	398	return 0;
398		399
399	while (diff > 1 && max > 0)	400	while (diff > 1 && max > 0)
400	{	401	{
401	lastx = x;	402	mapxy lastpos = pos;
402	lasty = y;
403	lastmap = m;
404	x = lastx + freearr_x[dir];
405	y = lasty + freearr_y[dir];
406		403
407	mflags = get_map_flags (m, &m, x, y, &x, &y);	404	pos.move (dir);
408	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
409		405
410	/* Space is blocked - try changing direction a little */	406	/* Space is blocked - try changing direction a little */
411	if ((mflags & P_OUT_OF_MAP) \|\| ((OB_TYPE_MOVE_BLOCK (mon, blocked) \|\| (mflags & P_BLOCKSVIEW))	407	if (!pos.normalise ()
412	&& (m == mon->map && blocked_link (mon, m, x, y))))	408	\|\| (((pos->flags () & P_BLOCKSVIEW) \|\| OB_TYPE_MOVE_BLOCK (mon, pos->move_block))
		409	&& blocked_link (mon, pos.m, pos.x, pos.y)))
413	{	410	{
414	/* recalculate direction from last good location. Possible	411	/* recalculate direction from last good location. Possible
415	* we were not traversing ideal location before.	412	* we were not traversing ideal location before.
416	*/	413	*/
417	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	414	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
418	if (rv.direction != dir)	415	if (rv.direction != dir)
419	{	416	{
420	/* OK - says direction should be different - lets reset the	417	/* OK - says direction should be different - lets reset the
421	* the values so it will try again.	418	* the values so it will try again.
422	*/	419	*/
423	x = lastx;
424	y = lasty;
425	m = lastmap;	420	pos = lastpos;
426	dir = firstdir = rv.direction;	421	dir = firstdir = rv.direction;
427	}	422	}
428	else	423	else
429	{	424	{
430	/* direct path is blocked - try taking a side step to	425	/* direct path is blocked - try taking a side step to
431	* either the left or right.	426	* either the left or right.
432	* Note increase the values in the loop below to be	427	* Note increase the values in the loop below to be
433	* more than -1/1 respectively will mean the monster takes	428	* more than -1/1 respectively will mean the monster takes
434	* bigger detour. Have to be careful about these values getting	429	* bigger detour. Have to be careful about these values getting
435	* too big (3 or maybe 4 or higher) as the monster may just try	430	* too big (3 or maybe 4 or higher) as the monster may just try
436	* stepping back and forth	431	* stepping back and forth
437	*/	432	*/
438	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	433	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
439	{	434	{
440	if (i == 0)	435	if (i == 0)
441	continue; /* already did this, so skip it */	436	continue; /* already did this, so skip it */
		437
442	/* Use lastdir here - otherwise,	438	/* Use lastdir here - otherwise,
443	* since the direction that the creature should move in	439	* since the direction that the creature should move in
444	* may change, you could get infinite loops.	440	* may change, you could get infinite loops.
445	* ie, player is northwest, but monster can only	441	* ie, player is northwest, but monster can only
446	* move west, so it does that. It goes some distance,	442	* move west, so it does that. It goes some distance,
…		…
448	* can't do that, but now finds it can move east, and	444	* can't do that, but now finds it can move east, and
449	* gets back to its original point. lastdir contains	445	* gets back to its original point. lastdir contains
450	* the last direction the creature has successfully	446	* the last direction the creature has successfully
451	* moved.	447	* moved.
452	*/	448	*/
453
454	x = lastx + freearr_x[absdir (lastdir + i)];
455	y = lasty + freearr_y[absdir (lastdir + i)];
456	m = lastmap;	449	pos = lastpos;
457	mflags = get_map_flags (m, &m, x, y, &x, &y);	450	pos.move (absdir (lastdir + i));
458	if (mflags & P_OUT_OF_MAP)	451
		452	if (!pos.normalise ())
459	continue;	453	continue;
460	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	454
461	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	455	mapspace &ms = *pos;
		456
		457	if (ms.flags () & P_BLOCKSVIEW)
462	continue;	458	continue;
463	if (mflags & P_BLOCKSVIEW)	459
		460	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
464	continue;	461	continue;
465		462
466	if (m == mon->map && blocked_link (mon, m, x, y))	463	if (blocked_link (mon, pos.m, pos.x, pos.y))
467	break;	464	break;
468	}	465	}
		466
469	/* go through entire loop without finding a valid	467	/* go through entire loop without finding a valid
470	* sidestep to take - thus, no valid path.	468	* sidestep to take - thus, no valid path.
471	*/	469	*/
472	if (i == (DETOUR_AMOUNT + 1))	470	if (i == DETOUR_AMOUNT + 1)
473	return 0;	471	return 0;
		472
474	diff--;	473	diff--;
475	lastdir = dir;	474	lastdir = dir;
476	max--;	475	max--;
477	if (!firstdir)	476	if (!firstdir)
478	firstdir = dir + i;	477	firstdir = dir + i;
…		…
482	{	481	{
483	/* we moved towards creature, so diff is less */	482	/* we moved towards creature, so diff is less */
484	diff--;	483	diff--;
485	max--;	484	max--;
486	lastdir = dir;	485	lastdir = dir;
		486
487	if (!firstdir)	487	if (!firstdir)
488	firstdir = dir;	488	firstdir = dir;
489	}	489	}
490		490
491	if (diff <= 1)	491	if (diff <= 1)
492	{	492	{
493	/* Recalculate diff (distance) because we may not have actually	493	/* Recalculate diff (distance) because we may not have actually
494	* headed toward player for entire distance.	494	* headed toward player for entire distance.
495	*/	495	*/
496	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	496	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
497	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	497	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
498	}	498	}
499		499
500	if (diff > max)	500	if (diff > max)
501	return 0;	501	return 0;
…		…
517	for (object next, op = pl->inv; op; op = next)	517	for (object next, op = pl->inv; op; op = next)
518	{	518	{
519	next = op->below;	519	next = op->below;
520		520
521	/* Forces get applied per default, unless they have the	521	/* Forces get applied per default, unless they have the
522	* flag "neutral" set. Sorry but I can't think of a better way	522	* flag "neutral" set. Sorry but I can't think of a better way
523	*/	523	*/
524	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	524	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
525	SET_FLAG (op, FLAG_APPLIED);	525	op->set_flag (FLAG_APPLIED);
526		526
527	/* we never give weapons/armour if these cannot be used	527	/* we never give weapons/armour if these cannot be used
528	* by this player due to race restrictions	528	* by this player due to race restrictions
529	*/	529	*/
530	if (pl->type == PLAYER)	530	if (pl->type == PLAYER)
531	{	531	{
532	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)	532	if ((!pl->flag [FLAG_USE_ARMOUR]
533	&&	533	&&
534	(op->type == ARMOUR \|\| op->type == BOOTS	534	(op->type == ARMOUR \|\| op->type == BOOTS
535	\|\| op->type == CLOAK \|\| op->type == HELMET	535	\|\| op->type == CLOAK \|\| op->type == HELMET
536	\|\| op->type == SHIELD \|\| op->type == GLOVES	536	\|\| op->type == SHIELD \|\| op->type == GLOVES
537	\|\| op->type == BRACERS \|\| op->type == GIRDLE))	537	\|\| op->type == BRACERS \|\| op->type == GIRDLE))
538	\|\| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	538	\|\| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
539	{	539	{
540	op->destroy ();	540	op->destroy ();
541	continue;	541	continue;
542	}	542	}
543	}	543	}
544		544
545	/* Here we remove duplicated skills (as duplicated spell objects have	545	/* Here we remove duplicated skills (as duplicated spell objects have
546	* _very_ confusing effects for players), which could for instance be	546	* _very_ confusing effects for players), which could for instance be
547	* generated by bad treasurelists. - elmex	547	* generated by multiple treasurelists specifying the same skills.
548	*/	548	*/
549	if (op->type == SKILL)	549	if (op->type == SKILL)
550	{	550	{
551	for (object *tmp = op->below; tmp; tmp = tmp->below)	551	for (object *tmp = op->below; tmp; tmp = tmp->below)
552	if (tmp->type == op->type && tmp->name == op->name)	552	if (tmp->type == op->type && tmp->name == op->name)
553	{	553	{
554	op->destroy ();	554	op->destroy ();
555	LOG (llevError,
556	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
557	break;	555	break;
558	}	556	}
559		557
560	if (op->nrof > 1)	558	if (op->nrof > 1)
561	op->nrof = 1;	559	op->nrof = 1;
562	}	560	}
563		561
564	if (op->type == SPELLBOOK && op->inv)	562	if (op->type == SPELLBOOK && op->inv)
565	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	563	op->inv->clr_flag (FLAG_STARTEQUIP);
566		564
567	/* Give starting characters identified, uncursed, and undamned	565	/* Give starting characters identified, uncursed, and undamned
568	* items. Just don't identify gold or silver, or it won't be	566	* items. Just don't identify gold or silver, or it won't be
569	* merged properly.	567	* merged properly.
570	*/	568	*/
571	if (need_identify (op))	569	if (op->need_identify ())
572	{	570	{
573	SET_FLAG (op, FLAG_IDENTIFIED);	571	op->set_flag (FLAG_IDENTIFIED);
574	CLEAR_FLAG (op, FLAG_CURSED);	572	op->clr_flag (FLAG_CURSED);
575	CLEAR_FLAG (op, FLAG_DAMNED);	573	op->clr_flag (FLAG_DAMNED);
576	}	574	}
577		575
578	if (op->type == SPELL)	576	if (op->type == SPELL)
579	{	577	{
580	op->destroy ();	578	op->destroy ();
581	continue;	579	continue;
582	}	580	}
583	else if (op->type == SKILL)	581	else if (op->type == SKILL)
584	{	582	{
585	SET_FLAG (op, FLAG_CAN_USE_SKILL);	583	op->set_flag (FLAG_CAN_USE_SKILL);
586	op->stats.exp = 0;	584	op->stats.exp = 0;
587	op->level = 1;	585	op->level = 1;
588	}	586	}
589	else /* lock all 'normal items by default */	587	else /* lock all 'normal items by default */
590	SET_FLAG (op, FLAG_INV_LOCKED);	588	op->set_flag (FLAG_INV_LOCKED);
591	} /* for loop of objects in player inv */	589	} /* for loop of objects in player inv */
592		590
593	/* Need to set up the skill pointers */	591	/* Need to set up the skill pointers */
594	pl->contr->link_skills ();	592	pl->contr->link_skills ();
595	}	593	}
…		…
614	roll_stat ()	612	roll_stat ()
615	{	613	{
616	int a[4], i, j, k;	614	int a[4], i, j, k;
617		615
618	for (i = 0; i < 4; i++)	616	for (i = 0; i < 4; i++)
619	a[i] = (int) rndm (6) + 1;	617	a[i] = rndm (1, 6);
620		618
621	for (i = 0, j = 0, k = 7; i < 4; i++)	619	for (i = 0, j = 0, k = 7; i < 4; i++)
622	if (a[i] < k)	620	if (a[i] < k)
623	k = a[i], j = i;	621	k = a[i], j = i;
624		622
…		…
721	treasurelist *tl = treasurelist::find (shstr_starting_wealth);	719	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
722	if (tl)	720	if (tl)
723	create_treasure (tl, ob, 0, 0, 0);	721	create_treasure (tl, ob, 0, 0, 0);
724		722
725	INVOKE_PLAYER (BIRTH, ob->contr);	723	INVOKE_PLAYER (BIRTH, ob->contr);
726	INVOKE_PLAYER (LOGIN, ob->contr);
727		724
728	ob->contr->ns->state = ST_PLAYING;	725	ob->contr->ns->state = ST_PLAYING;
729		726
730	if (ob->msg)	727	if (ob->msg)
731	ob->msg = 0;	728	ob->msg = 0;
732		729
733	start_info (ob);	730	start_info (ob);
734	CLEAR_FLAG (ob, FLAG_WIZ);	731	ob->clr_flag (FLAG_WIZ);
735	give_initial_items (ob, ob->randomitems);	732	give_initial_items (ob, ob->randomitems);
736	esrv_send_inventory (ob, ob);	733	esrv_send_inventory (ob, ob);
737	ob->update_stats ();	734	ob->update_stats ();
738		735
739	/* This moves the player to a different start map, if there	736	/* This moves the player to a different start map, if there
…		…
741	*/	738	*/
742	if (*first_map_ext_path)	739	if (*first_map_ext_path)
743	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);	740	ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
744	else	741	else
745	LOG (llevDebug, "first_map_ext_path not set\n");	742	LOG (llevDebug, "first_map_ext_path not set\n");
		743	}
		744
		745	/*
		746	* Returns true if the given player is a legal class.
		747	* The function to add and remove class-bonuses to the stats doesn't
		748	* check if the stat becomes negative, thus this function
		749	* merely checks that all stats are 1 or more, and returns
		750	* false otherwise.
		751	*/
		752	static int
		753	allowed_class (const object *op)
		754	{
		755	return op->stats.Dex > 0
		756	&& op->stats.Str > 0
		757	&& op->stats.Con > 0
		758	&& op->stats.Int > 0
		759	&& op->stats.Wis > 0
		760	&& op->stats.Pow > 0
		761	&& op->stats.Cha > 0;
746	}	762	}
747		763
748	void	764	void
749	player::chargen_race_next ()	765	player::chargen_race_next ()
750	{	766	{
…		…
788	rv_vector rv;	804	rv_vector rv;
789		805
790	if (op->stats.hp < 0)	806	if (op->stats.hp < 0)
791	{	807	{
792	LOG (llevDebug, "Fleeing player is dead.\n");	808	LOG (llevDebug, "Fleeing player is dead.\n");
793	CLEAR_FLAG (op, FLAG_SCARED);	809	op->clr_flag (FLAG_SCARED);
794	return;	810	return;
795	}	811	}
796		812
797	if (!op->enemy)	813	if (!op->enemy)
798	{	814	{
799	LOG (llevDebug, "Fleeing player had no enemy.\n");	815	LOG (llevDebug, "Fleeing player had no enemy.\n");
800	CLEAR_FLAG (op, FLAG_SCARED);	816	op->clr_flag (FLAG_SCARED);
801	return;	817	return;
802	}	818	}
803		819
804	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))	820	if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
805	{	821	{
806	op->enemy = NULL;	822	op->enemy = NULL;
807	CLEAR_FLAG (op, FLAG_SCARED);	823	op->clr_flag (FLAG_SCARED);
808	return;	824	return;
809	}	825	}
810		826
811	get_rangevector (op, op->enemy, &rv, 0);	827	get_rangevector (op, op->enemy, &rv, 0);
812		828
…		…
818	if (op->move (absdir (dir + diff * m)) \|\| (diff == 0 && op->move (absdir (dir - diff * m))))	834	if (op->move (absdir (dir + diff * m)) \|\| (diff == 0 && op->move (absdir (dir - diff * m))))
819	return;	835	return;
820	}	836	}
821		837
822	/* Cornered, get rid of scared */	838	/* Cornered, get rid of scared */
823	CLEAR_FLAG (op, FLAG_SCARED);	839	op->clr_flag (FLAG_SCARED);
824	op->enemy = NULL;	840	op->enemy = NULL;
825	}	841	}
826		842
827	/* check_pick sees if there is stuff to be picked up/picks up stuff.	843	/* check_pick sees if there is stuff to be picked up/picks up stuff.
828	* It returns 1 if the player should keep on moving, 0 if he should	844	* It returns 1 if the player should keep on moving, 0 if he should
…		…
920	* fighting */	936	* fighting */
921	if (op->contr->mode & PU_INHIBIT)	937	if (op->contr->mode & PU_INHIBIT)
922	return 1;	938	return 1;
923		939
924	/* prevent us from turning into auto-thieves :) */	940	/* prevent us from turning into auto-thieves :) */
925	if (QUERY_FLAG (tmp, FLAG_UNPAID))	941	if (tmp->flag [FLAG_UNPAID])
926	continue;	942	continue;
927		943
928	/* ignore known cursed objects */	944	/* ignore known cursed objects */
929	if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)	945	if (tmp->flag [FLAG_KNOWN_CURSED] && op->contr->mode & PU_NOT_CURSED)
930	continue;	946	continue;
931		947
932	/* all food and drink if desired */	948	/* all food and drink if desired */
933	/* question: don't pick up known-poisonous stuff? */	949	/* question: don't pick up known-poisonous stuff? */
934	if (op->contr->mode & PU_FOOD)	950	if (op->contr->mode & PU_FOOD)
…		…
937	CHK_PICK_PICKUP;	953	CHK_PICK_PICKUP;
938	continue;	954	continue;
939	}	955	}
940		956
941	if (op->contr->mode & PU_DRINK)	957	if (op->contr->mode & PU_DRINK)
942	if (tmp->type == DRINK \|\| (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))	958	if (tmp->type == DRINK \|\| (tmp->type == POISON && !tmp->flag [FLAG_KNOWN_CURSED]))
943	{	959	{
944	CHK_PICK_PICKUP;	960	CHK_PICK_PICKUP;
945	continue;	961	continue;
946	}	962	}
947		963
…		…
985	continue;	1001	continue;
986	}	1002	}
987		1003
988	/* pick up all magical items */	1004	/* pick up all magical items */
989	if (op->contr->mode & PU_MAGICAL)	1005	if (op->contr->mode & PU_MAGICAL)
990	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)	1006	if (tmp->flag [FLAG_KNOWN_MAGICAL]
991	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1007	&& !tmp->flag [FLAG_KNOWN_CURSED])
992	{	1008	{
993	CHK_PICK_PICKUP;	1009	CHK_PICK_PICKUP;
994	continue;	1010	continue;
995	}	1011	}
996		1012
…		…
1080	continue;	1096	continue;
1081	}	1097	}
1082		1098
1083	/* hoping to catch throwing daggers here */	1099	/* hoping to catch throwing daggers here */
1084	if (op->contr->mode & PU_MISSILEWEAPON)	1100	if (op->contr->mode & PU_MISSILEWEAPON)
1085	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1101	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1086	{	1102	{
1087	CHK_PICK_PICKUP;	1103	CHK_PICK_PICKUP;
1088	continue;	1104	continue;
1089	}	1105	}
1090		1106
…		…
1139	}	1155	}
1140		1156
1141	/* routine for both players and monsters. We call this when	1157	/* routine for both players and monsters. We call this when
1142	* there is a possibility for our action distrubing our hiding	1158	* there is a possibility for our action distrubing our hiding
1143	* place or invisiblity spell. Artefact invisiblity causes	1159	* place or invisiblity spell. Artefact invisiblity causes
1144	* "noise" instead. If we arent invisible to begin with, we	1160	* "noise" instead. If we arent invisible to begin with, we
1145	* return 0.	1161	* return 0.
1146	*/	1162	*/
1147	static int	1163	static int
1148	action_makes_visible (object *op)	1164	action_makes_visible (object *op)
1149	{	1165	{
1150	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	1166	if (op->invisible && op->flag [FLAG_ALIVE])
1151	{	1167	{
1152	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	1168	if (op->flag [FLAG_MAKE_INVIS])
1153	{	1169	{
1154	// artefact invisibility is permanent, but we still make noise	1170	// artefact invisibility is permanent, but we still make noise
1155	// this is important for game-balance.	1171	// this is important for game-balance.
1156	if (op->contr)	1172	if (op->contr)
1157	op->make_noise ();	1173	op->make_noise ();
…		…
1173	return 0;	1189	return 0;
1174	}	1190	}
1175		1191
1176	/*	1192	/*
1177	* Find an arrow in the inventory and after that	1193	* Find an arrow in the inventory and after that
1178	* in the right type container (quiver). Pointer to the	1194	* in the right type container (quiver). Pointer to the
1179	* found object is returned.	1195	* found object is returned.
1180	*/	1196	*/
1181	static object *	1197	static object *
1182	find_arrow (object op, const char type)	1198	find_arrow (object op, const char type)
1183	{	1199	{
1184	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1200	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1185	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1201	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1186	return splay (tmp);	1202	return splay (tmp);
1187		1203
1188	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1204	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1189	if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))	1205	if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && !strcmp (&tmp->race, type))
1190	if (object *arrow = find_arrow (tmp, type))	1206	if (object *arrow = find_arrow (tmp, type))
1191	{	1207	{
1192	splay (tmp);	1208	splay (tmp);
1193	return arrow;	1209	return arrow;
1194	}	1210	}
…		…
1211	if (!type)	1227	if (!type)
1212	return NULL;	1228	return NULL;
1213		1229
1214	for (arrow = op->inv; arrow; arrow = arrow->below)	1230	for (arrow = op->inv; arrow; arrow = arrow->below)
1215	{	1231	{
1216	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1232	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1217	{	1233	{
1218	i = 0;	1234	i = 0;
1219	ntmp = find_better_arrow (arrow, target, type, &i);	1235	ntmp = find_better_arrow (arrow, target, type, &i);
1220		1236
1221	if (i > betterby)	1237	if (i > betterby)
…		…
1302	y = op->y;	1318	y = op->y;
1303		1319
1304	/* find the first target */	1320	/* find the first target */
1305	for (i = 0, found = 0; i < 20; i++)	1321	for (i = 0, found = 0; i < 20; i++)
1306	{	1322	{
1307	x += freearr_x[dir];	1323	x += DIRX (dir);
1308	y += freearr_y[dir];	1324	y += DIRY (dir);
1309	mflags = get_map_flags (m, &m, x, y, &x, &y);	1325	mflags = get_map_flags (m, &m, x, y, &x, &y);
1310		1326
1311	if (mflags & P_OUT_OF_MAP \|\| mflags & P_BLOCKSVIEW)	1327	if (mflags & P_OUT_OF_MAP \|\| mflags & P_BLOCKSVIEW)
1312	{	1328	{
1313	tmp = 0;	1329	tmp = 0;
…		…
1322	break;	1338	break;
1323	}	1339	}
1324		1340
1325	if (mflags & P_IS_ALIVE)	1341	if (mflags & P_IS_ALIVE)
1326	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	1342	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1327	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1343	if (tmp->flag [FLAG_ALIVE])
1328	break;	1344	break;
1329	}	1345	}
1330		1346
1331	if (!tmp)	1347	if (!tmp)
1332	return find_arrow (op, type);	1348	return find_arrow (op, type);
…		…
1336		1352
1337	return find_better_arrow (op, tmp, type, &i);	1353	return find_better_arrow (op, tmp, type, &i);
1338	}	1354	}
1339		1355
1340	/*	1356	/*
1341	* Creature fires a bow - op can be monster or player. Returns	1357	* Creature fires a bow - op can be monster or player. Returns
1342	* 1 if bow was actually fired, 0 otherwise.	1358	* 1 if bow was actually fired, 0 otherwise.
1343	* op is the object firing the bow.	1359	* op is the object firing the bow.
1344	* part is for multipart creatures - the part firing the bow.	1360	* part is for multipart creatures - the part firing the bow.
1345	* dir is the direction of fire.	1361	* dir is the direction of fire.
1346	* wc_mod is any special modifier to give (used in special player fire modes)	1362	* wc_mod is any special modifier to give (used in special player fire modes)
…		…
1393	{	1409	{
1394	if (op->type == PLAYER)	1410	if (op->type == PLAYER)
1395	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);	1411	new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1396	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */	1412	/* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1397	else	1413	else
1398	CLEAR_FLAG (op, FLAG_READY_BOW);	1414	op->clr_flag (FLAG_READY_BOW);
1399		1415
1400	return 0;	1416	return 0;
1401	}	1417	}
1402	}	1418	}
1403		1419
…		…
1452	#endif	1468	#endif
1453		1469
1454	SET_ANIMATION (arrow, arrow->direction);	1470	SET_ANIMATION (arrow, arrow->direction);
1455		1471
1456	/* update the speed */	1472	/* update the speed */
1457	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1458	+ bow->stats.dam / 7.f;
1459		1473
1460	arrow->set_speed (max (arrow->speed, 2.f));
1461	arrow->speed_left = 0;	1474	arrow->speed_left = 0;
		1475	arrow->set_speed (max (2.f,
		1476	((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
		1477	+ bow->stats.dam / 7.f
		1478	));
1462		1479
1463	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;	1480	int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1464		1481
1465	if (op->type == PLAYER)	1482	if (op->type == PLAYER)
1466	{	1483	{
…		…
1487	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);	1504	arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1488		1505
1489	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1506	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1490	arrow->move_type = MOVE_FLY_LOW;	1507	arrow->move_type = MOVE_FLY_LOW;
1491	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1508	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
		1509	arrow->set_flag (FLAG_NO_PICK);
1492		1510
1493	op->play_sound (sound_find ("fire_arrow"));	1511	op->play_sound (sound_find ("fire_arrow"));
1494	m->insert (arrow, sx, sy, op);	1512	m->insert (arrow, sx, sy, op);
1495		1513
1496	if (!arrow->destroyed ())	1514	if (!arrow->destroyed ())
…		…
1521	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1539	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1522	}	1540	}
1523	else if (op->contr->bowtype == bow_threewide)	1541	else if (op->contr->bowtype == bow_threewide)
1524	{	1542	{
1525	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1543	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1526	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);	1544	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + DIRX (absdir (dir + 2)), op->y + DIRY (absdir (dir + 2)));
1527	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);	1545	ret \|= fire_bow (op, op, NULL, dir, -5, op->x + DIRX (absdir (dir - 2)), op->y + DIRY (absdir (dir - 2)));
1528	}	1546	}
1529	else if (op->contr->bowtype == bow_spreadshot)	1547	else if (op->contr->bowtype == bow_spreadshot)
1530	{	1548	{
1531	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1549	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1532	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);	1550	ret \|= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
…		…
1599		1617
1600	if (item->type == WAND)	1618	if (item->type == WAND)
1601	{	1619	{
1602	if (!(--item->stats.food))	1620	if (!(--item->stats.food))
1603	{	1621	{
1604	object *tmp;
1605
1606	if (item->arch)	1622	if (item->arch)
1607	{	1623	{
1608	CLEAR_FLAG (item, FLAG_ANIMATE);	1624	item->clr_flag (FLAG_ANIMATE);
1609	item->face = item->arch->face;	1625	item->face = item->arch->face;
1610	item->set_speed (0);	1626	item->set_speed (0);
1611	}	1627	}
1612		1628
1613	if (object *pl = item->visible_to ())	1629	if (object *pl = item->visible_to ())
…		…
1694	for (tmp = container->inv; tmp; tmp = tmp->below)	1710	for (tmp = container->inv; tmp; tmp = tmp->below)
1695	{	1711	{
1696	if (door->type == DOOR && tmp->type == KEY)	1712	if (door->type == DOOR && tmp->type == KEY)
1697	break;	1713	break;
1698		1714
1699	/* For sanity, we should really check door type, but other stuff	1715	/* For sanity, we should really check door type, but other stuff
1700	* (like containers) can be locked with special keys	1716	* (like containers) can be locked with special keys
1701	*/	1717	*/
1702	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1718	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1703	break;	1719	break;
1704	}	1720	}
…		…
1741	*	1757	*
1742	* Change the color so that the message doesn't disappear with	1758	* Change the color so that the message doesn't disappear with
1743	* all the others.	1759	* all the others.
1744	*/	1760	*/
1745	if (pl->contr->usekeys == key_inventory	1761	if (pl->contr->usekeys == key_inventory
1746	\|\| !QUERY_FLAG (container, FLAG_APPLIED)	1762	\|\| !container->flag [FLAG_APPLIED]
1747	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))	1763	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1748	{	1764	{
1749	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1765	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1750	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1766	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1751	return NULL;	1767	return NULL;
…		…
1758	/* find_key	1774	/* find_key
1759	* We try to find a key for the door as passed. If we find a key	1775	* We try to find a key for the door as passed. If we find a key
1760	* and successfully use it, we return the key, otherwise NULL	1776	* and successfully use it, we return the key, otherwise NULL
1761	* This function merges both normal and locked door, since the logic	1777	* This function merges both normal and locked door, since the logic
1762	* for both is the same - just the specific key is different.	1778	* for both is the same - just the specific key is different.
1763	* pl is the player,	1779	* pl is the player,
1764	* inv is the objects inventory to searched	1780	* inv is the objects inventory to searched
1765	* door is the door we are trying to match against.	1781	* door is the door we are trying to match against.
1766	* This function can be called recursively to search containers.	1782	* This function can be called recursively to search containers.
1767	*/	1783	*/
1768	object *	1784	object *
1769	find_key (object pl, object container, object *door)	1785	find_key (object pl, object container, object *door)
…		…
1841	{	1857	{
1842	--op->speed_left;	1858	--op->speed_left;
1843	return true;	1859	return true;
1844	}	1860	}
1845		1861
1846	sint16 nx = freearr_x[dir] + op->x;	1862	sint16 nx = DIRX (dir) + op->x;
1847	sint16 ny = freearr_y[dir] + op->y;	1863	sint16 ny = DIRY (dir) + op->y;
1848		1864
1849	if (out_of_map (op->map, nx, ny))	1865	if (out_of_map (op->map, nx, ny))
1850	return false;	1866	return false;
1851		1867
1852	/* If braced, or can't move to the square, and it is not out of the	1868	/* If braced, or can't move to the square, and it is not out of the
…		…
1873	\|\| mon->flag [FLAG_CAN_ROLL])	1889	\|\| mon->flag [FLAG_CAN_ROLL])
1874	&& mon != op)	1890	&& mon != op)
1875	break;	1891	break;
1876	}	1892	}
1877		1893
1878	if (!mon) /* This happens anytime the player tries to move */	1894	/* no monster == player tries to move into a wall or so */
1879	return false; /* into a wall */	1895	if (!mon)
		1896	{
		1897	for (object *ob = m->at (nx, ny).top; ob; ob = ob->below)
		1898	if (op->move_type & ob->move_block)
		1899	{
		1900	if (ob->move_block == MOVE_ALL)
		1901	move_into_wall (op, ob);
		1902	else
		1903	{
		1904	if (op->contr->ns->bumpmsg)
		1905	{
		1906	op->play_sound (sound_find ("blocked_move"));
		1907
		1908	op->statusmsg (ob->invisible
		1909	? "Something blocks you."
		1910	: format ("Something blocks you from entering the %s.", query_name (ob))
		1911	);
		1912	}
		1913	}
		1914
		1915	break;
		1916	}
		1917
		1918	return false;
		1919	}
1880		1920
1881	mon = mon->head_ ();	1921	mon = mon->head_ ();
1882		1922
1883	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))	1923	if ((mon->type == DOOR && mon->stats.hp >= 0) \|\| (mon->type == LOCKED_DOOR))
1884	if (op->contr->weapon_sp_left > 0.f)	1924	if (op->contr->weapon_sp_left > 0.f)
…		…
1902	*/	1942	*/
1903	if (op->type == PLAYER	1943	if (op->type == PLAYER
1904	&& ((mon->owner && mon->owner->contr	1944	&& ((mon->owner && mon->owner->contr
1905	&& same_party (mon->owner->contr->party, op->contr->party))	1945	&& same_party (mon->owner->contr->party, op->contr->party))
1906	\|\| mon->owner == op)	1946	\|\| mon->owner == op)
1907	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	1947	&& (mon->flag [FLAG_UNAGGRESSIVE] \|\| mon->flag [FLAG_FRIENDLY]))
1908	{	1948	{
1909	/* If we're braced, we don't want to switch places with it */	1949	/* If we're braced, we don't want to switch places with it */
1910	if (op->contr->braced)	1950	if (op->contr->braced)
1911	return false;	1951	return false;
1912		1952
…		…
1932	* creatures. Note that if you are braced, you can't push	1972	* creatures. Note that if you are braced, you can't push
1933	* someone, but put it inside this loop so that you won't	1973	* someone, but put it inside this loop so that you won't
1934	* attack them either.	1974	* attack them either.
1935	*/	1975	*/
1936	if ((mon->type == PLAYER \|\| mon->enemy != op)	1976	if ((mon->type == PLAYER \|\| mon->enemy != op)
1937	&& (mon->type == PLAYER \|\| QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY))	1977	&& (mon->type == PLAYER \|\| mon->flag [FLAG_UNAGGRESSIVE] \|\| mon->flag [FLAG_FRIENDLY])
1938	&& ((op->contr->peaceful	1978	&& ((op->contr->peaceful
1939	\|\| (mon->type == PLAYER && mon->contr->peaceful))	1979	\|\| (mon->type == PLAYER && mon->contr->peaceful))
1940	&& !on_battleground))	1980	&& !on_battleground))
1941	{	1981	{
1942	if (op->speed_left > 0.f)	1982	if (op->speed_left > 0.f)
…		…
1958	}	1998	}
1959	}	1999	}
1960	/* If the object is a boulder or other rollable object, then	2000	/* If the object is a boulder or other rollable object, then
1961	* roll it if not braced. You can't roll it if you are braced.	2001	* roll it if not braced. You can't roll it if you are braced.
1962	*/	2002	*/
1963	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2003	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1964	{	2004	{
1965	if (op->speed_left > 0.f)	2005	if (op->speed_left > 0.f)
1966	{	2006	{
1967	--op->speed_left;	2007	--op->speed_left;
1968		2008
…		…
1977	* Way it works is like this: First, it must have some hit points	2017	* Way it works is like this: First, it must have some hit points
1978	* and be living. Then, it must be one of the following:	2018	* and be living. Then, it must be one of the following:
1979	* 1) Not a player, 2) A player, but of a different party. Note	2019	* 1) Not a player, 2) A player, but of a different party. Note
1980	* that party_number -1 is no party, so attacks can still happen.	2020	* that party_number -1 is no party, so attacks can still happen.
1981	*/	2021	*/
1982	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2022	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
1983	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2023	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
1984	{	2024	{
1985	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])	2025	if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
1986	{	2026	{
1987	--op->contr->weapon_sp_left;	2027	--op->contr->weapon_sp_left;
…		…
1999	}	2039	}
2000		2040
2001	bool	2041	bool
2002	move_player (object *op, int dir)	2042	move_player (object *op, int dir)
2003	{	2043	{
2004	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)	2044	if (!op->map \|\| op->map->state != MAP_ACTIVE)
2005	return 0;	2045	return 0;
2006		2046
2007	/* Sanity check: make sure dir is valid */	2047	/* Sanity check: make sure dir is valid */
2008	if (dir < 0 \|\| dir >= 9)	2048	if (dir < 0 \|\| dir > 8)
2009	{	2049	{
2010	LOG (llevError, "move_player: invalid direction %d\n", dir);	2050	LOG (llevError, "move_player: invalid direction %d\n", dir);
2011	return 0;	2051	return 0;
2012	}	2052	}
2013		2053
2014	/* peterm: added following line */	2054	/* peterm: added following line */
2015	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2055	if (op->flag [FLAG_CONFUSED] && dir)
2016	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2056	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2017		2057
2018	op->facing = dir;	2058	op->facing = dir;
2019		2059
2020	if (op->flag [FLAG_HIDDEN])	2060	if (op->flag [FLAG_HIDDEN])
…		…
2060	* players.	2100	* players.
2061	*/	2101	*/
2062	bool	2102	bool
2063	handle_newcs_player (object *op)	2103	handle_newcs_player (object *op)
2064	{	2104	{
2065	if (QUERY_FLAG (op, FLAG_SCARED))	2105	if (op->flag [FLAG_SCARED])
2066	{	2106	{
2067	if (op->speed_left > 0.f)	2107	if (op->speed_left > 0.f)
2068	{	2108	{
2069	--op->speed_left;	2109	--op->speed_left;
2070	flee_player (op);	2110	flee_player (op);
…		…
2089	}	2129	}
2090		2130
2091	static int	2131	static int
2092	save_life (object *op)	2132	save_life (object *op)
2093	{	2133	{
2094	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2134	if (!op->flag [FLAG_LIFESAVE])
2095	return 0;	2135	return 0;
2096		2136
2097	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2137	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2098	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2138	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2099	{	2139	{
2100	op->play_sound (sound_find ("ob_evaporate"));	2140	op->play_sound (sound_find ("ob_evaporate"));
2101	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));	2141	new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2102		2142
2103	tmp->destroy ();	2143	tmp->destroy ();
2104	CLEAR_FLAG (op, FLAG_LIFESAVE);	2144	op->clr_flag (FLAG_LIFESAVE);
2105		2145
2106	if (op->stats.hp < 0)	2146	if (op->stats.hp < 0)
2107	op->stats.hp = op->stats.maxhp;	2147	op->stats.hp = op->stats.maxhp;
2108		2148
2109	if (op->stats.food < 0)	2149	if (op->stats.food < 0)
…		…
2112	op->update_stats ();	2152	op->update_stats ();
2113	return 1;	2153	return 1;
2114	}	2154	}
2115		2155
2116	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2156	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2117	CLEAR_FLAG (op, FLAG_LIFESAVE);	2157	op->clr_flag (FLAG_LIFESAVE);
2118	enter_player_savebed (op); /* bring him home. */	2158	enter_player_savebed (op); /* bring him home. */
2119	return 0;	2159	return 0;
2120	}	2160	}
2121		2161
2122	/* This goes throws the inventory and removes unpaid objects, and puts them	2162	/* This goes throws the inventory and removes unpaid objects, and puts them
…		…
2129	{	2169	{
2130	while (op)	2170	while (op)
2131	{	2171	{
2132	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */	2172	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2133		2173
2134	if (QUERY_FLAG (op, FLAG_UNPAID))	2174	if (op->flag [FLAG_UNPAID])
2135	op->insert_at (env);	2175	op->insert_at (env);
2136	else if (op->inv)	2176	else if (op->inv)
2137	drop_unpaid_items (op->inv, env);	2177	drop_unpaid_items (op->inv, env);
2138		2178
2139	op = next;	2179	op = next;
…		…
2150	void	2190	void
2151	do_some_living (object *op)	2191	do_some_living (object *op)
2152	{	2192	{
2153	int last_food = op->stats.food;	2193	int last_food = op->stats.food;
2154	int gen_hp, gen_sp, gen_grace;	2194	int gen_hp, gen_sp, gen_grace;
2155	int over_hp, over_sp, over_grace;
2156	int i;
2157	int rate_hp = 1200;	2195	int rate_hp = 1200;
2158	int rate_sp = 2500;	2196	int rate_sp = 2500;
2159	int rate_grace = 2000;	2197	int rate_grace = 2000;
2160	const int max_hp = 1;	2198	const int max_hp = 1;
2161	const int max_sp = 1;	2199	const int max_sp = 1;
2162	const int max_grace = 1;	2200	const int max_grace = 1;
2163		2201
		2202	#if 0
2164	if (op->contr->hidden)	2203	if (op->contr->hidden)
2165	{	2204	{
2166	op->invisible = 1000;	2205	op->invisible = 1000;
2167	/* the socket code flashes the player visible/invisible	2206	/* the socket code flashes the player visible/invisible
2168	* depending on the value of invisible, so we need to	2207	* depending on the value of invisible, so we need to
2169	* alternate it here for it to work correctly.	2208	* alternate it here for it to work correctly.
2170	*/	2209	*/
2171	if (pticks & 2)	2210	if (server_tick & 2)
2172	op->invisible--;	2211	op->invisible--;
2173	}	2212	}
		2213	else
		2214	#endif
2174	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2215	if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2175	{	2216	{
2176	if (!op->invisible--)	2217	if (!op->invisible--)
2177	{	2218	{
2178	make_visible (op);	2219	make_visible (op);
2179	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");	2220	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
…		…
2213	if (--op->last_grace < 0)	2254	if (--op->last_grace < 0)
2214	{	2255	{
2215	if (op->stats.grace < op->stats.maxgrace / 2)	2256	if (op->stats.grace < op->stats.maxgrace / 2)
2216	op->stats.grace++; /* no penalty in food for regaining grace */	2257	op->stats.grace++; /* no penalty in food for regaining grace */
2217		2258
		2259	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2260
2218	if (max_grace > 1)	2261	if (max_grace > 1)
2219	{	2262	{
2220	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2263	int over_grace = temp / rate_grace;
		2264
2221	if (over_grace > 0)	2265	if (over_grace > 0)
2222	{	2266	{
2223	op->stats.sp += over_grace	2267	op->stats.sp += over_grace + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > (temp % rate_grace)) ? -1 : 0;
2224	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2225	op->last_grace = 0;	2268	op->last_grace = 0;
2226	}	2269	}
2227	else	2270	else
2228	{	2271	op->last_grace = rate_grace / temp;
2229	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2230	}
2231	}	2272	}
2232	else	2273	else
2233	{	2274	op->last_grace = rate_grace / temp;
2234	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2275
2235	}
2236	/* wearing stuff doesn't detract from grace generation. */	2276	/* wearing stuff doesn't detract from grace generation. */
2237	}	2277	}
2238		2278
2239	if (op->stats.food > 0)	2279	if (op->stats.food > 0)
2240	{	2280	{
…		…
2246	if (op->stats.sp < op->stats.maxsp)	2286	if (op->stats.sp < op->stats.maxsp)
2247	{	2287	{
2248	op->stats.sp++;	2288	op->stats.sp++;
2249		2289
2250	/* dms do not consume food */	2290	/* dms do not consume food */
2251	if (!QUERY_FLAG (op, FLAG_WIZ))	2291	if (!op->flag [FLAG_WIZ])
2252	{	2292	{
2253	op->stats.food--;	2293	op->stats.food--;
2254		2294
2255	if (op->contr->digestion < 0)	2295	if (op->contr->digestion < 0)
2256	op->stats.food += op->contr->digestion;	2296	op->stats.food += op->contr->digestion;
…		…
2259	}	2299	}
2260	}	2300	}
2261		2301
2262	if (max_sp > 1)	2302	if (max_sp > 1)
2263	{	2303	{
2264	over_sp = (gen_sp + 10) / rate_sp;	2304	int over_sp = (gen_sp + 10) / rate_sp;
2265	if (over_sp > 0)	2305	if (over_sp > 0)
2266	{	2306	{
2267	if (op->stats.sp < op->stats.maxsp)	2307	if (op->stats.sp < op->stats.maxsp)
2268	{	2308	{
2269	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2309	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2290	if (op->stats.hp < op->stats.maxhp)	2330	if (op->stats.hp < op->stats.maxhp)
2291	{	2331	{
2292	op->stats.hp++;	2332	op->stats.hp++;
2293		2333
2294	/* dms do not consume food */	2334	/* dms do not consume food */
2295	if (!QUERY_FLAG (op, FLAG_WIZ))	2335	if (!op->flag [FLAG_WIZ])
2296	{	2336	{
2297	op->stats.food--;	2337	op->stats.food--;
2298		2338
2299	if (op->contr->digestion < 0)	2339	if (op->contr->digestion < 0)
2300	op->stats.food += op->contr->digestion;	2340	op->stats.food += op->contr->digestion;
2301	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))	2341	else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2302	op->stats.food = last_food;	2342	op->stats.food = last_food;
2303	}	2343	}
2304	}	2344	}
2305		2345
		2346	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2347
2306	if (max_hp > 1)	2348	if (max_hp > 1)
2307	{	2349	{
2308	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2350	int over_hp = temp / rate_hp;
2309		2351
2310	if (over_hp > 0)	2352	if (over_hp > 0)
2311	{	2353	{
2312	op->stats.sp += over_hp + (rndm (rate_hp) > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;	2354	op->stats.sp += over_hp + (random_roll (0, rate_hp - 1, op, PREFER_HIGH) > (temp % rate_hp)) ? -1 : 0;
2313	op->last_heal = 0;	2355	op->last_heal = 0;
2314	}	2356	}
2315	else	2357	else
2316	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2358	op->last_heal = rate_hp / temp;
2317	}	2359	}
2318	else	2360	else
2319	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2361	op->last_heal = rate_hp / temp;
2320	}	2362	}
2321	}	2363	}
2322		2364
2323	/* Digestion */	2365	/* Digestion */
2324	if (--op->last_eat < 0)	2366	if (--op->last_eat < 0)
…		…
2327	penalty = max (0, -op->contr->digestion);	2369	penalty = max (0, -op->contr->digestion);
2328		2370
2329	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);	2371	op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2330		2372
2331	/* dms do not consume food */	2373	/* dms do not consume food */
2332	if (!QUERY_FLAG (op, FLAG_WIZ))	2374	if (!op->flag [FLAG_WIZ])
2333	op->stats.food--;	2375	op->stats.food--;
2334	}	2376	}
2335		2377
2336	if (op->stats.food < 0 && op->stats.hp >= 0)	2378	if (op->stats.food < 0 && op->stats.hp >= 0)
2337	{	2379	{
2338	object *flesh = 0;	2380	object *flesh = 0;
2339		2381
2340	for_inv_removable (op, tmp)	2382	for_inv_removable (op, tmp)
2341	{	2383	{
2342	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2384	if (tmp->flag [FLAG_UNPAID])
2343	continue;	2385	continue;
2344		2386
2345	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)	2387	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)
2346	{	2388	{
2347	op->statusmsg ("You blindly grab for a bite of food. "	2389	op->statusmsg ("You blindly grab for a bite of food. "
…		…
2382	op->contr->killer->destroy ();	2424	op->contr->killer->destroy ();
2383	}	2425	}
2384	}	2426	}
2385		2427
2386	/* killer should be set here already */	2428	/* killer should be set here already */
2387	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2429	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2388	kill_player (op);	2430	kill_player (op);
2389	}	2431	}
2390	}	2432	}
2391		2433
2392	/* If the player should die (lack of hp, food, etc), we call this.	2434	/* If the player should die (lack of hp, food, etc), we call this.
…		…
2561		2603
2562	/* There is a maximum depletion total per level. */	2604	/* There is a maximum depletion total per level. */
2563	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)	2605	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
2564	{	2606	{
2565	lose_this_stat = 0;	2607	lose_this_stat = 0;
2566	/* Take loss chance vs keep chance to see if we	2608	/* Take loss chance vs keep chance to see if we
2567	retain the stat. */	2609	retain the stat. */
2568	}	2610	}
2569	else	2611	else
2570	{	2612	{
2571	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)	2613	if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
…		…
2587	* difference.	2629	* difference.
2588	*/	2630	*/
2589	if (this_stat >= -50)	2631	if (this_stat >= -50)
2590	{	2632	{
2591	change_attr_value (&(dep->stats), i, -1);	2633	change_attr_value (&(dep->stats), i, -1);
2592	SET_FLAG (dep, FLAG_APPLIED);	2634	dep->set_flag (FLAG_APPLIED);
2593	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2635	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2594	op->update_stats ();	2636	op->update_stats ();
2595	lost_a_stat = 1;	2637	lost_a_stat = 1;
2596	}	2638	}
2597	}	2639	}
…		…
2664	if (will_kill_again)	2706	if (will_kill_again)
2665	{	2707	{
2666	object *force;	2708	object *force;
2667	int at;	2709	int at;
2668		2710
2669	force = get_archetype (FORCE_NAME);	2711	force = archetype::get (FORCE_NAME);
2670	/* 50 ticks should be enough time for the spell to abate */	2712	/* 50 ticks should be enough time for the spell to abate */
2671	force->speed = 0.1f;
2672	force->speed_left = -5.f;	2713	force->speed_left = -5.f;
2673	SET_FLAG (force, FLAG_APPLIED);	2714	force->set_speed (0.1f);
		2715	force->set_flag (FLAG_APPLIED);
		2716
2674	for (at = 0; at < NROFATTACKS; at++)	2717	for (at = 0; at < NROFATTACKS; at++)
2675	if (will_kill_again & (1 << at))	2718	if (will_kill_again & (1 << at))
2676	force->resist[at] = 100;	2719	force->resist[at] = 100;
2677		2720
2678	insert_ob_in_ob (force, op);	2721	insert_ob_in_ob (force, op);
…		…
2683	}	2726	}
2684		2727
2685	static void	2728	static void
2686	loot_object (object *op)	2729	loot_object (object *op)
2687	{ /* Grab and destroy some treasure */	2730	{ /* Grab and destroy some treasure */
2688	object tmp, tmp2, *next;	2731	object tmp, next;
2689		2732
2690	op->close_container (); /* close open sack first */	2733	op->close_container (); /* close open sack first */
2691		2734
2692	for (tmp = op->inv; tmp; tmp = next)	2735	for (tmp = op->inv; tmp; tmp = next)
2693	{	2736	{
…		…
2700	tmp->x = op->x, tmp->y = op->y;	2743	tmp->x = op->x, tmp->y = op->y;
2701		2744
2702	if (tmp->type == CONTAINER)	2745	if (tmp->type == CONTAINER)
2703	loot_object (tmp); /* empty container to ground */	2746	loot_object (tmp); /* empty container to ground */
2704		2747
2705	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(rndm (3))))	2748	if (!tmp->flag [FLAG_UNIQUE] && (tmp->flag [FLAG_STARTEQUIP] \|\| tmp->flag [FLAG_NO_DROP] \|\| !(rndm (3))))
2706	{	2749	{
2707	if (tmp->nrof > 1)	2750	if (tmp->nrof > 1)
2708	{	2751	{
2709	tmp->decrease (rndm (1, tmp->nrof - 1));	2752	tmp->decrease (rndm (1, tmp->nrof - 1));
2710	insert_ob_in_map (tmp, op->map, NULL, 0);	2753	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2725	void	2768	void
2726	fix_weight ()	2769	fix_weight ()
2727	{	2770	{
2728	for_all_players (pl)	2771	for_all_players (pl)
2729	{	2772	{
2730	sint32 old = pl->ob->carrying;	2773	weight_t old = pl->ob->carrying;
2731		2774
2732	pl->ob->update_weight ();	2775	pl->ob->update_weight ();
2733		2776
2734	if (old != pl->ob->carrying)	2777	if (old != pl->ob->carrying)
2735	{	2778	{
…		…
2800	}	2843	}
2801		2844
2802	int	2845	int
2803	is_true_undead (object *op)	2846	is_true_undead (object *op)
2804	{	2847	{
2805	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2848	if (op->arch->flag [FLAG_UNDEAD])
2806	return 1;	2849	return 1;
2807		2850
2808	return 0;	2851	return 0;
2809	}	2852	}
2810		2853
…		…
2831	level = -(10 + (2 * ob->map->darklevel ()));	2874	level = -(10 + (2 * ob->map->darklevel ()));
2832		2875
2833	/* scan through all nearby squares for terrain to hide in */	2876	/* scan through all nearby squares for terrain to hide in */
2834	for (i = 0, x = ob->x, y = ob->y;	2877	for (i = 0, x = ob->x, y = ob->y;
2835	i <= SIZEOFFREE1;	2878	i <= SIZEOFFREE1;
2836	i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])	2879	i++, x = ob->x + DIRX (i), y = ob->y + DIRY (i))
2837	{	2880	{
2838	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2881	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
2839	if (mflag & P_OUT_OF_MAP)	2882	if (mflag & P_OUT_OF_MAP)
2840	continue;	2883	continue;
2841		2884
…		…
2908		2951
2909	if (who->type == PLAYER)	2952	if (who->type == PLAYER)
2910	player = 1;	2953	player = 1;
2911		2954
2912	else	2955	else
2913	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2956	friendly = who->flag [FLAG_FRIENDLY];
2914		2957
2915	/* search adjacent squares */	2958	/* search adjacent squares */
2916	for (i = 1; i < 9; i++)	2959	for (i = 1; i < 9; i++)
2917	{	2960	{
2918	x = who->x + freearr_x[i];	2961	x = who->x + DIRX (i);
2919	y = who->y + freearr_y[i];	2962	y = who->y + DIRY (i);
2920	m = who->map;	2963	m = who->map;
2921	mflags = get_map_flags (m, &m, x, y, &x, &y);	2964	mflags = get_map_flags (m, &m, x, y, &x, &y);
2922	/* space must be blocked if there is a monster. If not	2965	/* space must be blocked if there is a monster. If not
2923	* blocked, don't need to check this space.	2966	* blocked, don't need to check this space.
2924	*/	2967	*/
…		…
2927	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))	2970	if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
2928	continue;	2971	continue;
2929		2972
2930	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)	2973	for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
2931	{	2974	{
2932	if ((player \|\|friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))	2975	if ((player \|\|friendly) &&tmp->flag [FLAG_MONSTER] && !tmp->flag [FLAG_UNAGGRESSIVE])
2933	return 1;	2976	return 1;
2934	else if (tmp->type == PLAYER)	2977	else if (tmp->type == PLAYER)
2935	{
2936	/don't let a hidden DM prevent you from hiding /
2937	if (!QUERY_FLAG (tmp, FLAG_WIZ) \|\| tmp->contr->hidden == 0)
2938	return 1;	2978	return 1;
2939	}
2940	}	2979	}
2941	}	2980	}
2942	return 0;	2981	return 0;
2943	}	2982	}
2944		2983
2945	/* check the player los field for viewability of the	2984	/* check the player los field for viewability of the
2946	* object op. This function works fine for monsters,	2985	* object op. This function works fine for monsters,
2947	* but we dont worry if the object isnt the top one in	2986	* but we dont worry if the object isnt the top one in
2948	* a pile (say a coin under a table would return "viewable"	2987	* a pile (say a coin under a table would return "viewable"
2949	* by this routine). Another question, should we be	2988	* by this routine). Another question, should we be
2950	* concerned with the direction the player is looking	2989	* concerned with the direction the player is looking
2951	* in? Realistically, most of us can't see stuff behind	2990	* in? Realistically, most of us can't see stuff behind
2952	* our backs...on the other hand, does the "facing" direction	2991	* our backs...on the other hand, does the "facing" direction
2953	* imply the way your head, or body is facing? It's possible	2992	* imply the way your head, or body is facing? It's possible
2954	* for them to differ. Sigh, this fctn could get a bit more complex.	2993	* for them to differ. Sigh, this fctn could get a bit more complex.
2955	* -b.t.	2994	* -b.t.
2956	* This function is now map tiling safe.	2995	* This function is now map tiling safe.
2957	*/	2996	*/
2958	int	2997	int
2959	player_can_view (object pl, object op)	2998	player_can_view (object pl, object op)
2960	{	2999	{
…		…
2974		3013
2975	get_rangevector (pl, op, &rv, 0x1);	3014	get_rangevector (pl, op, &rv, 0x1);
2976		3015
2977	/* starting with the 'head' part, lets loop	3016	/* starting with the 'head' part, lets loop
2978	* through the object and find if it has any	3017	* through the object and find if it has any
2979	* part that is in the los array but isn't on	3018	* part that is in the los array but isn't on
2980	* a blocked los square.	3019	* a blocked los square.
2981	* we use the archetype to figure out offsets.	3020	* we use the archetype to figure out offsets.
2982	*/	3021	*/
2983	while (op)	3022	while (op)
2984	{	3023	{
…		…
3011	* and the exit-coordinates sp/hp must both be > 0.	3050	* and the exit-coordinates sp/hp must both be > 0.
3012	* => The intention here is to prevent abuse of the battleground-	3051	* => The intention here is to prevent abuse of the battleground-
3013	* feature (like pickable or hidden battleground tiles). */	3052	* feature (like pickable or hidden battleground tiles). */
3014	for (object *tmp = op->below; tmp; tmp = tmp->below)	3053	for (object *tmp = op->below; tmp; tmp = tmp->below)
3015	{	3054	{
3016	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3055	if (tmp->flag [FLAG_IS_FLOOR])
3017	{	3056	{
3018	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3057	if (tmp->flag [FLAG_NO_PICK]
3019	&& tmp->type == BATTLEGROUND	3058	&& tmp->type == BATTLEGROUND
3020	&& tmp->name == shstr_battleground	3059	&& tmp->name == shstr_battleground
3021	&& EXIT_X (tmp) && EXIT_Y (tmp))	3060	&& EXIT_X (tmp) && EXIT_Y (tmp))
3022	{	3061	{
3023	/* before we assign the exit, check if this is a teambattle */	3062	/* before we assign the exit, check if this is a teambattle */
…		…
3181	strcat (buf, ".");	3220	strcat (buf, ".");
3182	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, buf);	3221	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, buf);
3183	}	3222	}
3184		3223
3185	/* evtl. adding flags: */	3224	/* evtl. adding flags: */
3186	if (QUERY_FLAG (item, FLAG_XRAYS))	3225	if (item->flag [FLAG_XRAYS])
3187	SET_FLAG (skin, FLAG_XRAYS);	3226	skin->set_flag (FLAG_XRAYS);
3188	if (QUERY_FLAG (item, FLAG_STEALTH))	3227	if (item->flag [FLAG_STEALTH])
3189	SET_FLAG (skin, FLAG_STEALTH);	3228	skin->set_flag (FLAG_STEALTH);
3190	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3229	if (item->flag [FLAG_SEE_IN_DARK])
3191	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3230	skin->set_flag (FLAG_SEE_IN_DARK);
3192		3231
3193	/* print message if there is one */	3232	/* print message if there is one */
3194	if (item->msg != NULL)	3233	if (item->msg != NULL)
3195	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);	3234	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);
3196	}	3235	}
…		…
3238	{	3277	{
3239	play_sound (sound_find ("generic_failure"));	3278	play_sound (sound_find ("generic_failure"));
3240	statusmsg (msg, color);	3279	statusmsg (msg, color);
3241	}	3280	}
3242		3281
		3282	void
		3283	object::failmsgf (const char *format, ...)
		3284	{
		3285	if (!contr)
		3286	return;
		3287
		3288	va_list ap;
		3289	va_start (ap, format);
		3290	contr->failmsg (vformat (format, ap));
		3291	va_end (ap);
		3292	}
		3293
		3294	void
		3295	player::failmsgf (const char *format, ...)
		3296	{
		3297	va_list ap;
		3298	va_start (ap, format);
		3299	failmsg (vformat (format, ap));
		3300	va_end (ap);
		3301	}
		3302

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.268 by root, Wed Apr 7 19:54:45 2010 UTC vs. Revision 1.301 by root, Sat Nov 17 23:40:04 2018 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.268 by root, Wed Apr 7 19:54:45 2010 UTC vs.
Revision 1.301 by root, Sat Nov 17 23:40:04 2018 UTC