diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-17 21:28:56 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-17 21:28:56 +0000 |
| commit | 12de33d2d95164e30a8a2ac960ad28b2a69383e3 (patch) | |
| tree | 4b238a712c0c7f329eed44cc23832f6998c7b2ca /crawl-ref/source/misc.h | |
| parent | 46c7199d6ae8c006a78799a1c59dacf4e2d77c8f (diff) | |
| download | crawl-ref-12de33d2d95164e30a8a2ac960ad28b2a69383e3.tar.gz crawl-ref-12de33d2d95164e30a8a2ac960ad28b2a69383e3.zip | |
Another modification of autotargetting submerged monsters, based off
BR 1935715.
* Targeting a square with a known submerged monster ("strange
disturbance" description) always enforces '!' rather than '.'
* Submerged monsters only get targetted if there are no other more
viable targets (dangerous monsters, really) in sight.
The latter uses a heavily modified i_feel_safe() that now draws on
get_playervisible_monsters(), which got numerous new parameters to cover
all possibilities. :p
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4314 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/misc.h')
| -rw-r--r-- | crawl-ref/source/misc.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h index 9e71adead8..2223757511 100644 --- a/crawl-ref/source/misc.h +++ b/crawl-ref/source/misc.h @@ -113,7 +113,12 @@ void curare_hits_player(int agent, int degree); bool mons_is_safe(const monsters *mon, bool want_move = false); -bool i_feel_safe(bool announce = false, bool want_move = false); +void get_playervisible_monsters(std::vector<monsters*>& mons, + bool just_check = false, bool want_move = false, + bool dangerous = false, int range = -1); + +bool i_feel_safe(bool announce = false, bool want_move = false, + bool just_monsters = false, int range = -1); void setup_environment_effects(); @@ -137,6 +142,4 @@ bool interrupt_cmd_repeat( activity_interrupt_type ai, void reveal_secret_door(int x, int y); -void get_playervisible_monsters(std::vector<monsters*>& mons); - #endif |