diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-12-21 00:12:45 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-12-21 00:12:45 +0100 |
| commit | cab063e5e304ab59f2f5604f0c0a83be371e7a3e (patch) | |
| tree | a77303942b9945a9b687daba84c5e43430a4bed6 | |
| parent | d2bcb779ddd4339aa77e30d1f6d80a7a98cc6b81 (diff) | |
| download | crawl-ref-cab063e5e304ab59f2f5604f0c0a83be371e7a3e.tar.gz crawl-ref-cab063e5e304ab59f2f5604f0c0a83be371e7a3e.zip | |
Drop double newlines where they seem to serve no purpose.
Sometimes, they're there to emphasize a break between two sections of code,
which is good. In a majority of cases, though, they're just inconsistent.
186 files changed, 0 insertions, 335 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index 6fba8a9eeb..4dac07ad47 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -3643,7 +3643,6 @@ int scaling_cost::cost(int max) const return (value < 0) ? (-value) : ((value * max + 500) / 1000); } - bool _jump_player(int jump_range) { coord_def landing; diff --git a/crawl-ref/source/abl-show.h b/crawl-ref/source/abl-show.h index 117de27627..7058bdd2fa 100644 --- a/crawl-ref/source/abl-show.h +++ b/crawl-ref/source/abl-show.h @@ -3,7 +3,6 @@ * @brief Functions related to special abilities. **/ - #ifndef ABLSHOW_H #define ABLSHOW_H diff --git a/crawl-ref/source/abyss.h b/crawl-ref/source/abyss.h index 1e22490d0b..332a0aa569 100644 --- a/crawl-ref/source/abyss.h +++ b/crawl-ref/source/abyss.h @@ -3,7 +3,6 @@ * @brief Misc abyss specific functions. **/ - #ifndef ABYSS_H #define ABYSS_H diff --git a/crawl-ref/source/actor.h b/crawl-ref/source/actor.h index ce4ebf1a4c..91785ae810 100644 --- a/crawl-ref/source/actor.h +++ b/crawl-ref/source/actor.h @@ -432,7 +432,6 @@ public: string describe_props() const; - protected: void end_constriction(constricting_t::iterator i, bool intentional, bool quiet); diff --git a/crawl-ref/source/areas.cc b/crawl-ref/source/areas.cc index f19eca1d52..a0d2f59192 100644 --- a/crawl-ref/source/areas.cc +++ b/crawl-ref/source/areas.cc @@ -488,7 +488,6 @@ void create_sanctuary(const coord_def& center, int time) mpr("The monsters scatter in all directions!"); } - ///////////// // Silence @@ -646,7 +645,6 @@ bool liquefied(const coord_def& p, bool check_actual) return _check_agrid_flag(p, APROP_LIQUID); } - ///////////// // Orb's glow // diff --git a/crawl-ref/source/art-func.h b/crawl-ref/source/art-func.h index 90a741f75c..b9cbab9d03 100644 --- a/crawl-ref/source/art-func.h +++ b/crawl-ref/source/art-func.h @@ -103,7 +103,6 @@ static bool _evoke_sceptre_of_asmodeus() return true; } - static bool _ASMODEUS_evoke(item_def *item, int* pract, bool* did_work, bool* unevokable) { @@ -739,7 +738,6 @@ static void _UNDEADHUNTER_melee_effects(item_def* item, actor* attacker, } } - /////////////////////////////////////////////////// static void _BRILLIANCE_equip(item_def *item, bool *show_msgs, bool unmeld) { @@ -757,7 +755,6 @@ static void _DEVASTATOR_equip(item_def *item, bool *show_msgs, bool unmeld) _equip_mpr(show_msgs, "Time to lay down the shillelagh law."); } - static void _DEVASTATOR_melee_effects(item_def* item, actor* attacker, actor* defender, bool mondied, int dam) { diff --git a/crawl-ref/source/artefact.cc b/crawl-ref/source/artefact.cc index 0fe2f2611a..60ddc51687 100644 --- a/crawl-ref/source/artefact.cc +++ b/crawl-ref/source/artefact.cc @@ -1265,7 +1265,6 @@ void artefact_wpn_properties(const item_def &item, _get_randart_properties(item, proprt); } - void artefact_wpn_properties(const item_def &item, artefact_properties_t &proprt) { diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 761713ad30..df5b7e18d4 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -5295,7 +5295,6 @@ mon_resist_type bolt::apply_enchantment_to_monster(monster* mon) mon->props[ORIG_MONSTER_KEY] = orig_mon; } - return MON_AFFECTED; } @@ -5354,7 +5353,6 @@ mon_resist_type bolt::apply_enchantment_to_monster(monster* mon) return MON_AFFECTED; } - // Extra range used on hit. int bolt::range_used_on_hit() const { @@ -5564,7 +5562,6 @@ void bolt::refine_for_explosion() hearMsg = "You hear the sound of one hand!"; } - if (!is_tracer && *seeMsg && *hearMsg) { heard = player_can_hear(target); diff --git a/crawl-ref/source/beam.h b/crawl-ref/source/beam.h index e6934b0a2f..0333a48a05 100644 --- a/crawl-ref/source/beam.h +++ b/crawl-ref/source/beam.h @@ -3,11 +3,9 @@ * @brief Functions related to ranged attacks. **/ - #ifndef BEAM_H #define BEAM_H - #include "externs.h" #include "random.h" #include "ray.h" diff --git a/crawl-ref/source/book-data.h b/crawl-ref/source/book-data.h index 2e118c242d..0b51fcf1c6 100644 --- a/crawl-ref/source/book-data.h +++ b/crawl-ref/source/book-data.h @@ -252,7 +252,6 @@ SPELL_NO_SPELL, }, - { // Book of the Warp SPELL_RECALL, SPELL_CONTROL_TELEPORT, diff --git a/crawl-ref/source/chardump.cc b/crawl-ref/source/chardump.cc index e5de627b01..a7861c49ea 100644 --- a/crawl-ref/source/chardump.cc +++ b/crawl-ref/source/chardump.cc @@ -502,7 +502,6 @@ static string _sdump_turns_place_info(PlaceInfo place_info, string name = "") unsigned int global_non_interlevel = gi.turns_total - gi.turns_interlevel; - a = TO_PERCENT(place_info.turns_total, gi.turns_total); b = TO_PERCENT(non_interlevel, global_non_interlevel); c = TO_PERCENT(place_info.turns_interlevel, place_info.turns_total); @@ -1582,7 +1581,6 @@ void whereis_record(const char *status) } #endif - /////////////////////////////////////////////////////////////////////////////// // Turn timestamps // diff --git a/crawl-ref/source/chardump.h b/crawl-ref/source/chardump.h index 9b9707a424..c6840436dc 100644 --- a/crawl-ref/source/chardump.h +++ b/crawl-ref/source/chardump.h @@ -3,7 +3,6 @@ * @brief Dumps character info out to the morgue file. **/ - #ifndef CHARDUMP_H #define CHARDUMP_H diff --git a/crawl-ref/source/cio.cc b/crawl-ref/source/cio.cc index fdcf8c0b0d..090f0ea0c5 100644 --- a/crawl-ref/source/cio.cc +++ b/crawl-ref/source/cio.cc @@ -179,7 +179,6 @@ int cancellable_get_line(char *buf, int len, input_history *mh, return reader.read_line(fill); } - ///////////////////////////////////////////////////////////// // input_history // diff --git a/crawl-ref/source/cloud.cc b/crawl-ref/source/cloud.cc index 28c7eac817..fcea890200 100644 --- a/crawl-ref/source/cloud.cc +++ b/crawl-ref/source/cloud.cc @@ -949,7 +949,6 @@ static bool _actor_apply_cloud_side_effects(actor *act, poison_monster(mons, find_agent(cloud.source, cloud.whose)); return true; - case CLOUD_MIASMA: if (player) { diff --git a/crawl-ref/source/cloud.h b/crawl-ref/source/cloud.h index 79654b11d0..09ff3da930 100644 --- a/crawl-ref/source/cloud.h +++ b/crawl-ref/source/cloud.h @@ -3,7 +3,6 @@ * @brief Functions related to clouds. **/ - #ifndef CLOUD_H #define CLOUD_H diff --git a/crawl-ref/source/cluautil.cc b/crawl-ref/source/cluautil.cc index e6eea1c2d6..789b38bce2 100644 --- a/crawl-ref/source/cluautil.cc +++ b/crawl-ref/source/cluautil.cc @@ -53,7 +53,6 @@ void clua_push_dgn_event(lua_State *ls, const dgn_event *devent) *de = devent; } - void luaopen_setmeta(lua_State *ls, const char *global, const luaL_reg *lua_lib, diff --git a/crawl-ref/source/cluautil.h b/crawl-ref/source/cluautil.h index e7d03813c7..5b7a297ddd 100644 --- a/crawl-ref/source/cluautil.h +++ b/crawl-ref/source/cluautil.h @@ -48,7 +48,6 @@ extern "C" { luaL_error(ls, "Operation forbidden in end-user script"); \ } while (false) - // FIXME: remove one of these. void luaopen_setmeta(lua_State *ls, const char *global, @@ -159,7 +158,6 @@ void push_item(lua_State *ls, item_def *item); c.x, c.y).c_str()); \ else {}; - #define COORDS(c, p1, p2) \ GETCOORD(c, p1, p2, in_bounds) diff --git a/crawl-ref/source/colour.cc b/crawl-ref/source/colour.cc index 6ef21751a0..0c4ec69d0a 100644 --- a/crawl-ref/source/colour.cc +++ b/crawl-ref/source/colour.cc @@ -234,7 +234,6 @@ static int _etc_liquefied(int, const coord_def& loc) return phase ? YELLOW : BROWN; } - static int _etc_tree(int, const coord_def& loc) { uint32_t h = loc.x; diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index d285cb7293..cb659dbbaf 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -667,7 +667,6 @@ static const char *targeting_help_2 = "<w>i</w> : choose from Inventory.\n" ; - // Add the contents of the file fp to the scroller menu m. // If first_hotkey is nonzero, that will be the hotkey for the // start of the contents of the file. @@ -715,7 +714,6 @@ static void _add_file_to_scroller(FILE* fp, formatted_scroller& m, } } - struct help_file { const char* name; @@ -2288,7 +2286,6 @@ static void _add_formatted_keyhelp(column_composer &cols) _add_insert_commands(cols, 1, "<w>%</w>/<w>%</w> : use staircase", CMD_GO_UPSTAIRS, CMD_GO_DOWNSTAIRS, 0); - _add_command(cols, 1, CMD_INSPECT_FLOOR, "examine occupied tile and"); cols.add_formatted(1, " pickup part of a single stack\n", false, true, _cmdhelp_textfilter); diff --git a/crawl-ref/source/command.h b/crawl-ref/source/command.h index 95b4ecf494..b4b69869e4 100644 --- a/crawl-ref/source/command.h +++ b/crawl-ref/source/command.h @@ -3,7 +3,6 @@ * @brief Misc commands. **/ - #ifndef COMMAND_H #define COMMAND_H diff --git a/crawl-ref/source/coordit.cc b/crawl-ref/source/coordit.cc index 6a6726cbdc..a10b1734d3 100644 --- a/crawl-ref/source/coordit.cc +++ b/crawl-ref/source/coordit.cc @@ -74,7 +74,6 @@ void rectangle_iterator::operator++(int dummy) ++(*this); } - random_rectangle_iterator::random_rectangle_iterator(const coord_def& corner1, const coord_def& corner2) { diff --git a/crawl-ref/source/database.cc b/crawl-ref/source/database.cc index 77b7f41548..7186b953d2 100644 --- a/crawl-ref/source/database.cc +++ b/crawl-ref/source/database.cc @@ -357,7 +357,6 @@ void databaseSystemShutdown() //////////////////////////////////////////////////////////////////////////// // Main DB functions - static datum _database_fetch(DBM *database, const string &key) { datum result; @@ -806,7 +805,6 @@ string getGameStartDescription(const string &key) return _query_database(GameStartDB, key, true, true); } - ///////////////////////////////////////////////////////////////////////////// // Shout DB specific functions. string getShoutString(const string &monst, const string &suffix) diff --git a/crawl-ref/source/database.h b/crawl-ref/source/database.h index b41975c2e1..62fbb899b9 100644 --- a/crawl-ref/source/database.h +++ b/crawl-ref/source/database.h @@ -3,7 +3,6 @@ * database.h **/ - #ifndef DATABASE_H #define DATABASE_H diff --git a/crawl-ref/source/dbg-asrt.cc b/crawl-ref/source/dbg-asrt.cc index ccffb3c9d9..54f61fcf7a 100644 --- a/crawl-ref/source/dbg-asrt.cc +++ b/crawl-ref/source/dbg-asrt.cc @@ -83,7 +83,6 @@ #endif #endif - static string _assert_msg; static void _dump_compilation_info(FILE* file) diff --git a/crawl-ref/source/debug.h b/crawl-ref/source/debug.h index 4979f28e86..44705b32d6 100644 --- a/crawl-ref/source/debug.h +++ b/crawl-ref/source/debug.h @@ -25,7 +25,6 @@ #endif #endif - #ifndef _lint # if defined(TARGET_COMPILER_VC) || (defined(__cplusplus) && __cplusplus >= 201103) // We'd need to enable C++11 mode for nice messages. diff --git a/crawl-ref/source/decks.h b/crawl-ref/source/decks.h index cd42292e85..5045038d39 100644 --- a/crawl-ref/source/decks.h +++ b/crawl-ref/source/decks.h @@ -3,7 +3,6 @@ * @brief Functions with decks of cards. **/ - #ifndef DECKS_H #define DECKS_H diff --git a/crawl-ref/source/delay.cc b/crawl-ref/source/delay.cc index beaf897472..b645bdf928 100644 --- a/crawl-ref/source/delay.cc +++ b/crawl-ref/source/delay.cc @@ -1283,7 +1283,6 @@ static void _handle_run_delays(const delay_queue_item &delay) } } - switch (delay.type) { case DELAY_REST: diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index abbaff1bb7..6026242217 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -185,7 +185,6 @@ static const char* _jewellery_base_ability_string(int subtype) return ""; } - #define known_proprt(prop) (proprt[(prop)] && known[(prop)]) struct property_annotators @@ -1053,7 +1052,6 @@ static string _describe_weapon(const item_def &item, bool verbose) return description; } - //--------------------------------------------------------------- // // describe_ammo @@ -1691,7 +1689,6 @@ bool is_dumpable_artefact(const item_def &item, bool verbose) return false; } - //--------------------------------------------------------------- // // get_item_description @@ -2349,7 +2346,6 @@ static bool _describe_spellbook(item_def &item) } } - // it takes a key and a list of commands and it returns // the command from the list which corresponds to the key static command_type _get_action(int key, vector<command_type> actions) @@ -3390,7 +3386,6 @@ static string _monster_stat_description(const monster_info& mi) else if (sizes[mi.body_size()]) result << uppercase_first(pronoun) << " is " << sizes[mi.body_size()] << ".\n"; - result << _monster_spells_description(mi); return result.str(); } diff --git a/crawl-ref/source/dgn-height.h b/crawl-ref/source/dgn-height.h index b0db4efa8a..8215c9b901 100644 --- a/crawl-ref/source/dgn-height.h +++ b/crawl-ref/source/dgn-height.h @@ -27,7 +27,6 @@ void dgn_smooth_height_at(coord_def c, int radius = 1, int max_height = DGN_UNDEFINED_HEIGHT); void dgn_smooth_heights(int radius = 1, int npasses = 1); - void dgn_island_centred_at(const coord_def &c, // Number of times to raise heights of // points near c. diff --git a/crawl-ref/source/dgn-irregular-box.cc b/crawl-ref/source/dgn-irregular-box.cc index e5bd40e6c0..8b884d4be7 100644 --- a/crawl-ref/source/dgn-irregular-box.cc +++ b/crawl-ref/source/dgn-irregular-box.cc @@ -10,7 +10,6 @@ #include "random.h" #include "dgn-irregular-box.h" - // Adds a simple hollow box to the map with the specified // coordinates, glyphs, and number of doors. This is the // fallback if we can't place a irregular box. @@ -416,8 +415,6 @@ static void _fill_outside(vector<vector<char> >& map, } } - - void make_irregular_box(map_lines& map, int x1, int y1, int x2, int y2, int di_x, int di_y, int in_x, int in_y, char floor_glyph, char wall_glyph, diff --git a/crawl-ref/source/dgn-layouts.cc b/crawl-ref/source/dgn-layouts.cc index 6671969c8b..989cb8e454 100644 --- a/crawl-ref/source/dgn-layouts.cc +++ b/crawl-ref/source/dgn-layouts.cc @@ -518,7 +518,6 @@ static bool _octa_room(dgn_region& region, int oblique_max, oblique = oblique_max; - for (x = tl.x; x < br.x; x++) { for (y = tl.y + oblique; y < br.y - oblique; y++) diff --git a/crawl-ref/source/dgn-overview.h b/crawl-ref/source/dgn-overview.h index 501299db9f..453e1c7e1c 100644 --- a/crawl-ref/source/dgn-overview.h +++ b/crawl-ref/source/dgn-overview.h @@ -3,7 +3,6 @@ * @brief "Overview" functionality **/ - #ifndef OVERMAP_H #define OVERMAP_H diff --git a/crawl-ref/source/dgn-proclayouts.cc b/crawl-ref/source/dgn-proclayouts.cc index c42c224b4a..4e9a5933a0 100644 --- a/crawl-ref/source/dgn-proclayouts.cc +++ b/crawl-ref/source/dgn-proclayouts.cc @@ -64,7 +64,6 @@ DiamondLayout::operator()(const coord_def &p, const uint32_t offset) const return ProceduralSample(p, DNGN_FLOOR, offset + 4096); } - static uint32_t _get_changepoint(const worley::noise_datum &n, const double scale) { return max(1, (int) floor((n.distance[1] - n.distance[0]) * scale) - 5); diff --git a/crawl-ref/source/directn.cc b/crawl-ref/source/directn.cc index 637b49f5ae..78a4dc4353 100644 --- a/crawl-ref/source/directn.cc +++ b/crawl-ref/source/directn.cc @@ -478,7 +478,6 @@ void direction(dist &moves, const direction_chooser_args& args) direction_chooser(moves, args).choose_direction(); } - direction_chooser::direction_chooser(dist& moves_, const direction_chooser_args& args) : moves(moves_), @@ -832,7 +831,6 @@ void do_look_around(const coord_def &whence) } } - //--------------------------------------------------------------- // // direction @@ -1065,7 +1063,6 @@ bool direction_chooser::find_default_monster_target(coord_def& result) const true); } - // If we couldn't, maybe it was because of line-of-fire issues. // Check if that's happening, and inform the user (because it's // pretty confusing.) @@ -2060,7 +2057,6 @@ bool direction_chooser::choose_direction() range_view_annotator rva(hitfunc ? hitfunc : (range >= 0) ? &legacy_range : NULL); - // init moves.delta.reset(); @@ -2465,9 +2461,6 @@ static bool _find_jump_attack_mons(const coord_def& where, int mode, bool need_p return hitfunc->has_additional_sites(where); } - - - static bool _find_monster_expl(const coord_def& where, int mode, bool need_path, int range, targetter *hitfunc) { @@ -2774,7 +2767,6 @@ static bool _find_square(coord_def &mfp, int direction, } } // end else - finished_spiralling: x_change *= direction; y_change *= direction; diff --git a/crawl-ref/source/directn.h b/crawl-ref/source/directn.h index bb09a6d610..c93026ea30 100644 --- a/crawl-ref/source/directn.h +++ b/crawl-ref/source/directn.h @@ -3,7 +3,6 @@ * @brief Functions used when picking squares. **/ - #ifndef DIRECT_H #define DIRECT_H diff --git a/crawl-ref/source/dungeon.cc b/crawl-ref/source/dungeon.cc index a31b36b76c..7a411920ad 100644 --- a/crawl-ref/source/dungeon.cc +++ b/crawl-ref/source/dungeon.cc @@ -2209,7 +2209,6 @@ static void _ruin_level(Iterator iter, } } - for (vector<coord_def>::const_iterator it = replaced.begin(); it != replaced.end(); ++it) @@ -2814,7 +2813,6 @@ struct map_component } map_component * min_equivalent; - coord_def min_coord; coord_def max_coord; @@ -2879,7 +2877,6 @@ static void _ccomps_8(FixedArray<int, GXM, GYM > & connectivity_map, int next_label = 1; - // Pass 1, for each point, check the upper/left adjacent squares for labels // if a labels are found, use the min connected label, else assign a new // label and start a new component @@ -3104,7 +3101,6 @@ static void _slime_connectivity_fixup() search_astar(base_component->seed_position, valid_label, connection_costs, dummy, visited, path); - // Did the search, now remove any walls adjacent to squares in // the path. const position_node * current = &(*path[0]); @@ -4691,7 +4687,6 @@ static void _dgn_give_mon_spec_items(mons_spec &mspec, } } - monster* dgn_place_monster(mons_spec &mspec, coord_def where, bool force_pos, bool generate_awake, bool patrolling) { @@ -6934,7 +6929,6 @@ unwind_vault_placement_mask::~unwind_vault_placement_mask() Vault_Placement_Mask = oldmask; } - // mark all unexplorable squares, count the rest static void _calc_density() { diff --git a/crawl-ref/source/dungeon.h b/crawl-ref/source/dungeon.h index f60c2c537d..563de76cdf 100644 --- a/crawl-ref/source/dungeon.h +++ b/crawl-ref/source/dungeon.h @@ -3,7 +3,6 @@ * @brief Functions used when building new levels. **/ - #ifndef DUNGEON_H #define DUNGEON_H diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index 1410576dc2..1df86f3a7a 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -228,7 +228,6 @@ int torment_player(actor *attacker, int taux) } } - if (!hploss) { mpr("You feel a surge of unholy energy."); @@ -2707,7 +2706,6 @@ void collect_radius_points(vector<vector<coord_def> > &radius_points, fringe.pop(); - int idx = current.first.x + current.first.y * X_WIDTH; if (!visited_indices.insert(idx).second) continue; diff --git a/crawl-ref/source/effects.h b/crawl-ref/source/effects.h index adafbc3a77..1b509b19cf 100644 --- a/crawl-ref/source/effects.h +++ b/crawl-ref/source/effects.h @@ -3,7 +3,6 @@ * @brief Misc stuff. **/ - #ifndef EFFECTS_H #define EFFECTS_H diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 0aec52a8d9..c0737a19e5 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -3,7 +3,6 @@ * @brief Global (ick) enums. **/ - #ifndef ENUM_H #define ENUM_H @@ -4071,7 +4070,6 @@ enum tile_flags ENUM_INT64 TILE_FLAG_SUMMONED = 0x800000000000ULL, TILE_FLAG_PERM_SUMMON= 0x1000000000000ULL, - // MDAM has 5 possibilities, so uses 3 bits. TILE_FLAG_MDAM_MASK = 0x1C0000000ULL, TILE_FLAG_MDAM_LIGHT = 0x040000000ULL, @@ -4094,7 +4092,6 @@ enum tile_flags ENUM_INT64 TILE_FLAG_MIMIC_RAVEN = 0x6000000000ULL, TILE_FLAG_MIMIC_MASK = 0x6000000000ULL, - //// Background flags TILE_FLAG_RAY = 0x00010000ULL, diff --git a/crawl-ref/source/evoke.h b/crawl-ref/source/evoke.h index fe24649cf2..c11132bcd9 100644 --- a/crawl-ref/source/evoke.h +++ b/crawl-ref/source/evoke.h @@ -3,7 +3,6 @@ * @brief Functions for using some of the wackier inventory items. **/ - #ifndef EVOKE_H #define EVOKE_H diff --git a/crawl-ref/source/exclude.cc b/crawl-ref/source/exclude.cc index 6385d4a626..3228aff46c 100644 --- a/crawl-ref/source/exclude.cc +++ b/crawl-ref/source/exclude.cc @@ -676,7 +676,6 @@ string exclude_set::get_exclusion_desc() " and ", ", "); } - void marshallExcludes(writer& outf, const exclude_set& excludes) { marshallShort(outf, excludes.size()); diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index f2bf65fde7..268cce96af 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -59,7 +59,6 @@ protected: tileidx_t m_tile; }; - #define INFO_SIZE 200 // size of message buffers #define ITEMNAME_SIZE 200 // size of item names/shop names/etc #define HIGHSCORE_SIZE 800 // <= 10 Lines for long format scores @@ -353,7 +352,6 @@ struct shop_struct bool defined() const { return type != SHOP_UNASSIGNED; } }; - struct delay_queue_item { delay_type type; @@ -368,7 +366,6 @@ struct delay_queue_item size_t len; }; - // Identifies a level. Should never include virtual methods or // dynamically allocated memory (see code to push level_id onto Lua // stack in l_dgn.cc) diff --git a/crawl-ref/source/files.h b/crawl-ref/source/files.h index 8e16f386c6..c496d31158 100644 --- a/crawl-ref/source/files.h +++ b/crawl-ref/source/files.h @@ -3,7 +3,6 @@ * @brief Functions used to save and load levels/games. **/ - #ifndef FILES_H #define FILES_H @@ -63,7 +62,6 @@ time_t file_modtime(const string &file); time_t file_modtime(FILE *f); vector<string> get_title_files(); - class level_id; bool load_level(dungeon_feature_type stair_taken, load_mode_type load_mode, diff --git a/crawl-ref/source/fineff.cc b/crawl-ref/source/fineff.cc index 8b51f0b1d9..df3d0274ed 100644 --- a/crawl-ref/source/fineff.cc +++ b/crawl-ref/source/fineff.cc @@ -134,7 +134,6 @@ void deferred_damage_fineff::merge(const final_effect &fe) damage += ddamfe->damage; } - void lightning_fineff::fire() { if (you.see_cell(posn)) diff --git a/crawl-ref/source/fixedvector.h b/crawl-ref/source/fixedvector.h index c5dbcc61c2..81221b15eb 100644 --- a/crawl-ref/source/fixedvector.h +++ b/crawl-ref/source/fixedvector.h @@ -103,7 +103,6 @@ protected: TYPE mData[SIZE]; }; - // ========================================================================== // Outlined Methods // ========================================================================== diff --git a/crawl-ref/source/food.h b/crawl-ref/source/food.h index fde6053cb8..33c0fcddaf 100644 --- a/crawl-ref/source/food.h +++ b/crawl-ref/source/food.h @@ -3,7 +3,6 @@ * @brief Functions for eating and butchering. **/ - #ifndef FOOD_H #define FOOD_H diff --git a/crawl-ref/source/format.cc b/crawl-ref/source/format.cc index 2862dc91e5..452d3d50e1 100644 --- a/crawl-ref/source/format.cc +++ b/crawl-ref/source/format.cc @@ -311,7 +311,6 @@ char &formatted_string::operator [] (size_t idx) die("Invalid index"); } - string formatted_string::tostring(int s, int e) const { string st; @@ -558,7 +557,6 @@ static int _tagged_string_printable_length(const string& s) return len; } - // Count the length of the tags in the string. int tagged_string_tag_length(const string& s) { diff --git a/crawl-ref/source/fprop.h b/crawl-ref/source/fprop.h index ef0f2e29e5..292c3a2f59 100644 --- a/crawl-ref/source/fprop.h +++ b/crawl-ref/source/fprop.h @@ -33,7 +33,6 @@ enum feature_property_type FPROP_OLD_BLOOD = (1 << 18), }; - bool is_sanctuary(const coord_def& p); bool is_bloodcovered(const coord_def& p); bool is_tide_immune(const coord_def &p); diff --git a/crawl-ref/source/geom2d.cc b/crawl-ref/source/geom2d.cc index 9312e51c2c..3f7431592e 100644 --- a/crawl-ref/source/geom2d.cc +++ b/crawl-ref/source/geom2d.cc @@ -105,8 +105,6 @@ vector reflect(const vector &v, const form &f) return v - 2 * f(v)/f(normal) * normal; } - - ////////////////////////////////////////////////// // vector space implementation diff --git a/crawl-ref/source/glwrapper.h b/crawl-ref/source/glwrapper.h index c675583b99..56f66747f1 100644 --- a/crawl-ref/source/glwrapper.h +++ b/crawl-ref/source/glwrapper.h @@ -174,7 +174,6 @@ public: virtual void fixup_gl_state() = 0; #endif - // Texture-specific functinos virtual void delete_textures(size_t count, unsigned int *textures) = 0; virtual void generate_textures(size_t count, unsigned int *textures) = 0; diff --git a/crawl-ref/source/godabil.cc b/crawl-ref/source/godabil.cc index 2061f4b326..026d909ae0 100644 --- a/crawl-ref/source/godabil.cc +++ b/crawl-ref/source/godabil.cc @@ -2341,7 +2341,6 @@ static void _path_distance(const coord_def& origin, } } - // Find the minimum distance from each point of origin to one of the targets // The distance is stored in 'distances', which is the same size as origins. static void _point_point_distance(const vector<coord_def>& origins, @@ -2806,7 +2805,6 @@ struct monster_conversion monster_type new_type; }; - // Given a monster (which should be a plant/fungus), see if // fedhas_evolve_flora() can upgrade it, and set up a monster_conversion // structure for it. Return true (and fill in possible_monster) if the diff --git a/crawl-ref/source/godprayer.cc b/crawl-ref/source/godprayer.cc index fcc5877471..283c844193 100644 --- a/crawl-ref/source/godprayer.cc +++ b/crawl-ref/source/godprayer.cc @@ -855,7 +855,6 @@ static bool _offer_items() } } - piety_gain_t relative_gain = sacrifice_item_stack(item); print_sacrifice_message(you.religion, mitm[i], relative_gain); item_was_destroyed(mitm[i]); diff --git a/crawl-ref/source/godwrath.h b/crawl-ref/source/godwrath.h index fa5befd422..f38c7a93d6 100644 --- a/crawl-ref/source/godwrath.h +++ b/crawl-ref/source/godwrath.h @@ -3,7 +3,6 @@ * @brief Divine retribution. **/ - #ifndef GODWRATH_H #define GODWRATH_H diff --git a/crawl-ref/source/hints.cc b/crawl-ref/source/hints.cc index 673a731564..65003c2457 100644 --- a/crawl-ref/source/hints.cc +++ b/crawl-ref/source/hints.cc @@ -656,7 +656,6 @@ static void _hints_healing_reminder() } mprf(MSGCH_TUTORIAL, "%s", text.c_str()); - if (is_resting()) stop_running(); } diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc index 352b8ebd2a..5357ba24ed 100644 --- a/crawl-ref/source/hiscores.cc +++ b/crawl-ref/source/hiscores.cc @@ -384,7 +384,6 @@ static void _show_morgue(scorefile_entry& se) clrscr(); - column_composer cols(2, 40); cols.add_formatted( 0, @@ -496,7 +495,6 @@ void show_hiscore_table() } } - // Trying to supply an appropriate verb for the attack type. -- bwr static const char *_range_type_verb(const char *const aux) { @@ -1768,7 +1766,6 @@ string scorefile_entry::single_cdesc() const race_class_name.c_str(), lvl, (wiz_mode == 1) ? "W" : ""); } - static string _append_sentence_delimiter(const string &sentence, const string &delimiter) { diff --git a/crawl-ref/source/hiscores.h b/crawl-ref/source/hiscores.h index 3d09b30a88..f977bd7c59 100644 --- a/crawl-ref/source/hiscores.h +++ b/crawl-ref/source/hiscores.h @@ -3,11 +3,9 @@ * @brief Scorefile manipulation functions **/ - #ifndef HISCORES_H #define HISCORES_H - class scorefile_entry; void hiscores_new_entry(const scorefile_entry &se); diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 09ce57e5a0..334cd5ba21 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -449,7 +449,6 @@ static int _read_bool_or_number(const string &field, int def_value, return ret; } - static unsigned curses_attribute(const string &field) { if (field == "standout") // probably reverses diff --git a/crawl-ref/source/initfile.h b/crawl-ref/source/initfile.h index cdab79aef2..4cab3c0bda 100644 --- a/crawl-ref/source/initfile.h +++ b/crawl-ref/source/initfile.h @@ -3,7 +3,6 @@ * @brief Simple reading of init file. **/ - #ifndef INITFILE_H #define INITFILE_H diff --git a/crawl-ref/source/item_use.h b/crawl-ref/source/item_use.h index bd8970bc43..546138a95b 100644 --- a/crawl-ref/source/item_use.h +++ b/crawl-ref/source/item_use.h @@ -3,11 +3,9 @@ * @brief Functions for making use of inventory items. **/ - #ifndef ITEM_USE_H #define ITEM_USE_H - #include <string> #include "externs.h" #include "enum.h" diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 0539bab3f3..9cc79aa9a9 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -46,7 +46,6 @@ #include "throw.h" #include "transform.h" - static bool _is_random_name_space(char let); static bool _is_random_name_vowel(char let); @@ -493,7 +492,6 @@ const char* weapon_brand_name(const item_def& item, bool terse) } } - const char* armour_ego_name(const item_def& item, bool terse) { if (!terse) @@ -777,8 +775,6 @@ static const char* ring_secondary_string(int s) } } - - static const char* ring_primary_string(int p) { switch (p) @@ -2138,7 +2134,6 @@ public: string name; - if (item->base_type == OBJ_FOOD) { switch (item->sub_type) @@ -2437,7 +2432,6 @@ void check_item_knowledge(bool unknown_items) else stitle = "You recognise all items. (Select to toggle autopickup)"; - string prompt = "(_ for help)"; //TODO: when the menu is opened, the text is not justified properly. stitle = stitle + string(max(0, get_number_of_cols() - strwidth(stitle) diff --git a/crawl-ref/source/itemname.h b/crawl-ref/source/itemname.h index 0f40de3ec4..69aad0eb18 100644 --- a/crawl-ref/source/itemname.h +++ b/crawl-ref/source/itemname.h @@ -3,7 +3,6 @@ * @brief Misc functions. **/ - #ifndef ITEMNAME_H #define ITEMNAME_H diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index 524c2999f8..5ab1670eba 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -455,7 +455,6 @@ void init_properties() Food_index[ Food_prop[i].id ] = i; } - // Some convenient functions to hide the bit operations and create // an interface layer between the code and the data in case this // gets changed again. - bwr diff --git a/crawl-ref/source/itemprop.h b/crawl-ref/source/itemprop.h index 7f79f1bbba..81713019ad 100644 --- a/crawl-ref/source/itemprop.h +++ b/crawl-ref/source/itemprop.h @@ -3,7 +3,6 @@ * @brief Misc functions. **/ - #ifndef ITEMPROP_H #define ITEMPROP_H diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc index 94923a3b1d..7bcf62eea2 100644 --- a/crawl-ref/source/items.cc +++ b/crawl-ref/source/items.cc @@ -226,7 +226,6 @@ static int _cull_items(void) return first_cleaned; } - /*---------------------------------------------------------------------*/ stack_iterator::stack_iterator(const coord_def& pos, bool accessible) { @@ -284,7 +283,6 @@ stack_iterator stack_iterator::operator++(int dummy) } /*---------------------------------------------------------------------*/ - // Reduce quantity of an inventory item, do cleanup if item goes away. // // Returns true if stack of items no longer exists. @@ -548,7 +546,6 @@ void unlink_item(int dest) } } - // Okay, finally warn player if we didn't do anything. if (!linked) mprf(MSGCH_ERROR, "BUG WARNING: Item didn't seem to be linked at all."); @@ -1970,7 +1967,6 @@ void move_item_stack_to_grid(const coord_def& from, const coord_def& to) igrd(from) = NON_ITEM; } - // Returns false if no items could be dropped. bool copy_item_to_grid(const item_def &item, const coord_def& p, int quant_drop, bool mark_dropped, bool silent) diff --git a/crawl-ref/source/items.h b/crawl-ref/source/items.h index e717c62108..a40a32260b 100644 --- a/crawl-ref/source/items.h +++ b/crawl-ref/source/items.h @@ -3,7 +3,6 @@ * @brief Misc (mostly) inventory related functions. **/ - #ifndef ITEMS_H #define ITEMS_H diff --git a/crawl-ref/source/kills.cc b/crawl-ref/source/kills.cc index 5448c1a495..f63920684e 100644 --- a/crawl-ref/source/kills.cc +++ b/crawl-ref/source/kills.cc @@ -770,7 +770,6 @@ KILLEXP_ACCESS(monnum, number, monnum) KILLEXP_ACCESS(isghost, boolean, monnum == MONS_PLAYER_GHOST) KILLEXP_ACCESS(ispandemon, boolean, monnum == MONS_PANDEMONIUM_LORD) - static int kill_lualc_modifier(lua_State *ls) { if (!lua_islightuserdata(ls, 1)) diff --git a/crawl-ref/source/l_crawl.cc b/crawl-ref/source/l_crawl.cc index c79eee9e9c..b362d33a76 100644 --- a/crawl-ref/source/l_crawl.cc +++ b/crawl-ref/source/l_crawl.cc @@ -508,7 +508,6 @@ static int crawl_regex(lua_State *ls) if (!s) return 0; - text_pattern **tpudata = clua_new_userdata< text_pattern* >(ls, REGEX_METATABLE); if (tpudata) diff --git a/crawl-ref/source/l_dgn.cc b/crawl-ref/source/l_dgn.cc index 688001189d..4214548d8d 100644 --- a/crawl-ref/source/l_dgn.cc +++ b/crawl-ref/source/l_dgn.cc @@ -987,7 +987,6 @@ static int dgn_cloud_at(lua_State *ls) return 1; } - static int lua_dgn_set_branch_epilogue(lua_State *ls) { const char *branch_name = luaL_checkstring(ls, 1); @@ -1400,8 +1399,6 @@ static int dgn_place_cloud(lua_State *ls) return 0; } - - // XXX: Doesn't allow for messages or specifying the noise source. LUAFN(dgn_noisy) { diff --git a/crawl-ref/source/l_dgnbld.cc b/crawl-ref/source/l_dgnbld.cc index 6c09e96bd4..2fad1cd07b 100644 --- a/crawl-ref/source/l_dgnbld.cc +++ b/crawl-ref/source/l_dgnbld.cc @@ -412,7 +412,6 @@ LUAFN(dgn_count_passable_neighbors) return 1; } - LUAFN(dgn_is_valid_coord) { LINES(ls, 1, lines); diff --git a/crawl-ref/source/l_dgngrd.cc b/crawl-ref/source/l_dgngrd.cc index 23dfc79796..6f5bb4a766 100644 --- a/crawl-ref/source/l_dgngrd.cc +++ b/crawl-ref/source/l_dgngrd.cc @@ -141,7 +141,5 @@ const struct luaL_reg dgn_grid_dlib[] = { "in_bounds", dgn_in_bounds }, { "distance", dgn_distance }, - - { NULL, NULL } }; diff --git a/crawl-ref/source/l_dgnmon.cc b/crawl-ref/source/l_dgnmon.cc index d6296ad70d..897751c9df 100644 --- a/crawl-ref/source/l_dgnmon.cc +++ b/crawl-ref/source/l_dgnmon.cc @@ -202,7 +202,6 @@ static int dgn_mons_at(lua_State *ls) return 1; } - static int dgn_create_monster(lua_State *ls) { COORDS(c, 1, 2); diff --git a/crawl-ref/source/l_dgntil.cc b/crawl-ref/source/l_dgntil.cc index b4dd25b4e5..605f8cb1bd 100644 --- a/crawl-ref/source/l_dgntil.cc +++ b/crawl-ref/source/l_dgntil.cc @@ -17,7 +17,6 @@ #include "tiledef-dngn.h" #include "tileview.h" - tileidx_t get_tile_idx(lua_State *ls, int arg) { if (!lua_isstring(ls, arg)) diff --git a/crawl-ref/source/l_moninf.cc b/crawl-ref/source/l_moninf.cc index e5ddb03f15..c4b003624b 100644 --- a/crawl-ref/source/l_moninf.cc +++ b/crawl-ref/source/l_moninf.cc @@ -203,7 +203,6 @@ LUAFN(moninf_get_is_unique) return 1; } - LUAFN(moninf_get_damage_desc) { MONINF(ls, 1, mi); diff --git a/crawl-ref/source/l_spells.cc b/crawl-ref/source/l_spells.cc index 5340aaa3b0..231c50d53f 100644 --- a/crawl-ref/source/l_spells.cc +++ b/crawl-ref/source/l_spells.cc @@ -45,7 +45,6 @@ void cluaopen_spells(lua_State *ls) luaL_openlib(ls, "spells", spells_clib, 0); } - LUAWRAP(_refrigeration, cast_los_attack_spell(SPELL_OZOCUBUS_REFRIGERATION, luaL_checkint(ls, 1), NULL, true)) diff --git a/crawl-ref/source/l_view.cc b/crawl-ref/source/l_view.cc index 06575f6980..3b7d21ec16 100644 --- a/crawl-ref/source/l_view.cc +++ b/crawl-ref/source/l_view.cc @@ -17,7 +17,6 @@ #include "cloud.h" #include "travel.h" - LUAFN(view_feature_at) { COORDSHOW(s, 1, 2) diff --git a/crawl-ref/source/l_you.cc b/crawl-ref/source/l_you.cc index bb2404a20b..810bf6e15f 100644 --- a/crawl-ref/source/l_you.cc +++ b/crawl-ref/source/l_you.cc @@ -419,7 +419,6 @@ LUAFN(you_train_skill) PLUARET(number, you.train[sk]); } - static const struct luaL_reg you_clib[] = { { "turn_is_over", you_turn_is_over }, diff --git a/crawl-ref/source/lang-fake.cc b/crawl-ref/source/lang-fake.cc index 8529430955..42aaffa2b3 100644 --- a/crawl-ref/source/lang-fake.cc +++ b/crawl-ref/source/lang-fake.cc @@ -14,7 +14,6 @@ #define LOWER "abcdefghijklmnopqrstuvwxyz" #define LETTERS UPPER LOWER - // Any resemblance to the speech of a particular character from Rich Burlew's // work is entirely accidental. Suggestion that this table has been produced // by transcribing the whole corpus of that character's speech and making it diff --git a/crawl-ref/source/lev-pand.h b/crawl-ref/source/lev-pand.h index 61cb08f46d..544df5ca10 100644 --- a/crawl-ref/source/lev-pand.h +++ b/crawl-ref/source/lev-pand.h @@ -3,7 +3,6 @@ * @brief Functions used in Pandemonium. **/ - #ifndef LEVPAND_H #define LEVPAND_H diff --git a/crawl-ref/source/libunix.cc b/crawl-ref/source/libunix.cc index 7cc80ce0d1..5915b76324 100644 --- a/crawl-ref/source/libunix.cc +++ b/crawl-ref/source/libunix.cc @@ -755,7 +755,6 @@ void textbackground(int col) #endif } - void gotoxy_sys(int x, int y) { move(y - 1, x - 1); @@ -832,7 +831,6 @@ int wherex() return getcurx(stdscr) + 1; } - int wherey() { return getcury(stdscr) + 1; diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc index 19c822cf98..1762c6d213 100644 --- a/crawl-ref/source/libutil.cc +++ b/crawl-ref/source/libutil.cc @@ -1074,8 +1074,6 @@ void cscroll(int n, GotoRegion region) scroll_message_window(n); } - - mouse_mode mouse_control::ms_current_mode = MOUSE_MODE_NORMAL; size_t strlcpy(char *dst, const char *src, size_t n) diff --git a/crawl-ref/source/libw32c.cc b/crawl-ref/source/libw32c.cc index 61e2d4d4c8..d3d0fbef9e 100644 --- a/crawl-ref/source/libw32c.cc +++ b/crawl-ref/source/libw32c.cc @@ -575,7 +575,6 @@ void textbackground(int c) current_color = current_color | (macro_bg << 4); } - static void cprintf_aux(const char *s) { // early out -- not initted yet diff --git a/crawl-ref/source/macro.cc b/crawl-ref/source/macro.cc index 6608c9c771..384483ef09 100644 --- a/crawl-ref/source/macro.cc +++ b/crawl-ref/source/macro.cc @@ -1069,7 +1069,6 @@ void macro_init() _read_macros_from(get_macro_file().c_str()); } - void macro_userfn(const char *keys, const char *regname) { // TODO: Implement. @@ -1105,7 +1104,6 @@ void key_recorder::add_key(int key, bool reverse) if (paused) return; - if (reverse) keys.push_front(key); else diff --git a/crawl-ref/source/main.cc b/crawl-ref/source/main.cc index 3552b3dd75..53ea5ecb15 100644 --- a/crawl-ref/source/main.cc +++ b/crawl-ref/source/main.cc @@ -819,7 +819,6 @@ static void _do_wizard_command(int wiz_command, bool silent_fail) mpr("But you're not in Zot Defence!"); break; - default: if (!silent_fail) { @@ -1091,7 +1090,6 @@ static void _center_cursor() #endif } - // We have to refresh the SH display if the player's incapacitated state // changes (getting confused/paralyzed/etc. sets SH to 0, recovering // from the condition sets SH back to normal). @@ -1915,7 +1913,6 @@ void process_command(command_type cmd) case CMD_TOGGLE_VIEWPORT_MONSTER_HP: toggle_viewport_monster_hp(); break; case CMD_TOGGLE_TRAVEL_SPEED: _toggle_travel_speed(); break; - // Map commands. case CMD_CLEAR_MAP: _do_clear_map(); break; case CMD_DISPLAY_OVERMAP: display_overview(); break; @@ -2083,7 +2080,6 @@ void process_command(command_type cmd) break; } - // Quiver commands. case CMD_QUIVER_ITEM: choose_item_for_quiver(); break; case CMD_CYCLE_QUIVER_FORWARD: _do_cycle_quiver(+1); break; @@ -2165,7 +2161,6 @@ static void _prep_input() if (check_for_interesting_features() && you.running.is_explore()) stop_running(); - if (you.seen_portals) { ASSERT(you_worship(GOD_ASHENZARI)); @@ -4987,7 +4982,6 @@ static void _update_replay_state() repeat_again_rec.clear(); } - static void _compile_time_asserts() { //jmf: NEW ASSERTS: we ought to do a *lot* of these diff --git a/crawl-ref/source/makeitem.cc b/crawl-ref/source/makeitem.cc index 25648f095e..4371a3667a 100644 --- a/crawl-ref/source/makeitem.cc +++ b/crawl-ref/source/makeitem.cc @@ -82,7 +82,6 @@ static int _exciting_colour() } } - static int _weapon_colour(const item_def &item) { int item_colour = BLACK; @@ -3132,7 +3131,6 @@ static void _generate_misc_item(item_def& item, int force_type, int force_ego) } } - // Returns item slot or NON_ITEM if it fails. int items(bool allow_uniques, object_class_type force_class, // desired OBJECTS class {dlb} diff --git a/crawl-ref/source/mapdef.cc b/crawl-ref/source/mapdef.cc index 3b94a27e92..85cb87996e 100644 --- a/crawl-ref/source/mapdef.cc +++ b/crawl-ref/source/mapdef.cc @@ -210,7 +210,6 @@ void subvault_place::set_subvault(const map_def &_subvault) subvault.reset(new map_def(_subvault)); } - /////////////////////////////////////////////// // level_range // diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h index 613b664118..3b337c16b5 100644 --- a/crawl-ref/source/mapdef.h +++ b/crawl-ref/source/mapdef.h @@ -800,7 +800,6 @@ struct trap_spec : tr_type(static_cast<trap_type>(tr)) { } }; - /** * @class feature_spec * @ingroup mapdef @@ -848,7 +847,6 @@ struct map_flags const string &s) throw(string); }; - struct keyed_mapspec { public: @@ -1196,7 +1194,6 @@ public: bool run_postplace_hook(bool die_on_lua_error = false); void copy_hooks_from(const map_def &other_map, const string &hook_name); - // Returns true if the validation passed. bool test_lua_validate(bool croak = false); diff --git a/crawl-ref/source/maps.cc b/crawl-ref/source/maps.cc index 488d2fd277..79bf0810d3 100644 --- a/crawl-ref/source/maps.cc +++ b/crawl-ref/source/maps.cc @@ -626,7 +626,6 @@ static bool _apply_vault_grid(map_def &def, return false; } - place.pos = start; place.size = size; diff --git a/crawl-ref/source/maps.h b/crawl-ref/source/maps.h index 9fa6fa312f..4892f10182 100644 --- a/crawl-ref/source/maps.h +++ b/crawl-ref/source/maps.h @@ -3,7 +3,6 @@ * @brief Functions used to create vaults. **/ - #ifndef MAPS_H #define MAPS_H diff --git a/crawl-ref/source/melee_attack.cc b/crawl-ref/source/melee_attack.cc index a43317814b..f298e2a55b 100644 --- a/crawl-ref/source/melee_attack.cc +++ b/crawl-ref/source/melee_attack.cc @@ -3368,7 +3368,6 @@ bool melee_attack::apply_damage_brand() return ret; } - // XXX: // * Noise should probably scale non-linearly with damage_done, and // maybe even non-linearly with noise_factor. @@ -4069,7 +4068,6 @@ void melee_attack::player_stab_check() count_action(CACT_STAB, uat); } - // TODO: Unify this and player_unarmed_speed (if possible), then unify with // monster weapon/attack speed random_var melee_attack::player_weapon_speed() diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 1646470fde..efa99af48f 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -905,7 +905,6 @@ FeatureMenuEntry::FeatureMenuEntry(const string &str, quantity = 1; } - #ifdef USE_TILE PlayerMenuEntry::PlayerMenuEntry(const string &str) : MenuEntry(str, MEL_ITEM, 1) @@ -2662,7 +2661,6 @@ COLORS MenuItem::get_highlight_colour() const return m_highlight_colour; } - void MenuItem::set_bg_colour(COLORS colour) { m_bg_colour = colour; @@ -3001,7 +2999,6 @@ void TextTileItem::render() m_min_coord.x + tile_offset, m_min_coord.y + get_vertical_offset()); - m_dirty = false; } @@ -3107,8 +3104,6 @@ void SaveMenuItem::_pack_doll() } #endif - - MenuObject::MenuObject() : m_dirty(false), m_allow_focus(true), m_min_coord(0,0), m_max_coord(0,0) { @@ -3264,8 +3259,6 @@ bool MenuObject::is_visible() const return m_visible; } - - MenuFreeform::MenuFreeform(): m_active_item(NULL), m_default_item(NULL) { } @@ -3330,7 +3323,6 @@ MenuObject::InputReturnValue MenuFreeform::process_input(int key) return MenuObject::INPUT_ACTIVE_CHANGED; } - MenuItem* find_entry = NULL; switch (key) { @@ -4302,7 +4294,6 @@ void MenuDescriptor::_place_items() textcolor(LIGHTGRAY); #endif - if (tmp == NULL) m_desc_item.set_text(""); else @@ -4326,8 +4317,6 @@ vector<MenuItem*> BoxMenuHighlighter::get_selected_items() return ret_val; } - - MenuObject::InputReturnValue BoxMenuHighlighter::process_input(int key) { // just in case we somehow end up processing input of this item @@ -4391,7 +4380,6 @@ void BoxMenuHighlighter::_place_items() m_active_item = tmp; } - BlackWhiteHighlighter::BlackWhiteHighlighter(PrecisionMenu* parent): BoxMenuHighlighter(parent) { diff --git a/crawl-ref/source/message-stream.cc b/crawl-ref/source/message-stream.cc index e21e6f780b..3a8a578d83 100644 --- a/crawl-ref/source/message-stream.cc +++ b/crawl-ref/source/message-stream.cc @@ -43,7 +43,6 @@ namespace msg stream_buffers.clear(); } - setparam::setparam(int param) { m_param = param; diff --git a/crawl-ref/source/message.cc b/crawl-ref/source/message.cc index 9fa4568c6b..116702dc2f 100644 --- a/crawl-ref/source/message.cc +++ b/crawl-ref/source/message.cc @@ -1368,7 +1368,6 @@ void mpr_comma_separated_list(const string &prefix, _mpr(out, channel, param); } - // Checks whether a given message contains patterns relevant for // notes, stop_running or sounds and handles these cases. static void mpr_check_patterns(const string& message, @@ -1690,7 +1689,6 @@ void set_msg_dump_file(FILE* file) _msg_dump_file = file; } - void formatted_mpr(const formatted_string& fs, msg_channel_type channel, int param) { diff --git a/crawl-ref/source/message.h b/crawl-ref/source/message.h index 3b7a984fb1..e6d6dd15fa 100644 --- a/crawl-ref/source/message.h +++ b/crawl-ref/source/message.h @@ -66,7 +66,6 @@ int msgwin_get_line(string prompt, input_history *mh = NULL, const string &fill = ""); - // Do not use this templated function directly. Use the macro below instead. template<int> static int msgwin_get_line_autohist_temp(string prompt, char *buf, int len, diff --git a/crawl-ref/source/misc.cc b/crawl-ref/source/misc.cc index 2afa5b8249..83990dc9ca 100644 --- a/crawl-ref/source/misc.cc +++ b/crawl-ref/source/misc.cc @@ -2703,8 +2703,6 @@ string counted_monster_list::describe(description_level_type desc) return out; } - - bool move_stairs(coord_def orig, coord_def dest) { const dungeon_feature_type stair_feat = grd(orig); diff --git a/crawl-ref/source/misc.h b/crawl-ref/source/misc.h index 86597e7bb0..b416e88402 100644 --- a/crawl-ref/source/misc.h +++ b/crawl-ref/source/misc.h @@ -216,7 +216,6 @@ struct path_less }; - template<typename cost_T, typename est_T> struct simple_connect { @@ -288,7 +287,6 @@ void search_astar(position_node & start, set<position_node>::iterator current = visited.insert(start).first; fringe.push(current); - bool done = false; while (!fringe.empty()) { diff --git a/crawl-ref/source/mon-abil.cc b/crawl-ref/source/mon-abil.cc index ae2752cfff..7f11ace8fb 100644 --- a/crawl-ref/source/mon-abil.cc +++ b/crawl-ref/source/mon-abil.cc @@ -86,18 +86,15 @@ static void _search_dungeon(const coord_def & start, // can have 4-connectivity. int compass_idx[] = {0, 2, 4, 6, 1, 3, 5, 7}; - position_node temp_node; temp_node.pos = start; temp_node.last = NULL; - queue<set<position_node>::iterator > fringe; set<position_node>::iterator current = visited.insert(temp_node).first; fringe.push(current); - bool done = false; while (!fringe.empty()) { @@ -773,7 +770,6 @@ static bool _crawling_corpse_merge(monster *crawlie) return false; } - static bool _slime_can_spawn(const coord_def target) { return mons_class_can_pass(MONS_SLIME_CREATURE, env.grid(target)) @@ -1288,7 +1284,6 @@ static int _battle_cry(monster* chief, battlecry_type type) } who = get_monster_data(mon_type)->name; - mprf(channel, messages[type][2].c_str(), chief->friendly() ? "Your" : "The", (!generic ? pluralise(who).c_str() @@ -2444,7 +2439,6 @@ struct tentacle_attack_constraints map<coord_def, set<int> >::iterator probe = connection_constraints->find(temp.pos); - if (probe != connection_constraints->end()) { int max_val = probe->second.empty() ? INT_MAX : *probe->second.rbegin(); @@ -2467,7 +2461,6 @@ struct tentacle_attack_constraints temp.string_distance -= delta; } - if (connect_level < max_val) temp.path_distance = DISCONNECT_DIST; } @@ -2493,7 +2486,6 @@ struct tentacle_attack_constraints }; - struct tentacle_connect_constraints { map<coord_def, set<int> > * connection_constraints; @@ -2530,7 +2522,6 @@ struct tentacle_connect_constraints continue; } - if (!base_monster->is_habitable(temp.pos) || actor_at(temp.pos)) { @@ -2539,8 +2530,6 @@ struct tentacle_connect_constraints else temp.path_distance = 1 + node.path_distance; - - //temp.estimate = grid_distance(temp.pos, kraken->pos()); // Don't bother with an estimate, the search is highly constrained // so it's not really going to help @@ -2610,7 +2599,6 @@ struct multi_target return false; } - }; // returns pathfinding success/failure @@ -2645,7 +2633,6 @@ static bool _tentacle_pathfind(monster* tentacle, foe_check, attack_constraints, visited, tentacle_path); - bool path_found = false; // Did we find a path? if (!tentacle_path.empty()) @@ -2656,7 +2643,6 @@ static bool _tentacle_pathfind(monster* tentacle, const position_node * current = &(*tentacle_path[0]); const position_node * last; - // The last position in the chain is the base position, // so we want to stop at the one before the last. while (current && current->last) @@ -2668,7 +2654,6 @@ static bool _tentacle_pathfind(monster* tentacle, } } - return path_found; } @@ -2843,7 +2828,6 @@ static int _collect_connection_data(monster* start_monster, current_count++; } - // mprf("returned count %d", current_count); return current_count; } @@ -2873,7 +2857,6 @@ void move_solo_tentacle(monster* tentacle) base_position = tentacle->props["base_position"].get_coord(); - if (!severed) { complicated_sight_check base_sight; @@ -2882,7 +2865,6 @@ void move_solo_tentacle(monster* tentacle) attack_foe = !foe_positions.empty(); } - coord_def retract_pos; map<coord_def, set<int> > connection_data; @@ -3005,7 +2987,6 @@ void move_solo_tentacle(monster* tentacle) while (probe->second.count(escalated + 1)) escalated++; - if (!severed && tentacle->is_habitable(test) && escalated == *probe->second.rbegin() @@ -4002,7 +3983,6 @@ bool mon_special_ability(monster* mons, bolt & beem) } break; - case MONS_VAULT_SENTINEL: if (mons->has_ench(ENCH_CONFUSION) || mons->friendly()) break; @@ -4635,7 +4615,6 @@ static bool _mold_connected(const coord_def & target) return is_moldy(target) || _ballisto_at(target); } - // If 'monster' is a ballistomycete or spore, activate some number of // ballistomycetes on the level. void activate_ballistomycetes(monster* mons, const coord_def& origin, diff --git a/crawl-ref/source/mon-act.cc b/crawl-ref/source/mon-act.cc index acf20509e5..ecc7cfc418 100644 --- a/crawl-ref/source/mon-act.cc +++ b/crawl-ref/source/mon-act.cc @@ -508,7 +508,6 @@ bool mons_can_move_towards_target(const monster* mon) return false; } - //--------------------------------------------------------------- // // handle_movement @@ -3017,7 +3016,6 @@ static bool _mons_can_displace(const monster* mpusher, if (invalid_monster_index(ipushee)) return false; - if (!mpushee->has_action_energy() && !_same_tentacle_parts(mpusher, mpushee)) { diff --git a/crawl-ref/source/mon-behv.cc b/crawl-ref/source/mon-behv.cc index ba3502d490..4c09ef09e8 100644 --- a/crawl-ref/source/mon-behv.cc +++ b/crawl-ref/source/mon-behv.cc @@ -724,7 +724,6 @@ void handle_behaviour(monster* mon) } } - if (mon->foe_memory <= 0 && !(mon->friendly() && mon->foe == MHITYOU)) { diff --git a/crawl-ref/source/mon-cast.cc b/crawl-ref/source/mon-cast.cc index 29f937a0d9..5e46af307e 100644 --- a/crawl-ref/source/mon-cast.cc +++ b/crawl-ref/source/mon-cast.cc @@ -1238,7 +1238,6 @@ static spell_type _get_draconian_breath_spell(monster* mons) } } - if (draco_breath != SPELL_NO_SPELL) { // [ds] Check line-of-fire here. It won't happen elsewhere. @@ -3060,7 +3059,6 @@ static int _monster_abjuration(const monster* caster, bool actual) return maffected; } - static bool _mons_abjured(monster* mons, bool nearby) { if (nearby && _monster_abjuration(mons, false) > 0 diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 14dcc4ed03..714c9143c5 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -20,7 +20,6 @@ - row 8: intel, habitat, flight class, speed, energy_usage - row 9: gmon_use class, gmon_eat class, body size - - Some further explanations: - colour: if BLACK, monster uses value of mons_sec @@ -150,7 +149,6 @@ #define SPELL_ENERGY(x) {10, 10, 10, 10, x, 10, 10, 100} #define SWIM_ENERGY(x) {10, x, 10, 10, 10, 10, 10, 100} - static monsterentry mondata[] = { @@ -178,7 +176,6 @@ static monsterentry mondata[] = MONUSE_NOTHING, MONEAT_NOTHING, SIZE_HUGE }, - // Use this to replace removed monsters, to retain save compatibility. // Please put it in #if (TAG_MAJOR_VERSION <= X), so they will go away // after save compat is broken. @@ -1510,7 +1507,6 @@ static monsterentry mondata[] = MONUSE_STARTING_EQUIPMENT, MONEAT_NOTHING, SIZE_MEDIUM }, - // rotting monsters ('n') { MONS_BOG_BODY, 'n', GREEN, "bog body", @@ -3017,7 +3013,6 @@ static monsterentry mondata[] = MONUSE_NOTHING, MONEAT_NOTHING, SIZE_GIANT }, - // elementals (E) { // dummy genus monster MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental", diff --git a/crawl-ref/source/mon-ench.cc b/crawl-ref/source/mon-ench.cc index d50ece3931..2ba3df6d95 100644 --- a/crawl-ref/source/mon-ench.cc +++ b/crawl-ref/source/mon-ench.cc @@ -1294,7 +1294,6 @@ void monster::apply_enchantment(const mon_enchant &me) damage++; } - // Extra damage for large (50%) and big (always). if (mon_size == SIZE_BIG || mon_size == SIZE_LARGE && coinflip()) damage++; @@ -1651,7 +1650,6 @@ void monster::apply_enchantment(const mon_enchant &me) } break; - case ENCH_SEVERED: { simple_monster_message(this, " writhes!"); diff --git a/crawl-ref/source/mon-gear.cc b/crawl-ref/source/mon-gear.cc index ae2f73bb22..f41d005680 100644 --- a/crawl-ref/source/mon-gear.cc +++ b/crawl-ref/source/mon-gear.cc @@ -27,7 +27,6 @@ #include "tilepick.h" #include "unwind.h" - static void _give_monster_item(monster* mon, int thing, bool force_item = false, bool (monster::*pickupfn)(item_def&, int) = NULL) @@ -670,7 +669,6 @@ static item_make_species_type _give_weapon(monster* mon, int level, level = MAKE_GOOD_ITEM; break; - case MONS_RUPERT: item.base_type = OBJ_WEAPONS; // Rupert favours big two-handers with visceral up-close diff --git a/crawl-ref/source/mon-info.cc b/crawl-ref/source/mon-info.cc index b1f1a0e7b7..0980a62a5f 100644 --- a/crawl-ref/source/mon-info.cc +++ b/crawl-ref/source/mon-info.cc @@ -1572,7 +1572,6 @@ string monster_info::constriction_description() const return cinfo; } - int monster_info::randarts(artefact_prop_type ra_prop) const { int ret = 0; diff --git a/crawl-ref/source/mon-movetarget.cc b/crawl-ref/source/mon-movetarget.cc index 7214d13229..4eeba10340 100644 --- a/crawl-ref/source/mon-movetarget.cc +++ b/crawl-ref/source/mon-movetarget.cc @@ -896,7 +896,6 @@ static bool _band_ok(monster * mon) return false; } - void check_wander_target(monster* mon, bool isPacified) { // default wander behaviour diff --git a/crawl-ref/source/mon-pathfind.h b/crawl-ref/source/mon-pathfind.h index fdf859a084..d1a8c3807a 100644 --- a/crawl-ref/source/mon-pathfind.h +++ b/crawl-ref/source/mon-pathfind.h @@ -35,7 +35,6 @@ protected: void update_pos(coord_def pos, int total); bool get_best_position(void); - // The monster trying to find a path. const monster* mons; diff --git a/crawl-ref/source/mon-place.cc b/crawl-ref/source/mon-place.cc index bb6b3be954..ce3f4b11ec 100644 --- a/crawl-ref/source/mon-place.cc +++ b/crawl-ref/source/mon-place.cc @@ -2616,7 +2616,6 @@ static band_type _choose_band(monster_type mon_type, int &band_size, break; } - default: ; } diff --git a/crawl-ref/source/mon-place.h b/crawl-ref/source/mon-place.h index be88b910a5..91310752bf 100644 --- a/crawl-ref/source/mon-place.h +++ b/crawl-ref/source/mon-place.h @@ -3,7 +3,6 @@ * @brief Functions used when placing monsters in the dungeon. **/ - #ifndef MONPLACE_H #define MONPLACE_H diff --git a/crawl-ref/source/mon-speak.cc b/crawl-ref/source/mon-speak.cc index 2c5345c33d..14aa0bdca3 100644 --- a/crawl-ref/source/mon-speak.cc +++ b/crawl-ref/source/mon-speak.cc @@ -390,7 +390,6 @@ void maybe_mons_speaks(monster* mons) // Okay then, don't speak. } - // Returns true if something is said. bool mons_speaks(monster* mons) { diff --git a/crawl-ref/source/mon-spll.h b/crawl-ref/source/mon-spll.h index 3fed493dcb..fd92db1c9f 100644 --- a/crawl-ref/source/mon-spll.h +++ b/crawl-ref/source/mon-spll.h @@ -1,7 +1,6 @@ #ifndef MON_SPLL_H #define MON_SPLL_H - /* ********************************************************************* This file determines which spells are contained in monster spellbooks. @@ -23,7 +22,6 @@ ********************************************************************* */ - { MST_ORC_WIZARD_I, { SPELL_MAGIC_DART, @@ -81,7 +79,6 @@ } }, - { MST_BK_TROG, { SPELL_BROTHERS_IN_ARMS, diff --git a/crawl-ref/source/mon-stuff.h b/crawl-ref/source/mon-stuff.h index d0a054e00a..3116bc980b 100644 --- a/crawl-ref/source/mon-stuff.h +++ b/crawl-ref/source/mon-stuff.h @@ -3,7 +3,6 @@ * @brief Misc monster related functions. **/ - #ifndef MONSTUFF_H #define MONSTUFF_H @@ -72,7 +71,6 @@ struct level_exit #define MONST_INTERESTING(x) (x->flags & MF_INTERESTING) - const item_def *give_mimic_item(monster* mimic); dungeon_feature_type get_mimic_feat(const monster* mimic); bool feature_mimic_at(const coord_def &c); diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index 768475ad7b..285fbfd917 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -1056,7 +1056,6 @@ void discover_mimic(const coord_def& pos, bool wake) else if (x_chance_in_y(level - 15, 6)) mg.cls = item ? MONS_RAVENOUS_ITEM_MIMIC : MONS_RAVENOUS_FEATURE_MIMIC; - if (feature_mimic) { if (feat_is_stone_stair(feat)) diff --git a/crawl-ref/source/mon-util.h b/crawl-ref/source/mon-util.h index 6ee7eb1d27..4f85ef4a96 100644 --- a/crawl-ref/source/mon-util.h +++ b/crawl-ref/source/mon-util.h @@ -3,7 +3,6 @@ * @brief Misc monster related functions. **/ - #ifndef MONUTIL_H #define MONUTIL_H diff --git a/crawl-ref/source/monster.cc b/crawl-ref/source/monster.cc index 3a890fd479..1370fe1ca8 100644 --- a/crawl-ref/source/monster.cc +++ b/crawl-ref/source/monster.cc @@ -554,7 +554,6 @@ hands_reqd_type monster::hands_reqd(const item_def &item) const return actor::hands_reqd(item); } - bool monster::can_wield(const item_def& item, bool ignore_curse, bool ignore_brand, bool ignore_shield, bool ignore_transform) const diff --git a/crawl-ref/source/msvc.h b/crawl-ref/source/msvc.h index c25ccdbcdb..1e89ed09a3 100644 --- a/crawl-ref/source/msvc.h +++ b/crawl-ref/source/msvc.h @@ -48,7 +48,6 @@ // POSIX deprecation warnings #pragma warning(disable : 4996) - static inline double round(double x) { if (x >= 0.0) diff --git a/crawl-ref/source/mutation.cc b/crawl-ref/source/mutation.cc index c9f20de6f3..0dbbf4b720 100644 --- a/crawl-ref/source/mutation.cc +++ b/crawl-ref/source/mutation.cc @@ -1237,7 +1237,6 @@ static int _handle_conflicting_mutations(mutation_type mutation, return 1; // Nothing more to do. } - default: die("bad mutation conflict resulution"); } diff --git a/crawl-ref/source/mutation.h b/crawl-ref/source/mutation.h index 8e5e0fc940..ad1365fada 100644 --- a/crawl-ref/source/mutation.h +++ b/crawl-ref/source/mutation.h @@ -3,7 +3,6 @@ * @brief Functions for handling player mutations. **/ - #ifndef MUTATION_H #define MUTATION_H diff --git a/crawl-ref/source/newgame.h b/crawl-ref/source/newgame.h index 1986a3d138..1c1f985444 100644 --- a/crawl-ref/source/newgame.h +++ b/crawl-ref/source/newgame.h @@ -3,7 +3,6 @@ * @brief Functions used when starting a new game. **/ - #ifndef NEWGAME_H #define NEWGAME_H diff --git a/crawl-ref/source/ouch.cc b/crawl-ref/source/ouch.cc index 6846bb75d5..42c513fec0 100644 --- a/crawl-ref/source/ouch.cc +++ b/crawl-ref/source/ouch.cc @@ -963,7 +963,6 @@ static void _place_player_corpse(bool explode) move_item_to_grid(&o, you.pos(), !you.in_water()); } - #if defined(WIZARD) || defined(DEBUG) static void _wizard_restore_life() { diff --git a/crawl-ref/source/ouch.h b/crawl-ref/source/ouch.h index 87cbde8abe..24bd4af705 100644 --- a/crawl-ref/source/ouch.h +++ b/crawl-ref/source/ouch.h @@ -3,11 +3,9 @@ * @brief Functions used when Bad Things happen to the player. **/ - #ifndef OUCH_H #define OUCH_H - #define DEATH_NAME_LENGTH 10 #include "enum.h" diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc index f28d21511c..3226f42624 100644 --- a/crawl-ref/source/output.cc +++ b/crawl-ref/source/output.cc @@ -287,7 +287,6 @@ static void _nowrap_eol_cprintf_touchui(const char *format, ...) #define NOWRAP_EOL_CPRINTF nowrap_eol_cprintf #endif - static string _god_powers(bool simple = false); // Color for captions like 'Health:', 'Str:', etc. diff --git a/crawl-ref/source/output.h b/crawl-ref/source/output.h index a474724d16..30b97f4022 100644 --- a/crawl-ref/source/output.h +++ b/crawl-ref/source/output.h @@ -3,11 +3,9 @@ * @brief Functions used to print player related info. **/ - #ifndef OUTPUT_H #define OUTPUT_H - enum status_redraw_flag_type { REDRAW_HUNGER = 0x00000001, diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc index 07a157e734..174626a3ae 100644 --- a/crawl-ref/source/player-equip.cc +++ b/crawl-ref/source/player-equip.cc @@ -463,7 +463,6 @@ static void _equip_use_warning(const item_def& item) mpr("You really shouldn't be using a poisoned item like this."); } - static void _wield_cursed(item_def& item, bool known_cursed, bool unmeld) { if (!item.cursed() || unmeld) diff --git a/crawl-ref/source/player.cc b/crawl-ref/source/player.cc index ba5d88babd..294200eb4e 100644 --- a/crawl-ref/source/player.cc +++ b/crawl-ref/source/player.cc @@ -4377,7 +4377,6 @@ unsigned int exp_needed(int lev, int exp_apt) // 26 930525 120330 8470 // 27 1059325 128800 8470 - switch (lev) { case 1: @@ -4650,7 +4649,6 @@ bool enough_mp(int minimum, bool suppress_msg, return true; } - bool enough_zp(int minimum, bool suppress_msg) { ASSERT(!crawl_state.game_is_arena()); @@ -4814,7 +4812,6 @@ void set_mp(int new_amount) you.redraw_magic_points = true; } - // If trans is true, being berserk and/or transformed is taken into account // here. Else, the base hp is calculated. If rotted is true, calculate the // real max hp you'd have if the rotting was cured. @@ -5684,7 +5681,6 @@ void player::copy_from(const player &other) *m_quiver = *(other.m_quiver); } - // player struct initialization void player::init() { @@ -5879,7 +5875,6 @@ void player::init() last_mid = 0; last_cast_spell = SPELL_NO_SPELL; - // Non-saved UI state: prev_targ = MHITNOT; prev_grd_targ.reset(); @@ -7163,7 +7158,6 @@ void player::paralyse(actor *who, int str, string source) props["paralysed_by"] = source; } - mprf("You %s the ability to move!", paralysis ? "still haven't" : "suddenly lose"); diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h index f5a4368321..5e1f08c037 100644 --- a/crawl-ref/source/player.h +++ b/crawl-ref/source/player.h @@ -892,7 +892,6 @@ bool player_control_teleport(bool temp = true); int player_shield_class(void); - int player_spec_air(void); int player_spec_cold(void); int player_spec_conj(void); diff --git a/crawl-ref/source/potion.cc b/crawl-ref/source/potion.cc index 17a7a145f2..5d86e993b1 100644 --- a/crawl-ref/source/potion.cc +++ b/crawl-ref/source/potion.cc @@ -496,7 +496,6 @@ bool potion_effect(potion_type pot_eff, int pow, item_def *potion, bool was_know learned_something_new(HINT_YOU_MUTATED); break; - case POT_RESISTANCE: mprf(MSGCH_DURATION, "You feel protected."); you.increase_duration(DUR_RESISTANCE, (random2(pow) + 35) / factor); diff --git a/crawl-ref/source/potion.h b/crawl-ref/source/potion.h index 2d5a8b9a3d..0c55a35838 100644 --- a/crawl-ref/source/potion.h +++ b/crawl-ref/source/potion.h @@ -6,7 +6,6 @@ #ifndef POTION_H #define POTION_H - #include "externs.h" // drank_it should be true for real potion effects (as opposed diff --git a/crawl-ref/source/random-var.cc b/crawl-ref/source/random-var.cc index cf06461409..1979e71e15 100644 --- a/crawl-ref/source/random-var.cc +++ b/crawl-ref/source/random-var.cc @@ -95,7 +95,6 @@ double random_var::expected() const return ev; } - ////////////////////////////////// random_var constant(int n) diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index b748cf795d..235a96e808 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -3927,7 +3927,6 @@ int elyvilon_lifesaving() return you.piety > 130 ? 2 : 1; } - bool god_protects_from_harm() { if (you.duration[DUR_LIFESAVING]) @@ -4533,7 +4532,6 @@ static void _place_delayed_monsters() _delayed_failure.clear(); } - static bool _is_god(god_type god) { return god > GOD_NO_GOD && god < NUM_GODS; diff --git a/crawl-ref/source/religion.h b/crawl-ref/source/religion.h index 273d136812..5d2dce149b 100644 --- a/crawl-ref/source/religion.h +++ b/crawl-ref/source/religion.h @@ -3,7 +3,6 @@ * @brief Misc religion related functions. **/ - #ifndef RELIGION_H #define RELIGION_H diff --git a/crawl-ref/source/rltiles/tool/tile_list_processor.cc b/crawl-ref/source/rltiles/tool/tile_list_processor.cc index c0ff1dd742..e52b61077b 100644 --- a/crawl-ref/source/rltiles/tool/tile_list_processor.cc +++ b/crawl-ref/source/rltiles/tool/tile_list_processor.cc @@ -1053,7 +1053,6 @@ bool tile_list_processor::write_data(bool image, bool code) fprintf(fp, " %s_%s_MAX = %s\n};\n\n", m_prefix.c_str(), ucname.c_str(), max_enum.c_str()); } - fprintf(fp, "unsigned int tile_%s_count(tileidx_t idx);\n", lcname.c_str()); fprintf(fp, "tileidx_t tile_%s_basetile(tileidx_t idx);\n", lcname.c_str()); fprintf(fp, "int tile_%s_probs(tileidx_t idx);\n", @@ -1488,7 +1487,6 @@ bool tile_list_processor::write_data(bool image, bool code) delete[] part_min; - // Write "%name.d" if (m_abstract.empty()) { diff --git a/crawl-ref/source/shopping.cc b/crawl-ref/source/shopping.cc index 6403dfdd84..a7ca15dac8 100644 --- a/crawl-ref/source/shopping.cc +++ b/crawl-ref/source/shopping.cc @@ -225,7 +225,6 @@ static void _list_shop_keys(const string &purchasable, bool viewing, fs.display(); tmp->set_visible(true); - // ///////// SELECT ITEM TO BUY/EXAMINE ////////// // set cursor [32 + 16 chars + 5 whitespace] cgotoxy(53, numlines - 1, GOTO_CRT); diff --git a/crawl-ref/source/shopping.h b/crawl-ref/source/shopping.h index ed1c2bd478..796d6b4830 100644 --- a/crawl-ref/source/shopping.h +++ b/crawl-ref/source/shopping.h @@ -3,7 +3,6 @@ * @brief Shop keeper functions. **/ - #ifndef SHOPPING_H #define SHOPPING_H diff --git a/crawl-ref/source/shout.cc b/crawl-ref/source/shout.cc index 5583dc8539..2885e32219 100644 --- a/crawl-ref/source/shout.cc +++ b/crawl-ref/source/shout.cc @@ -945,7 +945,6 @@ bool noise_grid::propagate_noise_to_neighbour(int base_attenuation, return false; } - void noise_grid::apply_noise_effects(const coord_def &pos, int noise_intensity_millis, const noise_t &noise, diff --git a/crawl-ref/source/skill_menu.cc b/crawl-ref/source/skill_menu.cc index 43b9d3e9d4..6c125a6f92 100644 --- a/crawl-ref/source/skill_menu.cc +++ b/crawl-ref/source/skill_menu.cc @@ -1117,7 +1117,6 @@ void SkillMenu::init_switches() add_item(sw, sw->size(), m_pos); } - sw = new SkillMenuSwitch("View", '!'); m_switches[SKM_VIEW] = sw; const bool transferring = !is_invalid_skill(you.transfer_to_skill); diff --git a/crawl-ref/source/skill_menu.h b/crawl-ref/source/skill_menu.h index 9bf19321aa..141ac090d2 100644 --- a/crawl-ref/source/skill_menu.h +++ b/crawl-ref/source/skill_menu.h @@ -3,7 +3,6 @@ * @brief Skill menu. **/ - #ifndef SKILLS_MENU_H #define SKILLS_MENU_H diff --git a/crawl-ref/source/skills.cc b/crawl-ref/source/skills.cc index c7894b0a95..ed186e831d 100644 --- a/crawl-ref/source/skills.cc +++ b/crawl-ref/source/skills.cc @@ -793,7 +793,6 @@ static void _train_skills(int exp, const int cost, const bool simu) you.skill_cost_level, cost, exp); #endif - // We scale the training array to the amount of XP available in the pool. // That gives us the amount of XP available to train each skill. for (int i = 0; i < NUM_SKILLS; ++i) diff --git a/crawl-ref/source/skills.h b/crawl-ref/source/skills.h index 40d5024661..f903c28df2 100644 --- a/crawl-ref/source/skills.h +++ b/crawl-ref/source/skills.h @@ -3,7 +3,6 @@ * @brief Skill exercising functions. **/ - #ifndef SKILLS_H #define SKILLS_H diff --git a/crawl-ref/source/skills2.h b/crawl-ref/source/skills2.h index 153b69e6be..5b31ecd016 100644 --- a/crawl-ref/source/skills2.h +++ b/crawl-ref/source/skills2.h @@ -3,7 +3,6 @@ * @brief More skill related functions. **/ - #ifndef SKILLS2_H #define SKILLS2_H diff --git a/crawl-ref/source/spl-book.cc b/crawl-ref/source/spl-book.cc index 9a60ce3b8d..060673c80c 100644 --- a/crawl-ref/source/spl-book.cc +++ b/crawl-ref/source/spl-book.cc @@ -1011,7 +1011,6 @@ static spell_type _choose_mem_spell(spell_list &spells, spell_menu.set_maxpagesize(52); } - for (unsigned int i = 0; i < spells.size(); i++) { const spell_type spell = spells[i]; diff --git a/crawl-ref/source/spl-book.h b/crawl-ref/source/spl-book.h index 7848b6e2d3..680815468c 100644 --- a/crawl-ref/source/spl-book.h +++ b/crawl-ref/source/spl-book.h @@ -3,7 +3,6 @@ * @brief Spellbook/rod contents array and management functions **/ - #ifndef SPL_BOOK_H #define SPL_BOOK_H diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc index 303313ae8b..8b42ce325f 100644 --- a/crawl-ref/source/spl-cast.cc +++ b/crawl-ref/source/spl-cast.cc @@ -1817,7 +1817,6 @@ static spret_type _do_cast(spell_type spell, int powc, return SPRET_SUCCESS; } - // _tetrahedral_number: returns the nth tetrahedral number. // This is the number of triples of nonnegative integers with sum < n. // Called only by get_true_fail_rate. diff --git a/crawl-ref/source/spl-cast.h b/crawl-ref/source/spl-cast.h index 04dde33ff2..0eb7dc59fb 100644 --- a/crawl-ref/source/spl-cast.h +++ b/crawl-ref/source/spl-cast.h @@ -3,7 +3,6 @@ * @brief Spell casting functions. **/ - #ifndef SPL_CAST_H #define SPL_CAST_H diff --git a/crawl-ref/source/spl-clouds.cc b/crawl-ref/source/spl-clouds.cc index d6ae3c49c5..6a8304ddb4 100644 --- a/crawl-ref/source/spl-clouds.cc +++ b/crawl-ref/source/spl-clouds.cc @@ -281,7 +281,6 @@ void manage_fire_shield(int delay) int threshold = get_expiration_threshold(DUR_FIRE_SHIELD); - if (old_dur > threshold && you.duration[DUR_FIRE_SHIELD] < threshold) mprf(MSGCH_WARN, "Your ring of flames is guttering out."); diff --git a/crawl-ref/source/spl-data.h b/crawl-ref/source/spl-data.h index fdaeb292bb..cdcb3a2575 100644 --- a/crawl-ref/source/spl-data.h +++ b/crawl-ref/source/spl-data.h @@ -176,8 +176,6 @@ struct spell_desc false }, - - { SPELL_BOLT_OF_MAGMA, "Bolt of Magma", SPTYP_CONJURATION | SPTYP_FIRE | SPTYP_EARTH, @@ -924,7 +922,6 @@ struct spell_desc false }, - { SPELL_DISPEL_UNDEAD, "Dispel Undead", SPTYP_NECROMANCY, diff --git a/crawl-ref/source/spl-miscast.h b/crawl-ref/source/spl-miscast.h index e804253055..570717af0a 100644 --- a/crawl-ref/source/spl-miscast.h +++ b/crawl-ref/source/spl-miscast.h @@ -41,7 +41,6 @@ public: int _lethality_margin = 0, string _hand_str = "", bool _can_plural_hand = true); - ~MiscastEffect(); void do_miscast(); diff --git a/crawl-ref/source/spl-summoning.cc b/crawl-ref/source/spl-summoning.cc index f33184441e..404ddb5a24 100644 --- a/crawl-ref/source/spl-summoning.cc +++ b/crawl-ref/source/spl-summoning.cc @@ -1179,7 +1179,6 @@ spret_type cast_malign_gateway(actor * caster, int pow, god_type god, bool fail) return SPRET_ABORT; } - spret_type cast_summon_horrible_things(int pow, god_type god, bool fail) { fail_check(); @@ -2635,7 +2634,6 @@ bool trigger_battlesphere(actor* agent, bolt& beam) queue_monster_for_action(battlesphere); } - return true; } diff --git a/crawl-ref/source/spl-summoning.h b/crawl-ref/source/spl-summoning.h index 9e0c5f85f9..eb5c47b16d 100644 --- a/crawl-ref/source/spl-summoning.h +++ b/crawl-ref/source/spl-summoning.h @@ -15,13 +15,11 @@ #define DEAD_ARE_HOPPING 16 #define DEAD_ARE_CRAWLING 32 - // Properties set for active summons #define SW_TARGET_MID "sw_target_mid" #define SW_READIED "sw_readied" #define SW_TRACKING "sw_tracking" - spret_type cast_summon_butterflies(int pow, god_type god = GOD_NO_GOD, bool fail = false); spret_type cast_summon_small_mammal(int pow, god_type god, bool fail); diff --git a/crawl-ref/source/spl-util.cc b/crawl-ref/source/spl-util.cc index 0ef2338344..7cbd786e27 100644 --- a/crawl-ref/source/spl-util.cc +++ b/crawl-ref/source/spl-util.cc @@ -41,7 +41,6 @@ #include "terrain.h" #include "transform.h" - struct spell_desc { int id; @@ -513,7 +512,6 @@ const char *spell_title(spell_type spell) return _seekspell(spell)->title; } - // FUNCTION APPLICATORS: Idea from Juho Snellman <jsnell@lyseo.edu.ouka.fi> // on the Roguelike News pages, Development section. // <URL:http://www.skoardy.demon.co.uk/rlnews/> @@ -545,7 +543,6 @@ static int _apply_area_square(cell_func cf, const coord_def& where, return rv; } - // Applies the effect to the eight squares beside the target. // Returns summation of return values from passed in function. static int _apply_area_around_square(cell_func cf, const coord_def& where, diff --git a/crawl-ref/source/spl-util.h b/crawl-ref/source/spl-util.h index de77ddfb59..d35f47d71a 100644 --- a/crawl-ref/source/spl-util.h +++ b/crawl-ref/source/spl-util.h @@ -3,7 +3,6 @@ * @brief data handlers for player spell list **/ - #ifndef SPL_UTIL_H #define SPL_UTIL_H diff --git a/crawl-ref/source/spl-wpnench.cc b/crawl-ref/source/spl-wpnench.cc index 1199aedb1e..b85466f24a 100644 --- a/crawl-ref/source/spl-wpnench.cc +++ b/crawl-ref/source/spl-wpnench.cc @@ -16,7 +16,6 @@ #include "shout.h" #include "skills2.h" - // We need to know what brands equate with what missile brands to know if // we should disallow temporary branding or not. static special_missile_type _convert_to_missile(brand_type which_brand) diff --git a/crawl-ref/source/startup.cc b/crawl-ref/source/startup.cc index 25b8968098..e963125d4d 100644 --- a/crawl-ref/source/startup.cc +++ b/crawl-ref/source/startup.cc @@ -921,7 +921,6 @@ bool startup_step() if (!SysEnv.crawl_name.empty()) choice.name = SysEnv.crawl_name; - #ifndef DGAMELAUNCH if (crawl_state.last_type == GAME_TYPE_TUTORIAL || crawl_state.last_type == GAME_TYPE_SPRINT) diff --git a/crawl-ref/source/stash.cc b/crawl-ref/source/stash.cc index f92768b0a5..a20d19abc6 100644 --- a/crawl-ref/source/stash.cc +++ b/crawl-ref/source/stash.cc @@ -134,7 +134,6 @@ void describe_stash(const coord_def& c) mprf(MSGCH_EXAMINE_FILTER, "%s", desc.c_str()); } - vector<item_def> Stash::get_items() const { return items; @@ -1482,7 +1481,6 @@ LevelStashes *StashTracker::find_current_level() return find_level(level_id::current()); } - bool StashTracker::update_stash(const coord_def& c) { LevelStashes *lev = find_current_level(); @@ -1906,7 +1904,6 @@ void StashSearchMenu::draw_title() } } - bool StashSearchMenu::process_key(int key) { if (key == '/') diff --git a/crawl-ref/source/store.cc b/crawl-ref/source/store.cc index 03ad62b909..f44b21755e 100644 --- a/crawl-ref/source/store.cc +++ b/crawl-ref/source/store.cc @@ -1334,7 +1334,6 @@ void CrawlHashTable::read(reader &th) ASSERT_VALIDITY(); } - #ifdef DEBUG_PROPS static map<string, int> accesses; # define ACCESS(x) ++accesses[x] @@ -1935,7 +1934,6 @@ CrawlVector::const_iterator CrawlVector::end() const return vec.end(); } - #ifdef DEBUG_PROPS static bool _cmp(string a, string b) { diff --git a/crawl-ref/source/store.h b/crawl-ref/source/store.h index 2b8a16a25a..046b451aea 100644 --- a/crawl-ref/source/store.h +++ b/crawl-ref/source/store.h @@ -61,7 +61,6 @@ enum store_flag_type SFLAG_NO_ERASE = (1 << 3), }; - typedef union StoreUnion StoreUnion; union StoreUnion { @@ -74,7 +73,6 @@ union StoreUnion void* ptr; }; - class CrawlStoreValue { public: @@ -245,7 +243,6 @@ protected: friend class CrawlVector; }; - // By default a hash table's value data types are heterogeneous. To // make it homogeneous (which causes dynamic type checking) you have // to give a type to the hash table constructor; once it's been diff --git a/crawl-ref/source/stuff.h b/crawl-ref/source/stuff.h index ca9b5b83ba..da3e888bc2 100644 --- a/crawl-ref/source/stuff.h +++ b/crawl-ref/source/stuff.h @@ -3,7 +3,6 @@ * @brief Misc stuff. **/ - #ifndef STUFF_H #define STUFF_H diff --git a/crawl-ref/source/syscalls.cc b/crawl-ref/source/syscalls.cc index 272bd552d3..7ae3831217 100644 --- a/crawl-ref/source/syscalls.cc +++ b/crawl-ref/source/syscalls.cc @@ -202,7 +202,6 @@ int fdatasync(int fd) # endif #endif - // The old school way of doing short delays via low level I/O sync. // Good for systems like old versions of Solaris that don't have usleep. #ifdef NEED_USLEEP @@ -232,7 +231,6 @@ void usleep(unsigned long time) # endif #endif - bool file_exists(const string &name) { #ifdef TARGET_OS_WINDOWS diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index f119180ceb..7c6a02833c 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -268,7 +268,6 @@ long writer::tell() return _file? ftell(_file) : _pbuf->size(); } - #ifdef DEBUG_GLOBALS // Force a conditional jump valgrind may pick up, no matter the optimizations. static volatile uint32_t hashroll; @@ -1672,7 +1671,6 @@ static void marshall_item_list(writer &th, const i_transit_list &ilist) } } - static m_transit_list unmarshall_follower_list(reader &th) { m_transit_list mlist; @@ -2023,7 +2021,6 @@ static void tag_read_you(reader &th) #endif EAT_CANARY; - count = unmarshallShort(th); ASSERT_RANGE(count, 0, 32768); you.sage_skills.resize(count, SK_NONE); @@ -2611,7 +2608,6 @@ static void tag_read_you(reader &th) #endif abyssal_state.phase = unmarshallFloat(th); - #if TAG_MAJOR_VERSION == 34 if (th.getMinorVersion() >= TAG_MINOR_ABYSS_BRANCHES) abyssal_state.level = unmarshall_level_id(th); diff --git a/crawl-ref/source/target.cc b/crawl-ref/source/target.cc index 6a5f43235c..10e2166de8 100644 --- a/crawl-ref/source/target.cc +++ b/crawl-ref/source/target.cc @@ -298,7 +298,6 @@ aff_type targetter_view::is_affected(coord_def loc) return AFF_NO; } - targetter_smite::targetter_smite(const actor* act, int ran, int exp_min, int exp_max, bool wall_ok, bool (*affects_pos_func)(const coord_def &)): @@ -645,7 +644,6 @@ aff_type targetter_splash::is_affected(coord_def loc) return anyone_there(loc) ? AFF_YES : AFF_MAYBE; } - targetter_los::targetter_los(const actor *act, los_type _los, int range, int range_max) { @@ -686,7 +684,6 @@ aff_type targetter_los::is_affected(coord_def loc) return (loc - origin).abs() > range_max2 ? AFF_MAYBE : AFF_YES; } - targetter_thunderbolt::targetter_thunderbolt(const actor *act, int r, coord_def _prev) { diff --git a/crawl-ref/source/target.h b/crawl-ref/source/target.h index 86b8cdf74b..09704271e9 100644 --- a/crawl-ref/source/target.h +++ b/crawl-ref/source/target.h @@ -221,6 +221,4 @@ private: int range2; }; - - #endif diff --git a/crawl-ref/source/terrain.cc b/crawl-ref/source/terrain.cc index 1562e090b3..c9ae5ed12b 100644 --- a/crawl-ref/source/terrain.cc +++ b/crawl-ref/source/terrain.cc @@ -479,7 +479,6 @@ static void _find_connected_identical(const coord_def &d, } } - // Find all connected cells containing ft, starting at d. void find_connected_identical(const coord_def &d, set<coord_def>& out) { @@ -527,7 +526,6 @@ coord_def get_random_stair() return st[random2(st.size())]; } - static unique_ptr<map_mask_boolean> _slime_wall_precomputed_neighbour_mask; static void _precompute_slime_wall_neighbours() diff --git a/crawl-ref/source/tilebuf.cc b/crawl-ref/source/tilebuf.cc index 86d68f5807..85db8c1916 100644 --- a/crawl-ref/source/tilebuf.cc +++ b/crawl-ref/source/tilebuf.cc @@ -214,7 +214,6 @@ void ColouredTileBuffer::add(tileidx_t idx, int x, int y, int z, ///////////////////////////////////////////////////////////////////////////// // SubmergedTileBuffer - SubmergedTileBuffer::SubmergedTileBuffer(const TilesTexture *tex, int water_level) : m_water_level(water_level), diff --git a/crawl-ref/source/tiledgnbuf.cc b/crawl-ref/source/tiledgnbuf.cc index 0b55b403ae..c940afe880 100644 --- a/crawl-ref/source/tiledgnbuf.cc +++ b/crawl-ref/source/tiledgnbuf.cc @@ -546,7 +546,6 @@ void DungeonCellBuffer::pack_doll(const dolls_data &doll, int x, int y, pack_doll_buf(m_buf_doll, doll, x, y, submerged, ghost); } - void DungeonCellBuffer::pack_mcache(mcache_entry *entry, int x, int y, bool submerged) { diff --git a/crawl-ref/source/tiledoll.cc b/crawl-ref/source/tiledoll.cc index 832967dfa0..39e1274930 100644 --- a/crawl-ref/source/tiledoll.cc +++ b/crawl-ref/source/tiledoll.cc @@ -115,7 +115,6 @@ bool load_doll_data(const char *fn, dolls_data *dolls, int max, || !(stFileInfo.st_mode & S_IRUSR)) ? "dolls.txt" : dollsTxtString.c_str(); - if ((fp = fopen_u(dollsTxt, "r")) == NULL) { // File doesn't exist. By default, use equipment settings. diff --git a/crawl-ref/source/tilemcache.cc b/crawl-ref/source/tilemcache.cc index b1063f846d..9d75fae861 100644 --- a/crawl-ref/source/tilemcache.cc +++ b/crawl-ref/source/tilemcache.cc @@ -123,7 +123,6 @@ tileidx_t tile_fg_store::operator=(tileidx_t tile) return m_tile; } - ///////////////////////////////////////////////////////////////////////////// // mcache_manager diff --git a/crawl-ref/source/tilepick-p.cc b/crawl-ref/source/tilepick-p.cc index 34bbb05b74..819af2ca97 100644 --- a/crawl-ref/source/tilepick-p.cc +++ b/crawl-ref/source/tilepick-p.cc @@ -862,7 +862,6 @@ void tilep_job_default(int job, dolls_data *doll) parts[TILEP_PART_BOOTS] = TILEP_BOOTS_SHORT_BROWN2; break; - case JOB_WIZARD: parts[TILEP_PART_BODY] = TILEP_BODY_GANDALF_G; parts[TILEP_PART_HAND1] = TILEP_HAND1_GANDALF; @@ -969,7 +968,6 @@ void tilep_job_default(int job, dolls_data *doll) parts[TILEP_PART_CLOAK] = TILEP_CLOAK_RED; break; - case JOB_ARCANE_MARKSMAN: parts[TILEP_PART_BODY] = TILEP_BODY_ROBE_BROWN; parts[TILEP_PART_HELM] = TILEP_HELM_WIZARD_GRAY; diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc index da5a472de3..8b7355a478 100644 --- a/crawl-ref/source/tilepick.cc +++ b/crawl-ref/source/tilepick.cc @@ -586,7 +586,6 @@ tileidx_t tileidx_feature(const coord_def &gc) else if (player_in_branch(BRANCH_SHOALS)) t = TILE_SHOALS_SHALLOW_WATER; - if (env.map_knowledge(gc).invisible_monster()) { // Add disturbance to tile. @@ -3646,7 +3645,6 @@ static tileidx_t _tileidx_food(const item_def &item) return TILE_ERROR; } - // Returns index of skeleton tiles. // Parameter item holds the skeleton. static tileidx_t _tileidx_bone(const item_def &item) @@ -3682,7 +3680,6 @@ static tileidx_t _tileidx_bone(const item_def &item) } } - // Returns index of corpse tiles. // Parameter item holds the corpse. static tileidx_t _tileidx_corpse(const item_def &item) diff --git a/crawl-ref/source/tilepick.h b/crawl-ref/source/tilepick.h index 3588f92c23..aa75ccd709 100644 --- a/crawl-ref/source/tilepick.h +++ b/crawl-ref/source/tilepick.h @@ -47,7 +47,6 @@ tileidx_t tileidx_corpse_brand(const item_def &item); tileidx_t get_clean_map_idx(tileidx_t tile_idx, bool mon_only = false); tileidx_t tileidx_unseen_flag(const coord_def &gc); - // Return the level of enchantment as an int. None is 0, Randart is 4. int enchant_to_int(const item_def &item); // If tile has variations, select among them based upon the enchant of item. diff --git a/crawl-ref/source/tilereg-doll.cc b/crawl-ref/source/tilereg-doll.cc index 827d64efdd..5459d3fa4e 100644 --- a/crawl-ref/source/tilereg-doll.cc +++ b/crawl-ref/source/tilereg-doll.cc @@ -166,7 +166,6 @@ void DollEditRegion::render() m_font_buf.add("Equip", VColour::white, tile_name_x, tile_name_y); } - set_transform(); m_shape_buf.draw(); m_tile_buf.draw(); diff --git a/crawl-ref/source/tilereg-mem.cc b/crawl-ref/source/tilereg-mem.cc index 773cf647c6..55fc4cee79 100644 --- a/crawl-ref/source/tilereg-mem.cc +++ b/crawl-ref/source/tilereg-mem.cc @@ -156,5 +156,4 @@ void MemoriseRegion::update() } } - #endif diff --git a/crawl-ref/source/tilereg-mon.cc b/crawl-ref/source/tilereg-mon.cc index 7a3efc2c51..0832f54754 100644 --- a/crawl-ref/source/tilereg-mon.cc +++ b/crawl-ref/source/tilereg-mon.cc @@ -64,7 +64,6 @@ int MonsterRegion::handle_mouse(MouseEvent &event) if (mouse_control::current_mode() != MOUSE_MODE_COMMAND) return 0; - unsigned int item_idx = cursor_index(); const monster_info* mon = get_monster(item_idx); if (!mon) diff --git a/crawl-ref/source/tilereg-popup.cc b/crawl-ref/source/tilereg-popup.cc index 2d2056e12a..172c722ed1 100644 --- a/crawl-ref/source/tilereg-popup.cc +++ b/crawl-ref/source/tilereg-popup.cc @@ -54,7 +54,6 @@ void PopupRegion::place_entries() _place_entries(ex / 4, ey / 4, ex / 2); } - void PopupRegion::run() { m_retval = getchm(KMC_CONFIRM); diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 4651abed61..94945e9298 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -59,7 +59,6 @@ void Region::place(int _sx, int _sy, int _ex, int _ey, int margin) on_resize(); } - void Region::place(int _sx, int _sy) { sx = _sx; diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index e6ac2d4148..6b3c6d9afc 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -462,7 +462,6 @@ bool TilesFramework::initialise() m_region_tab->activate_tab(TAB_ITEM); #endif - m_region_msg = new MessageRegion(m_fonts[m_msg_font].font); m_region_stat = new StatRegion(m_fonts[stat_font].font); m_region_crt = new CRTRegion(m_fonts[m_crt_font].font); @@ -1150,7 +1149,6 @@ bool TilesFramework::zoom_from_minimap() return true; } - void TilesFramework::deactivate_tab() { m_region_tab->deactivate_tab(); @@ -1531,7 +1529,6 @@ void TilesFramework::toggle_inventory_display() m_region_tab->activate_tab((idx + 1) % m_region_tab->num_tabs()); } - void TilesFramework::place_cursor(cursor_type type, const coord_def &gc) { m_region_tile->place_cursor(type, gc); diff --git a/crawl-ref/source/tileview.h b/crawl-ref/source/tileview.h index 06be06a491..f18e4fa946 100644 --- a/crawl-ref/source/tileview.h +++ b/crawl-ref/source/tileview.h @@ -42,7 +42,6 @@ void tile_init_flavour(const coord_def &gc); // that match target. void tile_floor_halo(dungeon_feature_type target, tileidx_t tile); - // Tile view related void tile_draw_floor(); void tile_reset_fg(const coord_def &gc); diff --git a/crawl-ref/source/tileweb.cc b/crawl-ref/source/tileweb.cc index 60b1425453..524fbae005 100644 --- a/crawl-ref/source/tileweb.cc +++ b/crawl-ref/source/tileweb.cc @@ -48,8 +48,6 @@ #include <stdarg.h> #include <errno.h> - - static unsigned int get_milliseconds() { // This is Unix-only, but so is Webtiles at the moment. @@ -59,7 +57,6 @@ static unsigned int get_milliseconds() return ((unsigned int) tv.tv_sec) * 1000 + tv.tv_usec / 1000; } - // Helper for json.h struct JsonWrapper { @@ -88,7 +85,6 @@ struct JsonWrapper static class MalformedException { } malformed; }; - TilesFramework tiles; TilesFramework::TilesFramework() @@ -865,7 +861,6 @@ void TilesFramework::_send_item(item_info& current, const item_info& next, } } - static void _send_doll(const dolls_data &doll, bool submerged, bool ghost) { // Ordered from back to front. @@ -1801,7 +1796,6 @@ void TilesFramework::clear_to_end_of_line() m_print_area->put_character(' ', m_print_fg, m_print_bg, x, m_print_y); } - void TilesFramework::mark_for_redraw(const coord_def& gc) { mark_dirty(gc); @@ -1829,7 +1823,6 @@ bool TilesFramework::cell_needs_redraw(const coord_def& gc) return m_cells_needing_redraw[gc.y * GXM + gc.x]; } - void TilesFramework::write_message_escaped(const string& s) { m_msg_buf.reserve(m_msg_buf.size() + s.size()); diff --git a/crawl-ref/source/transform.cc b/crawl-ref/source/transform.cc index 01fe02b6ee..c0f36e392e 100644 --- a/crawl-ref/source/transform.cc +++ b/crawl-ref/source/transform.cc @@ -1219,7 +1219,6 @@ bool transform(int pow, transformation_type which_trans, bool involuntary, make_stringf("gaining the %s transformation", form_names[which_trans]).c_str()); } - return true; } diff --git a/crawl-ref/source/transform.h b/crawl-ref/source/transform.h index ba0d08cf6c..da9e2be706 100644 --- a/crawl-ref/source/transform.h +++ b/crawl-ref/source/transform.h @@ -3,7 +3,6 @@ * @brief Misc function related to player transformations. **/ - #ifndef TRANSFOR_H #define TRANSFOR_H diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc index 1579685ef8..b285c5ca9a 100644 --- a/crawl-ref/source/travel.cc +++ b/crawl-ref/source/travel.cc @@ -4518,7 +4518,6 @@ const int cmd_array[8] = CMD_MOVE_UP_LEFT, CMD_MOVE_UP, CMD_MOVE_UP_RIGHT, }; - static int _adjacent_cmd(const coord_def &gc, bool force) { const coord_def dir = gc - you.pos(); diff --git a/crawl-ref/source/tutorial.cc b/crawl-ref/source/tutorial.cc index 5d1bf4bd3a..b4e60b26f0 100644 --- a/crawl-ref/source/tutorial.cc +++ b/crawl-ref/source/tutorial.cc @@ -59,7 +59,6 @@ void tutorial_init_hint(const char* hintstr) else if (strcmp(hintstr, "HINT_ROTTEN_FOOD") == 0) hint = HINT_ROTTEN_FOOD; - if (hint != HINT_EVENTS_NUM) Hints.hints_events[hint] = true; } diff --git a/crawl-ref/source/unicode.h b/crawl-ref/source/unicode.h index c056c88a16..f9913f7540 100644 --- a/crawl-ref/source/unicode.h +++ b/crawl-ref/source/unicode.h @@ -6,7 +6,6 @@ #ifndef UNICODE_H #define UNICODE_H - int wctoutf8(char *d, ucs_t s); int utf8towc(ucs_t *d, const char *s); #ifdef TARGET_OS_WINDOWS diff --git a/crawl-ref/source/view.h b/crawl-ref/source/view.h index 59d02f70f7..45bf0f88e9 100644 --- a/crawl-ref/source/view.h +++ b/crawl-ref/source/view.h @@ -3,7 +3,6 @@ * @brief Misc function used to render the dungeon. **/ - #ifndef VIEW_H #define VIEW_H diff --git a/crawl-ref/source/wcwidth.cc b/crawl-ref/source/wcwidth.cc index 54bd33a426..b99f604e9e 100644 --- a/crawl-ref/source/wcwidth.cc +++ b/crawl-ref/source/wcwidth.cc @@ -92,7 +92,6 @@ static int bisearch(ucs_t ucs, const struct interval *table, ucs_t max) return 0; } - /* The following two functions define the column width of an ISO 10646 * character as follows: * diff --git a/crawl-ref/source/wiz-you.cc b/crawl-ref/source/wiz-you.cc index 2bd472d6be..5a71ce6080 100644 --- a/crawl-ref/source/wiz-you.cc +++ b/crawl-ref/source/wiz-you.cc @@ -495,7 +495,6 @@ void wizard_set_skill_level(skill_type skill) } #endif - #ifdef WIZARD void wizard_set_all_skills(void) { diff --git a/crawl-ref/source/worley.cc b/crawl-ref/source/worley.cc index 03c4674b3e..4b660e26c5 100644 --- a/crawl-ref/source/worley.cc +++ b/crawl-ref/source/worley.cc @@ -67,7 +67,6 @@ namespace worley double at[3], double *F, double (*delta)[3], uint32_t *ID); - /* The main function! */ static void _worley(double at[3], int32_t max_order, double *F, double (*delta)[3], uint32_t *ID) diff --git a/crawl-ref/source/zap-data.h b/crawl-ref/source/zap-data.h index 6933b26715..5f5e8d9d86 100644 --- a/crawl-ref/source/zap-data.h +++ b/crawl-ref/source/zap-data.h @@ -615,7 +615,6 @@ struct zap_info 7 }, - { ZAP_BREATHE_FROST, "freezing breath", |