diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-17 01:11:57 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-06-17 01:11:57 +0000 |
| commit | c607c2f3f8e17f4471bd4d774fb6faa6aa26ded1 (patch) | |
| tree | 0de559526859a0f985f8690dc224bed3b99e1c3e /crawl-ref/source/view.cc | |
| parent | a041cf61134ad4f96e06bdadccb4782546fbddc3 (diff) | |
| download | crawl-ref-c607c2f3f8e17f4471bd4d774fb6faa6aa26ded1.tar.gz crawl-ref-c607c2f3f8e17f4471bd4d774fb6faa6aa26ded1.zip | |
Make yet more use of wrappers.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5900 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/view.cc')
| -rw-r--r-- | crawl-ref/source/view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/view.cc b/crawl-ref/source/view.cc index d1562d57dc..9720b171c5 100644 --- a/crawl-ref/source/view.cc +++ b/crawl-ref/source/view.cc @@ -1128,8 +1128,8 @@ void monster_grid(bool do_updates) if (monster->type != -1 && mons_near(monster)) { - if (do_updates && (monster->behaviour == BEH_SLEEP - || monster->behaviour == BEH_WANDER) + if (do_updates && mons_is_sleeping(monster) + || mons_is_wandering(monster)) && check_awaken(monster)) { behaviour_event( monster, ME_ALERT, MHITYOU ); @@ -1240,7 +1240,7 @@ bool check_awaken(monsters* monster) // still actively on guard for the player, even if they can't see you. // Give them a large bonus -- handle_behaviour() will nuke 'foe' after // a while, removing this bonus. - if (monster->behaviour == BEH_WANDER && monster->foe == MHITYOU) + if (mons_is_wandering(monster) && monster->foe == MHITYOU) mons_perc += 15; if (!mons_player_visible(monster)) @@ -1249,7 +1249,7 @@ bool check_awaken(monsters* monster) unnatural_stealthy = true; } - if (monster->behaviour == BEH_SLEEP) + if (mons_is_sleeping(monster)) { if (mon_holy == MH_NATURAL) { |