diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-30 04:11:21 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-30 04:11:21 +0000 |
| commit | 8dfcdc9fede87a2b78deb195ab7fdd03149ad847 (patch) | |
| tree | 1dfa58c90868bb0cf3bd199161fc5c8f531adc0a /crawl-ref | |
| parent | ff82d5caa356efe08345101721f55658bc4c377c (diff) | |
| download | crawl-ref-8dfcdc9fede87a2b78deb195ab7fdd03149ad847.tar.gz crawl-ref-8dfcdc9fede87a2b78deb195ab7fdd03149ad847.zip | |
Add yet more whitespace fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3945 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/externs.h | 4 | ||||
| -rw-r--r-- | crawl-ref/source/mon-util.cc | 4 | ||||
| -rw-r--r-- | crawl-ref/source/monstuff.cc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index c6eed59f14..ff31e69961 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -937,7 +937,7 @@ struct player_save_info class monster_spells : public FixedVector<spell_type, NUM_MONSTER_SPELL_SLOTS> { public: - monster_spells() + monster_spells() : FixedVector<spell_type, NUM_MONSTER_SPELL_SLOTS>(SPELL_NO_SPELL) { } void clear() { init(SPELL_NO_SPELL); } @@ -960,7 +960,7 @@ public: killer_type killer() const; int kill_agent() const; - + operator std::string () const; const char *kill_category_desc(kill_category) const; void merge_killer(kill_category who); diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 757c31c663..1c651447eb 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2060,7 +2060,7 @@ bool ms_waste_of_time( const monsters *mon, spell_type monspell ) if (!mon->needs_berserk(false)) ret = true; break; - + case SPELL_HASTE: if (mon->has_ench(ENCH_HASTE)) ret = true; @@ -4781,7 +4781,7 @@ void monsters::apply_enchantment(const mon_enchant &me) break; case ENCH_SHAPESHIFTER: // this ench never runs out - if (type == MONS_SHAPESHIFTER + if (type == MONS_SHAPESHIFTER || random2(1000) < ( 1000 / ((15 * hit_dice) / 5))) { monster_polymorph(this, RANDOM_MONSTER, PPT_SAME); diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 6a2e1e54ec..0233091451 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -488,7 +488,7 @@ static bool _is_pet_kill(killer_type killer, int i) static bool _ely_protects_ally(monsters *monster) { ASSERT(you.religion == GOD_ELYVILON); - + if (mons_holiness(monster) != MH_NATURAL && mons_holiness(monster) != MH_HOLY || !mons_friendly(monster) @@ -3567,7 +3567,7 @@ static bool _handle_wand(monsters *monster, bolt &beem) // disintegration beams can do large amounts of damage. beem.damage.size = beem.damage.size * 2 / 3; break; - + // these have been deemed "too tricky" at this time {dlb}: case WAND_ENSLAVEMENT: case WAND_DIGGING: |