From fc34c2118ce7b3506c5d2c16e5dcc824978f79e5 Mon Sep 17 00:00:00 2001 From: dolorous Date: Thu, 30 Apr 2009 23:10:08 +0000 Subject: Add spacing fixes. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9709 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/acr.cc | 4 ++-- crawl-ref/source/arena.cc | 4 ++-- crawl-ref/source/cloud.cc | 12 ++++++------ crawl-ref/source/debug.cc | 14 +++++++------- crawl-ref/source/describe.cc | 2 +- crawl-ref/source/directn.cc | 2 +- crawl-ref/source/dungeon.cc | 2 +- crawl-ref/source/effects.cc | 2 +- crawl-ref/source/fight.cc | 2 +- crawl-ref/source/files.cc | 2 +- crawl-ref/source/food.h | 2 +- crawl-ref/source/initfile.cc | 2 +- crawl-ref/source/libunix.cc | 2 +- crawl-ref/source/libutil.cc | 2 +- crawl-ref/source/mapdef.cc | 2 +- crawl-ref/source/message.cc | 2 +- crawl-ref/source/mon-pick.cc | 4 ++-- crawl-ref/source/mon-util.cc | 22 +++++++++++----------- crawl-ref/source/monstuff.cc | 4 ++-- crawl-ref/source/mstuff2.cc | 2 +- crawl-ref/source/mutation.cc | 2 +- crawl-ref/source/newgame.cc | 2 +- crawl-ref/source/player.cc | 4 ++-- crawl-ref/source/randart.cc | 2 +- crawl-ref/source/store.cc | 12 ++++++------ crawl-ref/source/tags.cc | 10 +++++----- crawl-ref/source/tilepick.cc | 22 +++++++++++----------- crawl-ref/source/tutorial.cc | 10 +++++----- 28 files changed, 77 insertions(+), 77 deletions(-) (limited to 'crawl-ref') diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc index 1d08677187..11753c6070 100644 --- a/crawl-ref/source/acr.cc +++ b/crawl-ref/source/acr.cc @@ -726,7 +726,7 @@ static void _recharge_rods() static bool _cmd_is_repeatable(command_type cmd, bool is_again = false) { - switch(cmd) + switch (cmd) { // Informational commands case CMD_LOOK_AROUND: @@ -1073,7 +1073,7 @@ static void _input() delta.turns_total++; delta.elapsed_total += you.time_taken; - switch(you.running) + switch (you.running) { case RMODE_INTERLEVEL: delta.turns_interlevel++; diff --git a/crawl-ref/source/arena.cc b/crawl-ref/source/arena.cc index 8d02636812..303d93fd55 100644 --- a/crawl-ref/source/arena.cc +++ b/crawl-ref/source/arena.cc @@ -638,7 +638,7 @@ namespace arena int chan = channels[i]; std::string prefix; - switch(chan) + switch (chan) { case MSGCH_ERROR: prefix = "ERROR: "; break; case MSGCH_WARN: prefix = "WARN: "; break; @@ -706,7 +706,7 @@ namespace arena const command_type cmd = key_to_command(ch, KMC_DEFAULT); // We only allow a short list of commands to be used in the arena. - switch(cmd) + switch (cmd) { case CMD_LOOK_AROUND: case CMD_SUSPEND_GAME: diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc index 921cb9cfc7..a2a4f8609c 100644 --- a/crawl-ref/source/cloud.cc +++ b/crawl-ref/source/cloud.cc @@ -45,7 +45,7 @@ static int _actual_spread_rate(cloud_type type, int spread_rate) static bool _killer_whose_match(kill_category whose, killer_type killer) { - switch(whose) + switch (whose) { case KC_YOU: return (killer == KILL_YOU_MISSILE || killer == KILL_YOU_CONF); @@ -676,7 +676,7 @@ std::string cloud_name(cloud_type type) kill_category cloud_struct::killer_to_whose(killer_type killer) { - switch(killer) + switch (killer) { case KILL_YOU: case KILL_YOU_MISSILE: @@ -696,7 +696,7 @@ kill_category cloud_struct::killer_to_whose(killer_type killer) killer_type cloud_struct::whose_to_killer(kill_category whose) { - switch(whose) + switch (whose) { case KC_YOU: return(KILL_YOU_MISSILE); case KC_FRIENDLY: return(KILL_MON_MISSILE); @@ -717,7 +717,7 @@ void cloud_struct::set_killer(killer_type _killer) killer = _killer; whose = killer_to_whose(killer); - switch(killer) + switch (killer) { case KILL_YOU: killer = KILL_YOU_MISSILE; @@ -801,7 +801,7 @@ int num_fogs_for_place(int level_number, const level_id &place) if (level_number == -1) level_number = place.absdepth(); - switch(place.level_type) + switch (place.level_type) { case LEVEL_DUNGEON: { @@ -836,7 +836,7 @@ fog_machine_data random_fog_for_place(int level_number, const level_id &place) if (level_number == -1) level_number = place.absdepth(); - switch(place.level_type) + switch (place.level_type) { case LEVEL_DUNGEON: { diff --git a/crawl-ref/source/debug.cc b/crawl-ref/source/debug.cc index 035f387fd3..17e0d1a471 100644 --- a/crawl-ref/source/debug.cc +++ b/crawl-ref/source/debug.cc @@ -303,7 +303,7 @@ void wizard_change_species( void ) you.demon_pow[i] -= prev_muts[i]; } - switch(sp) + switch (sp) { case SP_GREEN_DRACONIAN: if (you.experience_level >= 7) @@ -654,7 +654,7 @@ static dungeon_feature_type _find_appropriate_stairs(bool down) } } - switch(you.level_type) + switch (you.level_type) { case LEVEL_LABYRINTH: if (down) @@ -1627,7 +1627,7 @@ bool get_item_by_name(item_def *item, char* specs, if (jewellery_is_amulet(*item)) break; - switch(item->sub_type) + switch (item->sub_type) { case RING_SLAYING: item->plus2 = 5; @@ -1771,7 +1771,7 @@ static void _tweak_randart(item_def &item) return; int val; - switch(_prop_type[choice]) + switch (_prop_type[choice]) { case RAP_VAL_BOOL: mprf(MSGCH_PROMPT, "Toggling %s to %s.", _prop_name[choice], @@ -3518,7 +3518,7 @@ static void _debug_rap_stats(FILE *ostat) { num_props++; all_props[j]++; - switch(good_or_bad[j]) + switch (good_or_bad[j]) { case -1: num_bad_props++; @@ -5419,9 +5419,9 @@ void wizard_give_monster_item(monsters *mon) // Shouldn't we be using MONUSE_MAGIC_ITEMS? if (item_use == MONUSE_STARTING_EQUIPMENT && item.base_type != OBJ_CORPSES - && !mons_is_unique( mon->type )) + && !mons_is_unique(mon->type)) { - switch(mon_slot) + switch (mon_slot) { case MSLOT_WEAPON: case MSLOT_ALT_WEAPON: diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 0b916d3882..140475f8dd 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -132,7 +132,7 @@ void print_description(const describe_info &inf) const char* jewellery_base_ability_string(int subtype) { - switch(subtype) + switch (subtype) { case RING_REGENERATION: return "Regen"; case RING_SUSTAIN_ABILITIES: return "SustAb"; diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 5a10ce217b..831b0ec089 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -2751,7 +2751,7 @@ std::string raw_feature_description(dungeon_feature_type grid, if (you.level_type == LEVEL_DUNGEON) { - switch(you.where_are_you) + switch (you.where_are_you) { case BRANCH_SLIME_PITS: if (grid == DNGN_ROCK_WALL) diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 8063ab6d44..49e3cc1fd5 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -4527,7 +4527,7 @@ static void _dgn_give_mon_spec_items(mons_spec &mspec, item_level = spec.level; else { - switch(spec.level) + switch (spec.level) { case ISPEC_GOOD: item_level = 5 + item_level * 2; diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 5e75380c3a..32fbc335ef 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -704,7 +704,7 @@ bool lose_stat(unsigned char which_stat, unsigned char stat_loss, ISFLAG_KNOW_CURSE | ISFLAG_KNOW_PLUSES); std::string verb; - switch(cause.base_type) + switch (cause.base_type) { case OBJ_ARMOUR: case OBJ_JEWELLERY: diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc index 4fc6f5df53..f2cd3e9cc4 100644 --- a/crawl-ref/source/fight.cc +++ b/crawl-ref/source/fight.cc @@ -5337,7 +5337,7 @@ static inline int calc_stat_to_dam_base( void ) static void stab_message(actor *defender, int stab_bonus) { - switch(stab_bonus) + switch (stab_bonus) { case 3: // big melee, monster surrounded/not paying attention if (coinflip()) diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc index 88896db533..db9b688ebf 100644 --- a/crawl-ref/source/files.cc +++ b/crawl-ref/source/files.cc @@ -1921,7 +1921,7 @@ static bool _determine_ghost_version( FILE *ghostFile, static void _restore_ghost_version( FILE *ghostFile, char majorVersion, char minorVersion ) { - switch(majorVersion) + switch (majorVersion) { case TAG_MAJOR_VERSION: _restore_tagged_file(ghostFile, TAGTYPE_GHOST, minorVersion); diff --git a/crawl-ref/source/food.h b/crawl-ref/source/food.h index 1e8a3ef8b2..971ee3c601 100644 --- a/crawl-ref/source/food.h +++ b/crawl-ref/source/food.h @@ -77,7 +77,7 @@ void set_hunger(int new_hunger_level, bool suppress_msg); /* *********************************************************************** * called from: delay.cc * *********************************************************************** */ -void weapon_switch( int targ ); +void weapon_switch(int targ); bool is_poisonous(const item_def &food); bool is_mutagenic(const item_def &food); diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 9083bf85ab..08f7546915 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -3491,7 +3491,7 @@ bool parse_args( int argc, char **argv, bool rc_only ) } //.take action according to the cmd chosen - switch(o) + switch (o) { case CLO_SCORES: case CLO_TSCORES: diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc index c259c45146..b328363451 100644 --- a/crawl-ref/source/libunix.cc +++ b/crawl-ref/source/libunix.cc @@ -455,7 +455,7 @@ static void unixcurses_defkeys( void ) int unixcurses_get_vi_key(int keyin) { - switch(keyin) + switch (keyin) { // 1001..1009: passed without change case 1031: return 1007; diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index 1cc7f40d85..eee6108d56 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -649,7 +649,7 @@ void cgotoxy(int x, int y, int region) { ASSERT(x >= 1); ASSERT(y >= 1); - switch(region) + switch (region) { case GOTO_MLIST: ASSERT(x <= crawl_view.mlistsz.x); diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index b373c9b40d..f48ccaa5d2 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -2762,7 +2762,7 @@ static int str_to_ego(item_spec &spec, std::string ego_str) int *order; - switch(spec.base_type) + switch (spec.base_type) { case OBJ_ARMOUR: order = armour_order; diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index 2b59f5152b..a5a31ca6a4 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -434,7 +434,7 @@ void mpr(const char *inf, msg_channel_type channel, int param) if (crawl_state.arena) { - switch(channel) + switch (channel) { case MSGCH_PROMPT: case MSGCH_GOD: diff --git a/crawl-ref/source/mon-pick.cc b/crawl-ref/source/mon-pick.cc index 10a1b2728e..9759560bde 100644 --- a/crawl-ref/source/mon-pick.cc +++ b/crawl-ref/source/mon-pick.cc @@ -54,7 +54,7 @@ struct global_level_info static int _mons_misc_level(int mcls) { - switch(mons_char(mcls)) + switch (mons_char(mcls)) { case '&': return 35; @@ -78,7 +78,7 @@ static int _mons_misc_level(int mcls) if (mons_is_unique(mcls)) return (mons_type_hit_dice(mcls) * 14 / 10 + 1); - switch(mcls) + switch (mcls) { case MONS_HUMAN: case MONS_ELF: diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 86cae98ca6..34b986e721 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -2484,7 +2484,7 @@ bool mons_is_summoned(const monsters *m, int *duration, int *summon_type) if (summon_type != NULL) *summon_type = summ.degree; - switch(summ.degree) + switch (summ.degree) { // Temporarily dancing weapons are really there. case SPELL_TUKIMAS_DANCE: @@ -3714,7 +3714,7 @@ int monsters::body_weight() const if (weight == 0 && !mons_is_insubstantial(type)) { const monsterentry *entry = get_monster_data(mclass); - switch(entry->size) + switch (entry->size) { case SIZE_TINY: weight = 150; @@ -3746,7 +3746,7 @@ int monsters::body_weight() const end(0); } - switch(mclass) + switch (mclass) { case MONS_IRON_DEVIL: weight += 550; @@ -3787,7 +3787,7 @@ int monsters::body_weight() const break; } - switch(monster_symbols[mclass].glyph) + switch (monster_symbols[mclass].glyph) { case 'L': weight /= 2; @@ -4845,7 +4845,7 @@ mon_inv_type equip_slot_to_mslot(equipment_type eq) mon_inv_type item_to_mslot(const item_def &item) { - switch(item.base_type) + switch (item.base_type) { case OBJ_WEAPONS: return MSLOT_WEAPON; @@ -5470,7 +5470,7 @@ std::string monsters::hand_name(bool plural, bool *can_plural) const const bool rand = (type == MONS_CHAOS_SPAWN); - switch(get_mon_shape(this)) + switch (get_mon_shape(this)) { case MON_SHAPE_CENTAUR: case MON_SHAPE_NAGA: @@ -5533,7 +5533,7 @@ std::string monsters::hand_name(bool plural, bool *can_plural) const break; case MON_SHAPE_ORB: - switch(type) + switch (type) { case MONS_GIANT_SPORE: str = "rhizome"; @@ -5589,7 +5589,7 @@ std::string monsters::foot_name(bool plural, bool *can_plural) const const bool rand = (type == MONS_CHAOS_SPAWN); - switch(get_mon_shape(this)) + switch (get_mon_shape(this)) { case MON_SHAPE_INSECT: case MON_SHAPE_INSECT_WINGED: @@ -5703,7 +5703,7 @@ std::string monsters::arm_name(bool plural, bool *can_plural) const *can_plural = true; std::string str; - switch(mons_genus(type)) + switch (mons_genus(type)) { case MONS_NAGA: case MONS_DRACONIAN: str = "scaled arm"; break; @@ -7881,7 +7881,7 @@ bool monsters::do_shaft() // the monster isn't standing over a shaft. if (get_trap_type(this->pos()) != TRAP_SHAFT) { - switch(grd(pos())) + switch (grd(pos())) { case DNGN_FLOOR: case DNGN_OPEN_DOOR: @@ -8800,7 +8800,7 @@ mon_body_shape get_mon_shape(const int type) if (type == MONS_CHAOS_SPAWN) return static_cast(random2(MON_SHAPE_MISC + 1)); - switch(mons_char(type)) + switch (mons_char(type)) { case 'a': // ants and cockroaches return(MON_SHAPE_INSECT); diff --git a/crawl-ref/source/monstuff.cc b/crawl-ref/source/monstuff.cc index 48dfa774ae..1c3be21281 100644 --- a/crawl-ref/source/monstuff.cc +++ b/crawl-ref/source/monstuff.cc @@ -862,7 +862,7 @@ static void _mummy_curse(monsters* monster, killer_type killer, int index) { int pow; - switch(killer) + switch (killer) { // Mummy killed by trap or something other than the player or // another monster, so no curse. @@ -876,7 +876,7 @@ static void _mummy_curse(monsters* monster, killer_type killer, int index) break; } - switch(monster->type) + switch (monster->type) { case MONS_MUMMY: pow = 1; break; case MONS_GUARDIAN_MUMMY: pow = 3; break; diff --git a/crawl-ref/source/mstuff2.cc b/crawl-ref/source/mstuff2.cc index 0908dcea75..903364dd1e 100644 --- a/crawl-ref/source/mstuff2.cc +++ b/crawl-ref/source/mstuff2.cc @@ -1540,7 +1540,7 @@ bool mons_throw(struct monsters *monster, struct bolt &pbolt, int hand_used) static void _scale_draconian_breath(bolt& beam, int drac_type) { int scaling = 100; - switch(drac_type) + switch (drac_type) { case MONS_RED_DRACONIAN: beam.name = "searing blast"; diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index b45503d917..e61888f960 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1772,7 +1772,7 @@ static bool _is_deadly(mutation_type mutat, bool delete_mut) char amnt = 1; char mod = 0; - switch(mutat) + switch (mutat) { case MUT_GREY2_SCALES: if (cur_level == 0 || cur_level == 2) diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index 3974f059eb..bef9f81d70 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -1069,7 +1069,7 @@ static bool _species_is_undead( const species_type speci ) undead_state_type get_undead_state(const species_type sp) { - switch(sp) + switch (sp) { case SP_MUMMY: return US_UNDEAD; diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index 76bad5791b..62bd92ea61 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -4701,7 +4701,7 @@ void modify_stat(stat_type which_stat, char amount, bool suppress_msg, ISFLAG_KNOW_CURSE | ISFLAG_KNOW_PLUSES); std::string verb; - switch(cause.base_type) + switch (cause.base_type) { case OBJ_ARMOUR: case OBJ_JEWELLERY: @@ -6145,7 +6145,7 @@ int player::body_weight() const end(0); } - switch(attribute[ATTR_TRANSFORMATION]) + switch (attribute[ATTR_TRANSFORMATION]) { case TRAN_STATUE: weight *= 2; diff --git a/crawl-ref/source/randart.cc b/crawl-ref/source/randart.cc index cf712b23a6..d7bdc79b34 100644 --- a/crawl-ref/source/randart.cc +++ b/crawl-ref/source/randart.cc @@ -619,7 +619,7 @@ static int _randart_add_one_property( const item_def &item, const bool negench = one_chance_in(4); - switch(prop) + switch (prop) { default: case 0: diff --git a/crawl-ref/source/store.cc b/crawl-ref/source/store.cc index f9b4216623..da3a4a52ac 100644 --- a/crawl-ref/source/store.cc +++ b/crawl-ref/source/store.cc @@ -290,7 +290,7 @@ CrawlStoreValue &CrawlStoreValue::operator = (const CrawlStoreValue &other) type = other.type; flags = other.flags; - switch(type) + switch (type) { case SV_NONE: break; @@ -592,7 +592,7 @@ CrawlVector &CrawlStoreValue::new_vector(store_val_type _type, else \ { \ ASSERT(!(flags & SFLAG_CONST_TYPE)); \ - switch(type) \ + switch (type) \ { \ case SV_BOOL: \ field = (_type) val.boolean; \ @@ -850,7 +850,7 @@ CrawlStoreValue::operator bool() const } #define CONST_INT_CAST() \ - switch(type) \ + switch (type) \ { \ case SV_BYTE: \ return get_byte(); \ @@ -964,7 +964,7 @@ CrawlStoreValue &CrawlStoreValue::operator = (const item_def &_val) /////////////////////////////////////////////////// // Non-assignment operators which affect the lvalue #define INT_OPERATOR_UNARY(op) \ - switch(type) \ + switch (type) \ { \ case SV_BYTE: \ { \ @@ -1162,7 +1162,7 @@ void CrawlHashTable::assert_validity() const ASSERT(val.type != SV_NONE); ASSERT(!(val.flags & SFLAG_UNSET)); - switch(val.type) + switch (val.type) { case SV_STR: case SV_COORD: @@ -1439,7 +1439,7 @@ void CrawlVector::assert_validity() const if (val.type == SV_NONE || (val.flags & SFLAG_UNSET)) continue; - switch(val.type) + switch (val.type) { case SV_STR: case SV_COORD: diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index 3f64344891..ef5eaaf648 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -653,7 +653,7 @@ void tag_write(tag_type tagID, FILE* outf) { std::vector buf; writer th(&buf); - switch(tagID) + switch (tagID) { case TAG_YOU: tag_construct_you(th); break; case TAG_YOU_ITEMS: tag_construct_you_items(th); break; @@ -754,9 +754,9 @@ tag_type tag_read(FILE *fp, char minorVersion) // (currently none). void tag_missing(int tag, char minorVersion) { - UNUSED( minorVersion ); + UNUSED(minorVersion); - switch(tag) + switch (tag) { case TAG_LEVEL_ATTITUDE: tag_missing_level_attitude(); @@ -821,7 +821,7 @@ void tag_set_expected(char tags[], int fileType) // --------------------------- player tags (foo.sav) -------------------- // static void tag_construct_you(writer &th) { - int i,j; + int i, j; marshallString(th, you.your_name, 30); @@ -2254,7 +2254,7 @@ void tag_missing_level_attitude() menv[i].foe = MHITNOT; - switch(menv[i].behaviour) + switch (menv[i].behaviour) { case 0: // old BEH_SLEEP new_beh = BEH_SLEEP; // don't wake sleepers diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index e9e2d9c9d2..86a538def4 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -1081,7 +1081,7 @@ static int _tileidx_monster(int mon_idx, bool detected) static int _tileidx_fixed_artefact(int special) { - switch(special) + switch (special) { case SPWPN_SINGING_SWORD: return TILE_SPWPN_SINGING_SWORD; case SPWPN_WRATH_OF_TROG: return TILE_SPWPN_WRATH_OF_TROG; @@ -1392,7 +1392,7 @@ static int _tileidx_weapon(const item_def &item) static int _tileidx_missile(const item_def &item) { int brand = item.special; - switch(item.sub_type) + switch (item.sub_type) { case MI_STONE: return TILE_MI_STONE; case MI_ARROW: return TILE_MI_ARROW; @@ -1420,7 +1420,7 @@ static int _tileidx_armour_base(const item_def &item) { int race = item.flags & ISFLAG_RACIAL_MASK; int type = item.sub_type; - switch(type) + switch (type) { case ARM_ROBE: return TILE_ARM_ROBE; @@ -1947,7 +1947,7 @@ static int _tileidx_rune(const item_def &item) static int _tileidx_misc(const item_def &item) { - switch(item.sub_type) + switch (item.sub_type) { case MISC_BOTTLED_EFREET: return TILE_MISC_BOTTLED_EFREET; @@ -2759,7 +2759,7 @@ static int _draconian_colour(int race, int level) { if (level < 0) // hack:monster { - switch(race) + switch (race) { case MONS_DRACONIAN: return 0; case MONS_BLACK_DRACONIAN: return 1; @@ -2774,7 +2774,7 @@ static int _draconian_colour(int race, int level) } if (level < 7) return 0; - switch(race) + switch (race) { case SP_BLACK_DRACONIAN: return 1; case SP_YELLOW_DRACONIAN: return 2; @@ -2800,7 +2800,7 @@ void tilep_race_default(int race, int gender, int level, int *parts) else hair = TILEP_HAIR_LONG_BLACK; - switch(race) + switch (race) { case SP_HUMAN: result = TILEP_BASE_HUMAN; @@ -2947,7 +2947,7 @@ void tilep_job_default(int job, int gender, int *parts) parts[TILEP_PART_HAND2] = 0; parts[TILEP_PART_HELM] = 0; - switch(job) + switch (job) { case JOB_FIGHTER: parts[TILEP_PART_BODY] = TILEP_SHOW_EQUIP; @@ -3326,7 +3326,7 @@ int tilep_equ_weapon(const item_def &item) if (item.base_type == OBJ_MISCELLANY) { - switch(item.sub_type) + switch (item.sub_type) { case MISC_BOTTLED_EFREET: return TILEP_HAND1_BOTTLE; case MISC_AIR_ELEMENTAL_FAN: return TILEP_HAND1_FAN; @@ -3361,7 +3361,7 @@ int tilep_equ_weapon(const item_def &item) if (is_fixed_artefact( item )) { - switch(item.special) + switch (item.special) { case SPWPN_SINGING_SWORD: return TILEP_HAND1_SINGING_SWORD; case SPWPN_WRATH_OF_TROG: return TILEP_HAND1_AXE_TROG; @@ -3550,7 +3550,7 @@ int tilep_equ_armour(const item_def &item) { case ARM_ROBE: - switch(item.colour) + switch (item.colour) { // We've got a zillion robes; let's use 'em! case BLACK: return TILEP_BODY_ROBE_BLACK_RED; diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index bde64525bc..4d6e541721 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -319,7 +319,7 @@ static formatted_string _tut_starting_info(unsigned int width) #ifdef TUTORIAL_DEBUG static std::string _tut_debug_list(int event) { - switch(event) + switch (event) { case TUT_SEEN_FIRST_OBJECT: return "seen first object"; @@ -983,7 +983,7 @@ void tutorial_healing_reminder() // first time. void taken_new_item(unsigned char item_type) { - switch(item_type) + switch (item_type) { case OBJ_WANDS: learned_something_new(TUT_SEEN_WAND); @@ -1149,7 +1149,7 @@ static bool _advise_use_wand() } // Can it be used to fight? - switch(obj.sub_type) + switch (obj.sub_type) { case WAND_FLAME: case WAND_FROST: @@ -2439,7 +2439,7 @@ void learned_something_new(tutorial_event_type seen_what, coord_def gc) break; case TUT_NEW_ABILITY: - switch(you.religion) + switch (you.religion) { // Gods where first granted ability is active. case GOD_KIKUBAAQUDGHA: case GOD_YREDELEMNUL: case GOD_NEMELEX_XOBEH: @@ -3736,7 +3736,7 @@ static void _tutorial_describe_cloud(int x, int y) ostr << "is "; bool need_cloud = false; - switch(ctype) + switch (ctype) { case CLOUD_BLACK_SMOKE: case CLOUD_GREY_SMOKE: -- cgit v1.2.3-54-g00ecf