From a226812664575190c3f60efc177903a80a8e774a Mon Sep 17 00:00:00 2001 From: dolorous Date: Sat, 17 Jan 2009 00:44:25 +0000 Subject: Add whitespace fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8480 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/initfile.cc | 2 +- crawl-ref/source/item_use.cc | 4 ++-- crawl-ref/source/misc.cc | 2 +- crawl-ref/source/mstuff2.cc | 4 ++-- crawl-ref/source/player.cc | 2 +- crawl-ref/source/spells1.cc | 2 +- crawl-ref/source/tilesdl.cc | 2 +- crawl-ref/source/xom.cc | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 648f246052..cf02e7b457 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -1506,7 +1506,7 @@ void game_options::read_options(InitLineInput &il, bool runscript, Options.explore_stop |= Options.explore_stop_prompt; - evil_colour = str_to_colour(variables["evil"]); + evil_colour = str_to_colour(variables["evil"]); } void game_options::fixup_options() diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index d1d7435357..b50de889d3 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1762,7 +1762,7 @@ static bool _item_penetrates_victim(const bolt &beam, const actor *victim, return (false); used = 0; - + if (!beam.is_tracer && you.can_see(victim)) mprf("The %s passes through %s!", beam.name.c_str(), victim->name(DESC_NOCAP_THE).c_str()); @@ -1838,7 +1838,7 @@ static bool _shadow_hit_victim(bolt& beam, actor* victim, int dmg, int corpse) else if (you.can_see(zomb)) mprf("%s appears out of thin air!", zomb->name(DESC_CAP_THE).c_str()); - return (true); + return (true); } static bool _dispersal_hit_victim(bolt& beam, actor* victim, int dmg, diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 4278b7d6fb..e6c4b3d427 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -1124,7 +1124,7 @@ void bleed_onto_floor(const coord_def& where, int montype, if (!m.can_bleed()) return; } - + _maybe_bloodify_square(where, damage, spatter, smell_alert); } diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index e1c561b528..39adaea987 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -137,7 +137,7 @@ void mons_cast(monsters *monster, bolt &pbolt, spell_type spell_cast, // Make sure the "comes into view" type messages are displayed before // the spell is cast. - if (monsterNearby && player_monster_visible(monster) + if (monsterNearby && player_monster_visible(monster) && !(monster->flags & MF_WAS_IN_VIEW)) { fire_monster_alerts(); @@ -2118,7 +2118,7 @@ bolt mons_spells( monsters *mons, spell_type spell_cast, int power ) return (beam); } - + if (beam.is_enchantment()) { beam.type = dchar_glyph(DCHAR_SPACE); diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 51eb1dc1d9..83f9acc7fa 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -7150,7 +7150,7 @@ bool player::can_bleed() const { return (false); } - + const int tran = you.attribute[ATTR_TRANSFORMATION]; if (tran == TRAN_STATUE || tran == TRAN_ICE_BEAST || tran == TRAN_AIR || tran == TRAN_LICH diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index cae0bde561..1eef770b03 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -1392,7 +1392,7 @@ void cast_teleport_control(int power) void cast_ring_of_flames(int power) { - _increase_duration(DUR_FIRE_SHIELD, + _increase_duration(DUR_FIRE_SHIELD, 5 + (power / 10) + (random2(power) / 5), 50, "The air around you leaps into flame!"); manage_fire_shield(); diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index 116b799163..93f8f36705 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -970,7 +970,7 @@ void TilesFramework::do_layout() } // If show_gold_turns isn't turned on, try turning it on if there's room. - if (!Options.show_gold_turns) + if (!Options.show_gold_turns) { if (layout_statcol(message_overlay, true)) Options.show_gold_turns = true; diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index b6cf9f9300..f3f7aa5ec7 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -887,7 +887,7 @@ static bool _xom_send_allies(int sever) static bool _xom_send_one_ally(int sever) { bool rc = false; - + const monster_type mon = _xom_random_demon(sever); const bool is_demonic = (mons_class_holiness(mon) == MH_DEMONIC); -- cgit v1.2.3-54-g00ecf