~widelands-dev/widelands/trunk

« back to all changes in this revision

Viewing changes to src/logic/map.h

Committer: The Widelands Bunnybot
Date: 2022-02-27 18:58:23 UTC
Revision ID: bunnybot@widelands.org-20220227185823-tyvkc7z2dho9it5a

Fix misc clang-tidy checks in `logic` (#5255)

(by Noordfrees)
f48cadd044004aa7eb32d222927ec9b0ab744457

files modified:
src/logic/addons.cc

src/logic/cmd_queue.cc

src/logic/editor_game_base.cc

src/logic/editor_game_base.h

src/logic/game.cc

src/logic/map.cc

src/logic/map.h

src/logic/map_objects/bob.cc

src/logic/map_objects/buildcost.h

src/logic/map_objects/checkstep.cc

src/logic/map_objects/checkstep.h

src/logic/map_objects/description_manager.cc

src/logic/map_objects/descriptions.cc

src/logic/map_objects/descriptions.h

src/logic/map_objects/findimmovable.cc

src/logic/map_objects/findnode.cc

src/logic/map_objects/immovable.cc

src/logic/map_objects/immovable.h

src/logic/map_objects/map_object.cc

src/logic/map_objects/map_object.h

src/logic/map_objects/tribes/building.cc

src/logic/map_objects/tribes/building_settings.cc

src/logic/map_objects/tribes/carrier.cc

src/logic/map_objects/tribes/constructionsite.cc

src/logic/map_objects/tribes/dismantlesite.cc

src/logic/map_objects/tribes/ferry.cc

src/logic/map_objects/tribes/market.cc

src/logic/map_objects/tribes/militarysite.cc

src/logic/map_objects/tribes/militarysite.h

src/logic/map_objects/tribes/partially_finished_building.cc

src/logic/map_objects/tribes/partially_finished_building.h

src/logic/map_objects/tribes/production_program.cc

src/logic/map_objects/tribes/productionsite.cc

src/logic/map_objects/tribes/requirements.cc

src/logic/map_objects/tribes/road_textures.h

src/logic/map_objects/tribes/ship.cc

src/logic/map_objects/tribes/soldier.cc

src/logic/map_objects/tribes/soldier.h

src/logic/map_objects/tribes/trainingsite.cc

src/logic/map_objects/tribes/trainingsite.h

src/logic/map_objects/tribes/tribe_basic_info.cc

src/logic/map_objects/tribes/tribe_descr.cc

src/logic/map_objects/tribes/tribe_descr.h

src/logic/map_objects/tribes/warehouse.cc

src/logic/map_objects/tribes/warehouse.h

src/logic/map_objects/tribes/worker.cc

src/logic/map_objects/tribes/worker_program.cc

src/logic/map_objects/world/critter.cc

src/logic/map_objects/world/map_gen.cc

src/logic/map_objects/world/terrain_description.cc

src/logic/path.cc

src/logic/pathfield.cc

src/logic/pathfield.h

src/logic/player.cc

src/logic/player.h

src/logic/playercommand.cc

src/logic/playercommand.h

src/logic/replay_game_controller.cc

src/logic/replay_game_controller.h

src/logic/save_handler.cc

src/logic/save_handler.h

src/logic/single_player_game_controller.h

src/logic/single_player_game_settings_provider.cc

Show diffs side-by-side

added added

removed removed

src/logic/map.h

199

std::function<std::string()> descname;

200

};

201

static const std::vector<OldWorldInfo> kOldWorldNames;

202

static const OldWorldInfo& get_old_world_info_by_new_name(const std::string& old_name);

202

static const OldWorldInfo& get_old_world_info_by_new_name(const std::string& new_name);

203

static const OldWorldInfo& get_old_world_info_by_old_name(const std::string& old_name);

204

205

using PortSpacesSet = std::set<Coords>;

625

void calculate_minimum_required_widelands_version(bool is_post_one_world);

626

627

private:

628

void recalc_border(const FCoords&);

629

void recalc_brightness(const FCoords&);

628

void recalc_border(const FCoords&) const;

629

void recalc_brightness(const FCoords&) const;

630

void recalc_nodecaps_pass1(const EditorGameBase&, const FCoords&);

631

void recalc_nodecaps_pass2(const EditorGameBase&, const FCoords& f);

632

NodeCaps

635

const FCoords&,

636

bool consider_mobs = true,

637

NodeCaps initcaps = CAPS_NONE) const;

638

void check_neighbour_heights(FCoords, uint32_t& radius);

638

void check_neighbour_heights(FCoords, uint32_t& area);

639

int calc_buildsize(const EditorGameBase&,

640

const FCoords& f,

641

bool avoidnature,

Older »