diff options
51 files changed, 0 insertions, 162 deletions
diff --git a/crawl-ref/source/acquire.cc b/crawl-ref/source/acquire.cc index 7898772664..6ed216396b 100644 --- a/crawl-ref/source/acquire.cc +++ b/crawl-ref/source/acquire.cc @@ -1497,9 +1497,7 @@ int acquirement_create_item(object_class_type class_wanted, } } else - { set_item_ego_type(thing, OBJ_WEAPONS, SPWPN_VORPAL); - } } break; } diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 27a805625a..3054e73144 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -2423,9 +2423,7 @@ void bolt::affect_endpoint() noisy(25, pos()); } else - { noisy(25, pos(), "You hear a splash."); - } _create_feat_splash(pos(), DNGN_FLOOR, DNGN_SHALLOW_WATER, diff --git a/crawl-ref/source/behold.cc b/crawl-ref/source/behold.cc index 223bfc30b8..6cc401a167 100644 --- a/crawl-ref/source/behold.cc +++ b/crawl-ref/source/behold.cc @@ -165,9 +165,7 @@ static void _removed_beholder_msg(const monster* mon) if (you.can_see(mon)) mprf("%s's is no longer quite as mesmerising!", mon->name(DESC_THE).c_str()); else - { mpr("Your mesmeriser suddenly seems less interesting!"); - } } return; @@ -183,9 +181,7 @@ static void _removed_beholder_msg(const monster* mon) mon->name(DESC_THE).c_str()); } else - { mpr("The silence clears your mind."); - } return; } diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc index 380a2d08e2..faa9f829dc 100644 --- a/crawl-ref/source/chardump.cc +++ b/crawl-ref/source/chardump.cc @@ -824,9 +824,7 @@ static void _sdump_inventory(dump_params &par) text += munge_description(text2); } else - { text += "\n"; - } } } } diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc index 8f0a5f94f3..d0d3b54f83 100644 --- a/crawl-ref/source/cloud.cc +++ b/crawl-ref/source/cloud.cc @@ -965,9 +965,7 @@ bool _actor_apply_cloud_side_effects(actor *act, cloud.cloud_name()); } else - { poison_monster(mons, find_agent(cloud.source, cloud.whose)); - } return true; @@ -981,9 +979,7 @@ bool _actor_apply_cloud_side_effects(actor *act, miasma_player(cloud.cloud_name()); } else - { miasma_monster(mons, find_agent(cloud.source, cloud.whose)); - } break; case CLOUD_MUTAGENIC: diff --git a/crawl-ref/source/coordit.cc b/crawl-ref/source/coordit.cc index 60718d7740..ec6d84e474 100644 --- a/crawl-ref/source/coordit.cc +++ b/crawl-ref/source/coordit.cc @@ -55,9 +55,7 @@ void rectangle_iterator::operator ++() current.y++; } else - { current.x++; - } } diff --git a/crawl-ref/source/dbg-scan.cc b/crawl-ref/source/dbg-scan.cc index 8a01fc8671..d950f479db 100644 --- a/crawl-ref/source/dbg-scan.cc +++ b/crawl-ref/source/dbg-scan.cc @@ -210,9 +210,7 @@ void debug_item_scan(void) _dump_item(name, i, mitm[i], "Bad plus or special value:"); } else if (mitm[i].flags & ISFLAG_SUMMONED && in_bounds(mitm[i].pos)) - { _dump_item(name, i, mitm[i], "Summoned item on floor:"); - } } // Quickly scan monsters for "program bug"s. diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 6ea31a602d..ed2a36d2e9 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -1532,9 +1532,7 @@ static string _describe_jewellery(const item_def &item, bool verbose) { string rand_desc = _randart_descrip(item); if (!rand_desc.empty()) - { description += rand_desc; - } if (!item_ident(item, ISFLAG_KNOW_PROPERTIES) || !item_ident(item, ISFLAG_KNOW_TYPE)) { diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index eb93c9a8c0..6be2de789c 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -1259,9 +1259,7 @@ void direction_chooser::object_cycle(int dir) target_unshifted = false; } else - { flush_input_buffer(FLUSH_ON_FAILURE); - } } void direction_chooser::monster_cycle(int dir) @@ -1273,9 +1271,7 @@ void direction_chooser::monster_cycle(int dir) target_unshifted = false; } else - { flush_input_buffer(FLUSH_ON_FAILURE); - } } void direction_chooser::feature_cycle_forward(int feature) @@ -1287,9 +1283,7 @@ void direction_chooser::feature_cycle_forward(int feature) set_target(objfind_pos); } else - { flush_input_buffer(FLUSH_ON_FAILURE); - } } void direction_chooser::update_previous_target() const @@ -1474,9 +1468,7 @@ void direction_chooser::print_target_monster_description(bool &did_cloud) const text = get_monster_equipment_desc(mi); } else - { text = "Disturbance"; - } // Build the final description string. if (!suffixes.empty()) @@ -1849,9 +1841,7 @@ void direction_chooser::handle_mlist_cycle_command(command_type key_command) set_target(monsfind_pos); } else - { flush_input_buffer(FLUSH_ON_FAILURE); - } } #endif } diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index 9a7c752ac2..534426b005 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -2461,9 +2461,7 @@ static void _pan_level() && !all_demons_generated) { do - { which_demon = random2(4); - } while (you.uniq_map_tags.count(string("uniq_") + pandemon_level_names[which_demon])); } @@ -2488,9 +2486,7 @@ static void _pan_level() { const map_def *layout; do - { layout = random_map_for_tag("layout", true, true); - } while (layout->has_tag("no_primary_vault")); dgn_ensure_vault_placed(_build_primary_vault(layout), true); @@ -5294,9 +5290,7 @@ static void _place_spec_shop(const coord_def& where, item_level = level_number + random2((level_number + 1) * 2); } else - { item_level = level_number + random2((level_number + 1) * 3); - } // Make bazaar items more valuable (up to double value). if (player_in_branch(BRANCH_BAZAAR)) @@ -5554,14 +5548,10 @@ static void _add_plant_clumps(int frequency /* = 10 */, mg.cls = type; } else - { continue; - } } else - { continue; - } vector<coord_def> to_place; to_place.push_back(*ri); diff --git a/crawl-ref/source/format.cc b/crawl-ref/source/format.cc index f2f4046422..1745e6fe9f 100644 --- a/crawl-ref/source/format.cc +++ b/crawl-ref/source/format.cc @@ -201,9 +201,7 @@ void formatted_string::parse_string1(const string &s, formatted_string &fs, die("Stack underflow in string \"%s\"", s.c_str()); } else - { colour_stack.push_back(get_colour(tagtext)); - } // fs.cprintf("%d%d", colour_stack.size(), colour_stack.back()); fs.textcolor(colour_stack.back()); diff --git a/crawl-ref/source/hints.cc b/crawl-ref/source/hints.cc index 6d654ab4b6..824640921f 100644 --- a/crawl-ref/source/hints.cc +++ b/crawl-ref/source/hints.cc @@ -3325,9 +3325,7 @@ void hints_describe_item(const item_def &item) cmd.push_back(CMD_FIRE); } else - { ostr << "To attack a monster, you can simply walk into it."; - } } if (is_throwable(&you, item) && !long_text) diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc index c4f188c272..c553fa8dec 100644 --- a/crawl-ref/source/hiscores.cc +++ b/crawl-ref/source/hiscores.cc @@ -2385,9 +2385,7 @@ string scorefile_entry::death_description(death_desc_verbosity verbosity) const desc += _hiscore_newline_string(); } else - { desc += " (" + *it; - } } if (semiverbose) diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 02ca766b02..75e9a6014c 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3329,9 +3329,7 @@ bool stasis_blocks_effect(bool calc_unid, } } else - { mpr(message.c_str()); - } } // In all cases, the amulet auto-ids if requested. diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index e9a2974c96..720f8bb486 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -329,9 +329,7 @@ bool dec_inv_item_quantity(int obj, int amount, bool suppress_burden) crawl_state.cancel_cmd_again(); } else - { you.inv[obj].quantity -= amount; - } if (!suppress_burden) burden_change(); diff --git a/crawl-ref/source/l_dgn.cc b/crawl-ref/source/l_dgn.cc index a5df29f7b8..e96649afeb 100644 --- a/crawl-ref/source/l_dgn.cc +++ b/crawl-ref/source/l_dgn.cc @@ -1590,9 +1590,7 @@ LUAFN(_dgn_place_map) env.level_vaults[env.level_vaults.size() - 1]); } else - { lua_pushnil(ls); - } return 1; } diff --git a/crawl-ref/source/l_file.cc b/crawl-ref/source/l_file.cc index ed0b768a4b..c14f709b4d 100644 --- a/crawl-ref/source/l_file.cc +++ b/crawl-ref/source/l_file.cc @@ -195,9 +195,7 @@ LUAFN(_file_writefile) lua_pushboolean(ls, true); } else - { lua_pushboolean(ls, false); - } return 1; } diff --git a/crawl-ref/source/l_item.cc b/crawl-ref/source/l_item.cc index 5ccb17b71f..ebd99c7133 100644 --- a/crawl-ref/source/l_item.cc +++ b/crawl-ref/source/l_item.cc @@ -759,9 +759,7 @@ static int l_item_do_identified(lua_State *ls) } } else - { known_status = item_ident(*item, ISFLAG_IDENT_MASK); - } lua_pushboolean(ls, known_status); return 1; diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index ac1da1f8d1..f97f3b0ff8 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -3420,9 +3420,7 @@ jewellery_type get_random_amulet_type() { int res; do - { res = (AMU_FIRST_AMULET + random2(NUM_JEWELLERY - AMU_FIRST_AMULET)); - } // Do not generate cFly (now used for amulet of the Air only) while (res == AMU_CONTROLLED_FLIGHT); return jewellery_type(res); diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index 5d5d30ae87..19cbeffa4b 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -3924,9 +3924,7 @@ void mons_list::get_zombie_type(string s, mons_spec &spec) const } } else - { s = s.substr(0, s.length() - strlen(zombie_types[mod - 1])); - } trim_string(s); diff --git a/crawl-ref/source/mapmark.cc b/crawl-ref/source/mapmark.cc index ecf99ca735..12d42ea8d0 100644 --- a/crawl-ref/source/mapmark.cc +++ b/crawl-ref/source/mapmark.cc @@ -235,9 +235,7 @@ bool map_lua_marker::get_table() const return lua_istable(dlua, -1); } else - { return false; - } } void map_lua_marker::write(writer &outf) const diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc index 88a3e3687c..65ad9a29d4 100644 --- a/crawl-ref/source/maps.cc +++ b/crawl-ref/source/maps.cc @@ -1028,9 +1028,7 @@ _random_map_in_list(const map_selector &sel, chance.push_back(&vdefs[i]); } else - { eligible.push_back(&vdefs[i]); - } } for (vault_chance_roll_iterator vc(chance); vc; ++vc) diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index 028dbbfc22..d47838ee2b 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -1440,9 +1440,7 @@ struct tentacle_attack_constraints } // An actor we can't path through is there else - { temp.path_distance = DISCONNECT_DIST; - } } @@ -2135,9 +2133,7 @@ void move_kraken_tentacles(monster* kraken) } } else - { current_mon = NULL; - } current_count++; } diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index c099238ce5..1d918b859e 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -3566,9 +3566,7 @@ static bool _monster_move(monster* mons) noisy(25, target); } else - { noisy(25, target, "You hear a crashing sound."); - } } else if (player_can_hear(mons->pos() + mmov)) { diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc index 3b35c94c39..cfe5a0d829 100644 --- a/crawl-ref/source/mon-behv.cc +++ b/crawl-ref/source/mon-behv.cc @@ -786,9 +786,7 @@ void handle_behaviour(monster* mon) new_beh = BEH_WANDER; } else - { mon->target = foepos; - } break; default: diff --git a/crawl-ref/source/mon-ench.cc b/crawl-ref/source/mon-ench.cc index 3cef356ad6..fe9ccab3ec 100644 --- a/crawl-ref/source/mon-ench.cc +++ b/crawl-ref/source/mon-ench.cc @@ -1258,9 +1258,7 @@ void monster::apply_enchantment(const mon_enchant &me) name(DESC_THE).c_str()); } else - { mpr("All of a sudden the net rips apart!"); - } } destroy_item(net); diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc index 58a8eadff0..f623f21c37 100644 --- a/crawl-ref/source/mon-info.cc +++ b/crawl-ref/source/mon-info.cc @@ -1213,9 +1213,7 @@ string monster_info::pluralised_name(bool fullname) const return pluralise(mons_type_name(type, DESC_PLAIN)); } else - { return pluralise(common_name()); - } } void monster_info::to_string(int count, string& desc, diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc index 48636ff839..9ee662fc90 100644 --- a/crawl-ref/source/mon-place.cc +++ b/crawl-ref/source/mon-place.cc @@ -3183,9 +3183,7 @@ public: best_distance = traveled_distance; } else - { good_square(dc); - } return false; } }; diff --git a/crawl-ref/source/mon-stealth.cc b/crawl-ref/source/mon-stealth.cc index 86e39772fa..cab06ab261 100644 --- a/crawl-ref/source/mon-stealth.cc +++ b/crawl-ref/source/mon-stealth.cc @@ -15,9 +15,7 @@ static int _clamp_stealth(int stealth) else if (stealth < -3) return -3; else - { return stealth; - } } // Monster stealth is a value between: diff --git a/crawl-ref/source/mon-stuff.cc b/crawl-ref/source/mon-stuff.cc index 2d910c1521..c85940cc98 100644 --- a/crawl-ref/source/mon-stuff.cc +++ b/crawl-ref/source/mon-stuff.cc @@ -1021,9 +1021,7 @@ static void _setup_base_explosion(bolt & beam, const monster& origin) beam.thrower = KILL_YOU; } else - { beam.thrower = KILL_MON; - } beam.aux_source.clear(); beam.attitude = origin.attitude; diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 9df64dc43d..2b20881440 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -5761,9 +5761,7 @@ bool monster::attempt_escape(int attempts) randfact += roll_dice(1, themonst->hit_dice); } else - { randfact = roll_dice(1, you.strength()); - } if (attfactor > randfact) { diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index e8aa5acb39..6ad9e24b47 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1935,9 +1935,7 @@ try_again: const facet_def* next_facet; do - { next_facet = &RANDOM_ELEMENT(_demon_facets); - } while (!_works_at_tier(*next_facet, tier) || facets_used.find(next_facet) != facets_used.end() || !_slot_is_unique(next_facet->muts, facets_used)); @@ -1993,9 +1991,7 @@ _order_ds_mutations(vector<demon_mutation_info> muts) int last = min(100, muts[i].when + 100); int k; do - { k = 10 * first + random2(10 * (last - first)); - } while (time_slots[k] >= 0); time_slots[k] = i; times.push_back(k); diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index ec85d32c11..f6c107f590 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -659,9 +659,7 @@ static void _construct_species_menu(const newgame_def* ng, if (ng->job != JOB_UNKNOWN) tmp->set_id(M_VIABLE); else - { tmp->set_id(M_RANDOM); - } tmp->set_highlight_colour(LIGHTGRAY); tmp->set_description_text("Picks a random viable species based on your current job choice"); menu->attach_item(tmp); @@ -925,9 +923,7 @@ static void _prompt_species(newgame_def* ng, newgame_def* ng_choice, return; } else - { continue; - } } } } @@ -1057,9 +1053,7 @@ static void _construct_backgrounds_menu(const newgame_def* ng, if (ng->species != SP_UNKNOWN) tmp->set_id(M_VIABLE); else - { tmp->set_id(M_RANDOM); - } tmp->set_highlight_colour(LIGHTGRAY); tmp->set_description_text("Picks a random viable background based on your current species choice"); menu->attach_item(tmp); diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index b5919445c3..50b4f43448 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -4167,9 +4167,7 @@ int player_spirit_shield(bool calc_unid) + player_equip_ego_type(EQ_ALL_ARMOUR, SPARM_SPIRIT_SHIELD); } else - { return 0; - } } int player_effect_inaccuracy() @@ -4178,9 +4176,7 @@ int player_effect_inaccuracy() if (!you.suppressed()) return wearing_amulet(AMU_INACCURACY); else - { return 0; - } } int player_res_mutation_from_item(bool calc_unid) @@ -4189,9 +4185,7 @@ int player_res_mutation_from_item(bool calc_unid) if (!you.suppressed()) return wearing_amulet(AMU_RESIST_MUTATION, calc_unid); else - { return 0; - } } int player_effect_gourmand() @@ -4200,9 +4194,7 @@ int player_effect_gourmand() if (!you.suppressed()) return wearing_amulet(AMU_THE_GOURMAND); else - { return 0; - } } int player_effect_stasis(bool calc_unid) @@ -4211,9 +4203,7 @@ int player_effect_stasis(bool calc_unid) if (!you.suppressed()) return wearing_amulet(AMU_STASIS, calc_unid); else - { return 0; - } } // This is a bit confusing. This is not the function that determines whether or @@ -4227,9 +4217,7 @@ int player_effect_notele(bool calc_unid) if (!you.suppressed()) return scan_artefacts(ARTP_PREVENT_TELEPORTATION, calc_unid); else - { return 0; - } } // permaswift effects like boots of running and lightning scales @@ -4239,9 +4227,7 @@ int player_effect_running() if (!you.suppressed()) return player_equip_ego_type(EQ_BOOTS, SPARM_RUNNING); else - { return 0; - } } int player_effect_cfly(bool calc_unid) @@ -4250,9 +4236,7 @@ int player_effect_cfly(bool calc_unid) if (!you.suppressed()) return wearing_amulet(AMU_CONTROLLED_FLIGHT, calc_unid); else - { return 0; - } } int player_effect_faith() @@ -4261,9 +4245,7 @@ int player_effect_faith() if (!you.suppressed()) return wearing_amulet(AMU_FAITH); else - { return 0; - } } int player_effect_archmagi() @@ -4272,9 +4254,7 @@ int player_effect_archmagi() if (!you.suppressed()) return player_equip_ego_type(EQ_BODY_ARMOUR, SPARM_ARCHMAGI); else - { return 0; - } } int player_effect_nocast() @@ -4283,22 +4263,16 @@ int player_effect_nocast() if (!you.suppressed()) return scan_artefacts(ARTP_PREVENT_SPELLCASTING); else - { return 0; - } } int player_effect_angry() { // All effects negated by magical suppression should go in here. if (!you.suppressed()) - { return (scan_artefacts(ARTP_ANGRY)); - } else - { return 0; - } } // Returns whether the player has the effect of the amulet from a diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index e412a990d1..18414e1063 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -674,9 +674,7 @@ bool cast_a_spell(bool check_range, spell_type spell) return false; } else - { spell = get_spell_by_letter(keyin); - } } if (spell == SPELL_NO_SPELL) diff --git a/crawl-ref/source/spl-miscast.cc b/crawl-ref/source/spl-miscast.cc index de031c5e9f..834ae384e2 100644 --- a/crawl-ref/source/spl-miscast.cc +++ b/crawl-ref/source/spl-miscast.cc @@ -275,9 +275,7 @@ string MiscastEffect::get_default_cause(bool attribute_to_user) const + " miscasting " + spell_title(spell)); } else - { return string("miscast of ") + spell_title(spell); - } } bool MiscastEffect::neither_end_silenced() diff --git a/crawl-ref/source/sqldbm.cc b/crawl-ref/source/sqldbm.cc index 03999a0e8a..b71fb3e4c0 100644 --- a/crawl-ref/source/sqldbm.cc +++ b/crawl-ref/source/sqldbm.cc @@ -35,9 +35,7 @@ public: usleep(1000); } else - { nretries = 0; - } } private: int nretries; diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index 92cf86c8af..718dcb9994 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -1739,9 +1739,7 @@ void StashTracker::search_stashes() redraw_screen(); } else - { break; - } } msgwin_reply(validline ? buf : ""); diff --git a/crawl-ref/source/stuff.cc b/crawl-ref/source/stuff.cc index f52052a336..2583460495 100644 --- a/crawl-ref/source/stuff.cc +++ b/crawl-ref/source/stuff.cc @@ -290,9 +290,7 @@ NORETURN void game_ended_with_error(const string &message) game_ended(); } else - { end(1, false, "%s", message.c_str()); - } } void redraw_screen(void) diff --git a/crawl-ref/source/tilebuf.cc b/crawl-ref/source/tilebuf.cc index 98720b826a..cabaa36e86 100644 --- a/crawl-ref/source/tilebuf.cc +++ b/crawl-ref/source/tilebuf.cc @@ -238,9 +238,7 @@ void SubmergedTileBuffer::add(tileidx_t idx, int x, int y, int z, bool submerged alpha_top, alpha_top); } else - { m_above_water.add(idx, x, y, z, ox, oy, -1, ymax, alpha_top, alpha_top); - } } void SubmergedTileBuffer::draw() const diff --git a/crawl-ref/source/tiledoll.cc b/crawl-ref/source/tiledoll.cc index 166cb7d06b..6cb1a34f24 100644 --- a/crawl-ref/source/tiledoll.cc +++ b/crawl-ref/source/tiledoll.cc @@ -293,9 +293,7 @@ void fill_doll_equipment(dolls_data &result) else if (item == -1) result.parts[TILEP_PART_HAND2] = 0; else - { result.parts[TILEP_PART_HAND2] = tilep_equ_shield(you.inv[item]); - } } // Body armour. if (result.parts[TILEP_PART_BODY] == TILEP_SHOW_EQUIP) diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc index 5e6407b006..4843c46202 100644 --- a/crawl-ref/source/tilemcache.cc +++ b/crawl-ref/source/tilemcache.cc @@ -530,9 +530,7 @@ int mcache_monster::info(tile_draw_info *dinfo) const int ofs_x, ofs_y; if (m_equ_tile && get_weapon_offset(m_mon_tile, &ofs_x, &ofs_y)) - { dinfo[count++].set(m_equ_tile, ofs_x, ofs_y); - } // In some cases, overlay a second weapon tile... if (m_mon_tile == TILEP_MONS_DEEP_ELF_BLADEMASTER) @@ -556,9 +554,7 @@ int mcache_monster::info(tile_draw_info *dinfo) const dinfo[count++].set(eq2, -ofs_x, ofs_y); } else if (m_shd_tile && get_shield_offset(m_mon_tile, &ofs_x, &ofs_y)) - { dinfo[count++].set(m_shd_tile, ofs_x, ofs_y); - } return count; } diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index 2a5a0e8783..87f47c0e15 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -5401,9 +5401,7 @@ string tile_debug_string(tileidx_t fg, tileidx_t bg, char prefix) } } else - { fg_name += "[not found]"; - } } string tile_string = make_stringf( diff --git a/crawl-ref/source/tilereg-crt.cc b/crawl-ref/source/tilereg-crt.cc index 374108d995..3e1063f0ec 100644 --- a/crawl-ref/source/tilereg-crt.cc +++ b/crawl-ref/source/tilereg-crt.cc @@ -30,9 +30,7 @@ int CRTRegion::handle_mouse(MouseEvent &event) } } else - { ret_val = m_attached_menu->handle_mouse(event); - } return ret_val; } diff --git a/crawl-ref/source/tilereg-menu.cc b/crawl-ref/source/tilereg-menu.cc index a15a619ef9..c30283748b 100644 --- a/crawl-ref/source/tilereg-menu.cc +++ b/crawl-ref/source/tilereg-menu.cc @@ -269,9 +269,7 @@ void MenuRegion::_place_entries(const int left_offset, const int top_offset, text.del_char(); } else - { text += m_entries[i].text; - } int w = entry_start + column_width - text_sx - tile_indent; int h = m_font_entry->char_height() * 2; diff --git a/crawl-ref/source/tilereg-text.cc b/crawl-ref/source/tilereg-text.cc index 5470e653b1..21eddb1fb8 100644 --- a/crawl-ref/source/tilereg-text.cc +++ b/crawl-ref/source/tilereg-text.cc @@ -226,9 +226,7 @@ void TextRegion::render() abuf[idx] = col_back; } else - { m_font->render_textblock(sx + ox, sy + oy, cbuf, abuf, mx, my); - } } void TextRegion::clear() diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index dccda89a0d..0957ec9e05 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -932,9 +932,7 @@ void TilesFramework::do_layout() } } else - { message_y_divider = available_height_in_tiles * m_region_tile->dy; - } } // Resize and place the dungeon region. diff --git a/crawl-ref/source/tileview.cc b/crawl-ref/source/tileview.cc index f70bae95e9..b5732406b4 100644 --- a/crawl-ref/source/tileview.cc +++ b/crawl-ref/source/tileview.cc @@ -651,9 +651,7 @@ void tile_floor_halo(dungeon_feature_type target, tileidx_t tile) else if (d_spc && r_spc) env.tile_flv[x][y].floor = tile + SPECIAL_NW; else - { env.tile_flv[x][y].floor = tile + SPECIAL_FULL; - } } } @@ -1247,9 +1245,7 @@ void tile_apply_properties(const coord_def &gc, packed_cell &cell) print_blood = false; } else - { cell.halo = HALO_RANGE; - } } else cell.halo = HALO_NONE; diff --git a/crawl-ref/source/tileweb.cc b/crawl-ref/source/tileweb.cc index 01cc4462a4..2a282129be 100644 --- a/crawl-ref/source/tileweb.cc +++ b/crawl-ref/source/tileweb.cc @@ -400,9 +400,7 @@ bool TilesFramework::await_input(wint_t& c, bool block) return false; } else - { die("select error: %s", strerror(errno)); - } } } @@ -873,9 +871,7 @@ void TilesFramework::_send_map(bool force_full) push_prefix(make_stringf("{x:%d,y:%d,", (x - m_origin.x), (y - m_origin.y))); } else - { push_prefix("{"); - } const screen_cell_t& sc = force_full ? default_cell : m_current_view(gc); diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 77f299871f..253fef9d18 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -606,9 +606,7 @@ void trap_def::trigger(actor& triggerer, bool flat_footed) know_trap_destroyed = you_trigger; } else - { mpr("But it is blocked!"); - } } break; } @@ -1545,9 +1543,7 @@ item_def trap_def::generate_trap_item() (sub == MI_NEEDLE) ? SPMSL_POISONED : SPMSL_NORMAL); } else - { set_item_ego_type(item, base, SPWPN_NORMAL); - } item_colour(item); return item; diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 6b0d8aca50..98e819c864 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -2390,9 +2390,7 @@ bool travel_kill_monster(monster_type mons) return true; } else - { return false; - } } return true; |