diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-08 21:44:54 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-04-08 21:44:54 +0000 |
| commit | 97e171351b793c4e02a0e8423f7dacb0f22fea3b (patch) | |
| tree | c4bafe0ac9902177526a4d95382e749343952a1d /crawl-ref | |
| parent | 96978ec986de7b655b20070a98813c45dbaab2ea (diff) | |
| download | crawl-ref-97e171351b793c4e02a0e8423f7dacb0f22fea3b.tar.gz crawl-ref-97e171351b793c4e02a0e8423f7dacb0f22fea3b.zip | |
Add yet more whitespace fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4150 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 4ad0360985..805d7d09f9 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -4695,7 +4695,7 @@ void monsters::apply_enchantment(const mon_enchant &me) // Air elementals are a special case, as their // submerging in air isn't up to choice. -- bwr - if (type == MONS_AIR_ELEMENTAL) + if (type == MONS_AIR_ELEMENTAL) { heal_monster( this, 1, one_chance_in(5) ); diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index c87263f71e..36686b29a2 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -4544,17 +4544,17 @@ static void _monster_regenerate(monsters *monster) } if (monster_descriptor(monster->type, MDSC_REGENERATES) - || (monster->type == MONS_FIRE_ELEMENTAL + || (monster->type == MONS_FIRE_ELEMENTAL && (grd(monster->pos()) == DNGN_LAVA || cloud_type_at(monster->pos()) == CLOUD_FIRE)) - - || (monster->type == MONS_WATER_ELEMENTAL + + || (monster->type == MONS_WATER_ELEMENTAL && grid_is_watery(grd(monster->pos()))) - + || (monster->type == MONS_AIR_ELEMENTAL && env.cgrid(monster->pos()) == EMPTY_CLOUD && one_chance_in(3)) - + || _mons_natural_regen_roll(monster)) { heal_monster(monster, 1, false); |