diff options
author | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-30 08:40:09 +0000 |
---|---|---|
committer | pauldubois <pauldubois@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-30 08:40:09 +0000 |
commit | 545034c7339efbe30c3ca89731979448345774a6 (patch) | |
tree | 0e58dd1b3a99a43cfc67fe4d1d73a8f528b2f0dc /crawl-ref/source/misc.h | |
parent | 7d398e13982b3106943d8890d62863eecebdb342 (diff) | |
download | crawl-ref-545034c7339efbe30c3ca89731979448345774a6.tar.gz crawl-ref-545034c7339efbe30c3ca89731979448345774a6.zip |
Polish for monster list:
- Slight refactoring of code
- Branded monsters not mixed in with un-branded monsters
- Add brand description in parentheses
- Add wounded status in parentheses
- Friendliness uses color, not text
Fix: Known mimics are now included in playervisible monster list
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3951 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, 4 insertions, 5 deletions
diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h index 0c48aafa2f..0a7ca790e5 100644 --- a/crawl-ref/source/misc.h +++ b/crawl-ref/source/misc.h @@ -10,18 +10,15 @@ * <1> -/--/-- LRH Created */ - #ifndef MISC_H #define MISC_H - #include "externs.h" struct bolt; struct dist; struct activity_interrupt_data; - // last updated 08jan2001 {gdl} /* *********************************************************************** * called from: ability - decks - fight - it_use2 - spells1 @@ -99,11 +96,13 @@ std::string weird_writing(); std::string cloud_name(cloud_type type); + bool is_damaging_cloud(cloud_type type, bool temp = false); 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 setup_environment_effects(); @@ -111,8 +110,6 @@ void setup_environment_effects(); // Lava smokes, swamp water mists. void run_environment_effects(); -////////////////////////////////////////////////////////////////////// - int str_to_shoptype(const std::string &s); bool do_autopray(); @@ -130,4 +127,6 @@ 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 |