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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.267 by root, Wed Apr 7 18:35:56 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
…		…
235		235
236	attachable::do_destroy ();	236	attachable::do_destroy ();
237		237
238	if (ob)	238	if (ob)
239	{	239	{
240	ob->destroy_inv (false);	240	// potentially fix a bug where ob->contr is non-null while ob->contr->ob is null, causing a segfault.
		241	// temporarily backed out patchset 4025 to see if THIS change causes crashes
		242	//ob->contr = 0;
241	ob->destroy ();	243	ob->destroy ();
242	}	244	}
243		245
244	ob = observe = viewpoint = 0;	246	ob = observe = viewpoint = 0;
245	}	247	}
…		…
331	#endif	333	#endif
332	return op;	334	return op;
333	}	335	}
334		336
335	/* 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
336	* 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
337	* detour a monster will take from the direction path when looking	339	* detour a monster will take from the direction path when looking
338	* 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
339	* the deviation is	341	* the deviation is
340	*/	342	*/
341	#define DETOUR_AMOUNT 2	343	#define DETOUR_AMOUNT 2
…		…
377	*/	379	*/
378	int	380	int
379	path_to_player (object mon, object pl, unsigned mindiff)	381	path_to_player (object mon, object pl, unsigned mindiff)
380	{	382	{
381	rv_vector rv;	383	rv_vector rv;
382	sint16 x, y;
383	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;
384	maptile m, lastmap;
385		385
386	get_rangevector (mon, pl, &rv, 0);	386	get_rangevector (mon, pl, &rv, 0);
387		387
388	if (rv.distance < mindiff)	388	if (rv.distance < mindiff)
389	return 0;	389	return 0;
390		390
391	x = mon->x;	391	mapxy pos (mon);
392	y = mon->y;
393	m = mon->map;
394	dir = rv.direction;	392	dir = rv.direction;
395	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 */
396	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	394	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
397		395
398	/* 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. */
399	if (diff > max)	397	if (diff > max)
400	return 0;	398	return 0;
401		399
402	while (diff > 1 && max > 0)	400	while (diff > 1 && max > 0)
403	{	401	{
404	lastx = x;	402	mapxy lastpos = pos;
405	lasty = y;
406	lastmap = m;
407	x = lastx + freearr_x[dir];
408	y = lasty + freearr_y[dir];
409		403
410	mflags = get_map_flags (m, &m, x, y, &x, &y);	404	pos.move (dir);
411	blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
412		405
413	/* Space is blocked - try changing direction a little */	406	/* Space is blocked - try changing direction a little */
414	if ((mflags & P_OUT_OF_MAP) \|\| ((OB_TYPE_MOVE_BLOCK (mon, blocked) \|\| (mflags & P_BLOCKSVIEW))	407	if (!pos.normalise ()
415	&& (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)))
416	{	410	{
417	/* recalculate direction from last good location. Possible	411	/* recalculate direction from last good location. Possible
418	* we were not traversing ideal location before.	412	* we were not traversing ideal location before.
419	*/	413	*/
420	get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);	414	get_rangevector_from_mapcoord (lastpos.m, lastpos.x, lastpos.y, pl, &rv, 0);
421	if (rv.direction != dir)	415	if (rv.direction != dir)
422	{	416	{
423	/* OK - says direction should be different - lets reset the	417	/* OK - says direction should be different - lets reset the
424	* the values so it will try again.	418	* the values so it will try again.
425	*/	419	*/
426	x = lastx;
427	y = lasty;
428	m = lastmap;	420	pos = lastpos;
429	dir = firstdir = rv.direction;	421	dir = firstdir = rv.direction;
430	}	422	}
431	else	423	else
432	{	424	{
433	/* direct path is blocked - try taking a side step to	425	/* direct path is blocked - try taking a side step to
434	* either the left or right.	426	* either the left or right.
435	* Note increase the values in the loop below to be	427	* Note increase the values in the loop below to be
436	* more than -1/1 respectively will mean the monster takes	428	* more than -1/1 respectively will mean the monster takes
437	* bigger detour. Have to be careful about these values getting	429	* bigger detour. Have to be careful about these values getting
438	* 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
439	* stepping back and forth	431	* stepping back and forth
440	*/	432	*/
441	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)	433	for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
442	{	434	{
443	if (i == 0)	435	if (i == 0)
444	continue; /* already did this, so skip it */	436	continue; /* already did this, so skip it */
		437
445	/* Use lastdir here - otherwise,	438	/* Use lastdir here - otherwise,
446	* since the direction that the creature should move in	439	* since the direction that the creature should move in
447	* may change, you could get infinite loops.	440	* may change, you could get infinite loops.
448	* ie, player is northwest, but monster can only	441	* ie, player is northwest, but monster can only
449	* move west, so it does that. It goes some distance,	442	* move west, so it does that. It goes some distance,
…		…
451	* 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
452	* gets back to its original point. lastdir contains	445	* gets back to its original point. lastdir contains
453	* the last direction the creature has successfully	446	* the last direction the creature has successfully
454	* moved.	447	* moved.
455	*/	448	*/
456
457	x = lastx + freearr_x[absdir (lastdir + i)];
458	y = lasty + freearr_y[absdir (lastdir + i)];
459	m = lastmap;	449	pos = lastpos;
460	mflags = get_map_flags (m, &m, x, y, &x, &y);	450	pos.move (absdir (lastdir + i));
461	if (mflags & P_OUT_OF_MAP)	451
		452	if (!pos.normalise ())
462	continue;	453	continue;
463	blocked = GET_MAP_MOVE_BLOCK (m, x, y);	454
464	if (OB_TYPE_MOVE_BLOCK (mon, blocked))	455	mapspace &ms = *pos;
		456
		457	if (ms.flags () & P_BLOCKSVIEW)
465	continue;	458	continue;
466	if (mflags & P_BLOCKSVIEW)	459
		460	if (OB_TYPE_MOVE_BLOCK (mon, ms.move_block))
467	continue;	461	continue;
468		462
469	if (m == mon->map && blocked_link (mon, m, x, y))	463	if (blocked_link (mon, pos.m, pos.x, pos.y))
470	break;	464	break;
471	}	465	}
		466
472	/* go through entire loop without finding a valid	467	/* go through entire loop without finding a valid
473	* sidestep to take - thus, no valid path.	468	* sidestep to take - thus, no valid path.
474	*/	469	*/
475	if (i == (DETOUR_AMOUNT + 1))	470	if (i == DETOUR_AMOUNT + 1)
476	return 0;	471	return 0;
		472
477	diff--;	473	diff--;
478	lastdir = dir;	474	lastdir = dir;
479	max--;	475	max--;
480	if (!firstdir)	476	if (!firstdir)
481	firstdir = dir + i;	477	firstdir = dir + i;
…		…
485	{	481	{
486	/* we moved towards creature, so diff is less */	482	/* we moved towards creature, so diff is less */
487	diff--;	483	diff--;
488	max--;	484	max--;
489	lastdir = dir;	485	lastdir = dir;
		486
490	if (!firstdir)	487	if (!firstdir)
491	firstdir = dir;	488	firstdir = dir;
492	}	489	}
493		490
494	if (diff <= 1)	491	if (diff <= 1)
495	{	492	{
496	/* Recalculate diff (distance) because we may not have actually	493	/* Recalculate diff (distance) because we may not have actually
497	* headed toward player for entire distance.	494	* headed toward player for entire distance.
498	*/	495	*/
499	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	496	get_rangevector_from_mapcoord (pos.m, pos.x, pos.y, pl, &rv, 0);
500	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));	497	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
501	}	498	}
502		499
503	if (diff > max)	500	if (diff > max)
504	return 0;	501	return 0;
…		…
520	for (object next, op = pl->inv; op; op = next)	517	for (object next, op = pl->inv; op; op = next)
521	{	518	{
522	next = op->below;	519	next = op->below;
523		520
524	/* Forces get applied per default, unless they have the	521	/* Forces get applied per default, unless they have the
525	* 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
526	*/	523	*/
527	if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))	524	if (op->type == FORCE && !op->flag [FLAG_NEUTRAL])
528	SET_FLAG (op, FLAG_APPLIED);	525	op->set_flag (FLAG_APPLIED);
529		526
530	/* we never give weapons/armour if these cannot be used	527	/* we never give weapons/armour if these cannot be used
531	* by this player due to race restrictions	528	* by this player due to race restrictions
532	*/	529	*/
533	if (pl->type == PLAYER)	530	if (pl->type == PLAYER)
534	{	531	{
535	if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)	532	if ((!pl->flag [FLAG_USE_ARMOUR]
536	&&	533	&&
537	(op->type == ARMOUR \|\| op->type == BOOTS	534	(op->type == ARMOUR \|\| op->type == BOOTS
538	\|\| op->type == CLOAK \|\| op->type == HELMET	535	\|\| op->type == CLOAK \|\| op->type == HELMET
539	\|\| op->type == SHIELD \|\| op->type == GLOVES	536	\|\| op->type == SHIELD \|\| op->type == GLOVES
540	\|\| op->type == BRACERS \|\| op->type == GIRDLE))	537	\|\| op->type == BRACERS \|\| op->type == GIRDLE))
541	\|\| (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))	538	\|\| (!pl->flag [FLAG_USE_WEAPON] && op->type == WEAPON))
542	{	539	{
543	op->destroy ();	540	op->destroy ();
544	continue;	541	continue;
545	}	542	}
546	}	543	}
547		544
548	/* Here we remove duplicated skills (as duplicated spell objects have	545	/* Here we remove duplicated skills (as duplicated spell objects have
549	* _very_ confusing effects for players), which could for instance be	546	* _very_ confusing effects for players), which could for instance be
550	* generated by bad treasurelists. - elmex	547	* generated by multiple treasurelists specifying the same skills.
551	*/	548	*/
552	if (op->type == SKILL)	549	if (op->type == SKILL)
553	{	550	{
554	for (object *tmp = op->below; tmp; tmp = tmp->below)	551	for (object *tmp = op->below; tmp; tmp = tmp->below)
555	if (tmp->type == op->type && tmp->name == op->name)	552	if (tmp->type == op->type && tmp->name == op->name)
556	{	553	{
557	op->destroy ();	554	op->destroy ();
558	LOG (llevError,
559	"give_initial_items: Removing duplicate skill %s\n", &tmp->name);
560	break;	555	break;
561	}	556	}
562		557
563	if (op->nrof > 1)	558	if (op->nrof > 1)
564	op->nrof = 1;	559	op->nrof = 1;
565	}	560	}
566		561
567	if (op->type == SPELLBOOK && op->inv)	562	if (op->type == SPELLBOOK && op->inv)
568	CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);	563	op->inv->clr_flag (FLAG_STARTEQUIP);
569		564
570	/* Give starting characters identified, uncursed, and undamned	565	/* Give starting characters identified, uncursed, and undamned
571	* 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
572	* merged properly.	567	* merged properly.
573	*/	568	*/
574	if (need_identify (op))	569	if (op->need_identify ())
575	{	570	{
576	SET_FLAG (op, FLAG_IDENTIFIED);	571	op->set_flag (FLAG_IDENTIFIED);
577	CLEAR_FLAG (op, FLAG_CURSED);	572	op->clr_flag (FLAG_CURSED);
578	CLEAR_FLAG (op, FLAG_DAMNED);	573	op->clr_flag (FLAG_DAMNED);
579	}	574	}
580		575
581	if (op->type == SPELL)	576	if (op->type == SPELL)
582	{	577	{
583	op->destroy ();	578	op->destroy ();
584	continue;	579	continue;
585	}	580	}
586	else if (op->type == SKILL)	581	else if (op->type == SKILL)
587	{	582	{
588	SET_FLAG (op, FLAG_CAN_USE_SKILL);	583	op->set_flag (FLAG_CAN_USE_SKILL);
589	op->stats.exp = 0;	584	op->stats.exp = 0;
590	op->level = 1;	585	op->level = 1;
591	}	586	}
592	else /* lock all 'normal items by default */	587	else /* lock all 'normal items by default */
593	SET_FLAG (op, FLAG_INV_LOCKED);	588	op->set_flag (FLAG_INV_LOCKED);
594	} /* for loop of objects in player inv */	589	} /* for loop of objects in player inv */
595		590
596	/* Need to set up the skill pointers */	591	/* Need to set up the skill pointers */
597	pl->contr->link_skills ();	592	pl->contr->link_skills ();
598	}	593	}
…		…
617	roll_stat ()	612	roll_stat ()
618	{	613	{
619	int a[4], i, j, k;	614	int a[4], i, j, k;
620		615
621	for (i = 0; i < 4; i++)	616	for (i = 0; i < 4; i++)
622	a[i] = (int) rndm (6) + 1;	617	a[i] = rndm (1, 6);
623		618
624	for (i = 0, j = 0, k = 7; i < 4; i++)	619	for (i = 0, j = 0, k = 7; i < 4; i++)
625	if (a[i] < k)	620	if (a[i] < k)
626	k = a[i], j = i;	621	k = a[i], j = i;
627		622
…		…
724	treasurelist *tl = treasurelist::find (shstr_starting_wealth);	719	treasurelist *tl = treasurelist::find (shstr_starting_wealth);
725	if (tl)	720	if (tl)
726	create_treasure (tl, ob, 0, 0, 0);	721	create_treasure (tl, ob, 0, 0, 0);
727		722
728	INVOKE_PLAYER (BIRTH, ob->contr);	723	INVOKE_PLAYER (BIRTH, ob->contr);
729	INVOKE_PLAYER (LOGIN, ob->contr);
730		724
731	ob->contr->ns->state = ST_PLAYING;	725	ob->contr->ns->state = ST_PLAYING;
732		726
733	if (ob->msg)	727	if (ob->msg)
734	ob->msg = 0;	728	ob->msg = 0;
735		729
736	start_info (ob);	730	start_info (ob);
737	CLEAR_FLAG (ob, FLAG_WIZ);	731	ob->clr_flag (FLAG_WIZ);
738	give_initial_items (ob, ob->randomitems);	732	give_initial_items (ob, ob->randomitems);
739	esrv_send_inventory (ob, ob);	733	esrv_send_inventory (ob, ob);
740	ob->update_stats ();	734	ob->update_stats ();
741		735
742	/* This moves the player to a different start map, if there	736	/* This moves the player to a different start map, if there
…		…
744	*/	738	*/
745	if (*first_map_ext_path)	739	if (*first_map_ext_path)
746	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);
747	else	741	else
748	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;
749	}	762	}
750		763
751	void	764	void
752	player::chargen_race_next ()	765	player::chargen_race_next ()
753	{	766	{
…		…
791	rv_vector rv;	804	rv_vector rv;
792		805
793	if (op->stats.hp < 0)	806	if (op->stats.hp < 0)
794	{	807	{
795	LOG (llevDebug, "Fleeing player is dead.\n");	808	LOG (llevDebug, "Fleeing player is dead.\n");
796	CLEAR_FLAG (op, FLAG_SCARED);	809	op->clr_flag (FLAG_SCARED);
797	return;	810	return;
798	}	811	}
799		812
800	if (!op->enemy)	813	if (!op->enemy)
801	{	814	{
802	LOG (llevDebug, "Fleeing player had no enemy.\n");	815	LOG (llevDebug, "Fleeing player had no enemy.\n");
803	CLEAR_FLAG (op, FLAG_SCARED);	816	op->clr_flag (FLAG_SCARED);
804	return;	817	return;
805	}	818	}
806		819
807	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))
808	{	821	{
809	op->enemy = NULL;	822	op->enemy = NULL;
810	CLEAR_FLAG (op, FLAG_SCARED);	823	op->clr_flag (FLAG_SCARED);
811	return;	824	return;
812	}	825	}
813		826
814	get_rangevector (op, op->enemy, &rv, 0);	827	get_rangevector (op, op->enemy, &rv, 0);
815		828
…		…
821	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))))
822	return;	835	return;
823	}	836	}
824		837
825	/* Cornered, get rid of scared */	838	/* Cornered, get rid of scared */
826	CLEAR_FLAG (op, FLAG_SCARED);	839	op->clr_flag (FLAG_SCARED);
827	op->enemy = NULL;	840	op->enemy = NULL;
828	}	841	}
829		842
830	/* 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.
831	* 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
…		…
923	* fighting */	936	* fighting */
924	if (op->contr->mode & PU_INHIBIT)	937	if (op->contr->mode & PU_INHIBIT)
925	return 1;	938	return 1;
926		939
927	/* prevent us from turning into auto-thieves :) */	940	/* prevent us from turning into auto-thieves :) */
928	if (QUERY_FLAG (tmp, FLAG_UNPAID))	941	if (tmp->flag [FLAG_UNPAID])
929	continue;	942	continue;
930		943
931	/* ignore known cursed objects */	944	/* ignore known cursed objects */
932	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)
933	continue;	946	continue;
934		947
935	/* all food and drink if desired */	948	/* all food and drink if desired */
936	/* question: don't pick up known-poisonous stuff? */	949	/* question: don't pick up known-poisonous stuff? */
937	if (op->contr->mode & PU_FOOD)	950	if (op->contr->mode & PU_FOOD)
…		…
940	CHK_PICK_PICKUP;	953	CHK_PICK_PICKUP;
941	continue;	954	continue;
942	}	955	}
943		956
944	if (op->contr->mode & PU_DRINK)	957	if (op->contr->mode & PU_DRINK)
945	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]))
946	{	959	{
947	CHK_PICK_PICKUP;	960	CHK_PICK_PICKUP;
948	continue;	961	continue;
949	}	962	}
950		963
…		…
988	continue;	1001	continue;
989	}	1002	}
990		1003
991	/* pick up all magical items */	1004	/* pick up all magical items */
992	if (op->contr->mode & PU_MAGICAL)	1005	if (op->contr->mode & PU_MAGICAL)
993	if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)	1006	if (tmp->flag [FLAG_KNOWN_MAGICAL]
994	&& !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))	1007	&& !tmp->flag [FLAG_KNOWN_CURSED])
995	{	1008	{
996	CHK_PICK_PICKUP;	1009	CHK_PICK_PICKUP;
997	continue;	1010	continue;
998	}	1011	}
999		1012
…		…
1083	continue;	1096	continue;
1084	}	1097	}
1085		1098
1086	/* hoping to catch throwing daggers here */	1099	/* hoping to catch throwing daggers here */
1087	if (op->contr->mode & PU_MISSILEWEAPON)	1100	if (op->contr->mode & PU_MISSILEWEAPON)
1088	if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))	1101	if (tmp->type == WEAPON && tmp->flag [FLAG_IS_THROWN])
1089	{	1102	{
1090	CHK_PICK_PICKUP;	1103	CHK_PICK_PICKUP;
1091	continue;	1104	continue;
1092	}	1105	}
1093		1106
…		…
1142	}	1155	}
1143		1156
1144	/* routine for both players and monsters. We call this when	1157	/* routine for both players and monsters. We call this when
1145	* there is a possibility for our action distrubing our hiding	1158	* there is a possibility for our action distrubing our hiding
1146	* place or invisiblity spell. Artefact invisiblity causes	1159	* place or invisiblity spell. Artefact invisiblity causes
1147	* "noise" instead. If we arent invisible to begin with, we	1160	* "noise" instead. If we arent invisible to begin with, we
1148	* return 0.	1161	* return 0.
1149	*/	1162	*/
1150	static int	1163	static int
1151	action_makes_visible (object *op)	1164	action_makes_visible (object *op)
1152	{	1165	{
1153	if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))	1166	if (op->invisible && op->flag [FLAG_ALIVE])
1154	{	1167	{
1155	if (QUERY_FLAG (op, FLAG_MAKE_INVIS))	1168	if (op->flag [FLAG_MAKE_INVIS])
1156	{	1169	{
1157	// artefact invisibility is permanent, but we still make noise	1170	// artefact invisibility is permanent, but we still make noise
1158	// this is important for game-balance.	1171	// this is important for game-balance.
1159	if (op->contr)	1172	if (op->contr)
1160	op->make_noise ();	1173	op->make_noise ();
…		…
1176	return 0;	1189	return 0;
1177	}	1190	}
1178		1191
1179	/*	1192	/*
1180	* Find an arrow in the inventory and after that	1193	* Find an arrow in the inventory and after that
1181	* in the right type container (quiver). Pointer to the	1194	* in the right type container (quiver). Pointer to the
1182	* found object is returned.	1195	* found object is returned.
1183	*/	1196	*/
1184	static object *	1197	static object *
1185	find_arrow (object op, const char type)	1198	find_arrow (object op, const char type)
1186	{	1199	{
1187	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1200	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1188	if (tmp->type == ARROW && !strcmp (&tmp->race, type))	1201	if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1189	return splay (tmp);	1202	return splay (tmp);
1190		1203
1191	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1204	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1192	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))
1193	if (object *arrow = find_arrow (tmp, type))	1206	if (object *arrow = find_arrow (tmp, type))
1194	{	1207	{
1195	splay (tmp);	1208	splay (tmp);
1196	return arrow;	1209	return arrow;
1197	}	1210	}
…		…
1214	if (!type)	1227	if (!type)
1215	return NULL;	1228	return NULL;
1216		1229
1217	for (arrow = op->inv; arrow; arrow = arrow->below)	1230	for (arrow = op->inv; arrow; arrow = arrow->below)
1218	{	1231	{
1219	if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))	1232	if (arrow->type == CONTAINER && arrow->race == type && arrow->flag [FLAG_APPLIED])
1220	{	1233	{
1221	i = 0;	1234	i = 0;
1222	ntmp = find_better_arrow (arrow, target, type, &i);	1235	ntmp = find_better_arrow (arrow, target, type, &i);
1223		1236
1224	if (i > betterby)	1237	if (i > betterby)
…		…
1305	y = op->y;	1318	y = op->y;
1306		1319
1307	/* find the first target */	1320	/* find the first target */
1308	for (i = 0, found = 0; i < 20; i++)	1321	for (i = 0, found = 0; i < 20; i++)
1309	{	1322	{
1310	x += freearr_x[dir];	1323	x += DIRX (dir);
1311	y += freearr_y[dir];	1324	y += DIRY (dir);
1312	mflags = get_map_flags (m, &m, x, y, &x, &y);	1325	mflags = get_map_flags (m, &m, x, y, &x, &y);
1313		1326
1314	if (mflags & P_OUT_OF_MAP \|\| mflags & P_BLOCKSVIEW)	1327	if (mflags & P_OUT_OF_MAP \|\| mflags & P_BLOCKSVIEW)
1315	{	1328	{
1316	tmp = 0;	1329	tmp = 0;
…		…
1325	break;	1338	break;
1326	}	1339	}
1327		1340
1328	if (mflags & P_IS_ALIVE)	1341	if (mflags & P_IS_ALIVE)
1329	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)
1330	if (QUERY_FLAG (tmp, FLAG_ALIVE))	1343	if (tmp->flag [FLAG_ALIVE])
1331	break;	1344	break;
1332	}	1345	}
1333		1346
1334	if (!tmp)	1347	if (!tmp)
1335	return find_arrow (op, type);	1348	return find_arrow (op, type);
…		…
1339		1352
1340	return find_better_arrow (op, tmp, type, &i);	1353	return find_better_arrow (op, tmp, type, &i);
1341	}	1354	}
1342		1355
1343	/*	1356	/*
1344	* Creature fires a bow - op can be monster or player. Returns	1357	* Creature fires a bow - op can be monster or player. Returns
1345	* 1 if bow was actually fired, 0 otherwise.	1358	* 1 if bow was actually fired, 0 otherwise.
1346	* op is the object firing the bow.	1359	* op is the object firing the bow.
1347	* part is for multipart creatures - the part firing the bow.	1360	* part is for multipart creatures - the part firing the bow.
1348	* dir is the direction of fire.	1361	* dir is the direction of fire.
1349	* 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)
…		…
1396	{	1409	{
1397	if (op->type == PLAYER)	1410	if (op->type == PLAYER)
1398	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);
1399	/* 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 */
1400	else	1413	else
1401	CLEAR_FLAG (op, FLAG_READY_BOW);	1414	op->clr_flag (FLAG_READY_BOW);
1402		1415
1403	return 0;	1416	return 0;
1404	}	1417	}
1405	}	1418	}
1406		1419
…		…
1455	#endif	1468	#endif
1456		1469
1457	SET_ANIMATION (arrow, arrow->direction);	1470	SET_ANIMATION (arrow, arrow->direction);
1458		1471
1459	/* update the speed */	1472	/* update the speed */
1460	arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1461	+ bow->stats.dam / 7.f;
1462		1473
1463	arrow->set_speed (max (arrow->speed, 2.f));
1464	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	));
1465		1479
1466	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;
1467		1481
1468	if (op->type == PLAYER)	1482	if (op->type == PLAYER)
1469	{	1483	{
…		…
1490	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);
1491		1505
1492	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);	1506	arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1493	arrow->move_type = MOVE_FLY_LOW;	1507	arrow->move_type = MOVE_FLY_LOW;
1494	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1508	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
		1509	arrow->set_flag (FLAG_NO_PICK);
1495		1510
1496	op->play_sound (sound_find ("fire_arrow"));	1511	op->play_sound (sound_find ("fire_arrow"));
1497	m->insert (arrow, sx, sy, op);	1512	m->insert (arrow, sx, sy, op);
1498		1513
1499	if (!arrow->destroyed ())	1514	if (!arrow->destroyed ())
…		…
1524	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);
1525	}	1540	}
1526	else if (op->contr->bowtype == bow_threewide)	1541	else if (op->contr->bowtype == bow_threewide)
1527	{	1542	{
1528	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);
1529	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)));
1530	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)));
1531	}	1546	}
1532	else if (op->contr->bowtype == bow_spreadshot)	1547	else if (op->contr->bowtype == bow_spreadshot)
1533	{	1548	{
1534	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);
1535	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);
…		…
1602		1617
1603	if (item->type == WAND)	1618	if (item->type == WAND)
1604	{	1619	{
1605	if (!(--item->stats.food))	1620	if (!(--item->stats.food))
1606	{	1621	{
1607	object *tmp;
1608
1609	if (item->arch)	1622	if (item->arch)
1610	{	1623	{
1611	CLEAR_FLAG (item, FLAG_ANIMATE);	1624	item->clr_flag (FLAG_ANIMATE);
1612	item->face = item->arch->face;	1625	item->face = item->arch->face;
1613	item->set_speed (0);	1626	item->set_speed (0);
1614	}	1627	}
1615		1628
1616	if (object *pl = item->visible_to ())	1629	if (object *pl = item->visible_to ())
…		…
1697	for (tmp = container->inv; tmp; tmp = tmp->below)	1710	for (tmp = container->inv; tmp; tmp = tmp->below)
1698	{	1711	{
1699	if (door->type == DOOR && tmp->type == KEY)	1712	if (door->type == DOOR && tmp->type == KEY)
1700	break;	1713	break;
1701		1714
1702	/* For sanity, we should really check door type, but other stuff	1715	/* For sanity, we should really check door type, but other stuff
1703	* (like containers) can be locked with special keys	1716	* (like containers) can be locked with special keys
1704	*/	1717	*/
1705	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1718	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1706	break;	1719	break;
1707	}	1720	}
…		…
1744	*	1757	*
1745	* Change the color so that the message doesn't disappear with	1758	* Change the color so that the message doesn't disappear with
1746	* all the others.	1759	* all the others.
1747	*/	1760	*/
1748	if (pl->contr->usekeys == key_inventory	1761	if (pl->contr->usekeys == key_inventory
1749	\|\| !QUERY_FLAG (container, FLAG_APPLIED)	1762	\|\| !container->flag [FLAG_APPLIED]
1750	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))	1763	\|\| (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1751	{	1764	{
1752	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1765	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1753	"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));
1754	return NULL;	1767	return NULL;
…		…
1761	/* find_key	1774	/* find_key
1762	* 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
1763	* and successfully use it, we return the key, otherwise NULL	1776	* and successfully use it, we return the key, otherwise NULL
1764	* This function merges both normal and locked door, since the logic	1777	* This function merges both normal and locked door, since the logic
1765	* for both is the same - just the specific key is different.	1778	* for both is the same - just the specific key is different.
1766	* pl is the player,	1779	* pl is the player,
1767	* inv is the objects inventory to searched	1780	* inv is the objects inventory to searched
1768	* door is the door we are trying to match against.	1781	* door is the door we are trying to match against.
1769	* This function can be called recursively to search containers.	1782	* This function can be called recursively to search containers.
1770	*/	1783	*/
1771	object *	1784	object *
1772	find_key (object pl, object container, object *door)	1785	find_key (object pl, object container, object *door)
…		…
1844	{	1857	{
1845	--op->speed_left;	1858	--op->speed_left;
1846	return true;	1859	return true;
1847	}	1860	}
1848		1861
1849	sint16 nx = freearr_x[dir] + op->x;	1862	sint16 nx = DIRX (dir) + op->x;
1850	sint16 ny = freearr_y[dir] + op->y;	1863	sint16 ny = DIRY (dir) + op->y;
1851		1864
1852	if (out_of_map (op->map, nx, ny))	1865	if (out_of_map (op->map, nx, ny))
1853	return false;	1866	return false;
1854		1867
1855	/* 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
…		…
1876	\|\| mon->flag [FLAG_CAN_ROLL])	1889	\|\| mon->flag [FLAG_CAN_ROLL])
1877	&& mon != op)	1890	&& mon != op)
1878	break;	1891	break;
1879	}	1892	}
1880		1893
1881	if (!mon) /* This happens anytime the player tries to move */	1894	/* no monster == player tries to move into a wall or so */
1882	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	}
1883		1920
1884	mon = mon->head_ ();	1921	mon = mon->head_ ();
1885		1922
1886	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))
1887	if (op->contr->weapon_sp_left > 0.f)	1924	if (op->contr->weapon_sp_left > 0.f)
…		…
1905	*/	1942	*/
1906	if (op->type == PLAYER	1943	if (op->type == PLAYER
1907	&& ((mon->owner && mon->owner->contr	1944	&& ((mon->owner && mon->owner->contr
1908	&& same_party (mon->owner->contr->party, op->contr->party))	1945	&& same_party (mon->owner->contr->party, op->contr->party))
1909	\|\| mon->owner == op)	1946	\|\| mon->owner == op)
1910	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	1947	&& (mon->flag [FLAG_UNAGGRESSIVE] \|\| mon->flag [FLAG_FRIENDLY]))
1911	{	1948	{
1912	/* 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 */
1913	if (op->contr->braced)	1950	if (op->contr->braced)
1914	return false;	1951	return false;
1915		1952
…		…
1935	* creatures. Note that if you are braced, you can't push	1972	* creatures. Note that if you are braced, you can't push
1936	* 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
1937	* attack them either.	1974	* attack them either.
1938	*/	1975	*/
1939	if ((mon->type == PLAYER \|\| mon->enemy != op)	1976	if ((mon->type == PLAYER \|\| mon->enemy != op)
1940	&& (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])
1941	&& ((op->contr->peaceful	1978	&& ((op->contr->peaceful
1942	\|\| (mon->type == PLAYER && mon->contr->peaceful))	1979	\|\| (mon->type == PLAYER && mon->contr->peaceful))
1943	&& !on_battleground))	1980	&& !on_battleground))
1944	{	1981	{
1945	if (op->speed_left > 0.f)	1982	if (op->speed_left > 0.f)
…		…
1961	}	1998	}
1962	}	1999	}
1963	/* If the object is a boulder or other rollable object, then	2000	/* If the object is a boulder or other rollable object, then
1964	* 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.
1965	*/	2002	*/
1966	else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))	2003	else if (mon->flag [FLAG_CAN_ROLL] && (!op->contr->braced))
1967	{	2004	{
1968	if (op->speed_left > 0.f)	2005	if (op->speed_left > 0.f)
1969	{	2006	{
1970	--op->speed_left;	2007	--op->speed_left;
1971		2008
…		…
1980	* 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
1981	* and be living. Then, it must be one of the following:	2018	* and be living. Then, it must be one of the following:
1982	* 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
1983	* 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.
1984	*/	2021	*/
1985	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2022	else if ((mon->stats.hp >= 0) && mon->flag [FLAG_ALIVE] &&
1986	((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)))
1987	{	2024	{
1988	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])
1989	{	2026	{
1990	--op->contr->weapon_sp_left;	2027	--op->contr->weapon_sp_left;
…		…
2002	}	2039	}
2003		2040
2004	bool	2041	bool
2005	move_player (object *op, int dir)	2042	move_player (object *op, int dir)
2006	{	2043	{
2007	if (!op->map \|\| op->map->in_memory != MAP_ACTIVE)	2044	if (!op->map \|\| op->map->state != MAP_ACTIVE)
2008	return 0;	2045	return 0;
2009		2046
2010	/* Sanity check: make sure dir is valid */	2047	/* Sanity check: make sure dir is valid */
2011	if (dir < 0 \|\| dir >= 9)	2048	if (dir < 0 \|\| dir > 8)
2012	{	2049	{
2013	LOG (llevError, "move_player: invalid direction %d\n", dir);	2050	LOG (llevError, "move_player: invalid direction %d\n", dir);
2014	return 0;	2051	return 0;
2015	}	2052	}
2016		2053
2017	/* peterm: added following line */	2054	/* peterm: added following line */
2018	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2055	if (op->flag [FLAG_CONFUSED] && dir)
2019	dir = absdir (dir + rndm (3) + rndm (3) - 2);	2056	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2020		2057
2021	op->facing = dir;	2058	op->facing = dir;
2022		2059
2023	if (op->flag [FLAG_HIDDEN])	2060	if (op->flag [FLAG_HIDDEN])
…		…
2063	* players.	2100	* players.
2064	*/	2101	*/
2065	bool	2102	bool
2066	handle_newcs_player (object *op)	2103	handle_newcs_player (object *op)
2067	{	2104	{
2068	if (QUERY_FLAG (op, FLAG_SCARED))	2105	if (op->flag [FLAG_SCARED])
2069	{	2106	{
2070	if (op->speed_left > 0.f)	2107	if (op->speed_left > 0.f)
2071	{	2108	{
2072	--op->speed_left;	2109	--op->speed_left;
2073	flee_player (op);	2110	flee_player (op);
…		…
2092	}	2129	}
2093		2130
2094	static int	2131	static int
2095	save_life (object *op)	2132	save_life (object *op)
2096	{	2133	{
2097	if (!QUERY_FLAG (op, FLAG_LIFESAVE))	2134	if (!op->flag [FLAG_LIFESAVE])
2098	return 0;	2135	return 0;
2099		2136
2100	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2137	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2101	if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))	2138	if (tmp->flag [FLAG_APPLIED] && tmp->flag [FLAG_LIFESAVE])
2102	{	2139	{
2103	op->play_sound (sound_find ("ob_evaporate"));	2140	op->play_sound (sound_find ("ob_evaporate"));
2104	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));
2105		2142
2106	tmp->destroy ();	2143	tmp->destroy ();
2107	CLEAR_FLAG (op, FLAG_LIFESAVE);	2144	op->clr_flag (FLAG_LIFESAVE);
2108		2145
2109	if (op->stats.hp < 0)	2146	if (op->stats.hp < 0)
2110	op->stats.hp = op->stats.maxhp;	2147	op->stats.hp = op->stats.maxhp;
2111		2148
2112	if (op->stats.food < 0)	2149	if (op->stats.food < 0)
…		…
2115	op->update_stats ();	2152	op->update_stats ();
2116	return 1;	2153	return 1;
2117	}	2154	}
2118		2155
2119	LOG (llevError, "Error: LIFESAVE set without applied object.\n");	2156	LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2120	CLEAR_FLAG (op, FLAG_LIFESAVE);	2157	op->clr_flag (FLAG_LIFESAVE);
2121	enter_player_savebed (op); /* bring him home. */	2158	enter_player_savebed (op); /* bring him home. */
2122	return 0;	2159	return 0;
2123	}	2160	}
2124		2161
2125	/* 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
…		…
2132	{	2169	{
2133	while (op)	2170	while (op)
2134	{	2171	{
2135	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' */
2136		2173
2137	if (QUERY_FLAG (op, FLAG_UNPAID))	2174	if (op->flag [FLAG_UNPAID])
2138	op->insert_at (env);	2175	op->insert_at (env);
2139	else if (op->inv)	2176	else if (op->inv)
2140	drop_unpaid_items (op->inv, env);	2177	drop_unpaid_items (op->inv, env);
2141		2178
2142	op = next;	2179	op = next;
…		…
2153	void	2190	void
2154	do_some_living (object *op)	2191	do_some_living (object *op)
2155	{	2192	{
2156	int last_food = op->stats.food;	2193	int last_food = op->stats.food;
2157	int gen_hp, gen_sp, gen_grace;	2194	int gen_hp, gen_sp, gen_grace;
2158	int over_hp, over_sp, over_grace;
2159	int i;
2160	int rate_hp = 1200;	2195	int rate_hp = 1200;
2161	int rate_sp = 2500;	2196	int rate_sp = 2500;
2162	int rate_grace = 2000;	2197	int rate_grace = 2000;
2163	const int max_hp = 1;	2198	const int max_hp = 1;
2164	const int max_sp = 1;	2199	const int max_sp = 1;
2165	const int max_grace = 1;	2200	const int max_grace = 1;
2166		2201
		2202	#if 0
2167	if (op->contr->hidden)	2203	if (op->contr->hidden)
2168	{	2204	{
2169	op->invisible = 1000;	2205	op->invisible = 1000;
2170	/* the socket code flashes the player visible/invisible	2206	/* the socket code flashes the player visible/invisible
2171	* depending on the value of invisible, so we need to	2207	* depending on the value of invisible, so we need to
2172	* alternate it here for it to work correctly.	2208	* alternate it here for it to work correctly.
2173	*/	2209	*/
2174	if (pticks & 2)	2210	if (server_tick & 2)
2175	op->invisible--;	2211	op->invisible--;
2176	}	2212	}
		2213	else
		2214	#endif
2177	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))	2215	if (op->invisible && !(op->flag [FLAG_MAKE_INVIS]))
2178	{	2216	{
2179	if (!op->invisible--)	2217	if (!op->invisible--)
2180	{	2218	{
2181	make_visible (op);	2219	make_visible (op);
2182	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.");
…		…
2216	if (--op->last_grace < 0)	2254	if (--op->last_grace < 0)
2217	{	2255	{
2218	if (op->stats.grace < op->stats.maxgrace / 2)	2256	if (op->stats.grace < op->stats.maxgrace / 2)
2219	op->stats.grace++; /* no penalty in food for regaining grace */	2257	op->stats.grace++; /* no penalty in food for regaining grace */
2220		2258
		2259	int temp = gen_grace < 20 ? 30 : gen_grace + 10;
		2260
2221	if (max_grace > 1)	2261	if (max_grace > 1)
2222	{	2262	{
2223	over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;	2263	int over_grace = temp / rate_grace;
		2264
2224	if (over_grace > 0)	2265	if (over_grace > 0)
2225	{	2266	{
2226	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;
2227	+ (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2228	op->last_grace = 0;	2268	op->last_grace = 0;
2229	}	2269	}
2230	else	2270	else
2231	{	2271	op->last_grace = rate_grace / temp;
2232	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2233	}
2234	}	2272	}
2235	else	2273	else
2236	{	2274	op->last_grace = rate_grace / temp;
2237	op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);	2275
2238	}
2239	/* wearing stuff doesn't detract from grace generation. */	2276	/* wearing stuff doesn't detract from grace generation. */
2240	}	2277	}
2241		2278
2242	if (op->stats.food > 0)	2279	if (op->stats.food > 0)
2243	{	2280	{
…		…
2249	if (op->stats.sp < op->stats.maxsp)	2286	if (op->stats.sp < op->stats.maxsp)
2250	{	2287	{
2251	op->stats.sp++;	2288	op->stats.sp++;
2252		2289
2253	/* dms do not consume food */	2290	/* dms do not consume food */
2254	if (!QUERY_FLAG (op, FLAG_WIZ))	2291	if (!op->flag [FLAG_WIZ])
2255	{	2292	{
2256	op->stats.food--;	2293	op->stats.food--;
2257		2294
2258	if (op->contr->digestion < 0)	2295	if (op->contr->digestion < 0)
2259	op->stats.food += op->contr->digestion;	2296	op->stats.food += op->contr->digestion;
…		…
2262	}	2299	}
2263	}	2300	}
2264		2301
2265	if (max_sp > 1)	2302	if (max_sp > 1)
2266	{	2303	{
2267	over_sp = (gen_sp + 10) / rate_sp;	2304	int over_sp = (gen_sp + 10) / rate_sp;
2268	if (over_sp > 0)	2305	if (over_sp > 0)
2269	{	2306	{
2270	if (op->stats.sp < op->stats.maxsp)	2307	if (op->stats.sp < op->stats.maxsp)
2271	{	2308	{
2272	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;	2309	op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
…		…
2293	if (op->stats.hp < op->stats.maxhp)	2330	if (op->stats.hp < op->stats.maxhp)
2294	{	2331	{
2295	op->stats.hp++;	2332	op->stats.hp++;
2296		2333
2297	/* dms do not consume food */	2334	/* dms do not consume food */
2298	if (!QUERY_FLAG (op, FLAG_WIZ))	2335	if (!op->flag [FLAG_WIZ])
2299	{	2336	{
2300	op->stats.food--;	2337	op->stats.food--;
2301		2338
2302	if (op->contr->digestion < 0)	2339	if (op->contr->digestion < 0)
2303	op->stats.food += op->contr->digestion;	2340	op->stats.food += op->contr->digestion;
2304	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))
2305	op->stats.food = last_food;	2342	op->stats.food = last_food;
2306	}	2343	}
2307	}	2344	}
2308		2345
		2346	int temp = gen_hp < 20 ? 30 : gen_hp + 10;
		2347
2309	if (max_hp > 1)	2348	if (max_hp > 1)
2310	{	2349	{
2311	over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;	2350	int over_hp = temp / rate_hp;
2312		2351
2313	if (over_hp > 0)	2352	if (over_hp > 0)
2314	{	2353	{
2315	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;
2316	op->last_heal = 0;	2355	op->last_heal = 0;
2317	}	2356	}
2318	else	2357	else
2319	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2358	op->last_heal = rate_hp / temp;
2320	}	2359	}
2321	else	2360	else
2322	op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);	2361	op->last_heal = rate_hp / temp;
2323	}	2362	}
2324	}	2363	}
2325		2364
2326	/* Digestion */	2365	/* Digestion */
2327	if (--op->last_eat < 0)	2366	if (--op->last_eat < 0)
…		…
2330	penalty = max (0, -op->contr->digestion);	2369	penalty = max (0, -op->contr->digestion);
2331		2370
2332	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);
2333		2372
2334	/* dms do not consume food */	2373	/* dms do not consume food */
2335	if (!QUERY_FLAG (op, FLAG_WIZ))	2374	if (!op->flag [FLAG_WIZ])
2336	op->stats.food--;	2375	op->stats.food--;
2337	}	2376	}
2338		2377
2339	if (op->stats.food < 0 && op->stats.hp >= 0)	2378	if (op->stats.food < 0 && op->stats.hp >= 0)
2340	{	2379	{
2341	object *flesh = 0;	2380	object *flesh = 0;
2342		2381
2343	for_inv_removable (op, tmp)	2382	for_inv_removable (op, tmp)
2344	{	2383	{
2345	if (QUERY_FLAG (tmp, FLAG_UNPAID))	2384	if (tmp->flag [FLAG_UNPAID])
2346	continue;	2385	continue;
2347		2386
2348	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)	2387	if (tmp->type == FOOD \|\| tmp->type == DRINK \|\| tmp->type == POISON)
2349	{	2388	{
2350	op->statusmsg ("You blindly grab for a bite of food. "	2389	op->statusmsg ("You blindly grab for a bite of food. "
…		…
2385	op->contr->killer->destroy ();	2424	op->contr->killer->destroy ();
2386	}	2425	}
2387	}	2426	}
2388		2427
2389	/* killer should be set here already */	2428	/* killer should be set here already */
2390	if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))	2429	if (op->stats.hp < 0 && !op->flag [FLAG_WIZ])
2391	kill_player (op);	2430	kill_player (op);
2392	}	2431	}
2393	}	2432	}
2394		2433
2395	/* 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.
…		…
2564		2603
2565	/* There is a maximum depletion total per level. */	2604	/* There is a maximum depletion total per level. */
2566	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)	2605	if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
2567	{	2606	{
2568	lose_this_stat = 0;	2607	lose_this_stat = 0;
2569	/* Take loss chance vs keep chance to see if we	2608	/* Take loss chance vs keep chance to see if we
2570	retain the stat. */	2609	retain the stat. */
2571	}	2610	}
2572	else	2611	else
2573	{	2612	{
2574	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)
…		…
2590	* difference.	2629	* difference.
2591	*/	2630	*/
2592	if (this_stat >= -50)	2631	if (this_stat >= -50)
2593	{	2632	{
2594	change_attr_value (&(dep->stats), i, -1);	2633	change_attr_value (&(dep->stats), i, -1);
2595	SET_FLAG (dep, FLAG_APPLIED);	2634	dep->set_flag (FLAG_APPLIED);
2596	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);	2635	new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2597	op->update_stats ();	2636	op->update_stats ();
2598	lost_a_stat = 1;	2637	lost_a_stat = 1;
2599	}	2638	}
2600	}	2639	}
…		…
2667	if (will_kill_again)	2706	if (will_kill_again)
2668	{	2707	{
2669	object *force;	2708	object *force;
2670	int at;	2709	int at;
2671		2710
2672	force = get_archetype (FORCE_NAME);	2711	force = archetype::get (FORCE_NAME);
2673	/* 50 ticks should be enough time for the spell to abate */	2712	/* 50 ticks should be enough time for the spell to abate */
2674	force->speed = 0.1f;
2675	force->speed_left = -5.f;	2713	force->speed_left = -5.f;
2676	SET_FLAG (force, FLAG_APPLIED);	2714	force->set_speed (0.1f);
		2715	force->set_flag (FLAG_APPLIED);
		2716
2677	for (at = 0; at < NROFATTACKS; at++)	2717	for (at = 0; at < NROFATTACKS; at++)
2678	if (will_kill_again & (1 << at))	2718	if (will_kill_again & (1 << at))
2679	force->resist[at] = 100;	2719	force->resist[at] = 100;
2680		2720
2681	insert_ob_in_ob (force, op);	2721	insert_ob_in_ob (force, op);
…		…
2686	}	2726	}
2687		2727
2688	static void	2728	static void
2689	loot_object (object *op)	2729	loot_object (object *op)
2690	{ /* Grab and destroy some treasure */	2730	{ /* Grab and destroy some treasure */
2691	object tmp, tmp2, *next;	2731	object tmp, next;
2692		2732
2693	op->close_container (); /* close open sack first */	2733	op->close_container (); /* close open sack first */
2694		2734
2695	for (tmp = op->inv; tmp; tmp = next)	2735	for (tmp = op->inv; tmp; tmp = next)
2696	{	2736	{
…		…
2703	tmp->x = op->x, tmp->y = op->y;	2743	tmp->x = op->x, tmp->y = op->y;
2704		2744
2705	if (tmp->type == CONTAINER)	2745	if (tmp->type == CONTAINER)
2706	loot_object (tmp); /* empty container to ground */	2746	loot_object (tmp); /* empty container to ground */
2707		2747
2708	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))))
2709	{	2749	{
2710	if (tmp->nrof > 1)	2750	if (tmp->nrof > 1)
2711	{	2751	{
2712	tmp->decrease (rndm (1, tmp->nrof - 1));	2752	tmp->decrease (rndm (1, tmp->nrof - 1));
2713	insert_ob_in_map (tmp, op->map, NULL, 0);	2753	insert_ob_in_map (tmp, op->map, NULL, 0);
…		…
2728	void	2768	void
2729	fix_weight ()	2769	fix_weight ()
2730	{	2770	{
2731	for_all_players (pl)	2771	for_all_players (pl)
2732	{	2772	{
2733	sint32 old = pl->ob->carrying;	2773	weight_t old = pl->ob->carrying;
2734		2774
2735	pl->ob->update_weight ();	2775	pl->ob->update_weight ();
2736		2776
2737	if (old != pl->ob->carrying)	2777	if (old != pl->ob->carrying)
2738	{	2778	{
…		…
2803	}	2843	}
2804		2844
2805	int	2845	int
2806	is_true_undead (object *op)	2846	is_true_undead (object *op)
2807	{	2847	{
2808	if (QUERY_FLAG (op->arch, FLAG_UNDEAD))	2848	if (op->arch->flag [FLAG_UNDEAD])
2809	return 1;	2849	return 1;
2810		2850
2811	return 0;	2851	return 0;
2812	}	2852	}
2813		2853
…		…
2834	level = -(10 + (2 * ob->map->darklevel ()));	2874	level = -(10 + (2 * ob->map->darklevel ()));
2835		2875
2836	/* scan through all nearby squares for terrain to hide in */	2876	/* scan through all nearby squares for terrain to hide in */
2837	for (i = 0, x = ob->x, y = ob->y;	2877	for (i = 0, x = ob->x, y = ob->y;
2838	i <= SIZEOFFREE1;	2878	i <= SIZEOFFREE1;
2839	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))
2840	{	2880	{
2841	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);	2881	mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
2842	if (mflag & P_OUT_OF_MAP)	2882	if (mflag & P_OUT_OF_MAP)
2843	continue;	2883	continue;
2844		2884
…		…
2911		2951
2912	if (who->type == PLAYER)	2952	if (who->type == PLAYER)
2913	player = 1;	2953	player = 1;
2914		2954
2915	else	2955	else
2916	friendly = QUERY_FLAG (who, FLAG_FRIENDLY);	2956	friendly = who->flag [FLAG_FRIENDLY];
2917		2957
2918	/* search adjacent squares */	2958	/* search adjacent squares */
2919	for (i = 1; i < 9; i++)	2959	for (i = 1; i < 9; i++)
2920	{	2960	{
2921	x = who->x + freearr_x[i];	2961	x = who->x + DIRX (i);
2922	y = who->y + freearr_y[i];	2962	y = who->y + DIRY (i);
2923	m = who->map;	2963	m = who->map;
2924	mflags = get_map_flags (m, &m, x, y, &x, &y);	2964	mflags = get_map_flags (m, &m, x, y, &x, &y);
2925	/* space must be blocked if there is a monster. If not	2965	/* space must be blocked if there is a monster. If not
2926	* blocked, don't need to check this space.	2966	* blocked, don't need to check this space.
2927	*/	2967	*/
…		…
2930	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)))
2931	continue;	2971	continue;
2932		2972
2933	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)
2934	{	2974	{
2935	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])
2936	return 1;	2976	return 1;
2937	else if (tmp->type == PLAYER)	2977	else if (tmp->type == PLAYER)
2938	{
2939	/don't let a hidden DM prevent you from hiding /
2940	if (!QUERY_FLAG (tmp, FLAG_WIZ) \|\| tmp->contr->hidden == 0)
2941	return 1;	2978	return 1;
2942	}
2943	}	2979	}
2944	}	2980	}
2945	return 0;	2981	return 0;
2946	}	2982	}
2947		2983
2948	/* check the player los field for viewability of the	2984	/* check the player los field for viewability of the
2949	* object op. This function works fine for monsters,	2985	* object op. This function works fine for monsters,
2950	* 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
2951	* a pile (say a coin under a table would return "viewable"	2987	* a pile (say a coin under a table would return "viewable"
2952	* by this routine). Another question, should we be	2988	* by this routine). Another question, should we be
2953	* concerned with the direction the player is looking	2989	* concerned with the direction the player is looking
2954	* in? Realistically, most of us can't see stuff behind	2990	* in? Realistically, most of us can't see stuff behind
2955	* our backs...on the other hand, does the "facing" direction	2991	* our backs...on the other hand, does the "facing" direction
2956	* 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
2957	* 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.
2958	* -b.t.	2994	* -b.t.
2959	* This function is now map tiling safe.	2995	* This function is now map tiling safe.
2960	*/	2996	*/
2961	int	2997	int
2962	player_can_view (object pl, object op)	2998	player_can_view (object pl, object op)
2963	{	2999	{
…		…
2977		3013
2978	get_rangevector (pl, op, &rv, 0x1);	3014	get_rangevector (pl, op, &rv, 0x1);
2979		3015
2980	/* starting with the 'head' part, lets loop	3016	/* starting with the 'head' part, lets loop
2981	* through the object and find if it has any	3017	* through the object and find if it has any
2982	* part that is in the los array but isn't on	3018	* part that is in the los array but isn't on
2983	* a blocked los square.	3019	* a blocked los square.
2984	* we use the archetype to figure out offsets.	3020	* we use the archetype to figure out offsets.
2985	*/	3021	*/
2986	while (op)	3022	while (op)
2987	{	3023	{
…		…
3014	* and the exit-coordinates sp/hp must both be > 0.	3050	* and the exit-coordinates sp/hp must both be > 0.
3015	* => The intention here is to prevent abuse of the battleground-	3051	* => The intention here is to prevent abuse of the battleground-
3016	* feature (like pickable or hidden battleground tiles). */	3052	* feature (like pickable or hidden battleground tiles). */
3017	for (object *tmp = op->below; tmp; tmp = tmp->below)	3053	for (object *tmp = op->below; tmp; tmp = tmp->below)
3018	{	3054	{
3019	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	3055	if (tmp->flag [FLAG_IS_FLOOR])
3020	{	3056	{
3021	if (QUERY_FLAG (tmp, FLAG_NO_PICK)	3057	if (tmp->flag [FLAG_NO_PICK]
3022	&& tmp->type == BATTLEGROUND	3058	&& tmp->type == BATTLEGROUND
3023	&& tmp->name == shstr_battleground	3059	&& tmp->name == shstr_battleground
3024	&& EXIT_X (tmp) && EXIT_Y (tmp))	3060	&& EXIT_X (tmp) && EXIT_Y (tmp))
3025	{	3061	{
3026	/* before we assign the exit, check if this is a teambattle */	3062	/* before we assign the exit, check if this is a teambattle */
…		…
3184	strcat (buf, ".");	3220	strcat (buf, ".");
3185	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, buf);	3221	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, buf);
3186	}	3222	}
3187		3223
3188	/* evtl. adding flags: */	3224	/* evtl. adding flags: */
3189	if (QUERY_FLAG (item, FLAG_XRAYS))	3225	if (item->flag [FLAG_XRAYS])
3190	SET_FLAG (skin, FLAG_XRAYS);	3226	skin->set_flag (FLAG_XRAYS);
3191	if (QUERY_FLAG (item, FLAG_STEALTH))	3227	if (item->flag [FLAG_STEALTH])
3192	SET_FLAG (skin, FLAG_STEALTH);	3228	skin->set_flag (FLAG_STEALTH);
3193	if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))	3229	if (item->flag [FLAG_SEE_IN_DARK])
3194	SET_FLAG (skin, FLAG_SEE_IN_DARK);	3230	skin->set_flag (FLAG_SEE_IN_DARK);
3195		3231
3196	/* print message if there is one */	3232	/* print message if there is one */
3197	if (item->msg != NULL)	3233	if (item->msg != NULL)
3198	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);	3234	new_draw_info (NDI_UNIQUE \| NDI_BLUE, 0, who, item->msg);
3199	}	3235	}
…		…
3241	{	3277	{
3242	play_sound (sound_find ("generic_failure"));	3278	play_sound (sound_find ("generic_failure"));
3243	statusmsg (msg, color);	3279	statusmsg (msg, color);
3244	}	3280	}
3245		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.267 by root, Wed Apr 7 18:35:56 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.267 by root, Wed Apr 7 18:35:56 2010 UTC vs.
Revision 1.301 by root, Sat Nov 17 23:40:04 2018 UTC