diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-21 23:16:42 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-21 23:16:42 +0000 |
| commit | bf946a85fe99dda39802fd242474264101ddd14f (patch) | |
| tree | b82d5360b43986f6fd6162c6d394227d4bb2d18d /crawl-ref/source/monstuff.h | |
| parent | 476b01632e0b94acf85a25dbad32782720cde555 (diff) | |
| download | crawl-ref-bf946a85fe99dda39802fd242474264101ddd14f.tar.gz crawl-ref-bf946a85fe99dda39802fd242474264101ddd14f.zip | |
For 2089989, reallow friendlies to walk into your damaging clouds in
some cases, regardless of god.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9145 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monstuff.h')
| -rw-r--r-- | crawl-ref/source/monstuff.h | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/crawl-ref/source/monstuff.h b/crawl-ref/source/monstuff.h index 42ad3d480c..614b639ef9 100644 --- a/crawl-ref/source/monstuff.h +++ b/crawl-ref/source/monstuff.h @@ -157,35 +157,14 @@ monsters *choose_random_monster_on_level( bool in_sight = true, bool near_by = false, bool prefer_named = false, bool prefer_priest = false); -/* *********************************************************************** - * called from: acr - * *********************************************************************** */ bool swap_places(monsters *monster); bool swap_places(monsters *monster, const coord_def &loc); bool swap_check(monsters *monster, coord_def &loc, bool quiet = false); -/* *********************************************************************** - * called from: bang - beam - direct - fight - spells1 - spells2 - spells3 - * *********************************************************************** */ void print_wounds(const monsters *monster); - - -/* *********************************************************************** - * called from: acr - * *********************************************************************** */ void handle_monsters(void); - - -/* *********************************************************************** - * called from: misc - * *********************************************************************** */ -bool monster_descriptor(int which_class, unsigned char which_descriptor); - - -/* *********************************************************************** - * called from: direct - item_use - spells1 - * *********************************************************************** */ +bool monster_descriptor(int which_class, mon_desc_type which_descriptor); bool message_current_target(void); unsigned int monster_index(const monsters *monster); @@ -209,12 +188,10 @@ int mons_thrown_weapon_damage(const item_def *weap); int mons_natural_regen_rate(monsters *monster); bool mons_avoids_cloud(const monsters *monster, cloud_type cl_type, - bool placement = false, - bool extra_careful = false); + bool placement = false); -// Like the above, but prevents monsters from moving into cloud if it -// would anger the player's god, and also allows a monster to move from -// one damaging cloud to another. +// Like the above, but allow a monster to move from one damaging cloud +// to another. bool mons_avoids_cloud(const monsters *monster, int cloud_num, cloud_type *cl_type = NULL, bool placement = false); #endif |