diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-18 15:20:46 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-09-18 15:20:46 +0000 |
| commit | ee45d583173ec10c5027b164437133a0efda79d4 (patch) | |
| tree | 9fb152d8175ab78e4347ff8ac6acf49ad641ecf8 /crawl-ref/source/monplace.cc | |
| parent | 6cb8f61061f9423b35c3c2e271055db44a8d4b8a (diff) | |
| download | crawl-ref-ee45d583173ec10c5027b164437133a0efda79d4.tar.gz crawl-ref-ee45d583173ec10c5027b164437133a0efda79d4.zip | |
Clean up monster potion handling, fix bug where !oHW healing
also applied !oH healing, make monsters drink !oH when helpful,
disallow potions for some monsters (currently only liches
and mummies, more can be added.)
Fixes 2035734, 2048006.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6944 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/monplace.cc')
| -rw-r--r-- | crawl-ref/source/monplace.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/crawl-ref/source/monplace.cc b/crawl-ref/source/monplace.cc index dab8358c73..a0d80ead9d 100644 --- a/crawl-ref/source/monplace.cc +++ b/crawl-ref/source/monplace.cc @@ -905,11 +905,8 @@ static int _place_monster_aux( const mgen_data &mg, menv[id].flags |= MF_BATTY; } - if (monster_can_submerge(&menv[id], grd(fpos)) - && !one_chance_in(5)) - { + if (monster_can_submerge(&menv[id], grd(fpos)) && !one_chance_in(5)) menv[id].add_ench(ENCH_SUBMERGED); - } menv[id].flags |= MF_JUST_SUMMONED; @@ -2109,7 +2106,7 @@ bool player_angers_monster(monsters *mon) if (see_grid(mon->pos()) && player_monster_visible(mon)) { - std::string aura = ""; + std::string aura; if (holy) aura = "holy"; |