From bcaca7e157d99d683b6c389b99cc25b5e1286e13 Mon Sep 17 00:00:00 2001 From: dolorous Date: Thu, 23 Oct 2008 06:11:53 +0000 Subject: Add whitespace fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7294 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/beam.cc | 18 +++++++++--------- crawl-ref/source/dungeon.cc | 10 +++++----- crawl-ref/source/item_use.cc | 8 ++++---- crawl-ref/source/spells2.cc | 2 +- crawl-ref/source/tilebuf.cc | 4 ++-- crawl-ref/source/tilebuf.h | 2 +- crawl-ref/source/tilereg.cc | 2 +- crawl-ref/source/traps.cc | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 9a4b7d2add..a51b2f7d28 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -452,7 +452,7 @@ const zap_info zap_data[] = { false, false }, - + { ZAP_HEALING, "0", @@ -497,7 +497,7 @@ const zap_info zap_data[] = { true, false }, - + { ZAP_COLD, "bolt of cold", @@ -512,7 +512,7 @@ const zap_info zap_data[] = { true, false }, - + { ZAP_CONFUSION, "0", @@ -632,7 +632,7 @@ const zap_info zap_data[] = { true, false }, - + { ZAP_NEGATIVE_ENERGY, "bolt of negative energy", @@ -1108,7 +1108,7 @@ const zap_info zap_data[] = { true, false }, - + { ZAP_BREATHE_STEAM, "ball of steam", @@ -1329,7 +1329,7 @@ static void _zappy( zap_type z_type, int power, bolt &pbolt ) #endif return; } - + // Fill pbolt.name = zinfo->name; pbolt.flavour = zinfo->flavour; @@ -3918,7 +3918,7 @@ static int _affect_player( bolt &beam, item_def *item, bool affect_items ) // Simple cases for scroll burns. if (beam.flavour == BEAM_LAVA || beam.name == "hellfire") expose_player_to_element(BEAM_LAVA, burn_power); - + // More complex (geez..) if (beam.flavour == BEAM_FIRE && beam.name != "ball of steam") expose_player_to_element(BEAM_FIRE, burn_power); @@ -3926,7 +3926,7 @@ static int _affect_player( bolt &beam, item_def *item, bool affect_items ) // Potions exploding. if (beam.flavour == BEAM_COLD) expose_player_to_element(BEAM_COLD, burn_power); - + if (beam.flavour == BEAM_ACID) splash_with_acid(5); @@ -3934,7 +3934,7 @@ static int _affect_player( bolt &beam, item_def *item, bool affect_items ) if (beam.in_explosion_phase && beam.flavour == BEAM_SPORE) expose_player_to_element(BEAM_SPORE, burn_power); } - + #if DEBUG_DIAGNOSTICS mprf(MSGCH_DIAGNOSTICS, "Damage: %d", hurted ); #endif diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index ac83dca08d..f3c51fedc7 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -1275,7 +1275,7 @@ static bool _fixup_stone_stairs(bool preserve_vault_stairs) return success; } -static bool _add_feat_if_missing(bool (*iswanted)(const coord_def &), +static bool _add_feat_if_missing(bool (*iswanted)(const coord_def &), dungeon_feature_type feat) { memset(travel_point_distance, 0, sizeof(travel_distance_grid_t)); @@ -1317,7 +1317,7 @@ static bool _add_feat_if_missing(bool (*iswanted)(const coord_def &), if (travel_point_distance[rnd.x][rnd.y] != nzones) continue; - + grd(rnd) = feat; return (true); } @@ -1359,7 +1359,7 @@ static bool _add_connecting_escape_hatches() return (_add_feat_if_missing(_is_perm_down_stair, DNGN_ESCAPE_HATCH_DOWN)); } -static bool _branch_entrances_are_connected() +static bool _branch_entrances_are_connected() { // Returns true if all branch entrances on the level are connected to // stone stairs. @@ -8121,7 +8121,7 @@ static bool _fixup_interlevel_connectivity() if (up_region[i] == -1) return (false); } - + region_connected.resize(max_region + 1); for (unsigned int i = 0; i < region_connected.size(); i++) region_connected[i] = false; @@ -8183,7 +8183,7 @@ static bool _fixup_interlevel_connectivity() } if (!unique_region) continue; - + // Try first to assign to any connected regions. for (int j = 0; j < 3; j++) { diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 9834c4bd23..ce6a2e8b86 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -1766,7 +1766,7 @@ void _merge_ammo_in_inventory(int slot) { if (i == slot || !is_valid_item(you.inv[i])) continue; - + // Merge with the thrower slot. This could be a bad // thing if you're wielding IDed ammo and firing from // an unIDed stack...but that's a pretty remote case. @@ -4293,11 +4293,11 @@ static void _vulnerability_scroll() monsters& mon = menv[targ_monst]; for (unsigned int i = 0; i < ARRAYSZ(lost_enchantments); ++i) mon.del_ench(lost_enchantments[i], true, true); - + // If relevant, monsters have their MR halved. if (!mons_immune_magic(&mon)) mon.add_ench(lowered_mr); - + // Annoying but not enough to turn friendlies against you. behaviour_event(&mon, ME_ANNOY, MHITYOU); } @@ -4527,7 +4527,7 @@ void read_scroll(int slot) id_the_scroll = false; } else - { + { // Also sets wield_change. do_curse_item( *you.weapon(), false ); learned_something_new(TUT_YOU_CURSED); diff --git a/crawl-ref/source/spells2.cc b/crawl-ref/source/spells2.cc index 9ddb65b0cc..657d8941c4 100644 --- a/crawl-ref/source/spells2.cc +++ b/crawl-ref/source/spells2.cc @@ -632,7 +632,7 @@ void cast_toxic_radiance(void) void cast_refrigeration(int pow) { mpr("The heat is drained from your surroundings."); - + you.flash_colour = LIGHTCYAN; viewwindow(true, false); more(); diff --git a/crawl-ref/source/tilebuf.cc b/crawl-ref/source/tilebuf.cc index 6a61de2823..f4eaa33a77 100644 --- a/crawl-ref/source/tilebuf.cc +++ b/crawl-ref/source/tilebuf.cc @@ -193,7 +193,7 @@ void TileBuffer::set_tex(const TilesTexture *tex) } ///////////////////////////////////////////////////////////////////////////// -// ShapeBuffer +// ShapeBuffer ShapeBuffer::ShapeBuffer() : VertBuffer(NULL, GL_QUADS) { @@ -231,7 +231,7 @@ void ShapeBuffer::add(float pos_sx, float pos_sy, float pos_ex, float pos_ey, } ///////////////////////////////////////////////////////////////////////////// -// LineBuffer +// LineBuffer LineBuffer::LineBuffer() : VertBuffer(NULL, GL_LINES) { diff --git a/crawl-ref/source/tilebuf.h b/crawl-ref/source/tilebuf.h index 9368f1eb2b..f1281ec977 100644 --- a/crawl-ref/source/tilebuf.h +++ b/crawl-ref/source/tilebuf.h @@ -112,7 +112,7 @@ public: ///////////////////////////////////////////////////////////////////////////// // template implementation -template +template inline VertBuffer::VertBuffer(const GenericTexture *tex, int prim) : m_tex(tex), m_prim(prim) { diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 1f35812db5..6fea149787 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -2385,7 +2385,7 @@ int MenuRegion::mouse_entry(int x, int y) } } - return -1; + return -1; } int MenuRegion::handle_mouse(MouseEvent &event) diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index bcdaa54f79..da2ab8ee38 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -858,7 +858,7 @@ static int damage_or_escape_net(int hold) { if (can_cut_meat(*you.weapon())) damage++; - + int brand = get_weapon_brand(*you.weapon()); if (brand == SPWPN_FLAMING || brand == SPWPN_VORPAL) damage++; -- cgit v1.2.3-54-g00ecf