diff options
author | Adam Borowski <kilobyte@angband.pl> | 2009-11-15 16:02:06 +0100 |
---|---|---|
committer | Adam Borowski <kilobyte@angband.pl> | 2009-11-15 16:02:06 +0100 |
commit | 65705e10994f2a18e8c69542ee1af23a19a1e5a4 (patch) | |
tree | 7711755fbdfb61ebc021e1d3731a52e421c48d2e /crawl-ref/source | |
parent | 6b9d38645fde3fd74cdd7fecc4523d4d36ee4318 (diff) | |
download | crawl-ref-65705e10994f2a18e8c69542ee1af23a19a1e5a4.tar.gz crawl-ref-65705e10994f2a18e8c69542ee1af23a19a1e5a4.zip |
Fix a few whitespace errors.
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/actor.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/dungeon.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/enum.h | 2 | ||||
-rw-r--r-- | crawl-ref/source/files.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/item_use.cc | 6 | ||||
-rw-r--r-- | crawl-ref/source/mon-speak.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/newgame.cc | 8 | ||||
-rw-r--r-- | crawl-ref/source/spells3.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/spl-book.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/spl-cast.cc | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/crawl-ref/source/actor.cc b/crawl-ref/source/actor.cc index 3b3599b377..26466c1e1f 100644 --- a/crawl-ref/source/actor.cc +++ b/crawl-ref/source/actor.cc @@ -136,7 +136,7 @@ bool actor::can_hibernate(bool holi_only) const return (false); // The monster has slept recently. - if (atype() == ACT_MONSTER && + if (atype() == ACT_MONSTER && static_cast<const monsters*>(this)->has_ench(ENCH_SLEEP_WARY)) { return (false); diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 05a924cb8c..8e59c7f94b 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -1707,7 +1707,7 @@ static void _build_overflow_temples(int level_number) { CrawlVector &god_vec = temple[TEMPLE_GODS_KEY]; god_type god = (god_type) god_vec[0].get_byte(); - + std::string name = god_name(god); name = replace_all(name, " ", "_"); lowercase(name); diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 08a30334c6..ba3a2b4e41 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -2158,7 +2158,7 @@ enum monster_flag_type MF_GOING_BERSERK = 0x1000000,// Is about to go berserk! - MF_NAME_DESCRIPTOR = 0x2000000,// mname should be treated with normal + MF_NAME_DESCRIPTOR = 0x2000000,// mname should be treated with normal // grammar, ie, prevent "You hit red rat" // and other such constructs. MF_NAME_DEFINITE = 0x4000000 // give this monster the definite "the" diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index ee78c2a02c..2c01dbdc75 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -1086,7 +1086,7 @@ static void _grab_followers() // Deal with Dowan and Duvessa here. if (dowan && duvessa) { - if (!testbits(dowan->flags, MF_TAKING_STAIRS) + if (!testbits(dowan->flags, MF_TAKING_STAIRS) || !testbits(duvessa->flags, MF_TAKING_STAIRS)) { dowan->flags &= ~MF_TAKING_STAIRS; diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index b4da7b7f6a..d73e975b89 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -2052,9 +2052,9 @@ bool setup_missile_beam(const actor *agent, bolt &beam, item_def &item, const bool reaping = (bow_brand == SPWPN_REAPING || ammo_brand == SPMSL_REAPING) && bow_brand != SPWPN_HOLY_WRATH; - const bool charged = bow_brand == SPWPN_ELECTROCUTION + const bool charged = bow_brand == SPWPN_ELECTROCUTION || ammo_brand == SPMSL_ELECTRIC; - const bool blessed = bow_brand == SPWPN_HOLY_WRATH + const bool blessed = bow_brand == SPWPN_HOLY_WRATH && ammo_brand != SPMSL_REAPING; ASSERT(!exploding || !is_artefact(item)); @@ -2822,7 +2822,7 @@ bool throw_it(bolt &pbolt, int throw_2, bool teleport, int acc_bonus, } // check for returning ammo from launchers - if (returning && projected == LRET_LAUNCHED) + if (returning && projected == LRET_LAUNCHED) { switch (lnchType) { diff --git a/crawl-ref/source/mon-speak.cc b/crawl-ref/source/mon-speak.cc index 7e1cb37394..595dbcffd5 100644 --- a/crawl-ref/source/mon-speak.cc +++ b/crawl-ref/source/mon-speak.cc @@ -373,7 +373,7 @@ void maybe_mons_speaks (monsters *monster) { mons_speaks(monster); } - else if (monster->type == MONS_CRAZY_YIUF + else if (monster->type == MONS_CRAZY_YIUF && one_chance_in(MON_SPEAK_CHANCE / 3)) { // Yiuf gets an extra chance to speak! diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 1057bccb07..9878f0725e 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -4255,13 +4255,13 @@ bool _give_items_skills() case JOB_WARPER: _newgame_make_item(0, EQ_WEAPON, OBJ_WEAPONS, WPN_SHORT_SWORD); - + if (!_choose_weapon()) return (false); - + if (you.inv[0].quantity < 1) _newgame_clear_item(0); - + _newgame_make_item(1, EQ_BODY_ARMOUR, OBJ_ARMOUR, ARM_LEATHER_ARMOUR, ARM_ROBE); _newgame_make_item(2, EQ_NONE, OBJ_BOOKS, BOOK_SPATIAL_TRANSLOCATIONS); @@ -4338,7 +4338,7 @@ bool _give_items_skills() you.skills[SK_DODGING] = 2; you.skills[SK_SPELLCASTING] = 2; - + switch (you.inv[3].sub_type) { case BOOK_ELEMENTAL_MISSILES: diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index f6cd30dbd8..f2908da88a 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -1997,7 +1997,7 @@ void cast_brand_ammo(special_missile_type which_type) switch (which_type) { - + case SPMSL_POISONED: if (set_item_ego_type( you.inv[ammo], OBJ_MISSILES, SPMSL_POISONED )) { @@ -2058,7 +2058,7 @@ void cast_brand_ammo(special_missile_type which_type) if (ammo == you.equip[EQ_WEAPON]) you.wield_change = true; - } + } else canned_msg(MSG_NOTHING_HAPPENS); break; diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 26aa0baf15..33a2de822b 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -482,7 +482,7 @@ static spell_type spellbook_template_array[][SPELLBOOK_SIZE] = SPELL_NO_SPELL, }, - // Book of Elemental Missiles + // Book of Elemental Missiles {SPELL_CORONA, SPELL_SWIFTNESS, SPELL_REPEL_MISSILES, diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 968f1c85b1..74b84bf7f1 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1947,7 +1947,7 @@ spret_type your_spells(spell_type spell, int powc, bool allow_fail) case SPELL_RETURNING_AMMUNITION: cast_brand_ammo(SPMSL_RETURNING); break; - + // Transformations. case SPELL_BLADE_HANDS: if (!transform(powc, TRAN_BLADE_HANDS)) |