diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-28 21:46:27 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-28 21:46:27 +0000 |
| commit | fc09d2de4c77399a6562507ad99c394d93c5cee9 (patch) | |
| tree | b957a366c7ca56c83a0e3075aed0e738a0abf5ae /crawl-ref/source/debug.cc | |
| parent | 0ffadca40b94c481141887d294d311ff738c2ad1 (diff) | |
| download | crawl-ref-fc09d2de4c77399a6562507ad99c394d93c5cee9.tar.gz crawl-ref-fc09d2de4c77399a6562507ad99c394d93c5cee9.zip | |
Fix 2004501: buggy ?identify; also finally properly id ?identify itself
after a successful identification (if there are several).
Fix 2004793: wandering mushroom flees - for real, this time (I hope).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6189 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/debug.cc')
| -rw-r--r-- | crawl-ref/source/debug.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index 250b8caeba..f45437f653 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -1768,15 +1768,15 @@ void debug_stethoscope(int mon) (hab == HT_ROCK) ? "rock" : (hab == HT_LAND) ? "floor" : "unknown"), - ((menv[i].behaviour == BEH_SLEEP) ? "sleep" : - (menv[i].behaviour == BEH_WANDER) ? "wander" : - (menv[i].behaviour == BEH_SEEK) ? "seek" : - (menv[i].behaviour == BEH_FLEE) ? "flee" : - (menv[i].behaviour == BEH_CORNERED) ? "cornered" : - (menv[i].behaviour == BEH_PANIC) ? "panic" : - (menv[i].behaviour == BEH_LEAVE) ? "leave" : - (menv[i].behaviour == BEH_LURK) ? "lurk" - : "unknown"), + (mons_is_sleeping(menv[i]) ? "sleep" : + mons_is_wandering(menv[i]) ? "wander" : + mons_is_seeking(menv[i]) ? "seek" : + mons_is_fleeing(menv[i]) ? "flee" : + mons_is_cornered(menv[i]) ? "cornered" : + mons_is_panicking(menv[i]) ? "panic" : + (menv[i].behaviour == BEH_LEAVE) ? "leave" : + mons_is_lurking(menv[i]) ? "lurk" + : "unknown"), menv[i].behaviour, ((menv[i].foe == MHITYOU) ? "you" : (menv[i].foe == MHITNOT) ? "none" : |