diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-10 21:18:49 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-10 21:18:49 +0000 |
| commit | b65103057f7e8d047d0ae1364eabc8436a90194f (patch) | |
| tree | 4bfdd559066080ee3bd0a2426cb4cad421d3e200 /crawl-ref/source/monstuff.h | |
| parent | 3aad70adfaef9d8b71dd37112e407c63e1816e09 (diff) | |
| download | crawl-ref-b65103057f7e8d047d0ae1364eabc8436a90194f.tar.gz crawl-ref-b65103057f7e8d047d0ae1364eabc8436a90194f.zip | |
Expand the SAME_ATTITUDE() macro to account for the good neutral
attitude.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5714 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.h')
| -rw-r--r-- | crawl-ref/source/monstuff.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h index 7ed2c197e4..0bdad00936 100644 --- a/crawl-ref/source/monstuff.h +++ b/crawl-ref/source/monstuff.h @@ -39,8 +39,10 @@ enum mon_desc_type // things that cross categorical lines {dlb} #define MON_KILL(x) ((x) == KILL_MON || (x) == KILL_MON_MISSILE) // useful macro -#define SAME_ATTITUDE(x) (mons_friendly(x)? BEH_FRIENDLY: \ - mons_neutral(x)? BEH_NEUTRAL : BEH_HOSTILE) +#define SAME_ATTITUDE(x) (mons_friendly(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) |