diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-22 04:57:56 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-22 04:57:56 +0000 |
commit | d3dc033d07bfbebeafbfaaccccee240e4097afe9 (patch) | |
tree | 3e51369d30cb34399ba8131b7122c2c8e8f83b48 /crawl-ref | |
parent | 5df03ebcfd88fbfa131d34508645a6f26b9dac82 (diff) | |
download | crawl-ref-d3dc033d07bfbebeafbfaaccccee240e4097afe9.tar.gz crawl-ref-d3dc033d07bfbebeafbfaaccccee240e4097afe9.zip |
Add whitespace fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7904 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/beam.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/debug.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/fight.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/items.cc | 2 | ||||
-rw-r--r-- | crawl-ref/source/misc.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/mutation.cc | 4 | ||||
-rw-r--r-- | crawl-ref/source/tile2.cc | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index fa00a3a828..1cd9769bb4 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -1747,7 +1747,7 @@ void fire_beam(bolt &pbolt) break; const bool was_seen = pbolt.seen; - if (!was_seen && pbolt.range > 0 && !beam_invisible + if (!was_seen && pbolt.range > 0 && !beam_invisible && see_grid(testpos)) { pbolt.seen = true; @@ -5842,7 +5842,7 @@ std::string bolt::get_short_name() if (item != NULL && is_valid_item(*item)) return item->name(DESC_NOCAP_A, false, false, false, false, - ISFLAG_IDENT_MASK | ISFLAG_COSMETIC_MASK + ISFLAG_IDENT_MASK | ISFLAG_COSMETIC_MASK | ISFLAG_RACIAL_MASK); if (real_flavour == BEAM_RANDOM || real_flavour == BEAM_CHAOS) diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index 7ac71feebd..f5d38f854b 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -3149,7 +3149,7 @@ void wizard_get_religion(void) mpr( "That god doesn't seem to be taking followers today." ); else { - dungeon_feature_type feat = + dungeon_feature_type feat = static_cast<dungeon_feature_type>( DNGN_ALTAR_FIRST_GOD + god - 1 ); dungeon_terrain_changed(you.pos(), feat, false); diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 213110157d..a5f5861dde 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -2659,7 +2659,7 @@ void melee_attack::do_miscast() if (miscast_target->atype() == ACT_PLAYER && you.banished) return; - const bool chaos_brand = + const bool chaos_brand = weapon && get_weapon_brand(*weapon) == SPWPN_CHAOS; // If the miscast is happening on the attacker's side and is due to diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 6d935b48a2..990dd46204 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -1011,7 +1011,7 @@ static std::string _origin_place_desc(const item_def &item) { return item.props[PORTAL_VAULT_ORIGIN_KEY].get_string(); } - + return prep_branch_level_name(item.orig_place); } diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 89155a97de..415910a7e2 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2615,9 +2615,9 @@ bool mons_is_safe(const monsters *mon, bool want_move, && you.delay_queue.front().type != DELAY_REST || you.running < RMODE_NOT_RUNNING || want_move); - + bool result = is_safe; - + if (clua.callfn("ch_mon_is_safe", "Mbbd>b", mon, is_safe, moving, dist, &result)) diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index 999bf49ed2..97ecc63231 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1669,7 +1669,7 @@ static bool _is_deadly(mutation_type mutat, bool delete_mut) char *stat_ptr = &you.dex; // Default for the scales. char amnt = 1; char mod = 0; - + switch(mutat) { case MUT_GREY2_SCALES: @@ -3007,7 +3007,7 @@ bool give_bad_mutation(bool failMsg, bool force_mutation, bool non_fatal) case 12: mutat = MUT_LOW_MAGIC; break; } } while (non_fatal && !accept_mutation(mutat, true, true)); - + const bool result = mutate(mutat, failMsg, force_mutation); if (result) learned_something_new(TUT_YOU_MUTATED); diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc index b327aa84f6..db50ab4dee 100644 --- a/crawl-ref/source/tile2.cc +++ b/crawl-ref/source/tile2.cc @@ -185,7 +185,7 @@ void tile_default_flv(level_area_type lev, branch_type br, tile_flavour &flv) void tile_init_default_flavour() { - tile_default_flv(you.level_type, you.where_are_you, env.tile_default); + tile_default_flv(you.level_type, you.where_are_you, env.tile_default); } int get_clean_map_idx(int tile_idx) |