diff options
| author | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-06 01:37:30 +0000 |
|---|---|---|
| committer | zelgadis <zelgadis@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-06 01:37:30 +0000 |
| commit | b047730f0c88df6ab5d53aac6470a47aae2a7af3 (patch) | |
| tree | 77f59865f0ce7a9c089101fb9ca752111d7aed15 /crawl-ref/source/monstuff.h | |
| parent | d91b7c79b321690ca48ec952cd6012b419eb3c03 (diff) | |
| download | crawl-ref-b047730f0c88df6ab5d53aac6470a47aae2a7af3.tar.gz crawl-ref-b047730f0c88df6ab5d53aac6470a47aae2a7af3.zip | |
In arena mode, make mons_friendly() and mons_wont_attack() always return false,
with mons_friendly_real() and monst_wont_attack_real() having the old behaviour
of ignoring arena mode. Remove all special casing of
"mons_friendly(mon) && !crawl_state.arena", instead using mons_friendly_real()
and mons_wont_attack_real() in the monster code which distinguishes friend from
foe. Might be a bit buggy.
Make Zot traps affect all monsters in arena mode, and never the player.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8255 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.h')
| -rw-r--r-- | crawl-ref/source/monstuff.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h index f362d867b4..382b435c5a 100644 --- a/crawl-ref/source/monstuff.h +++ b/crawl-ref/source/monstuff.h @@ -51,10 +51,10 @@ public: #define MON_KILL(x) ((x) == KILL_MON || (x) == KILL_MON_MISSILE) // useful macro -#define SAME_ATTITUDE(x) (mons_friendly(x) ? BEH_FRIENDLY : \ - mons_good_neutral(x) ? BEH_GOOD_NEUTRAL : \ - mons_neutral(x) ? BEH_NEUTRAL \ - : BEH_HOSTILE) +#define SAME_ATTITUDE(x) (mons_friendly_real(x) ? BEH_FRIENDLY : \ + mons_good_neutral(x) ? BEH_GOOD_NEUTRAL : \ + mons_neutral(x) ? BEH_NEUTRAL \ + : BEH_HOSTILE) #define MONST_INTERESTING(x) (x->flags & MF_INTERESTING) |