widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #02693
Re: [Merge] lp:~widelands-dev/widelands/bug-1343297_2 into lp:widelands
Review: Approve
One nit. Please fix and merge.
Diff comments:
> === added file 'cmake/codecheck/rules/camel_case_for_classes'
> --- cmake/codecheck/rules/camel_case_for_classes 1970-01-01 00:00:00 +0000
> +++ cmake/codecheck/rules/camel_case_for_classes 2014-09-15 07:27:30 +0000
> @@ -0,0 +1,41 @@
> +#!/usr/bin/python
> +
> +import re
> +
> +strip_comments_and_strings = True
> +
> +def evaluate_matches(lines, fn):
> + errors = []
> +
> + for lineno, line in enumerate(lines):
> +
> + # Exception for Microsoft fix in src/network/network_system.h
> + if not line.count("in_port_t = uint16_t") and not line.count("in_addr_t = uint32_t"):
if reads better if you use if line.count: continue. The rest of the method will have one indent less.
> +
> + if re.match("(^\s*((class|struct)\s+((\S+_)|([a-z]\S+)).*{)|((enum)\s+((\S+_)|(([abd-z])|(c(?!lass))\S+)).*{)|((using)\s+((\S+_)|([a-z]\S+)).*=).*$)", line):
> +
> + errors.append((fn, lineno+1, "Use CapitalLetterWithCamelCase when naming an enum class, struct, or \"using\"."))
> +
> + return errors
> +# /end evaluate_matches
> +
> +forbidden = [
> + "class my_class",
> + "class myClass",
> + "struct my_struct",
> + "struct myStruct",
> + "using my_typedef",
> + "using myTypedef",
> + "enum class my_enum",
> + "enum class myEnum"
> + "enum my_enum",
> + "enum myEnum"
> +]
> +
> +allowed = [
> + "class MyClass",
> + "struct MyStruct",
> + "using MyTypedef",
> + "enum class MyEnum",
> + "enum MyEnum"
> +]
>
> === added file 'cmake/codecheck/rules/do_not_use_typedef'
> --- cmake/codecheck/rules/do_not_use_typedef 1970-01-01 00:00:00 +0000
> +++ cmake/codecheck/rules/do_not_use_typedef 2014-09-15 07:27:30 +0000
> @@ -0,0 +1,24 @@
> +#!/usr/bin/python
> +
> +import re
> +
> +strip_comments_and_strings = True
> +
> +def evaluate_matches(lines, fn):
> + errors = []
> +
> + for lineno, line in enumerate(lines):
> +
> + if line.count("typedef"):
> + errors.append((fn, lineno+1, "Do not use \"typedef\". Use \"using\" instead."))
> +
> + return errors
> +# /end evaluate_matches
> +
> +forbidden = [
> + "typedef uint8_t MyType"
> +]
> +
> +allowed = [
> + "using MyType = uint8_t"
> +]
>
> === modified file 'src/ai/ai_help_structs.h'
> --- src/ai/ai_help_structs.h 2014-07-28 16:59:54 +0000
> +++ src/ai/ai_help_structs.h 2014-09-15 07:27:30 +0000
> @@ -283,7 +283,7 @@
>
> struct BuildingObserver {
> char const* name;
> - Widelands::Building_Index id;
> + Widelands::BuildingIndex id;
> Widelands::BuildingDescr const* desc;
>
> enum {
>
> === modified file 'src/ai/computer_player.cc'
> --- src/ai/computer_player.cc 2014-07-23 20:12:17 +0000
> +++ src/ai/computer_player.cc 2014-09-15 07:27:30 +0000
> @@ -21,24 +21,24 @@
>
> #include "ai/defaultai.h"
>
> -Computer_Player::Computer_Player
> - (Widelands::Game & g, Widelands::Player_Number const pid)
> +ComputerPlayer::ComputerPlayer
> + (Widelands::Game & g, Widelands::PlayerNumber const pid)
> : m_game(g), m_player_number(pid)
> {
> }
>
> -Computer_Player::~Computer_Player() {}
> +ComputerPlayer::~ComputerPlayer() {}
>
> -struct EmptyAI : Computer_Player {
> - EmptyAI(Widelands::Game & g, const Widelands::Player_Number pid)
> - : Computer_Player(g, pid) {}
> +struct EmptyAI : ComputerPlayer {
> + EmptyAI(Widelands::Game & g, const Widelands::PlayerNumber pid)
> + : ComputerPlayer(g, pid) {}
>
> void think() override {}
>
> struct EmptyAIImpl : Implementation {
> EmptyAIImpl() {name = _("None");}
> - Computer_Player * instantiate
> - (Widelands::Game & g, Widelands::Player_Number const pid) const override
> + ComputerPlayer * instantiate
> + (Widelands::Game & g, Widelands::PlayerNumber const pid) const override
> {
> return new EmptyAI(g, pid);
> }
> @@ -49,10 +49,10 @@
>
> EmptyAI::EmptyAIImpl EmptyAI::implementation;
>
> -const Computer_Player::ImplementationVector &
> -Computer_Player::getImplementations()
> +const ComputerPlayer::ImplementationVector &
> +ComputerPlayer::getImplementations()
> {
> - static std::vector<Computer_Player::Implementation const *> impls;
> + static std::vector<ComputerPlayer::Implementation const *> impls;
>
> if (impls.empty()) {
> impls.push_back(&DefaultAI::aggressiveImpl);
> @@ -64,12 +64,12 @@
> return impls;
> }
>
> -const Computer_Player::Implementation * Computer_Player::getImplementation
> +const ComputerPlayer::Implementation * ComputerPlayer::getImplementation
> (const std::string & name)
> {
> const ImplementationVector & vec = getImplementations();
>
> - for (const Computer_Player::Implementation* implementation : vec) {
> + for (const ComputerPlayer::Implementation* implementation : vec) {
> if (implementation->name == name) {
> return implementation;
> }
>
> === modified file 'src/ai/computer_player.h'
> --- src/ai/computer_player.h 2014-07-16 08:23:42 +0000
> +++ src/ai/computer_player.h 2014-09-15 07:27:30 +0000
> @@ -36,14 +36,14 @@
> * Instances of actual AI implementation can be created via the
> * \ref Implementation interface.
> */
> -struct Computer_Player {
> - Computer_Player(Widelands::Game &, const Widelands::Player_Number);
> - virtual ~Computer_Player();
> +struct ComputerPlayer {
> + ComputerPlayer(Widelands::Game &, const Widelands::PlayerNumber);
> + virtual ~ComputerPlayer();
>
> virtual void think () = 0;
>
> Widelands::Game & game() const {return m_game;}
> - Widelands::Player_Number player_number() {return m_player_number;}
> + Widelands::PlayerNumber player_number() {return m_player_number;}
>
> /**
> * Interface to a concrete implementation, used to instantiate AIs.
> @@ -53,12 +53,10 @@
> struct Implementation {
> std::string name;
> virtual ~Implementation() {}
> - virtual Computer_Player * instantiate
> - (Widelands::Game &, Widelands::Player_Number) const = 0;
> + virtual ComputerPlayer * instantiate
> + (Widelands::Game &, Widelands::PlayerNumber) const = 0;
> };
> - typedef
> - std::vector<Computer_Player::Implementation const *>
> - ImplementationVector;
> + using ImplementationVector = std::vector<ComputerPlayer::Implementation const *>;
>
> /**
> * Get a list of available AI implementations.
> @@ -72,9 +70,9 @@
>
> private:
> Widelands::Game & m_game;
> - Widelands::Player_Number const m_player_number;
> + Widelands::PlayerNumber const m_player_number;
>
> - DISALLOW_COPY_AND_ASSIGN(Computer_Player);
> + DISALLOW_COPY_AND_ASSIGN(ComputerPlayer);
> };
>
> #endif // end of include guard: WL_AI_COMPUTER_PLAYER_H
>
> === modified file 'src/ai/defaultai.cc'
> --- src/ai/defaultai.cc 2014-08-26 19:40:13 +0000
> +++ src/ai/defaultai.cc 2014-09-15 07:27:30 +0000
> @@ -62,8 +62,8 @@
> DefaultAI::DefensiveImpl DefaultAI::defensiveImpl;
>
> /// Constructor of DefaultAI
> -DefaultAI::DefaultAI(Game& ggame, Player_Number const pid, uint8_t const t)
> - : Computer_Player(ggame, pid),
> +DefaultAI::DefaultAI(Game& ggame, PlayerNumber const pid, uint8_t const t)
> + : ComputerPlayer(ggame, pid),
> type_(t),
> m_buildable_changed(true),
> m_mineable_changed(true),
> @@ -232,20 +232,20 @@
> player_ = game().get_player(player_number());
> tribe_ = &player_->tribe();
> log("ComputerPlayer(%d): initializing (%u)\n", player_number(), type_);
> - Ware_Index const nr_wares = tribe_->get_nrwares();
> + WareIndex const nr_wares = tribe_->get_nrwares();
> wares.resize(nr_wares);
>
> - for (Ware_Index i = 0; i < nr_wares; ++i) {
> + for (WareIndex i = 0; i < nr_wares; ++i) {
> wares.at(i).producers_ = 0;
> wares.at(i).consumers_ = 0;
> wares.at(i).preciousness_ = tribe_->get_ware_descr(i)->preciousness();
> }
>
> // collect information about the different buildings our tribe can construct
> - Building_Index const nr_buildings = tribe_->get_nrbuildings();
> + BuildingIndex const nr_buildings = tribe_->get_nrbuildings();
> const World& world = game().world();
>
> - for (Building_Index i = 0; i < nr_buildings; ++i) {
> + for (BuildingIndex i = 0; i < nr_buildings; ++i) {
> const BuildingDescr& bld = *tribe_->get_building_descr(i);
> const std::string& building_name = bld.name();
> const BuildingHints& bh = bld.hints();
> @@ -299,7 +299,7 @@
> for (const WareAmount& temp_input : prod.inputs()) {
> bo.inputs_.push_back(temp_input.first);
> }
> - for (const Ware_Index& temp_output : prod.output_ware_types()) {
> + for (const WareIndex& temp_output : prod.output_ware_types()) {
> bo.outputs_.push_back(temp_output);
> }
>
> @@ -354,8 +354,8 @@
> Map& map = game().map();
> std::set<OPtr<PlayerImmovable>> found_immovables;
>
> - for (Y_Coordinate y = 0; y < map.get_height(); ++y) {
> - for (X_Coordinate x = 0; x < map.get_width(); ++x) {
> + for (int16_t y = 0; y < map.get_height(); ++y) {
> + for (int16_t x = 0; x < map.get_width(); ++x) {
> FCoords f = map.get_fcoords(Coords(x, y));
>
> if (f.field->get_owned_by() != player_number())
> @@ -483,7 +483,7 @@
> Map& map = game().map();
> FindNodeUnowned find_unowned(player_, game());
> FindNodeUnownedMineable find_unowned_mines_pots(player_, game());
> - Player_Number const pn = player_->player_number();
> + PlayerNumber const pn = player_->player_number();
> const World& world = game().world();
> field.unowned_land_nearby_ =
> map.find_fields(Area<FCoords>(field.coords, range), nullptr, find_unowned);
> @@ -841,7 +841,7 @@
> military_boost = 200;
> }
>
> - // Building_Index proposed_building = INVALID_INDEX; // I need BuildingObserver not index
> + // BuildingIndex proposed_building = INVALID_INDEX; // I need BuildingObserver not index
> BuildingObserver* best_building = nullptr;
> int32_t proposed_priority = 0;
> Coords proposed_coords;
> @@ -925,7 +925,7 @@
> continue;
>
> for (uint32_t m = 0; m < bo.outputs_.size(); ++m) {
> - Ware_Index wt(static_cast<size_t>(bo.outputs_.at(m)));
> + WareIndex wt(static_cast<size_t>(bo.outputs_.at(m)));
>
> if (observer->economy.needs_ware(wt)) {
> output_is_needed = true;
> @@ -1557,7 +1557,7 @@
> const Map& map = game().map();
> CoordPath cp(map, path);
> // try to split after two steps
> - CoordPath::Step_Vector::size_type i = cp.get_nsteps() - 1, j = 1;
> + CoordPath::StepVector::size_type i = cp.get_nsteps() - 1, j = 1;
>
> for (; i >= j; --i, ++j) {
> {
> @@ -1813,8 +1813,8 @@
> }
>
> // Get max radius of recursive workarea
> - Workarea_Info::size_type radius = 0;
> - const Workarea_Info& workarea_info = site.bo->desc->m_workarea_info;
> + WorkareaInfo::size_type radius = 0;
> + const WorkareaInfo& workarea_info = site.bo->desc->m_workarea_info;
> for (const std::pair<uint32_t, std::set<std::string> > & temp_info : workarea_info) {
> if (radius < temp_info.first) {
> radius = temp_info.first;
> @@ -2012,8 +2012,8 @@
>
> // Check whether building is enhanceable and if wares of the enhanced
> // buildings are needed. If yes consider an upgrade.
> - const Building_Index enhancement = site.site->descr().enhancement();
> - Building_Index enbld = INVALID_INDEX; // to get rid of this
> + const BuildingIndex enhancement = site.site->descr().enhancement();
> + BuildingIndex enbld = INVALID_INDEX; // to get rid of this
> BuildingObserver* bestbld = nullptr;
>
> // Only enhance buildings that are allowed (scenario mode)
> @@ -2118,8 +2118,8 @@
> }
>
> // Check whether building is enhanceable. If yes consider an upgrade.
> - const Building_Index enhancement = site.site->descr().enhancement();
> - Building_Index enbld = INVALID_INDEX;
> + const BuildingIndex enhancement = site.site->descr().enhancement();
> + BuildingIndex enbld = INVALID_INDEX;
> BuildingObserver* bestbld = nullptr;
> bool changed = false;
> // Only enhance buildings that are allowed (scenario mode)
> @@ -2163,7 +2163,7 @@
> // this count ware as hints
> uint32_t DefaultAI::get_stocklevel_by_hint(size_t hintoutput) {
> uint32_t count = 0;
> - Ware_Index wt(hintoutput);
> + WareIndex wt(hintoutput);
> for (EconomyObserver* observer : economies) {
> // Don't check if the economy has no warehouse.
> if (observer->economy.warehouses().empty())
> @@ -2186,7 +2186,7 @@
> continue;
>
> for (uint32_t m = 0; m < bo.outputs_.size(); ++m) {
> - Ware_Index wt(static_cast<size_t>(bo.outputs_.at(m)));
> + WareIndex wt(static_cast<size_t>(bo.outputs_.at(m)));
> count += observer->economy.stock_ware(wt);
> }
> }
> @@ -2603,7 +2603,7 @@
> // counting players in game
> uint32_t plr_in_game = 0;
> std::vector<bool> player_attackable;
> - Player_Number const nr_players = game().map().get_nrplayers();
> + PlayerNumber const nr_players = game().map().get_nrplayers();
> player_attackable.resize(nr_players);
> bool any_attackable = false;
> bool any_attacked = false;
> @@ -2619,7 +2619,7 @@
> iterate_players_existing_novar(p, nr_players, game())++ plr_in_game;
>
> // receiving games statistics and parsing it (reading latest entry)
> - const Game::General_Stats_vector& genstats = game().get_general_statistics();
> + const Game::GeneralStatsVector& genstats = game().get_general_statistics();
> for (uint8_t j = 1; j <= plr_in_game; ++j) {
> if (pn == j) {
> player_attackable[j - 1] = false;
>
> === modified file 'src/ai/defaultai.h'
> --- src/ai/defaultai.h 2014-07-26 10:43:23 +0000
> +++ src/ai/defaultai.h 2014-09-15 07:27:30 +0000
> @@ -65,8 +65,8 @@
> // - handling of trainingsites (if supply line is broken - send some soldiers
> // out, to have some more forces. Reincrease the number of soldiers that
> // should be trained if inputs_ get filled again.).
> -struct DefaultAI : Computer_Player {
> - DefaultAI(Widelands::Game&, const Widelands::Player_Number, uint8_t);
> +struct DefaultAI : ComputerPlayer {
> + DefaultAI(Widelands::Game&, const Widelands::PlayerNumber, uint8_t);
> ~DefaultAI();
> void think() override;
>
> @@ -77,32 +77,32 @@
> };
>
> /// Implementation for Aggressive
> - struct AggressiveImpl : public Computer_Player::Implementation {
> + struct AggressiveImpl : public ComputerPlayer::Implementation {
> AggressiveImpl() {
> name = _("Aggressive");
> }
> - Computer_Player* instantiate(Widelands::Game& game,
> - Widelands::Player_Number const p) const override {
> + ComputerPlayer* instantiate(Widelands::Game& game,
> + Widelands::PlayerNumber const p) const override {
> return new DefaultAI(game, p, AGGRESSIVE);
> }
> };
>
> - struct NormalImpl : public Computer_Player::Implementation {
> + struct NormalImpl : public ComputerPlayer::Implementation {
> NormalImpl() {
> name = _("Normal");
> }
> - Computer_Player* instantiate(Widelands::Game& game,
> - Widelands::Player_Number const p) const override {
> + ComputerPlayer* instantiate(Widelands::Game& game,
> + Widelands::PlayerNumber const p) const override {
> return new DefaultAI(game, p, NORMAL);
> }
> };
>
> - struct DefensiveImpl : public Computer_Player::Implementation {
> + struct DefensiveImpl : public ComputerPlayer::Implementation {
> DefensiveImpl() {
> name = _("Defensive");
> }
> - Computer_Player* instantiate(Widelands::Game& game,
> - Widelands::Player_Number const p) const override {
> + ComputerPlayer* instantiate(Widelands::Game& game,
> + Widelands::PlayerNumber const p) const override {
> return new DefaultAI(game, p, DEFENSIVE);
> }
> };
> @@ -165,7 +165,7 @@
> bool m_mineable_changed;
>
> Widelands::Player* player_;
> - Widelands::Tribe_Descr const* tribe_;
> + Widelands::TribeDescr const* tribe_;
>
> std::vector<BuildingObserver> buildings_;
> uint32_t num_constructionsites_;
>
> === modified file 'src/base/exceptions.cc'
> --- src/base/exceptions.cc 2014-06-23 20:17:05 +0000
> +++ src/base/exceptions.cc 2014-09-15 07:27:30 +0000
> @@ -25,10 +25,10 @@
> #include <sstream>
>
> /*
> - * class _wexception implementation
> + * class WException implementation
> */
> #undef wexception
> -_wexception::_wexception
> +WException::WException
> (char const * const file, uint32_t const line, char const * const fmt, ...)
> {
> char buffer[512];
> @@ -43,7 +43,7 @@
> m_what = ost.str();
> }
>
> -char const * _wexception::what() const noexcept {
> +char const * WException::what() const noexcept {
> return m_what.c_str();
> }
>
> @@ -51,7 +51,7 @@
> /*
> * class warning implementation
> */
> -warning::warning(char const * const et, char const * const em, ...) :
> +WLWarning::WLWarning(char const * const et, char const * const em, ...) :
> m_title(et)
> {
> char buffer[512];
> @@ -64,11 +64,11 @@
> m_what = buffer;
> }
>
> -char const * warning::title() const
> +char const * WLWarning::title() const
> {
> return m_title.c_str();
> }
>
> -char const * warning::what() const noexcept {
> +char const * WLWarning::what() const noexcept {
> return m_what.c_str();
> }
>
> === modified file 'src/base/md5.cc'
> --- src/base/md5.cc 2014-07-03 19:26:30 +0000
> +++ src/base/md5.cc 2014-09-15 07:27:30 +0000
> @@ -32,7 +32,7 @@
> /**
> * Create a hex string out of the MD5 checksum.
> */
> -string md5_checksum::str() const
> +string Md5Checksum::str() const
> {
> string s;
>
> @@ -60,7 +60,7 @@
>
> IMPORTANT: On some systems it is required that RESBUF is correctly
> aligned for a 32 bits value. */
> -void * md5_finish_ctx (md5_ctx * const ctx, void * const resbuf)
> +void * md5_finish_ctx (Md5Ctx * const ctx, void * const resbuf)
> {
> /* Take yet unprocessed bytes into account. */
> uint32_t bytes = ctx->buflen;
> @@ -95,7 +95,7 @@
>
> /* Processes some bytes in the internal buffer */
> void md5_process_bytes
> - (void const * buffer, uint32_t len, struct md5_ctx * const ctx)
> + (void const * buffer, uint32_t len, struct Md5Ctx * const ctx)
> {
> /* When we already have some bits in our internal buffer concatenate
> both inputs first. */
> @@ -151,7 +151,7 @@
> It is assumed that LEN % 64 == 0. */
>
> void md5_process_block
> - (void const * const buffer, uint32_t const len, md5_ctx * const ctx)
> + (void const * const buffer, uint32_t const len, Md5Ctx * const ctx)
> {
> uint32_t correct_words[16];
> uint32_t const * words = static_cast<uint32_t const *>(buffer);
>
> === modified file 'src/base/md5.h'
> --- src/base/md5.h 2014-07-20 07:47:15 +0000
> +++ src/base/md5.h 2014-09-15 07:27:30 +0000
> @@ -29,7 +29,7 @@
> #include <stdint.h>
>
> /* Structure to save state of computation between the single steps. */
> -struct md5_ctx {
> +struct Md5Ctx {
> uint32_t A;
> uint32_t B;
> uint32_t C;
> @@ -43,24 +43,24 @@
> /**
> * One MD5 checksum is simply an array of 16 bytes.
> */
> -struct md5_checksum {
> +struct Md5Checksum {
> uint8_t data[16];
>
> std::string str() const;
>
> - bool operator== (const md5_checksum & o) const {
> + bool operator== (const Md5Checksum & o) const {
> return memcmp(data, o.data, sizeof(data)) == 0;
> }
>
> - bool operator!= (const md5_checksum & o) const {return !(*this == o);}
> + bool operator!= (const Md5Checksum & o) const {return !(*this == o);}
> };
>
> // Note that the implementation of MD5Checksum is basically just
> // a wrapper around these functions, which have been taken basically
> // verbatim (with some whitespace changes) from the GNU tools; see below.
> -void * md5_finish_ctx (md5_ctx *, void * resbuf);
> -void md5_process_bytes (void const * buffer, uint32_t len, md5_ctx *);
> -void md5_process_block (void const * buffer, uint32_t len, md5_ctx *);
> +void * md5_finish_ctx (Md5Ctx *, void * resbuf);
> +void md5_process_bytes (void const * buffer, uint32_t len, Md5Ctx *);
> +void md5_process_block (void const * buffer, uint32_t len, Md5Ctx *);
>
> /**
> * This class is responsible for creating a streaming md5 checksum.
> @@ -110,18 +110,18 @@
> /// before this function.
> ///
> /// \return a pointer to an array of 16 bytes containing the checksum.
> - const md5_checksum & GetChecksum() const {
> + const Md5Checksum & GetChecksum() const {
> assert(!can_handle_data);
> return sum;
> }
>
> private:
> bool can_handle_data;
> - md5_checksum sum;
> - md5_ctx ctx;
> + Md5Checksum sum;
> + Md5Ctx ctx;
> };
>
> class _DummyMD5Base {};
> -typedef MD5Checksum<_DummyMD5Base> SimpleMD5Checksum;
> +using SimpleMD5Checksum = MD5Checksum<_DummyMD5Base>;
>
> #endif // end of include guard: WL_BASE_MD5_H
>
> === modified file 'src/base/warning.h'
> --- src/base/warning.h 2014-07-26 10:43:23 +0000
> +++ src/base/warning.h 2014-09-15 07:27:30 +0000
> @@ -38,8 +38,8 @@
>
> /// Similar exception type as wexception, but without the debug output.
> /// Intended for normal warnings like "map could not be found".
> -struct warning : public std::exception {
> - explicit warning (char const * title, char const * message, ...)
> +struct WLWarning : public std::exception {
> + explicit WLWarning (char const * title, char const * message, ...)
> PRINTF_FORMAT(3, 4);
>
> /// The target of the returned pointer remains valid during the lifetime of
> @@ -48,7 +48,7 @@
> const char * what() const noexcept override;
>
> protected:
> - warning() {}
> + WLWarning() {}
> std::string m_what;
> std::string m_title;
> };
>
> === modified file 'src/base/wexception.h'
> --- src/base/wexception.h 2014-07-26 10:43:23 +0000
> +++ src/base/wexception.h 2014-09-15 07:27:30 +0000
> @@ -41,23 +41,23 @@
> * Stupid, simple exception class. It has the nice bonus that you can give it
> * sprintf()-style format strings
> */
> -struct _wexception : public std::exception {
> - explicit _wexception
> +struct WException : public std::exception {
> + explicit WException
> (const char * file, uint32_t line, const char * fmt, ...)
> PRINTF_FORMAT(4, 5);
>
> /**
> * The target of the returned pointer remains valid during the lifetime of
> - * the _wexception object.
> + * the WException object.
> */
> const char * what() const noexcept override;
>
> protected:
> - _wexception() {}
> + WException() {}
> std::string m_what;
> };
>
> -#define wexception(...) _wexception(__FILE__, __LINE__, __VA_ARGS__)
> +#define wexception(...) WException(__FILE__, __LINE__, __VA_ARGS__)
>
>
> #endif // end of include guard: WL_BASE_WEXCEPTION_H
>
> === modified file 'src/economy/cmd_call_economy_balance.cc'
> --- src/economy/cmd_call_economy_balance.cc 2014-07-28 14:17:07 +0000
> +++ src/economy/cmd_call_economy_balance.cc 2014-09-15 07:27:30 +0000
> @@ -25,12 +25,12 @@
> #include "io/filewrite.h"
> #include "logic/game.h"
> #include "logic/player.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
>
> namespace Widelands {
>
> -Cmd_Call_Economy_Balance::Cmd_Call_Economy_Balance
> +CmdCallEconomyBalance::CmdCallEconomyBalance
> (int32_t const starttime, Economy * const economy, uint32_t const timerid)
> : GameLogicCommand(starttime)
> {
> @@ -42,7 +42,7 @@
> * Called by Cmd_Queue as requested by start_request_timer().
> * Call economy functions to balance supply and request.
> */
> -void Cmd_Call_Economy_Balance::execute(Game & game)
> +void CmdCallEconomyBalance::execute(Game & game)
> {
> if (Flag * const flag = m_flag.get(game))
> flag->get_economy()->balance(m_timerid);
> @@ -53,8 +53,8 @@
> /**
> * Read and write
> */
> -void Cmd_Call_Economy_Balance::Read
> - (FileRead & fr, Editor_Game_Base & egbase, MapMapObjectLoader & mol)
> +void CmdCallEconomyBalance::Read
> + (FileRead & fr, EditorGameBase & egbase, MapObjectLoader & mol)
> {
> try {
> uint16_t const packet_version = fr.Unsigned16();
> @@ -84,14 +84,14 @@
> else
> m_timerid = 0;
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const _wexception & e) {
> + } catch (const WException & e) {
> throw wexception("call economy balance: %s", e.what());
> }
> }
> -void Cmd_Call_Economy_Balance::Write
> - (FileWrite & fw, Editor_Game_Base & egbase, MapMapObjectSaver & mos)
> +void CmdCallEconomyBalance::Write
> + (FileWrite & fw, EditorGameBase & egbase, MapObjectSaver & mos)
> {
> fw.Unsigned16(CURRENT_CMD_CALL_ECONOMY_VERSION);
>
>
> === modified file 'src/economy/cmd_call_economy_balance.h'
> --- src/economy/cmd_call_economy_balance.h 2014-07-28 14:17:07 +0000
> +++ src/economy/cmd_call_economy_balance.h 2014-09-15 07:27:30 +0000
> @@ -27,20 +27,20 @@
> namespace Widelands {
> class Economy;
> class Game;
> -class MapMapObjectLoader;
> -
> -
> -struct Cmd_Call_Economy_Balance : public GameLogicCommand {
> - Cmd_Call_Economy_Balance () : GameLogicCommand(0), m_timerid(0) {} ///< for load and save
> -
> - Cmd_Call_Economy_Balance (int32_t starttime, Economy *, uint32_t timerid);
> +class MapObjectLoader;
> +
> +
> +struct CmdCallEconomyBalance : public GameLogicCommand {
> + CmdCallEconomyBalance () : GameLogicCommand(0), m_timerid(0) {} ///< for load and save
> +
> + CmdCallEconomyBalance (int32_t starttime, Economy *, uint32_t timerid);
>
> void execute (Game &) override;
>
> uint8_t id() const override {return QUEUE_CMD_CALL_ECONOMY_BALANCE;}
>
> - void Write(FileWrite &, Editor_Game_Base &, MapMapObjectSaver &) override;
> - void Read (FileRead &, Editor_Game_Base &, MapMapObjectLoader &) override;
> + void Write(FileWrite &, EditorGameBase &, MapObjectSaver &) override;
> + void Read (FileRead &, EditorGameBase &, MapObjectLoader &) override;
>
> private:
> OPtr<Flag> m_flag;
>
> === modified file 'src/economy/economy.cc'
> --- src/economy/economy.cc 2014-07-28 16:59:54 +0000
> +++ src/economy/economy.cc 2014-09-15 07:27:30 +0000
> @@ -44,25 +44,25 @@
> m_owner(player),
> m_request_timerid(0)
> {
> - const Tribe_Descr & tribe = player.tribe();
> - Ware_Index const nr_wares = tribe.get_nrwares();
> - Ware_Index const nr_workers = tribe.get_nrworkers();
> + const TribeDescr & tribe = player.tribe();
> + WareIndex const nr_wares = tribe.get_nrwares();
> + WareIndex const nr_workers = tribe.get_nrworkers();
> m_wares.set_nrwares(nr_wares);
> m_workers.set_nrwares(nr_workers);
>
> player.add_economy(*this);
>
> - m_ware_target_quantities = new Target_Quantity[nr_wares];
> - for (Ware_Index i = 0; i < nr_wares; ++i) {
> - Target_Quantity tq;
> + m_ware_target_quantities = new TargetQuantity[nr_wares];
> + for (WareIndex i = 0; i < nr_wares; ++i) {
> + TargetQuantity tq;
> tq.permanent =
> tribe.get_ware_descr(i)->default_target_quantity();
> tq.last_modified = 0;
> m_ware_target_quantities[i] = tq;
> }
> - m_worker_target_quantities = new Target_Quantity[nr_workers];
> - for (Ware_Index i = 0; i < nr_workers; ++i) {
> - Target_Quantity tq;
> + m_worker_target_quantities = new TargetQuantity[nr_workers];
> + for (WareIndex i = 0; i < nr_workers; ++i) {
> + TargetQuantity tq;
> tq.permanent =
> tribe.get_worker_descr(i)->default_target_quantity();
> tq.last_modified = 0;
> @@ -139,7 +139,7 @@
>
> void Economy::_check_splits()
> {
> - Editor_Game_Base & egbase = owner().egbase();
> + EditorGameBase & egbase = owner().egbase();
> Map & map = egbase.map();
>
> while (m_split_checks.size()) {
> @@ -320,29 +320,29 @@
> }
>
> /**
> - * Set the target quantities for the given Ware_Index to the
> + * Set the target quantities for the given WareIndex to the
> * numbers given in permanent. Also update the last
> * modification time.
> *
> * This is called from Cmd_ResetTargetQuantity and Cmd_SetTargetQuantity
> */
> void Economy::set_ware_target_quantity
> - (Ware_Index const ware_type,
> + (WareIndex const ware_type,
> uint32_t const permanent,
> Time const mod_time)
> {
> - Target_Quantity & tq = m_ware_target_quantities[ware_type];
> + TargetQuantity & tq = m_ware_target_quantities[ware_type];
> tq.permanent = permanent;
> tq.last_modified = mod_time;
> }
>
>
> void Economy::set_worker_target_quantity
> - (Ware_Index const ware_type,
> + (WareIndex const ware_type,
> uint32_t const permanent,
> Time const mod_time)
> {
> - Target_Quantity & tq = m_worker_target_quantities[ware_type];
> + TargetQuantity & tq = m_worker_target_quantities[ware_type];
> tq.permanent = permanent;
> tq.last_modified = mod_time;
> }
> @@ -354,7 +354,7 @@
> * This is also called when a ware is added to the economy through trade or
> * a merger.
> */
> -void Economy::add_wares(Ware_Index const id, uint32_t const count)
> +void Economy::add_wares(WareIndex const id, uint32_t const count)
> {
> //log("%p: add(%i, %i)\n", this, id, count);
>
> @@ -363,7 +363,7 @@
>
> // TODO(unknown): add to global player inventory?
> }
> -void Economy::add_workers(Ware_Index const id, uint32_t const count)
> +void Economy::add_workers(WareIndex const id, uint32_t const count)
> {
> //log("%p: add(%i, %i)\n", this, id, count);
>
> @@ -379,7 +379,7 @@
> * This is also called when a ware is removed from the economy through trade or
> * a split of the Economy.
> */
> -void Economy::remove_wares(Ware_Index const id, uint32_t const count)
> +void Economy::remove_wares(WareIndex const id, uint32_t const count)
> {
> assert(id < m_owner.tribe().get_nrwares());
> //log("%p: remove(%i, %i) from %i\n", this, id, count, m_wares.stock(id));
> @@ -394,7 +394,7 @@
> * This is also called when a worker is removed from the economy through
> * a split of the Economy.
> */
> -void Economy::remove_workers(Ware_Index const id, uint32_t const count)
> +void Economy::remove_workers(WareIndex const id, uint32_t const count)
> {
> //log("%p: remove(%i, %i) from %i\n", this, id, count, m_workers.stock(id));
>
> @@ -499,7 +499,7 @@
> }
>
>
> -bool Economy::needs_ware(Ware_Index const ware_type) const {
> +bool Economy::needs_ware(WareIndex const ware_type) const {
> uint32_t const t = ware_target_quantity(ware_type).permanent;
> uint32_t quantity = 0;
> for (const Warehouse * wh : m_warehouses) {
> @@ -511,7 +511,7 @@
> }
>
>
> -bool Economy::needs_worker(Ware_Index const worker_type) const {
> +bool Economy::needs_worker(WareIndex const worker_type) const {
> uint32_t const t = worker_target_quantity(worker_type).permanent;
> uint32_t quantity = 0;
> for (const Warehouse * wh : m_warehouses) {
> @@ -531,17 +531,17 @@
> */
> void Economy::_merge(Economy & e)
> {
> - for (Ware_Index i = m_owner.tribe().get_nrwares(); i;) {
> + for (WareIndex i = m_owner.tribe().get_nrwares(); i;) {
> --i;
> - Target_Quantity other_tq = e.m_ware_target_quantities[i];
> - Target_Quantity & this_tq = m_ware_target_quantities[i];
> + TargetQuantity other_tq = e.m_ware_target_quantities[i];
> + TargetQuantity & this_tq = m_ware_target_quantities[i];
> if (this_tq.last_modified < other_tq.last_modified)
> this_tq = other_tq;
> }
> - for (Ware_Index i = m_owner.tribe().get_nrworkers(); i;) {
> + for (WareIndex i = m_owner.tribe().get_nrworkers(); i;) {
> --i;
> - Target_Quantity other_tq = e.m_worker_target_quantities[i];
> - Target_Quantity & this_tq = m_worker_target_quantities[i];
> + TargetQuantity other_tq = e.m_worker_target_quantities[i];
> + TargetQuantity & this_tq = m_worker_target_quantities[i];
> if (this_tq.last_modified < other_tq.last_modified)
> this_tq = other_tq;
> }
> @@ -584,11 +584,11 @@
>
> Economy & e = *new Economy(m_owner);
>
> - for (Ware_Index i = m_owner.tribe().get_nrwares (); i;) {
> + for (WareIndex i = m_owner.tribe().get_nrwares (); i;) {
> --i;
> e.m_ware_target_quantities[i] = m_ware_target_quantities[i];
> }
> - for (Ware_Index i = m_owner.tribe().get_nrworkers(); i;) {
> + for (WareIndex i = m_owner.tribe().get_nrworkers(); i;) {
> --i;
> e.m_worker_target_quantities[i] = m_worker_target_quantities[i];
> }
> @@ -613,7 +613,7 @@
> {
> if (upcast(Game, game, &m_owner.egbase()))
> game->cmdqueue().enqueue
> - (new Cmd_Call_Economy_Balance
> + (new CmdCallEconomyBalance
> (game->get_gametime() + delta, this, m_request_timerid));
> }
>
> @@ -694,12 +694,9 @@
> };
> };
>
> -typedef
> - std::priority_queue
> - <RequestSupplyPair,
> +using RSPairQueue = std::priority_queue<RequestSupplyPair,
> std::vector<RequestSupplyPair>,
> - RequestSupplyPair::Compare>
> - RSPairQueue;
> + RequestSupplyPair::Compare>;
>
> struct RSPairStruct {
> RSPairQueue queue;
> @@ -807,12 +804,12 @@
> * Check whether there is a supply for the given request. If the request is a
> * worker request without supply, attempt to create a new worker in a warehouse.
> */
> -void Economy::_create_requested_worker(Game & game, Ware_Index index)
> +void Economy::_create_requested_worker(Game & game, WareIndex index)
> {
> unsigned demand = 0;
>
> bool soldier_level_check;
> - const Tribe_Descr & tribe = owner().tribe();
> + const TribeDescr & tribe = owner().tribe();
> const WorkerDescr & w_desc = *tribe.get_worker_descr(index);
>
> // Make a dummy soldier, which should never be assigned to any economy
> @@ -935,9 +932,9 @@
> if (!warehouses().size())
> return;
>
> - const Tribe_Descr & tribe = owner().tribe();
> + const TribeDescr & tribe = owner().tribe();
> for
> - (Ware_Index index = 0;
> + (WareIndex index = 0;
> index < tribe.get_nrworkers(); ++index)
> {
> if (!owner().is_worker_type_allowed(index))
> @@ -954,7 +951,7 @@
> */
> static bool accept_warehouse_if_policy
> (Warehouse & wh, WareWorker type,
> - Ware_Index ware, Warehouse::StockPolicy policy)
> + WareIndex ware, Warehouse::StockPolicy policy)
> {
> return wh.get_stock_policy(type, ware) == policy;
> }
> @@ -968,7 +965,7 @@
> if (!warehouses().size())
> return;
>
> - typedef std::vector<std::pair<Supply *, Warehouse *> > Assignments;
> + using Assignments = std::vector<std::pair<Supply *, Warehouse *>>;
> Assignments assignments;
>
> for (uint32_t idx = 0; idx < m_supplies.get_nrsupplies(); ++idx) {
> @@ -977,7 +974,7 @@
> continue;
>
> WareWorker type;
> - Ware_Index ware;
> + WareIndex ware;
> supply.get_ware_type(type, ware);
>
> bool haveprefer = false;
> @@ -1041,7 +1038,7 @@
> return;
> ++m_request_timerid;
>
> - Game & game = ref_cast<Game, Editor_Game_Base>(owner().egbase());
> + Game & game = ref_cast<Game, EditorGameBase>(owner().egbase());
>
> _check_splits();
>
>
> === modified file 'src/economy/economy.h'
> --- src/economy/economy.h 2014-07-14 19:44:28 +0000
> +++ src/economy/economy.h 2014-09-15 07:27:30 +0000
> @@ -87,7 +87,7 @@
> /// The last_modified time is used to determine which setting to use when
> /// economies are merged. The setting that was modified most recently will
> /// be used for the merged economy.
> - struct Target_Quantity {
> + struct TargetQuantity {
> uint32_t permanent;
> Time last_modified;
> };
> @@ -106,7 +106,7 @@
> WareWorker type,
> int32_t cost_cutoff = -1);
>
> - typedef boost::function<bool (Warehouse &)> WarehouseAcceptFn;
> + using WarehouseAcceptFn = boost::function<bool (Warehouse &)>;
> Warehouse * find_closest_warehouse
> (Flag & start, WareWorker type = wwWORKER, Route * route = nullptr,
> uint32_t cost_cutoff = 0,
> @@ -120,14 +120,14 @@
> // (i.e. an Expedition ship).
> Flag* get_arbitrary_flag();
>
> - void set_ware_target_quantity (Ware_Index, uint32_t, Time);
> - void set_worker_target_quantity(Ware_Index, uint32_t, Time);
> -
> - void add_wares (Ware_Index, uint32_t count = 1);
> - void remove_wares (Ware_Index, uint32_t count = 1);
> -
> - void add_workers(Ware_Index, uint32_t count = 1);
> - void remove_workers(Ware_Index, uint32_t count = 1);
> + void set_ware_target_quantity (WareIndex, uint32_t, Time);
> + void set_worker_target_quantity(WareIndex, uint32_t, Time);
> +
> + void add_wares (WareIndex, uint32_t count = 1);
> + void remove_wares (WareIndex, uint32_t count = 1);
> +
> + void add_workers(WareIndex, uint32_t count = 1);
> + void remove_workers(WareIndex, uint32_t count = 1);
>
> void add_warehouse(Warehouse &);
> void remove_warehouse(Warehouse &);
> @@ -140,33 +140,33 @@
> void remove_supply(Supply &);
>
> /// information about this economy
> - WareList::count_type stock_ware (Ware_Index const i) {
> + WareList::WareCount stock_ware (WareIndex const i) {
> return m_wares .stock(i);
> }
> - WareList::count_type stock_worker(Ware_Index const i) {
> + WareList::WareCount stock_worker(WareIndex const i) {
> return m_workers.stock(i);
> }
>
> /// Whether the economy needs more of this ware type.
> /// Productionsites may ask this before they produce, to avoid depleting a
> /// ware type by overproducing another from it.
> - bool needs_ware(Ware_Index) const;
> + bool needs_ware(WareIndex) const;
>
> /// Whether the economy needs more of this worker type.
> /// Productionsites may ask this before they produce, to avoid depleting a
> /// ware type by overproducing a worker type from it.
> - bool needs_worker(Ware_Index) const;
> + bool needs_worker(WareIndex) const;
>
> - const Target_Quantity & ware_target_quantity (Ware_Index const i) const {
> - return m_ware_target_quantities[i];
> - }
> - Target_Quantity & ware_target_quantity (Ware_Index const i) {
> - return m_ware_target_quantities[i];
> - }
> - const Target_Quantity & worker_target_quantity(Ware_Index const i) const {
> + const TargetQuantity & ware_target_quantity (WareIndex const i) const {
> + return m_ware_target_quantities[i];
> + }
> + TargetQuantity & ware_target_quantity (WareIndex const i) {
> + return m_ware_target_quantities[i];
> + }
> + const TargetQuantity & worker_target_quantity(WareIndex const i) const {
> return m_worker_target_quantities[i];
> }
> - Target_Quantity & worker_target_quantity(Ware_Index const i) {
> + TargetQuantity & worker_target_quantity(WareIndex const i) {
> return m_worker_target_quantities[i];
> }
>
> @@ -201,18 +201,18 @@
> void _balance_requestsupply(Game &);
> void _handle_active_supplies(Game &);
> void _create_requested_workers(Game &);
> - void _create_requested_worker(Game &, Ware_Index);
> + void _create_requested_worker(Game &, WareIndex);
>
> bool _has_request(Request &);
>
> /*************/
> /* Variables */
> /*************/
> - typedef std::vector<Request *> RequestList;
> + using RequestList = std::vector<Request *>;
>
> Player & m_owner;
>
> - typedef std::vector<Flag *> Flags;
> + using Flags = std::vector<Flag *>;
> Flags m_flags;
> WareList m_wares; ///< virtual storage with all wares in this Economy
> WareList m_workers; ///< virtual storage with all workers in this Economy
> @@ -221,11 +221,11 @@
> RequestList m_requests; ///< requests
> SupplyList m_supplies;
>
> - Target_Quantity * m_ware_target_quantities;
> - Target_Quantity * m_worker_target_quantities;
> + TargetQuantity * m_ware_target_quantities;
> + TargetQuantity * m_worker_target_quantities;
> Router * m_router;
>
> - typedef std::pair<OPtr<Flag>, OPtr<Flag> > SplitPair;
> + using SplitPair = std::pair<OPtr<Flag>, OPtr<Flag>>;
> std::vector<SplitPair> m_split_checks;
>
> /**
>
> === modified file 'src/economy/economy_data_packet.cc'
> --- src/economy/economy_data_packet.cc 2014-07-20 07:42:37 +0000
> +++ src/economy/economy_data_packet.cc 2014-09-15 07:27:30 +0000
> @@ -24,8 +24,8 @@
> #include "io/filewrite.h"
> #include "logic/player.h"
> #include "logic/tribe.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
>
> #define CURRENT_ECONOMY_VERSION 3
>
> @@ -39,13 +39,13 @@
> if (1 <= version && version <= CURRENT_ECONOMY_VERSION) {
> if (2 <= version)
> try {
> - const Tribe_Descr & tribe = m_eco->owner().tribe();
> + const TribeDescr & tribe = m_eco->owner().tribe();
> while (Time const last_modified = fr.Unsigned32()) {
> char const * const type_name = fr.CString();
> uint32_t const permanent = fr.Unsigned32();
> if (version <= 2)
> fr.Unsigned32();
> - Ware_Index i = tribe.ware_index(type_name);
> + WareIndex i = tribe.ware_index(type_name);
> if (i != INVALID_INDEX) {
> if (tribe.get_ware_descr(i)->default_target_quantity() ==
> std::numeric_limits<uint32_t>::max())
> @@ -54,10 +54,10 @@
> "ignoring\n",
> type_name);
> else {
> - Economy::Target_Quantity & tq =
> + Economy::TargetQuantity & tq =
> m_eco->m_ware_target_quantities[i];
> if (tq.last_modified)
> - throw game_data_error
> + throw GameDataError
> ("duplicated entry for %s", type_name);
> tq.permanent = permanent;
> tq.last_modified = last_modified;
> @@ -73,10 +73,10 @@
> "ignoring\n",
> type_name);
> else {
> - Economy::Target_Quantity & tq =
> + Economy::TargetQuantity & tq =
> m_eco->m_worker_target_quantities[i];
> if (tq.last_modified)
> - throw game_data_error
> + throw GameDataError
> ("duplicated entry for %s", type_name);
> tq.permanent = permanent;
> tq.last_modified = last_modified;
> @@ -88,25 +88,25 @@
> "%s, ignoring\n",
> type_name, tribe.name().c_str());
> }
> - } catch (const _wexception & e) {
> - throw game_data_error("target quantities: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("target quantities: %s", e.what());
> }
> m_eco->m_request_timerid = fr.Unsigned32();
> } else {
> - throw game_data_error("unknown version %u", version);
> + throw GameDataError("unknown version %u", version);
> }
> } catch (const std::exception & e) {
> - throw game_data_error("economy: %s", e.what());
> + throw GameDataError("economy: %s", e.what());
> }
> }
>
> void EconomyDataPacket::Write(FileWrite & fw)
> {
> fw.Unsigned16(CURRENT_ECONOMY_VERSION);
> - const Tribe_Descr & tribe = m_eco->owner().tribe();
> - for (Ware_Index i = tribe.get_nrwares(); i;) {
> + const TribeDescr & tribe = m_eco->owner().tribe();
> + for (WareIndex i = tribe.get_nrwares(); i;) {
> --i;
> - const Economy::Target_Quantity & tq =
> + const Economy::TargetQuantity & tq =
> m_eco->m_ware_target_quantities[i];
> if (Time const last_modified = tq.last_modified) {
> fw.Unsigned32(last_modified);
> @@ -114,9 +114,9 @@
> fw.Unsigned32(tq.permanent);
> }
> }
> - for (Ware_Index i = tribe.get_nrworkers(); i;) {
> + for (WareIndex i = tribe.get_nrworkers(); i;) {
> --i;
> - const Economy::Target_Quantity & tq =
> + const Economy::TargetQuantity & tq =
> m_eco->m_worker_target_quantities[i];
> if (Time const last_modified = tq.last_modified) {
> fw.Unsigned32(last_modified);
>
> === modified file 'src/economy/economy_data_packet.h'
> --- src/economy/economy_data_packet.h 2014-07-28 14:17:07 +0000
> +++ src/economy/economy_data_packet.h 2014-09-15 07:27:30 +0000
> @@ -26,8 +26,8 @@
> namespace Widelands {
> class Economy;
> class Game;
> -class MapMapObjectLoader;
> -struct MapMapObjectSaver;
> +class MapObjectLoader;
> +struct MapObjectSaver;
>
> class EconomyDataPacket {
> public:
>
> === modified file 'src/economy/flag.cc'
> --- src/economy/flag.cc 2014-07-28 16:59:54 +0000
> +++ src/economy/flag.cc 2014-09-15 07:27:30 +0000
> @@ -80,7 +80,7 @@
> log("Flag: ouch! road left\n");
> }
>
> -void Flag::load_finish(Editor_Game_Base & egbase) {
> +void Flag::load_finish(EditorGameBase & egbase) {
> auto should_be_deleted = [&egbase, this](const OPtr<Worker>& r) {
> Worker& worker = *r.get(egbase);
> Bob::State const* const state = worker.get_state(Worker::taskWaitforcapacity);
> @@ -112,7 +112,7 @@
> * Create a flag at the given location
> */
> Flag::Flag
> - (Editor_Game_Base & egbase, Player & owning_player, Coords const coords)
> + (EditorGameBase & egbase, Player & owning_player, Coords const coords)
> :
> PlayerImmovable (g_flag_descr),
> m_building (nullptr),
> @@ -196,7 +196,7 @@
> /**
> * Call this only from the Building init!
> */
> -void Flag::attach_building(Editor_Game_Base & egbase, Building & building)
> +void Flag::attach_building(EditorGameBase & egbase, Building & building)
> {
> assert(!m_building || m_building == &building);
>
> @@ -212,7 +212,7 @@
> /**
> * Call this only from the Building cleanup!
> */
> -void Flag::detach_building(Editor_Game_Base & egbase)
> +void Flag::detach_building(EditorGameBase & egbase)
> {
> assert(m_building);
>
> @@ -251,7 +251,7 @@
> * Return all positions we occupy on the map. For a Flag, this is only one
> */
> BaseImmovable::PositionList Flag::get_positions
> - (const Editor_Game_Base &) const
> + (const EditorGameBase &) const
> {
> PositionList rv;
> rv.push_back(m_position);
> @@ -368,7 +368,7 @@
> }
>
>
> -void Flag::add_ware(Editor_Game_Base & egbase, WareInstance & ware)
> +void Flag::add_ware(EditorGameBase & egbase, WareInstance & ware)
> {
>
> assert(m_ware_filled < m_ware_capacity);
> @@ -558,7 +558,7 @@
> * Force a removal of the given ware from this flag.
> * Called by \ref WareInstance::cleanup()
> */
> -void Flag::remove_ware(Editor_Game_Base & egbase, WareInstance * const ware)
> +void Flag::remove_ware(EditorGameBase & egbase, WareInstance * const ware)
> {
> for (int32_t i = 0; i < m_ware_filled; ++i) {
> if (m_wares[i].ware != ware)
> @@ -694,7 +694,7 @@
> m_always_call_for_flag = nullptr;
> }
>
> -void Flag::init(Editor_Game_Base & egbase)
> +void Flag::init(EditorGameBase & egbase)
> {
> PlayerImmovable::init(egbase);
>
> @@ -706,7 +706,7 @@
> /**
> * Detach building and free roads.
> */
> -void Flag::cleanup(Editor_Game_Base & egbase)
> +void Flag::cleanup(EditorGameBase & egbase)
> {
> //molog("Flag::cleanup\n");
>
> @@ -753,7 +753,7 @@
> * \ref Flag::cleanup(). This function is needed to ensure a fire is created
> * when a player removes a flag.
> */
> -void Flag::destroy(Editor_Game_Base & egbase)
> +void Flag::destroy(EditorGameBase & egbase)
> {
> if (m_building) {
> m_building->destroy(egbase);
> @@ -768,7 +768,7 @@
> * the given program once it's completed.
> */
> void Flag::add_flag_job
> - (Game &, Ware_Index const workerware, const std::string & programname)
> + (Game &, WareIndex const workerware, const std::string & programname)
> {
> FlagJob j;
>
> @@ -787,7 +787,7 @@
> void Flag::flag_job_request_callback
> (Game & game,
> Request & rq,
> - Ware_Index,
> + WareIndex,
> Worker * const w,
> PlayerImmovable & target)
> {
> @@ -811,7 +811,7 @@
> flag.molog("BUG: flag_job_request_callback: worker not found in list\n");
> }
>
> -void Flag::log_general_info(const Widelands::Editor_Game_Base & egbase)
> +void Flag::log_general_info(const Widelands::EditorGameBase & egbase)
> {
> molog("Flag at %i,%i\n", m_position.x, m_position.y);
>
>
> === modified file 'src/economy/flag.h'
> --- src/economy/flag.h 2014-07-28 16:59:54 +0000
> +++ src/economy/flag.h 2014-09-15 07:27:30 +0000
> @@ -61,23 +61,23 @@
> * WALK_xx in all "direction" parameters.
> */
> struct Flag : public PlayerImmovable, public RoutingNode {
> - typedef std::vector<const WareInstance *> Wares;
> + using Wares = std::vector<const WareInstance *>;
>
> friend class Economy;
> friend class FlagQueue;
> - friend class Map_Flagdata_Data_Packet; // has to read/write this to a file
> - friend struct Map_Ware_Data_Packet; // has to look at pending wares
> - friend struct Map_Waredata_Data_Packet; // has to look at pending wares
> + friend class MapFlagdataPacket; // has to read/write this to a file
> + friend struct MapWarePacket; // has to look at pending wares
> + friend struct MapWaredataPacket; // has to look at pending wares
> friend struct Router;
>
> const FlagDescr& descr() const;
>
> Flag(); /// empty flag for savegame loading
> - Flag(Editor_Game_Base &, Player & owner, Coords); /// create a new flag
> + Flag(EditorGameBase &, Player & owner, Coords); /// create a new flag
> ~Flag() override;
>
> - void load_finish(Editor_Game_Base &) override;
> - void destroy(Editor_Game_Base &) override;
> + void load_finish(EditorGameBase &) override;
> + void destroy(EditorGameBase &) override;
>
> int32_t get_size () const override;
> bool get_passable() const override;
> @@ -85,15 +85,15 @@
> Flag & base_flag() override;
>
> const Coords & get_position() const override {return m_position;}
> - PositionList get_positions (const Editor_Game_Base &) const override;
> + PositionList get_positions (const EditorGameBase &) const override;
> void get_neighbours(WareWorker type, RoutingNodeNeighbours &) override;
> int32_t get_waitcost() const {return m_ware_filled;}
>
> void set_economy(Economy *) override;
>
> Building * get_building() const {return m_building;}
> - void attach_building(Editor_Game_Base &, Building &);
> - void detach_building(Editor_Game_Base &);
> + void attach_building(EditorGameBase &, Building &);
> + void detach_building(EditorGameBase &);
>
> bool has_road() const {
> return
> @@ -114,7 +114,7 @@
> uint32_t current_wares() const {return m_ware_filled;}
> void wait_for_capacity(Game &, Worker &);
> void skip_wait_for_capacity(Game &, Worker &);
> - void add_ware(Editor_Game_Base &, WareInstance &);
> + void add_ware(EditorGameBase &, WareInstance &);
> bool has_pending_ware(Game &, Flag & destflag);
> bool ack_pickup(Game &, Flag & destflag);
> bool cancel_pickup(Game &, Flag & destflag);
> @@ -124,21 +124,21 @@
> void call_carrier(Game &, WareInstance &, PlayerImmovable * nextstep);
> void update_wares(Game &, Flag * other);
>
> - void remove_ware(Editor_Game_Base &, WareInstance * const);
> -
> - void add_flag_job(Game &, Ware_Index workerware, const std::string & programname);
> -
> - void log_general_info(const Editor_Game_Base &) override;
> + void remove_ware(EditorGameBase &, WareInstance * const);
> +
> + void add_flag_job(Game &, WareIndex workerware, const std::string & programname);
> +
> + void log_general_info(const EditorGameBase &) override;
>
> protected:
> - void init(Editor_Game_Base &) override;
> - void cleanup(Editor_Game_Base &) override;
> + void init(EditorGameBase &) override;
> + void cleanup(EditorGameBase &) override;
>
> - void draw(const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&) override;
> + void draw(const EditorGameBase &, RenderTarget &, const FCoords&, const Point&) override;
>
> void wake_up_capacity_queue(Game &);
>
> - static void flag_job_request_callback(Game &, Request &, Ware_Index, Worker *, PlayerImmovable &);
> + static void flag_job_request_callback(Game &, Request &, WareIndex, Worker *, PlayerImmovable &);
>
> void set_flag_position(Coords coords);
>
> @@ -169,10 +169,10 @@
> /// the given flag
> Flag * m_always_call_for_flag;
>
> - typedef std::vector<OPtr<Worker> > CapacityWaitQueue;
> + using CapacityWaitQueue = std::vector<OPtr<Worker>>;
> CapacityWaitQueue m_capacity_wait; ///< workers waiting for capacity
>
> - typedef std::list<FlagJob> FlagJobs;
> + using FlagJobs = std::list<FlagJob>;
> FlagJobs m_flag_jobs;
> };
>
>
> === modified file 'src/economy/fleet.cc'
> --- src/economy/fleet.cc 2014-07-28 16:59:54 +0000
> +++ src/economy/fleet.cc 2014-09-15 07:27:30 +0000
> @@ -35,8 +35,8 @@
> #include "logic/player.h"
> #include "logic/ship.h"
> #include "logic/warehouse.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
>
> namespace Widelands {
>
> @@ -101,7 +101,7 @@
> * Initialize the fleet, including a search through the map
> * to rejoin with the next other fleet we can find.
> */
> -void Fleet::init(Editor_Game_Base & egbase)
> +void Fleet::init(EditorGameBase & egbase)
> {
> MapObject::init(egbase);
>
> @@ -140,7 +140,7 @@
> * Search the map, starting at our ships and ports, for another fleet
> * of the same player.
> */
> -void Fleet::find_other_fleet(Editor_Game_Base & egbase)
> +void Fleet::find_other_fleet(EditorGameBase & egbase)
> {
> Map & map = egbase.map();
> MapAStar<StepEvalFindFleet> astar(map, StepEvalFindFleet());
> @@ -192,7 +192,7 @@
> /**
> * Merge the @p other fleet into this fleet, and remove the other fleet.
> */
> -void Fleet::merge(Editor_Game_Base & egbase, Fleet * other)
> +void Fleet::merge(EditorGameBase & egbase, Fleet * other)
> {
> if (m_ports.empty() && !other->m_ports.empty()) {
> other->merge(egbase, this);
> @@ -244,7 +244,7 @@
> }
> }
>
> -void Fleet::cleanup(Editor_Game_Base & egbase)
> +void Fleet::cleanup(EditorGameBase & egbase)
> {
> while (!m_ports.empty()) {
> PortDock * pd = m_ports.back();
> @@ -371,7 +371,7 @@
> }
> }
>
> -void Fleet::remove_ship(Editor_Game_Base & egbase, Ship * ship)
> +void Fleet::remove_ship(EditorGameBase & egbase, Ship * ship)
> {
> std::vector<Ship *>::iterator it = std::find(m_ships.begin(), m_ships.end(), ship);
> if (it != m_ships.end()) {
> @@ -432,7 +432,7 @@
> * Note that this is done lazily, i.e. the first time a path is actually requested,
> * because path finding is flaky during map loading.
> */
> -void Fleet::connect_port(Editor_Game_Base & egbase, uint32_t idx)
> +void Fleet::connect_port(EditorGameBase & egbase, uint32_t idx)
> {
> Map & map = egbase.map();
> StepEvalFindPorts se;
> @@ -508,7 +508,7 @@
> }
> }
>
> -void Fleet::add_port(Editor_Game_Base & /* egbase */, PortDock * port)
> +void Fleet::add_port(EditorGameBase & /* egbase */, PortDock * port)
> {
> m_ports.push_back(port);
> port->set_fleet(this);
> @@ -522,7 +522,7 @@
> m_portpaths.resize((m_ports.size() * (m_ports.size() - 1)) / 2);
> }
>
> -void Fleet::remove_port(Editor_Game_Base & egbase, PortDock * port)
> +void Fleet::remove_port(EditorGameBase & egbase, PortDock * port)
> {
> std::vector<PortDock *>::iterator it = std::find(m_ports.begin(), m_ports.end(), port);
> if (it != m_ports.end()) {
> @@ -582,7 +582,7 @@
> /**
> * Trigger an update of ship scheduling
> */
> -void Fleet::update(Editor_Game_Base & egbase)
> +void Fleet::update(EditorGameBase & egbase)
> {
> if (m_act_pending)
> return;
> @@ -672,7 +672,7 @@
> }
> }
>
> -void Fleet::log_general_info(const Editor_Game_Base & egbase)
> +void Fleet::log_general_info(const EditorGameBase & egbase)
> {
> MapObject::log_general_info(egbase);
>
> @@ -750,7 +750,7 @@
> }
>
> MapObject::Loader * Fleet::load
> - (Editor_Game_Base & egbase, MapMapObjectLoader & mol, FileRead & fr)
> + (EditorGameBase & egbase, MapObjectLoader & mol, FileRead & fr)
> {
> std::unique_ptr<Loader> loader(new Loader);
>
> @@ -758,20 +758,20 @@
> // The header has been peeled away by the caller
> uint8_t const version = fr.Unsigned8();
> if (1 <= version && version <= FLEET_SAVEGAME_VERSION) {
> - Player_Number owner_number = fr.Unsigned8();
> + PlayerNumber owner_number = fr.Unsigned8();
> if (!owner_number || owner_number > egbase.map().get_nrplayers())
> - throw game_data_error
> + throw GameDataError
> ("owner number is %u but there are only %u players",
> owner_number, egbase.map().get_nrplayers());
>
> Player * owner = egbase.get_player(owner_number);
> if (!owner)
> - throw game_data_error("owning player %u does not exist", owner_number);
> + throw GameDataError("owning player %u does not exist", owner_number);
>
> loader->init(egbase, mol, *(new Fleet(*owner)));
> loader->load(fr, version);
> } else
> - throw game_data_error("unknown/unhandled version %u", version);
> + throw GameDataError("unknown/unhandled version %u", version);
> } catch (const std::exception & e) {
> throw wexception("loading portdock: %s", e.what());
> }
> @@ -779,7 +779,7 @@
> return loader.release();
> }
>
> -void Fleet::save(Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw)
> +void Fleet::save(EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw)
> {
> fw.Unsigned8(HeaderFleet);
> fw.Unsigned8(FLEET_SAVEGAME_VERSION);
>
> === modified file 'src/economy/fleet.h'
> --- src/economy/fleet.h 2014-07-28 16:59:54 +0000
> +++ src/economy/fleet.h 2014-09-15 07:27:30 +0000
> @@ -84,16 +84,16 @@
>
> bool active() const;
>
> - void init(Editor_Game_Base &) override;
> - void cleanup(Editor_Game_Base &) override;
> - void update(Editor_Game_Base &);
> + void init(EditorGameBase &) override;
> + void cleanup(EditorGameBase &) override;
> + void update(EditorGameBase &);
>
> void add_ship(Ship * ship);
> - void remove_ship(Editor_Game_Base & egbase, Ship * ship);
> - void add_port(Editor_Game_Base & egbase, PortDock * port);
> - void remove_port(Editor_Game_Base & egbase, PortDock * port);
> + void remove_ship(EditorGameBase & egbase, Ship * ship);
> + void add_port(EditorGameBase & egbase, PortDock * port);
> + void remove_port(EditorGameBase & egbase, PortDock * port);
>
> - void log_general_info(const Editor_Game_Base &) override;
> + void log_general_info(const EditorGameBase &) override;
>
> bool get_path(PortDock & start, PortDock & end, Path & path);
> void add_neighbours(PortDock & pd, std::vector<RoutingNodeNeighbour> & neighbours);
> @@ -102,10 +102,10 @@
> void act(Game &, uint32_t data) override;
>
> private:
> - void find_other_fleet(Editor_Game_Base & egbase);
> - void merge(Editor_Game_Base & egbase, Fleet * other);
> + void find_other_fleet(EditorGameBase & egbase);
> + void merge(EditorGameBase & egbase, Fleet * other);
> void check_merge_economy();
> - void connect_port(Editor_Game_Base & egbase, uint32_t idx);
> + void connect_port(EditorGameBase & egbase, uint32_t idx);
>
> PortPath & portpath(uint32_t i, uint32_t j);
> const PortPath & portpath(uint32_t i, uint32_t j) const;
> @@ -142,10 +142,10 @@
>
> public:
> bool has_new_save_support() override {return true;}
> - void save(Editor_Game_Base &, MapMapObjectSaver &, FileWrite &) override;
> + void save(EditorGameBase &, MapObjectSaver &, FileWrite &) override;
>
> static MapObject::Loader * load
> - (Editor_Game_Base &, MapMapObjectLoader &, FileRead &);
> + (EditorGameBase &, MapObjectLoader &, FileRead &);
> };
>
> } // namespace Widelands
>
> === modified file 'src/economy/idleworkersupply.cc'
> --- src/economy/idleworkersupply.cc 2014-07-20 07:42:37 +0000
> +++ src/economy/idleworkersupply.cc 2014-09-15 07:27:30 +0000
> @@ -76,7 +76,7 @@
> return m_worker.get_transfer();
> }
>
> -void IdleWorkerSupply::get_ware_type(WareWorker & type, Ware_Index & ware) const
> +void IdleWorkerSupply::get_ware_type(WareWorker & type, WareIndex & ware) const
> {
> type = wwWORKER;
> ware = m_worker.descr().worker_index();
>
> === modified file 'src/economy/idleworkersupply.h'
> --- src/economy/idleworkersupply.h 2014-07-26 10:43:23 +0000
> +++ src/economy/idleworkersupply.h 2014-09-15 07:27:30 +0000
> @@ -35,7 +35,7 @@
>
> bool is_active() const override;
> bool has_storage() const override;
> - void get_ware_type(WareWorker & type, Ware_Index & ware) const override;
> + void get_ware_type(WareWorker & type, WareIndex & ware) const override;
> void send_to_storage(Game &, Warehouse * wh) override;
>
> uint32_t nr_supplies(const Game &, const Request &) const override;
>
> === modified file 'src/economy/portdock.cc'
> --- src/economy/portdock.cc 2014-07-28 16:59:54 +0000
> +++ src/economy/portdock.cc 2014-09-15 07:27:30 +0000
> @@ -34,8 +34,8 @@
> #include "logic/ship.h"
> #include "logic/warehouse.h"
> #include "logic/widelands_geometry_io.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
> #include "wui/interactive_gamebase.h"
>
> namespace Widelands {
> @@ -106,7 +106,7 @@
> }
>
> PortDock::PositionList PortDock::get_positions
> - (const Editor_Game_Base &) const
> + (const EditorGameBase &) const
> {
> return m_dockpoints;
> }
> @@ -154,12 +154,12 @@
>
>
> void PortDock::draw
> - (const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&)
> + (const EditorGameBase &, RenderTarget &, const FCoords&, const Point&)
> {
> // do nothing
> }
>
> -void PortDock::init(Editor_Game_Base & egbase)
> +void PortDock::init(EditorGameBase & egbase)
> {
> PlayerImmovable::init(egbase);
>
> @@ -174,7 +174,7 @@
> * Create our initial singleton @ref Fleet. The fleet code ensures
> * that we merge with a larger fleet when possible.
> */
> -void PortDock::init_fleet(Editor_Game_Base & egbase)
> +void PortDock::init_fleet(EditorGameBase & egbase)
> {
> Fleet * fleet = new Fleet(owner());
> fleet->add_port(egbase, this);
> @@ -182,7 +182,7 @@
> // Note: the Fleet calls our set_fleet automatically
> }
>
> -void PortDock::cleanup(Editor_Game_Base & egbase)
> +void PortDock::cleanup(EditorGameBase & egbase)
> {
> if (egbase.objects().object_still_available(m_warehouse)) {
> // Transfer all our wares into the warehouse.
> @@ -344,7 +344,7 @@
> // The expedition goods are now on the ship, so from now on it is independent from the port
> // and thus we switch the port to normal, so we could even start a new expedition,
> cancel_expedition(game);
> - if (upcast(Interactive_GameBase, igb, game.get_ibase()))
> + if (upcast(InteractiveGameBase, igb, game.get_ibase()))
> ship.refresh_window(*igb);
> return m_fleet->update(game);
> }
> @@ -393,7 +393,7 @@
> /**
> * Return the number of wares or workers of the given type that are waiting at the dock.
> */
> -uint32_t PortDock::count_waiting(WareWorker waretype, Ware_Index wareindex)
> +uint32_t PortDock::count_waiting(WareWorker waretype, WareIndex wareindex)
> {
> uint32_t count = 0;
>
> @@ -446,7 +446,7 @@
> }
>
>
> -void PortDock::log_general_info(const Editor_Game_Base & egbase)
> +void PortDock::log_general_info(const EditorGameBase & egbase)
> {
> PlayerImmovable::log_general_info(egbase);
>
> @@ -538,7 +538,7 @@
> }
>
> MapObject::Loader * PortDock::load
> - (Editor_Game_Base & egbase, MapMapObjectLoader & mol, FileRead & fr)
> + (EditorGameBase & egbase, MapObjectLoader & mol, FileRead & fr)
> {
> std::unique_ptr<Loader> loader(new Loader);
>
> @@ -550,7 +550,7 @@
> loader->init(egbase, mol, *new PortDock(nullptr));
> loader->load(fr, version);
> } else
> - throw game_data_error("unknown/unhandled version %u", version);
> + throw GameDataError("unknown/unhandled version %u", version);
> } catch (const std::exception & e) {
> throw wexception("loading portdock: %s", e.what());
> }
> @@ -558,7 +558,7 @@
> return loader.release();
> }
>
> -void PortDock::save(Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw)
> +void PortDock::save(EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw)
> {
> fw.Unsigned8(HeaderPortDock);
> fw.Unsigned8(PORTDOCK_SAVEGAME_VERSION);
>
> === modified file 'src/economy/portdock.h'
> --- src/economy/portdock.h 2014-07-28 16:59:54 +0000
> +++ src/economy/portdock.h 2014-09-15 07:27:30 +0000
> @@ -93,12 +93,12 @@
>
> Flag & base_flag() override;
> PositionList get_positions
> - (const Editor_Game_Base &) const override;
> + (const EditorGameBase &) const override;
> void draw
> - (const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&) override;
> + (const EditorGameBase &, RenderTarget &, const FCoords&, const Point&) override;
>
> - void init(Editor_Game_Base &) override;
> - void cleanup(Editor_Game_Base &) override;
> + void init(EditorGameBase &) override;
> + void cleanup(EditorGameBase &) override;
>
> void add_neighbours(std::vector<RoutingNodeNeighbour> & neighbours);
>
> @@ -110,9 +110,9 @@
>
> void ship_arrived(Game &, Ship &);
>
> - void log_general_info(const Editor_Game_Base &) override;
> + void log_general_info(const EditorGameBase &) override;
>
> - uint32_t count_waiting(WareWorker waretype, Ware_Index wareindex);
> + uint32_t count_waiting(WareWorker waretype, WareIndex wareindex);
>
> // Returns true if a expedition is started or ready to be send out.
> bool expedition_started();
> @@ -131,7 +131,7 @@
> private:
> friend struct Fleet;
>
> - void init_fleet(Editor_Game_Base & egbase);
> + void init_fleet(EditorGameBase & egbase);
> void set_fleet(Fleet * fleet);
> void _update_shippingitem(Game &, std::vector<ShippingItem>::iterator);
> void set_need_ship(Game &, bool need);
> @@ -162,10 +162,10 @@
>
> public:
> bool has_new_save_support() override {return true;}
> - void save(Editor_Game_Base &, MapMapObjectSaver &, FileWrite &) override;
> + void save(EditorGameBase &, MapObjectSaver &, FileWrite &) override;
>
> static MapObject::Loader * load
> - (Editor_Game_Base &, MapMapObjectLoader &, FileRead &);
> + (EditorGameBase &, MapObjectLoader &, FileRead &);
> };
>
> extern PortdockDescr g_portdock_descr;
>
> === modified file 'src/economy/request.cc'
> --- src/economy/request.cc 2014-07-28 14:23:03 +0000
> +++ src/economy/request.cc 2014-09-15 07:27:30 +0000
> @@ -34,8 +34,8 @@
> #include "logic/tribe.h"
> #include "logic/warehouse.h"
> #include "logic/worker.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
>
>
> namespace Widelands {
> @@ -50,8 +50,8 @@
>
> Request::Request
> (PlayerImmovable & _target,
> - Ware_Index const index,
> - callback_t const cbfn,
> + WareIndex const index,
> + CallbackFn const cbfn,
> WareWorker const w)
> :
> m_type (w),
> @@ -106,19 +106,19 @@
> * them through the data in the file
> */
> void Request::Read
> - (FileRead & fr, Game & game, MapMapObjectLoader & mol)
> + (FileRead & fr, Game & game, MapObjectLoader & mol)
> {
> try {
> uint16_t const version = fr.Unsigned16();
> if (version == 6) {
> - const Tribe_Descr& tribe = m_target.owner().tribe();
> + const TribeDescr& tribe = m_target.owner().tribe();
> char const* const type_name = fr.CString();
> - Ware_Index const wai = tribe.ware_index(type_name);
> + WareIndex const wai = tribe.ware_index(type_name);
> if (wai != INVALID_INDEX) {
> m_type = wwWARE;
> m_index = wai;
> } else {
> - Ware_Index const woi = tribe.worker_index(type_name);
> + WareIndex const woi = tribe.worker_index(type_name);
> if (woi != INVALID_INDEX) {
> m_type = wwWORKER;
> m_index = woi;
> @@ -161,15 +161,15 @@
> transfer->set_request(this);
> m_transfers.push_back(transfer);
> }
> - } catch (const _wexception& e) {
> + } catch (const WException& e) {
> throw wexception("transfer %u: %s", i, e.what());
> }
> m_requirements.Read (fr, game, mol);
> if (!is_open() && m_economy)
> m_economy->remove_request(*this);
> } else
> - throw game_data_error("unknown/unhandled version %u", version);
> - } catch (const _wexception & e) {
> + throw GameDataError("unknown/unhandled version %u", version);
> + } catch (const WException & e) {
> throw wexception("request: %s", e.what());
> }
> }
> @@ -178,14 +178,14 @@
> * Write this request to a file
> */
> void Request::Write
> - (FileWrite & fw, Game & game, MapMapObjectSaver & mos) const
> + (FileWrite & fw, Game & game, MapObjectSaver & mos) const
> {
> fw.Unsigned16(REQUEST_VERSION);
>
> // Target and econmy should be set. Same is true for callback stuff.
>
> assert(m_type == wwWARE || m_type == wwWORKER);
> - const Tribe_Descr & tribe = m_target.owner().tribe();
> + const TribeDescr & tribe = m_target.owner().tribe();
> assert(m_type != wwWARE || m_index < tribe.get_nrwares ());
> assert(m_type != wwWORKER || m_index < tribe.get_nrworkers());
> fw.CString
> @@ -227,7 +227,7 @@
> * be delivered. nr is in the range [0..m_count[
> */
> int32_t Request::get_base_required_time
> - (Editor_Game_Base & egbase, uint32_t const nr) const
> + (EditorGameBase & egbase, uint32_t const nr) const
> {
> if (m_count <= nr) {
> if (!(m_count == 1 && nr == 1)) {
>
> === modified file 'src/economy/request.h'
> --- src/economy/request.h 2014-07-28 14:17:07 +0000
> +++ src/economy/request.h 2014-09-15 07:27:30 +0000
> @@ -31,11 +31,11 @@
> namespace Widelands {
>
> class Economy;
> -class Editor_Game_Base;
> +class EditorGameBase;
> struct Flag;
> class Game;
> -class MapMapObjectLoader;
> -struct MapMapObjectSaver;
> +class MapObjectLoader;
> +struct MapObjectSaver;
> struct PlayerImmovable;
> class RequestList;
> struct Requirements;
> @@ -63,14 +63,14 @@
> friend class Economy;
> friend class RequestList;
>
> - typedef void (*callback_t)
> - (Game &, Request &, Ware_Index, Worker *, PlayerImmovable &);
> + using CallbackFn = void (*)
> + (Game &, Request &, WareIndex, Worker *, PlayerImmovable &);
>
> - Request(PlayerImmovable & target, Ware_Index, callback_t, WareWorker);
> + Request(PlayerImmovable & target, WareIndex, CallbackFn, WareWorker);
> ~Request();
>
> PlayerImmovable & target() const {return m_target;}
> - Ware_Index get_index() const {return m_index;}
> + WareIndex get_index() const {return m_index;}
> WareWorker get_type() const {return m_type;}
> uint32_t get_count() const {return m_count;}
> uint32_t get_open_count() const {return m_count - m_transfers.size();}
> @@ -93,8 +93,8 @@
>
> void start_transfer(Game &, Supply &);
>
> - void Read (FileRead &, Game &, MapMapObjectLoader &);
> - void Write(FileWrite &, Game &, MapMapObjectSaver &) const;
> + void Read (FileRead &, Game &, MapObjectLoader &);
> + void Write(FileWrite &, Game &, MapObjectSaver &) const;
> Worker * get_transfer_worker();
>
> // callbacks for WareInstance/Worker code
> @@ -105,14 +105,14 @@
> const Requirements & get_requirements () const {return m_requirements;}
>
> private:
> - int32_t get_base_required_time(Editor_Game_Base &, uint32_t nr) const;
> + int32_t get_base_required_time(EditorGameBase &, uint32_t nr) const;
> public:
> void cancel_transfer(uint32_t idx);
> private:
> void remove_transfer(uint32_t idx);
> uint32_t find_transfer(Transfer &);
>
> - typedef std::vector<Transfer *> TransferList;
> + using TransferList = std::vector<Transfer *>;
>
> WareWorker m_type;
>
> @@ -126,10 +126,10 @@
> ConstructionSite * m_target_constructionsite;
>
> Economy * m_economy;
> - Ware_Index m_index; // the index of the ware descr
> + WareIndex m_index; // the index of the ware descr
> uint32_t m_count; // how many do we need in total
>
> - callback_t m_callbackfn; // called on request success
> + CallbackFn m_callbackfn; // called on request success
>
> // when do we need the first ware (can be in the past)
> int32_t m_required_time;
>
> === modified file 'src/economy/road.cc'
> --- src/economy/road.cc 2014-07-28 16:59:54 +0000
> +++ src/economy/road.cc 2014-09-15 07:27:30 +0000
> @@ -89,7 +89,7 @@
> * Create a road between the given flags, using the given path.
> */
> Road & Road::create
> - (Editor_Game_Base & egbase,
> + (EditorGameBase & egbase,
> Flag & start, Flag & end, const Path & path)
> {
> assert(start.get_position() == path.get_start());
> @@ -121,14 +121,14 @@
> }
>
> BaseImmovable::PositionList Road::get_positions
> - (const Editor_Game_Base & egbase) const
> + (const EditorGameBase & egbase) const
> {
> Map & map = egbase.map();
> Coords curf = map.get_fcoords(m_path.get_start());
>
> PositionList rv;
> - const Path::Step_Vector::size_type nr_steps = m_path.get_nsteps();
> - for (Path::Step_Vector::size_type steps = 0; steps < nr_steps + 1; ++steps)
> + const Path::StepVector::size_type nr_steps = m_path.get_nsteps();
> + for (Path::StepVector::size_type steps = 0; steps < nr_steps + 1; ++steps)
> {
> if (steps > 0 && steps < m_path.get_nsteps())
> rv.push_back(curf);
> @@ -156,7 +156,7 @@
> * Set the new path, calculate costs.
> * You have to set start and end flags before calling this function.
> */
> -void Road::_set_path(Editor_Game_Base & egbase, const Path & path)
> +void Road::_set_path(EditorGameBase & egbase, const Path & path)
> {
> assert(path.get_nsteps() >= 2);
> assert(path.get_start() == m_flags[FlagStart]->get_position());
> @@ -172,13 +172,13 @@
> /**
> * Add road markings to the map
> */
> -void Road::_mark_map(Editor_Game_Base & egbase)
> +void Road::_mark_map(EditorGameBase & egbase)
> {
> Map & map = egbase.map();
> FCoords curf = map.get_fcoords(m_path.get_start());
>
> - const Path::Step_Vector::size_type nr_steps = m_path.get_nsteps();
> - for (Path::Step_Vector::size_type steps = 0; steps < nr_steps + 1; ++steps)
> + const Path::StepVector::size_type nr_steps = m_path.get_nsteps();
> + for (Path::StepVector::size_type steps = 0; steps < nr_steps + 1; ++steps)
> {
> if (steps > 0 && steps < m_path.get_nsteps())
> set_position(egbase, curf);
> @@ -208,12 +208,12 @@
> /**
> * Remove road markings from the map
> */
> -void Road::_unmark_map(Editor_Game_Base & egbase) {
> +void Road::_unmark_map(EditorGameBase & egbase) {
> Map & map = egbase.map();
> FCoords curf(m_path.get_start(), &map[m_path.get_start()]);
>
> - const Path::Step_Vector::size_type nr_steps = m_path.get_nsteps();
> - for (Path::Step_Vector::size_type steps = 0; steps < nr_steps + 1; ++steps)
> + const Path::StepVector::size_type nr_steps = m_path.get_nsteps();
> + for (Path::StepVector::size_type steps = 0; steps < nr_steps + 1; ++steps)
> {
> if (steps > 0 && steps < m_path.get_nsteps())
> unset_position(egbase, curf);
> @@ -243,7 +243,7 @@
> /**
> * Initialize the road.
> */
> -void Road::init(Editor_Game_Base & egbase)
> +void Road::init(EditorGameBase & egbase)
> {
> PlayerImmovable::init(egbase);
>
> @@ -258,7 +258,7 @@
> * we needed to have this road already registered
> * as Map Object, thats why this is moved
> */
> -void Road::_link_into_flags(Editor_Game_Base & egbase) {
> +void Road::_link_into_flags(EditorGameBase & egbase) {
> assert(m_path.get_nsteps() >= 2);
>
> // Link into the flags (this will also set our economy)
> @@ -303,7 +303,7 @@
> /**
> * Cleanup the road
> */
> -void Road::cleanup(Editor_Game_Base & egbase)
> +void Road::cleanup(EditorGameBase & egbase)
> {
>
> for (CarrierSlot& slot : m_carrier_slots) {
> @@ -376,7 +376,7 @@
> void Road::_request_carrier_callback
> (Game & game,
> Request & rq,
> - Ware_Index,
> + WareIndex,
> Worker * const w,
> PlayerImmovable & target)
> {
> @@ -412,7 +412,7 @@
> */
> void Road::remove_worker(Worker & w)
> {
> - Editor_Game_Base & egbase = owner().egbase();
> + EditorGameBase & egbase = owner().egbase();
>
> for (CarrierSlot& slot : m_carrier_slots) {
> Carrier const * carrier = slot.carrier.get(egbase);
> @@ -462,7 +462,7 @@
> * After the split, this road will span [start...new flag]. A new road will
> * be created to span [new flag...end]
> */
> -// TODO(SirVer): This need to take an Editor_Game_Base as well.
> +// TODO(SirVer): This needs to take an EditorGameBase as well.
> void Road::postsplit(Game & game, Flag & flag)
> {
> Flag & oldend = *m_flags[FlagEnd];
> @@ -663,7 +663,7 @@
> return false;
> }
>
> -void Road::log_general_info(const Editor_Game_Base & egbase)
> +void Road::log_general_info(const EditorGameBase & egbase)
> {
> PlayerImmovable::log_general_info(egbase);
> molog("m_busyness: %i\n", m_busyness);
>
> === modified file 'src/economy/road.h'
> --- src/economy/road.h 2014-07-28 16:59:54 +0000
> +++ src/economy/road.h 2014-09-15 07:27:30 +0000
> @@ -58,8 +58,8 @@
> * road.
> */
> struct Road : public PlayerImmovable {
> - friend class Map_Roaddata_Data_Packet; // For saving
> - friend class Map_Road_Data_Packet; // For init()
> + friend class MapRoaddataPacket; // For saving
> + friend class MapRoadPacket; // For init()
>
> const RoadDescr& descr() const;
>
> @@ -82,7 +82,7 @@
> virtual ~Road();
>
> static Road & create
> - (Editor_Game_Base &,
> + (EditorGameBase &,
> Flag & start, Flag & end, const Path &);
>
> Flag & get_flag(FlagId const flag) const {return *m_flags[flag];}
> @@ -90,7 +90,7 @@
> uint8_t get_roadtype() const {return m_type;}
> int32_t get_size () const override;
> bool get_passable() const override;
> - PositionList get_positions(const Editor_Game_Base &) const override;
> + PositionList get_positions(const EditorGameBase &) const override;
>
> Flag & base_flag() override;
>
> @@ -108,25 +108,25 @@
> void remove_worker(Worker &) override;
> void assign_carrier(Carrier &, uint8_t);
>
> - void log_general_info(const Editor_Game_Base &) override;
> + void log_general_info(const EditorGameBase &) override;
>
> protected:
> - void init(Editor_Game_Base &) override;
> - void cleanup(Editor_Game_Base &) override;
> + void init(EditorGameBase &) override;
> + void cleanup(EditorGameBase &) override;
>
> - void draw(const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&) override;
> + void draw(const EditorGameBase &, RenderTarget &, const FCoords&, const Point&) override;
>
> private:
> - void _set_path(Editor_Game_Base &, const Path &);
> -
> - void _mark_map(Editor_Game_Base &);
> - void _unmark_map(Editor_Game_Base &);
> -
> - void _link_into_flags(Editor_Game_Base &);
> + void _set_path(EditorGameBase &, const Path &);
> +
> + void _mark_map(EditorGameBase &);
> + void _unmark_map(EditorGameBase &);
> +
> + void _link_into_flags(EditorGameBase &);
>
> void _request_carrier(CarrierSlot &);
> static void _request_carrier_callback
> - (Game &, Request &, Ware_Index, Worker *, PlayerImmovable &);
> + (Game &, Request &, WareIndex, Worker *, PlayerImmovable &);
>
> private:
>
> @@ -147,7 +147,7 @@
> Path m_path; ///< path goes from start to end
> uint32_t m_idle_index; ///< index into path where carriers should idle
>
> - typedef std::vector<CarrierSlot> SlotVector;
> + using SlotVector = std::vector<CarrierSlot>;
> SlotVector m_carrier_slots;
> };
>
>
> === modified file 'src/economy/route.cc'
> --- src/economy/route.cc 2014-07-28 14:17:07 +0000
> +++ src/economy/route.cc 2014-09-15 07:27:30 +0000
> @@ -23,8 +23,8 @@
> #include "io/fileread.h"
> #include "io/filewrite.h"
> #include "logic/editor_game_base.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
>
> /*
> ==============================================================================
> @@ -54,7 +54,7 @@
> * Every route has at least one flag.
> */
> Flag & Route::get_flag
> - (Editor_Game_Base & egbase, std::vector<Flag *>::size_type const idx)
> + (EditorGameBase & egbase, std::vector<Flag *>::size_type const idx)
> {
> assert(idx < m_route.size());
> return *m_route[idx].get(egbase);
> @@ -102,12 +102,12 @@
> * load_pointers phase of loading: This is responsible for filling
> * in the \ref Flag pointers. Must be called after \ref load.
> */
> -void Route::load_pointers(const LoadData & data, MapMapObjectLoader & mol) {
> +void Route::load_pointers(const LoadData & data, MapObjectLoader & mol) {
> for (uint32_t i = 0; i < data.flags.size(); ++i) {
> uint32_t const flag_serial = data.flags.size();
> try {
> m_route.push_back(&mol.get<Flag>(flag_serial));
> - } catch (const _wexception & e) {
> + } catch (const WException & e) {
> throw wexception("Route flag #%u (%u): %s", i, flag_serial, e.what());
> }
> }
> @@ -118,12 +118,12 @@
> * Save the route to the given file.
> */
> void Route::save
> - (FileWrite & fw, Editor_Game_Base & egbase, MapMapObjectSaver & mos)
> + (FileWrite & fw, EditorGameBase & egbase, MapObjectSaver & mos)
> {
> fw.Signed32(get_totalcost());
> fw.Unsigned16(m_route.size());
> for
> - (std::vector<Object_Ptr>::size_type idx = 0;
> + (std::vector<ObjectPointer>::size_type idx = 0;
> idx < m_route.size();
> ++idx)
> {
>
> === modified file 'src/economy/route.h'
> --- src/economy/route.h 2014-07-28 14:17:07 +0000
> +++ src/economy/route.h 2014-09-15 07:27:30 +0000
> @@ -29,9 +29,9 @@
> namespace Widelands {
>
> struct Flag;
> -class Editor_Game_Base;
> -struct MapMapObjectSaver;
> -class MapMapObjectLoader;
> +class EditorGameBase;
> +struct MapObjectSaver;
> +class MapObjectLoader;
> struct RoutingNode;
>
> /**
> @@ -48,7 +48,7 @@
>
> int32_t get_totalcost() const {return m_totalcost;}
> int32_t get_nrsteps() const {return m_route.size() - 1;}
> - Flag & get_flag(Editor_Game_Base &, std::vector<Flag *>::size_type);
> + Flag & get_flag(EditorGameBase &, std::vector<Flag *>::size_type);
>
> void starttrim(int32_t count);
> void truncate(int32_t count);
> @@ -58,8 +58,8 @@
> };
>
> void load(LoadData &, FileRead &);
> - void load_pointers(const LoadData &, MapMapObjectLoader &);
> - void save(FileWrite &, Editor_Game_Base &, MapMapObjectSaver &);
> + void load_pointers(const LoadData &, MapObjectLoader &);
> + void save(FileWrite &, EditorGameBase &, MapObjectSaver &);
>
> void insert_as_first(RoutingNode * node) override;
>
>
> === modified file 'src/economy/routeastar.h'
> --- src/economy/routeastar.h 2014-07-24 18:22:30 +0000
> +++ src/economy/routeastar.h 2014-09-15 07:27:30 +0000
> @@ -75,7 +75,7 @@
> */
> template<typename Est_>
> struct RouteAStar : BaseRouteAStar {
> - typedef Est_ Estimator;
> + using Estimator = Est_;
>
> RouteAStar(Router & router, WareWorker type, const Estimator & est = Estimator());
>
>
> === modified file 'src/economy/router.h'
> --- src/economy/router.h 2014-07-16 08:23:42 +0000
> +++ src/economy/router.h 2014-09-15 07:27:30 +0000
> @@ -36,7 +36,7 @@
> * The functionality was split from Economy
> */
> struct Router {
> - typedef boost::function<void ()> ResetCycleFn;
> + using ResetCycleFn = boost::function<void ()>;
>
> Router(const ResetCycleFn & reset);
>
>
> === modified file 'src/economy/routing_node.h'
> --- src/economy/routing_node.h 2014-07-05 16:41:51 +0000
> +++ src/economy/routing_node.h 2014-09-15 07:27:30 +0000
> @@ -50,7 +50,7 @@
> RoutingNode * m_nb;
> int32_t m_cost; /// Cost to get from me to the neighbour (Cost for road)
> };
> -typedef std::vector<RoutingNodeNeighbour> RoutingNodeNeighbours;
> +using RoutingNodeNeighbours = std::vector<RoutingNodeNeighbour>;
>
> /**
> * A routing node is a field with a cost attached to it
> @@ -65,10 +65,10 @@
> return a.cost() < b.cost();
> }
> };
> - typedef cookie_priority_queue<RoutingNode, LessCost> Queue;
> + using Queue = CookiePriorityQueue<RoutingNode, LessCost>;
>
> uint32_t mpf_cycle;
> - Queue::cookie mpf_cookie;
> + Queue::Cookie mpf_cookie;
> int32_t mpf_realcost; ///< real cost of getting to this flag
> RoutingNode * mpf_backlink; ///< flag where we came from
> int32_t mpf_estimate; ///< estimate of cost to destination
> @@ -83,7 +83,7 @@
> }
>
> int32_t cost() const {return mpf_realcost + mpf_estimate;}
> - Queue::cookie & cookie() {return mpf_cookie;}
> + Queue::Cookie & cookie() {return mpf_cookie;}
>
> virtual Flag & base_flag() = 0;
> virtual void get_neighbours(WareWorker type, RoutingNodeNeighbours &) = 0;
>
> === modified file 'src/economy/shippingitem.cc'
> --- src/economy/shippingitem.cc 2014-07-28 14:23:03 +0000
> +++ src/economy/shippingitem.cc 2014-09-15 07:27:30 +0000
> @@ -25,8 +25,8 @@
> #include "io/filewrite.h"
> #include "logic/game_data_error.h"
> #include "logic/worker.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
>
> namespace Widelands {
>
> @@ -40,7 +40,7 @@
> {
> }
>
> -void ShippingItem::get(Editor_Game_Base& game, WareInstance** ware, Worker** worker) const {
> +void ShippingItem::get(EditorGameBase& game, WareInstance** ware, Worker** worker) const {
> if (ware) {
> *ware = nullptr;
> }
> @@ -154,7 +154,7 @@
> /**
> * Remove the underlying item directly. This is used when ships are removed.
> */
> -void ShippingItem::remove(Editor_Game_Base & egbase)
> +void ShippingItem::remove(EditorGameBase & egbase)
> {
> if (MapObject * obj = m_object.get(egbase)) {
> obj->remove(egbase);
> @@ -171,10 +171,10 @@
> if (1 <= version && version <= SHIPPINGITEM_SAVEGAME_VERSION) {
> m_serial = fr.Unsigned32();
> } else
> - throw game_data_error("unknown ShippingItem version %u", version);
> + throw GameDataError("unknown ShippingItem version %u", version);
> }
>
> -ShippingItem ShippingItem::Loader::get(MapMapObjectLoader & mol)
> +ShippingItem ShippingItem::Loader::get(MapObjectLoader & mol)
> {
> ShippingItem it;
> if (m_serial != 0)
> @@ -182,7 +182,7 @@
> return it;
> }
>
> -void ShippingItem::save(Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw)
> +void ShippingItem::save(EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw)
> {
> fw.Unsigned8(SHIPPINGITEM_SAVEGAME_VERSION);
> fw.Unsigned32(mos.get_object_file_index_or_zero(m_object.get(egbase)));
>
> === modified file 'src/economy/shippingitem.h'
> --- src/economy/shippingitem.h 2014-07-28 14:17:07 +0000
> +++ src/economy/shippingitem.h 2014-09-15 07:27:30 +0000
> @@ -30,8 +30,8 @@
>
> class Economy;
> class Game;
> -class MapMapObjectLoader;
> -struct MapMapObjectSaver;
> +class MapObjectLoader;
> +struct MapObjectSaver;
> class MapObject;
> class PortDock;
> class WareInstance;
> @@ -49,23 +49,23 @@
> // Unboxes the item that is shipped which might be either a ware or a
> // worker. It is safe to pass nullptr for 'ware' or 'worker' in case you are
> // only interested in the ware if it is the one or the other.
> - void get(Editor_Game_Base& game, WareInstance** ware, Worker** worker) const;
> + void get(EditorGameBase& game, WareInstance** ware, Worker** worker) const;
>
> void set_economy(Game &, Economy * e);
> PortDock * get_destination(Game &);
> void schedule_update(Game &, int32_t delay);
>
> - void remove(Editor_Game_Base &);
> + void remove(EditorGameBase &);
>
> struct Loader {
> void load(FileRead & fr);
> - ShippingItem get(MapMapObjectLoader & mol);
> + ShippingItem get(MapObjectLoader & mol);
>
> private:
> uint32_t m_serial;
> };
>
> - void save(Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw);
> + void save(EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw);
>
> private:
> friend class PortDock;
> @@ -80,7 +80,7 @@
> // Updates m_destination_dock.
> void update_destination(Game &, PortDock &);
>
> - Object_Ptr m_object;
> + ObjectPointer m_object;
> OPtr<PortDock> m_destination_dock;
> };
>
>
> === modified file 'src/economy/supply.h'
> --- src/economy/supply.h 2014-07-05 16:41:51 +0000
> +++ src/economy/supply.h 2014-09-15 07:27:30 +0000
> @@ -69,7 +69,7 @@
> *
> * \note This is only valid if \ref has_storage returns \c false.
> */
> - virtual void get_ware_type(WareWorker & type, Ware_Index & ware) const = 0;
> + virtual void get_ware_type(WareWorker & type, WareIndex & ware) const = 0;
>
> /**
> * Send this to the given warehouse.
>
> === modified file 'src/economy/supply_list.h'
> --- src/economy/supply_list.h 2014-07-05 16:41:51 +0000
> +++ src/economy/supply_list.h 2014-09-15 07:27:30 +0000
> @@ -43,7 +43,7 @@
> bool have_supplies(Game & game, const Request &);
>
> private:
> - typedef std::vector<Supply *> Supplies;
> + using Supplies = std::vector<Supply *>;
> Supplies m_supplies;
> };
>
>
> === modified file 'src/economy/test/test_road.cc'
> --- src/economy/test/test_road.cc 2014-07-26 10:43:23 +0000
> +++ src/economy/test/test_road.cc 2014-09-15 07:27:30 +0000
> @@ -38,7 +38,7 @@
> /* Helper classes */
> /******************/
> struct TestingFlag : public Flag {
> - TestingFlag(Editor_Game_Base &, Coords const c) : Flag() {
> + TestingFlag(EditorGameBase &, Coords const c) : Flag() {
> set_flag_position(c);
> }
>
> @@ -77,11 +77,11 @@
> ~SimpleRoadTestsFixture() {
> delete start;
> delete end;
> - // Map is deleted by Editor_Game_Base
> + // Map is deleted by EditorGameBase
> }
>
> TestingMap * map;
> - Editor_Game_Base g;
> + EditorGameBase g;
> Road r;
> Path path;
> TestingFlag * start;
>
> === modified file 'src/economy/test/test_routing.cc'
> --- src/economy/test/test_routing.cc 2014-07-26 10:57:26 +0000
> +++ src/economy/test/test_routing.cc 2014-09-15 07:27:30 +0000
> @@ -67,7 +67,7 @@
> bool all_members_zeroed();
>
> private:
> - typedef std::vector<TestingRoutingNode *> Neigbours;
> + using Neigbours = std::vector<TestingRoutingNode *>;
>
> Neigbours _neighbours;
> int32_t _waitcost;
> @@ -100,7 +100,7 @@
> };
> class TestingRoute : public IRoute {
> public:
> - typedef std::vector<RoutingNode *> Nodes;
> + using Nodes = std::vector<RoutingNode *>;
>
> void init(int32_t) override {
> nodes.clear();
> @@ -178,14 +178,14 @@
> BOOST_CHECK_EQUAL(d0.get_position().x, 0);
> BOOST_CHECK_EQUAL(d1.get_position().x, 15);
> }
> -struct TestingNode_DefaultNodes_Fixture {
> - TestingNode_DefaultNodes_Fixture() {
> +struct TestingNodeDefaultNodesFixture {
> + TestingNodeDefaultNodesFixture() {
> d0 = new TestingRoutingNode();
> d1 = new TestingRoutingNode(1, Coords(15, 0));
> nodes.push_back(d0);
> nodes.push_back(d1);
> }
> - ~TestingNode_DefaultNodes_Fixture() {
> + ~TestingNodeDefaultNodesFixture() {
> while (!nodes.empty()) {
> TestingRoutingNode * n = nodes.back();
> delete n;
> @@ -197,14 +197,14 @@
> TestingRoutingNode * d1;
> };
> BOOST_FIXTURE_TEST_CASE
> - (testingnode_neighbour_attaching, TestingNode_DefaultNodes_Fixture)
> + (testingnode_neighbour_attaching, TestingNodeDefaultNodesFixture)
> {
> d0->add_neighbour(d1);
>
> BOOST_CHECK_EQUAL(d0->get_neighbour(0), d1);
> }
> BOOST_FIXTURE_TEST_CASE
> - (testingnode_illegalneighbour_access, TestingNode_DefaultNodes_Fixture)
> + (testingnode_illegalneighbour_access, TestingNodeDefaultNodesFixture)
> {
> try {
> d0->get_neighbour(0);
> @@ -391,7 +391,7 @@
> }
>
> struct ComplexRouterFixture {
> - typedef std::vector<RoutingNode *> Nodes;
> + using Nodes = std::vector<RoutingNode *>;
>
> ComplexRouterFixture() : r(boost::bind(&ComplexRouterFixture::reset, this)) {
> d0 = new TestingRoutingNode();
>
> === modified file 'src/economy/transfer.cc'
> --- src/economy/transfer.cc 2014-07-28 14:17:07 +0000
> +++ src/economy/transfer.cc 2014-09-15 07:27:30 +0000
> @@ -33,8 +33,8 @@
> #include "logic/player.h"
> #include "logic/warehouse.h"
> #include "logic/worker.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
>
> namespace Widelands {
>
> @@ -324,13 +324,13 @@
> }
>
> void Transfer::read_pointers
> - (MapMapObjectLoader & mol, const Widelands::Transfer::ReadData & rd)
> + (MapObjectLoader & mol, const Widelands::Transfer::ReadData & rd)
> {
> if (rd.destination)
> m_destination = &mol.get<PlayerImmovable>(rd.destination);
> }
>
> -void Transfer::write(MapMapObjectSaver & mos, FileWrite & fw)
> +void Transfer::write(MapObjectSaver & mos, FileWrite & fw)
> {
> fw.Unsigned8(TRANSFER_SAVEGAME_VERSION);
> fw.Unsigned32(mos.get_object_file_index_or_zero(m_destination.get(m_game)));
>
> === modified file 'src/economy/transfer.h'
> --- src/economy/transfer.h 2014-07-28 14:17:07 +0000
> +++ src/economy/transfer.h 2014-09-15 07:27:30 +0000
> @@ -27,8 +27,8 @@
> struct PlayerImmovable;
> class Request;
> class WareInstance;
> -class MapMapObjectLoader;
> -struct MapMapObjectSaver;
> +class MapObjectLoader;
> +struct MapObjectSaver;
> class Worker;
>
> /**
> @@ -70,8 +70,8 @@
> };
>
> void read(FileRead & fr, ReadData & rd);
> - void read_pointers(MapMapObjectLoader & mol, const ReadData & rd);
> - void write(MapMapObjectSaver & mos, FileWrite & fw);
> + void read_pointers(MapObjectLoader & mol, const ReadData & rd);
> + void write(MapObjectSaver & mos, FileWrite & fw);
>
> private:
> void tlog(char const * fmt, ...) PRINTF_FORMAT(2, 3);
>
> === modified file 'src/economy/ware_instance.cc'
> --- src/economy/ware_instance.cc 2014-07-28 14:28:02 +0000
> +++ src/economy/ware_instance.cc 2014-09-15 07:27:30 +0000
> @@ -36,8 +36,8 @@
> #include "logic/tribe.h"
> #include "logic/warehouse.h"
> #include "logic/worker.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
>
> namespace Widelands {
>
> @@ -56,7 +56,7 @@
> PlayerImmovable * get_position(Game &) override;
> bool is_active() const override;
> bool has_storage() const override;
> - void get_ware_type(WareWorker & type, Ware_Index & ware) const override;
> + void get_ware_type(WareWorker & type, WareIndex & ware) const override;
> void send_to_storage(Game &, Warehouse * wh) override;
>
> uint32_t nr_supplies(const Game &, const Request &) const override;
> @@ -131,7 +131,7 @@
> return m_ware.is_moving();
> }
>
> -void IdleWareSupply::get_ware_type(WareWorker & type, Ware_Index & ware) const
> +void IdleWareSupply::get_ware_type(WareWorker & type, WareIndex & ware) const
> {
> type = wwWARE;
> ware = m_ware.descr_index();
> @@ -183,7 +183,7 @@
> /* Ware Instance Implementation */
> /*************************************************************************/
> WareInstance::WareInstance
> - (Ware_Index const i, const WareDescr * const ware_descr)
> + (WareIndex const i, const WareDescr * const ware_descr)
> :
> MapObject (ware_descr),
> m_economy (nullptr),
> @@ -200,12 +200,12 @@
> }
> }
>
> -void WareInstance::init(Editor_Game_Base & egbase)
> +void WareInstance::init(EditorGameBase & egbase)
> {
> MapObject::init(egbase);
> }
>
> -void WareInstance::cleanup(Editor_Game_Base & egbase)
> +void WareInstance::cleanup(EditorGameBase & egbase)
> {
> // Unlink from our current location, if necessary
> if (upcast(Flag, flag, m_location.get(egbase)))
> @@ -244,7 +244,7 @@
> * Once you've assigned a ware to its new location, you usually have to call
> * \ref update() as well.
> */
> -void WareInstance::set_location(Editor_Game_Base & egbase, MapObject * const location)
> +void WareInstance::set_location(EditorGameBase & egbase, MapObject * const location)
> {
> MapObject * const oldlocation = m_location.get(egbase);
>
> @@ -527,7 +527,7 @@
> dynamic_cast<PlayerImmovable *>(m_transfer_nextstep.get(game)) : nullptr;
> }
>
> -void WareInstance::log_general_info(const Editor_Game_Base & egbase)
> +void WareInstance::log_general_info(const EditorGameBase & egbase)
> {
> MapObject::log_general_info(egbase);
>
> @@ -561,7 +561,7 @@
> m_transfer_nextstep = fr.Unsigned32();
> if (fr.Unsigned8()) {
> ware.m_transfer =
> - new Transfer(ref_cast<Game, Editor_Game_Base>(egbase()), ware);
> + new Transfer(ref_cast<Game, EditorGameBase>(egbase()), ware);
> ware.m_transfer->read(fr, m_transfer);
> }
> }
> @@ -596,7 +596,7 @@
>
>
> void WareInstance::save
> - (Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw)
> + (EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw)
> {
> fw.Unsigned8(HeaderWareInstance);
> fw.Unsigned8(WAREINSTANCE_SAVEGAME_VERSION);
> @@ -617,7 +617,7 @@
> }
>
> MapObject::Loader * WareInstance::load
> - (Editor_Game_Base & egbase, MapMapObjectLoader & mol, FileRead & fr)
> + (EditorGameBase & egbase, MapObjectLoader & mol, FileRead & fr)
> {
> try {
> uint8_t version = fr.Unsigned8();
> @@ -630,11 +630,11 @@
>
> egbase.manually_load_tribe(tribename);
>
> - const Tribe_Descr * tribe = egbase.get_tribe(tribename);
> + const TribeDescr * tribe = egbase.get_tribe(tribename);
> if (!tribe)
> throw wexception("unknown tribe '%s'", tribename.c_str());
>
> - Ware_Index wareindex = tribe->ware_index(warename);
> + WareIndex wareindex = tribe->ware_index(warename);
> const WareDescr * descr = tribe->get_ware_descr(wareindex);
>
> std::unique_ptr<Loader> loader(new Loader);
>
> === modified file 'src/economy/ware_instance.h'
> --- src/economy/ware_instance.h 2014-07-28 14:17:07 +0000
> +++ src/economy/ware_instance.h 2014-09-15 07:27:30 +0000
> @@ -29,7 +29,7 @@
>
> class Building;
> class Economy;
> -class Editor_Game_Base;
> +class EditorGameBase;
> class Game;
> struct IdleWareSupply;
> class MapObject;
> @@ -53,30 +53,30 @@
> * for seafaring
> */
> class WareInstance : public MapObject {
> - friend struct Map_Waredata_Data_Packet;
> + friend struct MapWaredataPacket;
>
> MO_DESCR(WareDescr)
>
> public:
> - WareInstance(Ware_Index, const WareDescr* const);
> + WareInstance(WareIndex, const WareDescr* const);
> ~WareInstance();
>
> - MapObject* get_location(Editor_Game_Base& egbase) {
> + MapObject* get_location(EditorGameBase& egbase) {
> return m_location.get(egbase);
> }
> Economy* get_economy() const {
> return m_economy;
> }
> - Ware_Index descr_index() const {
> + WareIndex descr_index() const {
> return m_descr_index;
> }
>
> - void init(Editor_Game_Base&) override;
> - void cleanup(Editor_Game_Base&) override;
> + void init(EditorGameBase&) override;
> + void cleanup(EditorGameBase&) override;
> void act(Game&, uint32_t data) override;
> void update(Game&);
>
> - void set_location(Editor_Game_Base&, MapObject* loc);
> + void set_location(EditorGameBase&, MapObject* loc);
> void set_economy(Economy*);
>
> void enter_building(Game&, Building& building);
> @@ -92,16 +92,16 @@
> return m_transfer;
> }
>
> - void log_general_info(const Editor_Game_Base& egbase) override;
> + void log_general_info(const EditorGameBase& egbase) override;
>
> private:
> - Object_Ptr m_location;
> + ObjectPointer m_location;
> Economy* m_economy;
> - Ware_Index m_descr_index;
> + WareIndex m_descr_index;
>
> IdleWareSupply* m_supply;
> Transfer* m_transfer;
> - Object_Ptr m_transfer_nextstep; ///< cached PlayerImmovable, can be 0
> + ObjectPointer m_transfer_nextstep; ///< cached PlayerImmovable, can be 0
>
> // loading and saving stuff
> protected:
> @@ -123,8 +123,8 @@
> return true;
> }
>
> - void save(Editor_Game_Base&, MapMapObjectSaver&, FileWrite&) override;
> - static MapObject::Loader* load(Editor_Game_Base&, MapMapObjectLoader&, FileRead&);
> + void save(EditorGameBase&, MapObjectSaver&, FileWrite&) override;
> + static MapObject::Loader* load(EditorGameBase&, MapObjectLoader&, FileRead&);
> };
> }
>
>
> === modified file 'src/economy/warehousesupply.h'
> --- src/economy/warehousesupply.h 2014-07-26 10:43:23 +0000
> +++ src/economy/warehousesupply.h 2014-09-15 07:27:30 +0000
> @@ -36,27 +36,27 @@
>
> void set_economy(Economy *);
>
> - void set_nrworkers(Ware_Index);
> - void set_nrwares (Ware_Index);
> + void set_nrworkers(WareIndex);
> + void set_nrwares (WareIndex);
>
> const WareList & get_wares () const {return m_wares;}
> const WareList & get_workers() const {return m_workers;}
> - uint32_t stock_wares (Ware_Index const i) const {
> + uint32_t stock_wares (WareIndex const i) const {
> return m_wares .stock(i);
> }
> - uint32_t stock_workers(Ware_Index const i) const {
> + uint32_t stock_workers(WareIndex const i) const {
> return m_workers.stock(i);
> }
> - void add_wares (Ware_Index, uint32_t count);
> - void remove_wares (Ware_Index, uint32_t count);
> - void add_workers (Ware_Index, uint32_t count);
> - void remove_workers(Ware_Index, uint32_t count);
> + void add_wares (WareIndex, uint32_t count);
> + void remove_wares (WareIndex, uint32_t count);
> + void add_workers (WareIndex, uint32_t count);
> + void remove_workers(WareIndex, uint32_t count);
>
> // Supply implementation
> PlayerImmovable * get_position(Game &) override;
> bool is_active() const override;
> bool has_storage() const override;
> - void get_ware_type(WareWorker & type, Ware_Index & ware) const override;
> + void get_ware_type(WareWorker & type, WareIndex & ware) const override;
>
> void send_to_storage(Game &, Warehouse * wh) override;
> uint32_t nr_supplies(const Game &, const Request &) const override;
>
> === modified file 'src/economy/wares_queue.cc'
> --- src/economy/wares_queue.cc 2014-07-28 14:17:07 +0000
> +++ src/economy/wares_queue.cc 2014-09-15 07:27:30 +0000
> @@ -28,8 +28,8 @@
> #include "logic/game.h"
> #include "logic/player.h"
> #include "logic/tribe.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
>
> namespace Widelands {
>
> @@ -38,7 +38,7 @@
> */
> WaresQueue::WaresQueue
> (PlayerImmovable & _owner,
> - Ware_Index const _ware,
> + WareIndex const _ware,
> uint8_t const _max_size)
> :
> m_owner (_owner),
> @@ -110,7 +110,7 @@
> /**
> * Set the callback function that is called when an item has arrived.
> */
> -void WaresQueue::set_callback(callback_t * const fn, void * const data)
> +void WaresQueue::set_callback(CallbackFn * const fn, void * const data)
> {
> m_callback_fn = fn;
> m_callback_data = data;
> @@ -122,7 +122,7 @@
> void WaresQueue::request_callback
> (Game & game,
> Request &,
> - Ware_Index const ware,
> + WareIndex const ware,
> #ifndef NDEBUG
> Worker * const w,
> #else
> @@ -235,7 +235,7 @@
> * Read and write
> */
> #define WARES_QUEUE_DATA_PACKET_VERSION 2
> -void WaresQueue::Write(FileWrite & fw, Game & game, MapMapObjectSaver & mos)
> +void WaresQueue::Write(FileWrite & fw, Game & game, MapObjectSaver & mos)
> {
> fw.Unsigned16(WARES_QUEUE_DATA_PACKET_VERSION);
>
> @@ -254,7 +254,7 @@
> }
>
>
> -void WaresQueue::Read(FileRead & fr, Game & game, MapMapObjectLoader & mol)
> +void WaresQueue::Read(FileRead & fr, Game & game, MapObjectLoader & mol)
> {
> uint16_t const packet_version = fr.Unsigned16();
> try {
> @@ -283,10 +283,10 @@
> if (m_owner.get_economy())
> add_to_economy(*m_owner.get_economy());
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const game_data_error & e) {
> - throw game_data_error("waresqueue: %s", e.what());
> + } catch (const GameDataError & e) {
> + throw GameDataError("waresqueue: %s", e.what());
> }
> }
>
>
> === modified file 'src/economy/wares_queue.h'
> --- src/economy/wares_queue.h 2014-07-28 14:17:07 +0000
> +++ src/economy/wares_queue.h 2014-09-15 07:27:30 +0000
> @@ -26,10 +26,10 @@
> namespace Widelands {
>
> class Economy;
> -class Editor_Game_Base;
> +class EditorGameBase;
> class Game;
> -class MapMapObjectLoader;
> -struct MapMapObjectSaver;
> +class MapObjectLoader;
> +struct MapObjectSaver;
> class Player;
> class Request;
> class Worker;
> @@ -39,23 +39,23 @@
> */
> class WaresQueue {
> public:
> - typedef void (callback_t)
> - (Game &, WaresQueue *, Ware_Index ware, void * data);
> + using CallbackFn = void
> + (Game &, WaresQueue *, WareIndex ware, void * data);
>
> - WaresQueue(PlayerImmovable &, Ware_Index, uint8_t size);
> + WaresQueue(PlayerImmovable &, WareIndex, uint8_t size);
>
> #ifndef NDEBUG
> ~WaresQueue() {assert(m_ware == INVALID_INDEX);}
> #endif
>
> - Ware_Index get_ware() const {return m_ware;}
> + WareIndex get_ware() const {return m_ware;}
> uint32_t get_max_fill() const {return m_max_fill;}
> uint32_t get_max_size() const {return m_max_size;}
> uint32_t get_filled() const {return m_filled;}
>
> void cleanup();
>
> - void set_callback(callback_t *, void * data);
> + void set_callback(CallbackFn *, void * data);
>
> void remove_from_economy(Economy &);
> void add_to_economy(Economy &);
> @@ -67,16 +67,16 @@
>
> Player & owner() const {return m_owner.owner();}
>
> - void Read (FileRead &, Game &, MapMapObjectLoader &);
> - void Write(FileWrite &, Game &, MapMapObjectSaver &);
> + void Read (FileRead &, Game &, MapObjectLoader &);
> + void Write(FileWrite &, Game &, MapObjectSaver &);
>
> private:
> static void request_callback
> - (Game &, Request &, Ware_Index, Worker *, PlayerImmovable &);
> + (Game &, Request &, WareIndex, Worker *, PlayerImmovable &);
> void update();
>
> PlayerImmovable & m_owner;
> - Ware_Index m_ware; ///< ware ID
> + WareIndex m_ware; ///< ware ID
> uint32_t m_max_size; ///< nr of items that fit into the queue maximum
> uint32_t m_max_fill; ///< nr of wares that should be ideally in this queue
> uint32_t m_filled; ///< nr of items that are currently in the queue
> @@ -86,7 +86,7 @@
>
> Request * m_request; ///< currently pending request
>
> - callback_t * m_callback_fn;
> + CallbackFn * m_callback_fn;
> void * m_callback_data;
> };
>
>
> === modified file 'src/editor/editorinteractive.cc'
> --- src/editor/editorinteractive.cc 2014-07-25 22:17:48 +0000
> +++ src/editor/editorinteractive.cc 2014-09-15 07:27:30 +0000
> @@ -58,8 +58,8 @@
> using Widelands::Building;
>
> // Load all tribes from disk.
> -void load_all_tribes(Widelands::Editor_Game_Base* egbase, UI::ProgressWindow* loader_ui) {
> - for (const std::string& tribename : Widelands::Tribe_Descr::get_all_tribenames()) {
> +void load_all_tribes(Widelands::EditorGameBase* egbase, UI::ProgressWindow* loader_ui) {
> + for (const std::string& tribename : Widelands::TribeDescr::get_all_tribenames()) {
> ScopedTimer timer((boost::format("Loading %s took %%ums.") % tribename).str());
> loader_ui->stepf(_("Loading tribe: %s"), tribename.c_str());
> egbase->manually_load_tribe(tribename);
> @@ -68,8 +68,8 @@
>
> } // namespace
>
> -Editor_Interactive::Editor_Interactive(Widelands::Editor_Game_Base & e) :
> - Interactive_Base(e, g_options.pull_section("global")),
> +EditorInteractive::EditorInteractive(Widelands::EditorGameBase & e) :
> + InteractiveBase(e, g_options.pull_section("global")),
> m_need_save(false),
> m_realtime(WLApplication::get()->get_time()),
> m_left_mouse_button_is_down(false),
> @@ -106,16 +106,16 @@
> (INIT_BUTTON
> ("editor_redo", "redo", _("Redo")))
> {
> - m_toggle_main_menu.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_mainmenu, this));
> - m_toggle_tool_menu.sigclicked.connect(boost::bind(&Editor_Interactive::tool_menu_btn, this));
> - m_toggle_toolsize_menu.sigclicked.connect(boost::bind(&Editor_Interactive::toolsize_menu_btn, this));
> - m_toggle_minimap.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_minimap, this));
> - m_toggle_buildhelp.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_buildhelp, this));
> - m_toggle_player_menu.sigclicked.connect(boost::bind(&Editor_Interactive::toggle_playermenu, this));
> + m_toggle_main_menu.sigclicked.connect(boost::bind(&EditorInteractive::toggle_mainmenu, this));
> + m_toggle_tool_menu.sigclicked.connect(boost::bind(&EditorInteractive::tool_menu_btn, this));
> + m_toggle_toolsize_menu.sigclicked.connect(boost::bind(&EditorInteractive::toolsize_menu_btn, this));
> + m_toggle_minimap.sigclicked.connect(boost::bind(&EditorInteractive::toggle_minimap, this));
> + m_toggle_buildhelp.sigclicked.connect(boost::bind(&EditorInteractive::toggle_buildhelp, this));
> + m_toggle_player_menu.sigclicked.connect(boost::bind(&EditorInteractive::toggle_playermenu, this));
> m_undo.sigclicked.connect(
> - boost::bind(&Editor_History::undo_action, &m_history, boost::cref(egbase().world())));
> + boost::bind(&EditorHistory::undo_action, &m_history, boost::cref(egbase().world())));
> m_redo.sigclicked.connect(
> - boost::bind(&Editor_History::redo_action, &m_history, boost::cref(egbase().world())));
> + boost::bind(&EditorHistory::redo_action, &m_history, boost::cref(egbase().world())));
>
> m_toolbar.set_layout_toplevel(true);
> m_toolbar.add(&m_toggle_main_menu, UI::Box::AlignLeft);
> @@ -132,19 +132,19 @@
> m_redo.set_enabled(false);
>
> #ifndef NDEBUG
> - set_display_flag(Interactive_Base::dfDebug, true);
> + set_display_flag(InteractiveBase::dfDebug, true);
> #else
> - set_display_flag(Interactive_Base::dfDebug, false);
> + set_display_flag(InteractiveBase::dfDebug, false);
> #endif
>
> - fieldclicked.connect(boost::bind(&Editor_Interactive::map_clicked, this, false));
> + fieldclicked.connect(boost::bind(&EditorInteractive::map_clicked, this, false));
> }
>
> -void Editor_Interactive::register_overlays() {
> +void EditorInteractive::register_overlays() {
> Widelands::Map & map = egbase().map();
>
> // Starting locations
> - Widelands::Player_Number const nr_players = map.get_nrplayers();
> + Widelands::PlayerNumber const nr_players = map.get_nrplayers();
> assert(nr_players <= 99); // 2 decimal digits
> char fname[] = "pics/editor_player_00_starting_pos.png";
> iterate_player_numbers(p, nr_players) {
> @@ -174,7 +174,7 @@
> }
>
>
> -void Editor_Interactive::load(const std::string & filename) {
> +void EditorInteractive::load(const std::string & filename) {
> assert(filename.size());
>
> Widelands::Map & map = egbase().map();
> @@ -184,9 +184,9 @@
> egbase().cleanup_for_load();
> m_history.reset();
>
> - std::unique_ptr<Widelands::Map_Loader> ml(map.get_correct_loader(filename));
> + std::unique_ptr<Widelands::MapLoader> ml(map.get_correct_loader(filename));
> if (!ml.get())
> - throw warning
> + throw WLWarning
> (_("Unsupported format"),
> _("Widelands could not load the file \"%s\". The file format seems to be incompatible."),
> filename.c_str());
> @@ -219,7 +219,7 @@
>
>
> /// Called just before the editor starts, after postload, init and gfxload.
> -void Editor_Interactive::start() {
> +void EditorInteractive::start() {
> // Run the editor initialization script, if any
> try {
> egbase().lua().run_script("map:scripting/editor_init.lua");
> @@ -235,8 +235,8 @@
> *
> * Advance the timecounter and animate textures.
> */
> -void Editor_Interactive::think() {
> - Interactive_Base::think();
> +void EditorInteractive::think() {
> + InteractiveBase::think();
>
> int32_t lasttime = m_realtime;
> int32_t frametime;
> @@ -251,7 +251,7 @@
>
>
>
> -void Editor_Interactive::exit() {
> +void EditorInteractive::exit() {
> if (m_need_save) {
> UI::WLMessageBox mmb
> (this,
> @@ -264,14 +264,14 @@
> end_modal(0);
> }
>
> -void Editor_Interactive::toggle_mainmenu() {
> +void EditorInteractive::toggle_mainmenu() {
> if (m_mainmenu.window)
> delete m_mainmenu.window;
> else
> - new Editor_Main_Menu(*this, m_mainmenu);
> + new EditorMainMenu(*this, m_mainmenu);
> }
>
> -void Editor_Interactive::map_clicked(bool should_draw) {
> +void EditorInteractive::map_clicked(bool should_draw) {
> m_history.do_action
> (tools.current(),
> tools.use_tool, egbase().map(), egbase().world(),
> @@ -280,72 +280,72 @@
> set_need_save(true);
> }
>
> -bool Editor_Interactive::handle_mouserelease(uint8_t btn, int32_t x, int32_t y) {
> +bool EditorInteractive::handle_mouserelease(uint8_t btn, int32_t x, int32_t y) {
> if (btn == SDL_BUTTON_LEFT) {
> m_left_mouse_button_is_down = false;
> }
> - return Interactive_Base::handle_mouserelease(btn, x, y);
> + return InteractiveBase::handle_mouserelease(btn, x, y);
> }
>
> -bool Editor_Interactive::handle_mousepress(uint8_t btn, int32_t x, int32_t y) {
> +bool EditorInteractive::handle_mousepress(uint8_t btn, int32_t x, int32_t y) {
> if (btn == SDL_BUTTON_LEFT) {
> m_left_mouse_button_is_down = true;
> }
> - return Interactive_Base::handle_mousepress(btn, x, y);
> + return InteractiveBase::handle_mousepress(btn, x, y);
> }
>
> /// Needed to get freehand painting tools (hold down mouse and move to edit).
> -void Editor_Interactive::set_sel_pos(Widelands::Node_and_Triangle<> const sel) {
> +void EditorInteractive::set_sel_pos(Widelands::NodeAndTriangle<> const sel) {
> bool const target_changed =
> tools.current().operates_on_triangles() ?
> sel.triangle != get_sel_pos().triangle : sel.node != get_sel_pos().node;
> - Interactive_Base::set_sel_pos(sel);
> + InteractiveBase::set_sel_pos(sel);
> if (target_changed && m_left_mouse_button_is_down)
> map_clicked(true);
> }
>
> -void Editor_Interactive::toggle_buildhelp() {
> +void EditorInteractive::toggle_buildhelp() {
> egbase().map().overlay_manager().toggle_buildhelp();
> }
>
>
> -void Editor_Interactive::tool_menu_btn() {
> +void EditorInteractive::tool_menu_btn() {
> if (m_toolmenu.window)
> delete m_toolmenu.window;
> else
> - new Editor_Tool_Menu(*this, m_toolmenu);
> + new EditorToolMenu(*this, m_toolmenu);
> }
>
>
> -void Editor_Interactive::toggle_playermenu() {
> +void EditorInteractive::toggle_playermenu() {
> if (m_playermenu.window)
> delete m_playermenu.window;
> else {
> - select_tool(tools.set_starting_pos, Editor_Tool::First);
> - new Editor_Player_Menu(*this, m_playermenu);
> + select_tool(tools.set_starting_pos, EditorTool::First);
> + new EditorPlayerMenu(*this, m_playermenu);
> }
>
> }
>
> -void Editor_Interactive::toolsize_menu_btn() {
> +void EditorInteractive::toolsize_menu_btn() {
> if (m_toolsizemenu.window)
> delete m_toolsizemenu.window;
> else
> - new Editor_Toolsize_Menu(*this, m_toolsizemenu);
> + new EditorToolsizeMenu(*this, m_toolsizemenu);
> }
>
> -void Editor_Interactive::set_sel_radius_and_update_menu(uint32_t const val) {
> +void EditorInteractive::set_sel_radius_and_update_menu(uint32_t const val) {
> if (tools.current().has_size_one())
> return;
> if (UI::UniqueWindow * const w = m_toolsizemenu.window)
> - ref_cast<Editor_Toolsize_Menu, UI::UniqueWindow>(*w).update(val);
> + ref_cast<EditorToolsizeMenu, UI::UniqueWindow>(*w).update(val);
> else
> set_sel_radius(val);
> }
>
>
> -bool Editor_Interactive::handle_key(bool const down, SDL_keysym const code) {
> - bool handled = Interactive_Base::handle_key(down, code);
> +bool EditorInteractive::handle_key(bool const down, SDL_keysym const code) {
> + bool handled = InteractiveBase::handle_key(down, code);
>
> if (down) {
> // only on down events
> @@ -395,16 +395,16 @@
>
> case SDLK_LSHIFT:
> case SDLK_RSHIFT:
> - if (tools.use_tool == Editor_Tool::First)
> - select_tool(tools.current(), Editor_Tool::Second);
> + if (tools.use_tool == EditorTool::First)
> + select_tool(tools.current(), EditorTool::Second);
> handled = true;
> break;
>
> case SDLK_LALT:
> case SDLK_RALT:
> case SDLK_MODE:
> - if (tools.use_tool == Editor_Tool::First)
> - select_tool(tools.current(), Editor_Tool::Third);
> + if (tools.use_tool == EditorTool::First)
> + select_tool(tools.current(), EditorTool::Third);
> handled = true;
> break;
>
> @@ -415,8 +415,8 @@
>
> case SDLK_c:
> set_display_flag
> - (Interactive_Base::dfShowCensus,
> - !get_display_flag(Interactive_Base::dfShowCensus));
> + (InteractiveBase::dfShowCensus,
> + !get_display_flag(InteractiveBase::dfShowCensus));
> handled = true;
> break;
>
> @@ -431,7 +431,7 @@
> break;
>
> case SDLK_i:
> - select_tool(tools.info, Editor_Tool::First);
> + select_tool(tools.info, EditorTool::First);
> handled = true;
> break;
>
> @@ -442,7 +442,7 @@
>
> case SDLK_l:
> if (code.mod & (KMOD_LCTRL | KMOD_RCTRL))
> - new Main_Menu_Load_Map(*this);
> + new MainMenuLoadMap(*this);
> handled = true;
> break;
>
> @@ -453,7 +453,7 @@
>
> case SDLK_s:
> if (code.mod & (KMOD_LCTRL | KMOD_RCTRL))
> - new Main_Menu_Save_Map(*this);
> + new MainMenuSaveMap(*this);
> handled = true;
> break;
>
> @@ -486,8 +486,8 @@
> case SDLK_LALT:
> case SDLK_RALT:
> case SDLK_MODE:
> - if (tools.use_tool != Editor_Tool::First)
> - select_tool(tools.current(), Editor_Tool::First);
> + if (tools.use_tool != EditorTool::First)
> + select_tool(tools.current(), EditorTool::First);
> handled = true;
> break;
> default:
> @@ -498,9 +498,9 @@
> }
>
>
> -void Editor_Interactive::select_tool
> -(Editor_Tool & primary, Editor_Tool::Tool_Index const which) {
> - if (which == Editor_Tool::First && & primary != tools.current_pointer) {
> +void EditorInteractive::select_tool
> +(EditorTool & primary, EditorTool::ToolIndex const which) {
> + if (which == EditorTool::First && & primary != tools.current_pointer) {
> if (primary.has_size_one())
> set_sel_radius_and_update_menu(0);
> Widelands::Map & map = egbase().map();
> @@ -524,12 +524,12 @@
> *
> * data is a pointer to a tribe (for buildings)
> */
> -void Editor_Interactive::reference_player_tribe
> -(Widelands::Player_Number player, void const * const data) {
> +void EditorInteractive::reference_player_tribe
> +(Widelands::PlayerNumber player, void const * const data) {
> assert(0 < player);
> assert(player <= egbase().map().get_nrplayers());
>
> - Player_References r;
> + PlayerReferences r;
> r.player = player;
> r.object = data;
>
> @@ -537,14 +537,14 @@
> }
>
> /// Unreference !once!, if referenced many times, this will leak a reference.
> -void Editor_Interactive::unreference_player_tribe
> -(Widelands::Player_Number const player, void const * const data) {
> +void EditorInteractive::unreference_player_tribe
> +(Widelands::PlayerNumber const player, void const * const data) {
> assert(player <= egbase().map().get_nrplayers());
> assert(data);
>
> - std::vector<Player_References> & references = m_player_tribe_references;
> - std::vector<Player_References>::iterator it = references.begin();
> - std::vector<Player_References>::const_iterator references_end =
> + std::vector<PlayerReferences> & references = m_player_tribe_references;
> + std::vector<PlayerReferences>::iterator it = references.begin();
> + std::vector<PlayerReferences>::const_iterator references_end =
> references.end();
> if (player) {
> for (; it < references_end; ++it)
> @@ -561,8 +561,8 @@
> ++it;
> }
>
> -bool Editor_Interactive::is_player_tribe_referenced
> -(Widelands::Player_Number const player) {
> +bool EditorInteractive::is_player_tribe_referenced
> +(Widelands::PlayerNumber const player) {
> assert(0 < player);
> assert(player <= egbase().map().get_nrplayers());
>
> @@ -573,9 +573,9 @@
> return false;
> }
>
> -void Editor_Interactive::run_editor(const std::string& filename, const std::string& script_to_run) {
> - Widelands::Editor_Game_Base editor(nullptr);
> - Editor_Interactive eia(editor);
> +void EditorInteractive::run_editor(const std::string& filename, const std::string& script_to_run) {
> + Widelands::EditorGameBase editor(nullptr);
> + EditorInteractive eia(editor);
> editor.set_ibase(&eia); // TODO(unknown): get rid of this
> {
> UI::ProgressWindow loader_ui("pics/editor.jpg");
> @@ -606,7 +606,7 @@
> }
> }
>
> - eia.select_tool(eia.tools.increase_height, Editor_Tool::First);
> + eia.select_tool(eia.tools.increase_height, EditorTool::First);
> editor.postload();
> eia.start();
>
>
> === modified file 'src/editor/editorinteractive.h'
> --- src/editor/editorinteractive.h 2014-07-26 10:43:23 +0000
> +++ src/editor/editorinteractive.h 2014-09-15 07:27:30 +0000
> @@ -37,21 +37,21 @@
> #include "wui/interactive_base.h"
>
> class Editor;
> -class Editor_Tool;
> +class EditorTool;
>
> /**
> * This is the EditorInteractive. It is like the InteractivePlayer class,
> * but for the Editor instead of the game
> */
> -struct Editor_Interactive : public Interactive_Base {
> - friend struct Editor_Tool_Menu;
> +struct EditorInteractive : public InteractiveBase {
> + friend struct EditorToolMenu;
>
> // Runs the Editor via the commandline --editor flag. Will load 'filename' as a
> // map and run 'script_to_run' directly after all initialization is done.
> static void run_editor(const std::string & filename, const std::string& script_to_run);
>
> private:
> - Editor_Interactive(Widelands::Editor_Game_Base &);
> + EditorInteractive(Widelands::EditorGameBase &);
>
> public:
> void register_overlays();
> @@ -62,7 +62,7 @@
> void think() override;
>
> void map_clicked(bool draw = false);
> - void set_sel_pos(Widelands::Node_and_Triangle<>) override;
> + void set_sel_pos(Widelands::NodeAndTriangle<>) override;
> void set_sel_radius_and_update_menu(uint32_t);
>
> // Handle UI elements.
> @@ -74,7 +74,7 @@
> Tools()
> :
> current_pointer(&increase_height),
> - use_tool(Editor_Tool::First),
> + use_tool(EditorTool::First),
> increase_height(decrease_height, set_height),
> noise_height(set_height),
> place_immovable(delete_immovable),
> @@ -82,32 +82,32 @@
> increase_resources(decrease_resources, set_resources),
> set_port_space(unset_port_space)
> {}
> - Editor_Tool & current() const {return *current_pointer;}
> - typedef std::vector<Editor_Tool *> Tool_Vector;
> - //Tool_Vector tools;
> - Editor_Tool * current_pointer;
> - Editor_Tool::Tool_Index use_tool;
> - Editor_Info_Tool info;
> - Editor_Set_Height_Tool set_height;
> - Editor_Decrease_Height_Tool decrease_height;
> - Editor_Increase_Height_Tool increase_height;
> - Editor_Noise_Height_Tool noise_height;
> - Editor_Set_Terrain_Tool set_terrain;
> - Editor_Delete_Immovable_Tool delete_immovable;
> - Editor_Place_Immovable_Tool place_immovable;
> - Editor_Set_Starting_Pos_Tool set_starting_pos;
> - Editor_Delete_Bob_Tool delete_bob;
> - Editor_Place_Bob_Tool place_bob;
> - Editor_Decrease_Resources_Tool decrease_resources;
> - Editor_Set_Resources_Tool set_resources;
> - Editor_Increase_Resources_Tool increase_resources;
> - Editor_Set_Port_Space_Tool set_port_space;
> - Editor_Unset_Port_Space_Tool unset_port_space;
> - Editor_Set_Origin_Tool set_origin;
> - Editor_Make_Infrastructure_Tool make_infrastructure;
> + EditorTool & current() const {return *current_pointer;}
> + using ToolVector = std::vector<EditorTool *>;
> + //ToolVector tools;
> + EditorTool * current_pointer;
> + EditorTool::ToolIndex use_tool;
> + EditorInfoTool info;
> + EditorSetHeightTool set_height;
> + EditorDecreaseHeightTool decrease_height;
> + EditorIncreaseHeightTool increase_height;
> + EditorNoiseHeightTool noise_height;
> + EditorSetTerrainTool set_terrain;
> + EditorDeleteImmovableTool delete_immovable;
> + EditorPlaceImmovableTool place_immovable;
> + EditorSetStartingPosTool set_starting_pos;
> + EditorDeleteBobTool delete_bob;
> + EditorPlaceBobTool place_bob;
> + EditorDecreaseResourcesTool decrease_resources;
> + EditorSetResourcesTool set_resources;
> + EditorIncreaseResourcesTool increase_resources;
> + EditorSetPortSpaceTool set_port_space;
> + EditorUnsetPortSpaceTool unset_port_space;
> + EditorSetOriginTool set_origin;
> + EditorMakeInfrastructureTool make_infrastructure;
> } tools;
>
> - void select_tool(Editor_Tool &, Editor_Tool::Tool_Index);
> + void select_tool(EditorTool &, EditorTool::ToolIndex);
>
> Widelands::Player * get_player() const override {return nullptr;}
>
> @@ -115,9 +115,9 @@
> void exit();
>
> // reference functions
> - void reference_player_tribe(Widelands::Player_Number, void const * const) override;
> - void unreference_player_tribe(Widelands::Player_Number, void const * const);
> - bool is_player_tribe_referenced(Widelands::Player_Number);
> + void reference_player_tribe(Widelands::PlayerNumber, void const * const) override;
> + void unreference_player_tribe(Widelands::PlayerNumber, void const * const);
> + bool is_player_tribe_referenced(Widelands::PlayerNumber);
> void set_need_save(bool const t) {m_need_save = t;}
>
> private:
> @@ -129,16 +129,16 @@
>
> // state variables
> bool m_need_save;
> - struct Player_References {
> + struct PlayerReferences {
> int32_t player;
> void const * object;
> };
> - std::vector<Player_References> m_player_tribe_references;
> + std::vector<PlayerReferences> m_player_tribe_references;
>
> int32_t m_realtime;
> bool m_left_mouse_button_is_down;
>
> - Editor_History m_history;
> + EditorHistory m_history;
>
> UI::UniqueWindow::Registry m_toolmenu;
>
>
> === modified file 'src/editor/map_generator.cc'
> --- src/editor/map_generator.cc 2014-07-25 22:17:48 +0000
> +++ src/editor/map_generator.cc 2014-09-15 07:27:30 +0000
> @@ -40,7 +40,7 @@
>
> namespace Widelands {
>
> -MapGenerator::MapGenerator(Map& map, const UniqueRandomMapInfo& mapInfo, Editor_Game_Base& egbase) :
> +MapGenerator::MapGenerator(Map& map, const UniqueRandomMapInfo& mapInfo, EditorGameBase& egbase) :
> map_(map),
> map_info_(mapInfo),
> egbase_(egbase)
> @@ -126,12 +126,12 @@
> // TODO(unknown): Check how the editor handles this...
>
> const World& world = egbase_.world();
> - Terrain_Index const tix = fc.field->get_terrains().d;
> + TerrainIndex const tix = fc.field->get_terrains().d;
> const TerrainDescription& terrain_description = egbase_.world().terrain_descr(tix);
>
> const auto set_resource_helper = [this, &world, &terrain_description, &fc] (
> const uint32_t random_value, const int valid_resource_index) {
> - const Resource_Index res_idx = terrain_description.get_valid_resource(valid_resource_index);
> + const ResourceIndex res_idx = terrain_description.get_valid_resource(valid_resource_index);
> const uint32_t max_amount = world.get_resource(res_idx)->max_amount();
> uint8_t res_val = static_cast<uint8_t>(random_value / (kMaxElevation / max_amount));
> res_val *= static_cast<uint8_t>(map_info_.resource_amount) + 1;
> @@ -227,8 +227,8 @@
> if (map_info_.islandMode) {
> int32_t const border_dist =
> std::min
> - (std::min<X_Coordinate>(c.x, map_info_.w - c.x),
> - std::min<Y_Coordinate>(c.y, map_info_.h - c.y));
> + (std::min<int16_t>(c.x, map_info_.w - c.x),
> + std::min<int16_t>(c.y, map_info_.h - c.y));
> if (border_dist <= kIslandBorder) {
> res_h =
> static_cast<uint8_t>
> @@ -442,7 +442,7 @@
> terrType: Returns the terrain-Type fpor this triangle
> ===============
> */
> -Terrain_Index MapGenerator::figure_out_terrain
> +TerrainIndex MapGenerator::figure_out_terrain
> (uint32_t * const random2,
> uint32_t * const random3,
> uint32_t * const random4,
> @@ -770,16 +770,16 @@
>
> // Random placement of starting positions
> assert(map_info_.numPlayers);
> - std::vector<Player_Number> pn(map_info_.numPlayers);
> - for (Player_Number n = 1; n <= map_info_.numPlayers; ++n) {
> + std::vector<PlayerNumber> pn(map_info_.numPlayers);
> + for (PlayerNumber n = 1; n <= map_info_.numPlayers; ++n) {
> bool okay = false;
> // This is a kinda dump algorithm -> we generate a random number and increase it until it fits.
> // However it's working and simple ;) - if you've got a better idea, feel free to fix it.
> - Player_Number x = rng.rand() % map_info_.numPlayers;
> + PlayerNumber x = rng.rand() % map_info_.numPlayers;
> while (!okay) {
> okay = true;
> - ++x; // Player_Number begins at 1 not at 0
> - for (Player_Number p = 1; p < n; ++p) {
> + ++x; // PlayerNumber begins at 1 not at 0
> + for (PlayerNumber p = 1; p < n; ++p) {
> if (pn[p - 1] == x) {
> okay = false;
> x = x % map_info_.numPlayers;
> @@ -790,7 +790,7 @@
> pn[n - 1] = x;
> }
>
> - for (Player_Number n = 1; n <= map_info_.numPlayers; ++n) {
> + for (PlayerNumber n = 1; n <= map_info_.numPlayers; ++n) {
> // Set scenario information - needed even if it's not a scenario
> map_.set_scenario_player_name(n, "Random Player");
> map_.set_scenario_player_tribe(n, tribe);
> @@ -1010,7 +1010,7 @@
>
> // Convert amount of resources
> mapInfo_out.resource_amount =
> - static_cast<Widelands::UniqueRandomMapInfo::Resource_Amount>
> + static_cast<Widelands::UniqueRandomMapInfo::ResourceAmount>
> ((nums[6] & 0xc) >> 2);
>
> if
>
> === modified file 'src/editor/map_generator.h'
> --- src/editor/map_generator.h 2014-07-05 16:41:51 +0000
> +++ src/editor/map_generator.h 2014-09-15 07:27:30 +0000
> @@ -30,7 +30,7 @@
> namespace Widelands {
>
> class Map;
> -class Editor_Game_Base;
> +class EditorGameBase;
>
> /**
> * This helper class repesents the complete map initialization
> @@ -43,7 +43,7 @@
> */
> struct UniqueRandomMapInfo {
>
> - enum Resource_Amount
> + enum ResourceAmount
> {
> raLow = 0,
> raMedium = 1,
> @@ -53,13 +53,13 @@
> uint32_t mapNumber;
> uint32_t w;
> uint32_t h;
> - Resource_Amount resource_amount;
> + ResourceAmount resource_amount;
> std::string world_name;
>
> double waterRatio; // How much of the map is water?
> double landRatio; // How much of the map is land?
> double wastelandRatio; // How much of the "land" is wasteland?
> - Player_Number numPlayers; // number of player to generate
> + PlayerNumber numPlayers; // number of player to generate
> bool islandMode; // whether the world will be an island
>
> // other stuff
> @@ -79,7 +79,7 @@
>
> MapGenerator
> (Map & map, const UniqueRandomMapInfo & mapInfo,
> - Editor_Game_Base & egbase);
> + EditorGameBase & egbase);
>
> void create_random_map();
>
> @@ -104,7 +104,7 @@
> static uint32_t * generate_random_value_map
> (uint32_t w, uint32_t h, RNG & rng);
>
> - Terrain_Index figure_out_terrain
> + TerrainIndex figure_out_terrain
> (uint32_t * const random2,
> uint32_t * const random3,
> uint32_t * const random4,
> @@ -116,7 +116,7 @@
> std::unique_ptr<const MapGenInfo> map_gen_info_;
> Map& map_;
> const UniqueRandomMapInfo& map_info_;
> - Editor_Game_Base& egbase_;
> + EditorGameBase& egbase_;
> };
>
> }
>
> === modified file 'src/editor/tools/editor_action_args.h'
> --- src/editor/tools/editor_action_args.h 2014-07-26 16:37:37 +0000
> +++ src/editor/tools/editor_action_args.h 2014-09-15 07:27:30 +0000
> @@ -30,21 +30,21 @@
> class BobDescr;
> } // namespace Widelands
>
> -struct Editor_Interactive;
> -struct Editor_Tool_Action;
> +struct EditorInteractive;
> +struct EditorToolAction;
>
> /// Class to save important and changeable properties of classes needed for actions
> // Implementations in editor_history.cc
> -struct Editor_Action_Args {
> - Editor_Action_Args(Editor_Interactive & base);
> +struct EditorActionArgs {
> + EditorActionArgs(EditorInteractive & base);
>
> // TODO(sirver): This class does its own reference counting. This design is
> // brittle and on a quick overview I have a feeling that it might not be
> // correct.
> - Editor_Action_Args(const Editor_Action_Args&) = default;
> - Editor_Action_Args& operator = (const Editor_Action_Args&) = default;
> + EditorActionArgs(const EditorActionArgs&) = default;
> + EditorActionArgs& operator = (const EditorActionArgs&) = default;
>
> - ~Editor_Action_Args();
> + ~EditorActionArgs();
>
> uint32_t sel_radius;
>
> @@ -56,9 +56,9 @@
> std::list<std::string> oimmov_types; // immovable change tools
> std::list<int32_t> nimmov_types; // immovable change tools
> Widelands::HeightInterval m_interval; // noise hight tool
> - std::list<Widelands::Terrain_Index> terrainType, origTerrainType; // set terrain tool
> + std::list<Widelands::TerrainIndex> terrainType, origTerrainType; // set terrain tool
>
> - std::list<Editor_Tool_Action *> draw_actions; // draw tool
> + std::list<EditorToolAction *> draw_actions; // draw tool
>
> uint32_t refcount;
> };
>
> === modified file 'src/editor/tools/editor_decrease_height_tool.cc'
> --- src/editor/tools/editor_decrease_height_tool.cc 2014-03-01 17:09:07 +0000
> +++ src/editor/tools/editor_decrease_height_tool.cc 2014-09-15 07:27:30 +0000
> @@ -27,11 +27,11 @@
> #include "logic/mapregion.h"
>
> /// Decreases the heights by a value. Chages surrounding nodes if necessary.
> -int32_t Editor_Decrease_Height_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorDecreaseHeightTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> if (args.origHights.empty()) {
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> @@ -47,12 +47,12 @@
> -args.change_by);
> }
>
> -int32_t Editor_Decrease_Height_Tool::handle_undo_impl
> +int32_t EditorDecreaseHeightTool::handle_undo_impl
> (Widelands::Map & map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive & /* parent */,
> - Editor_Action_Args & args)
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive & /* parent */,
> + EditorActionArgs & args)
> {
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> @@ -72,9 +72,9 @@
> return mr.radius() + 1;
> }
>
> -Editor_Action_Args Editor_Decrease_Height_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorDecreaseHeightTool::format_args_impl(EditorInteractive & parent)
> {
> - Editor_Action_Args a(parent);
> + EditorActionArgs a(parent);
> a.change_by = m_change_by;
> return a;
> }
>
> === modified file 'src/editor/tools/editor_decrease_height_tool.h'
> --- src/editor/tools/editor_decrease_height_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_decrease_height_tool.h 2014-09-15 07:27:30 +0000
> @@ -23,22 +23,22 @@
> #include "editor/tools/editor_tool.h"
>
> /// Decreases the height of a node by a value.
> -struct Editor_Decrease_Height_Tool : public Editor_Tool {
> - Editor_Decrease_Height_Tool() : Editor_Tool(*this, *this), m_change_by(1) {}
> +struct EditorDecreaseHeightTool : public EditorTool {
> + EditorDecreaseHeightTool() : EditorTool(*this, *this), m_change_by(1) {}
>
> int32_t handle_click_impl
> (Widelands::Map & map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive & parent, Editor_Action_Args & args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive & parent, EditorActionArgs & args) override;
>
> int32_t handle_undo_impl
> (Widelands::Map & map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive & parent, Editor_Action_Args & args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive & parent, EditorActionArgs & args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {
> return "pics/fsel_editor_decrease_height.png";
>
> === modified file 'src/editor/tools/editor_decrease_resources_tool.cc'
> --- src/editor/tools/editor_decrease_resources_tool.cc 2014-03-23 18:26:08 +0000
> +++ src/editor/tools/editor_decrease_resources_tool.cc 2014-09-15 07:27:30 +0000
> @@ -36,11 +36,11 @@
> * there is not already another resource there.
> */
> int32_t
> -Editor_Decrease_Resources_Tool::handle_click_impl(Widelands::Map& map,
> +EditorDecreaseResourcesTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> Widelands::Area<Widelands::FCoords>
> @@ -82,18 +82,18 @@
> return mr.radius();
> }
>
> -int32_t Editor_Decrease_Resources_Tool::handle_undo_impl(
> +int32_t EditorDecreaseResourcesTool::handle_undo_impl(
> Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> return parent.tools.set_resources.handle_undo_impl(map, world, center, parent, args);
> }
>
> -Editor_Action_Args Editor_Decrease_Resources_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorDecreaseResourcesTool::format_args_impl(EditorInteractive & parent)
> {
> - Editor_Action_Args a(parent);
> + EditorActionArgs a(parent);
> a.change_by = m_change_by;
> a.cur_res = m_cur_res;
> return a;
>
> === modified file 'src/editor/tools/editor_decrease_resources_tool.h'
> --- src/editor/tools/editor_decrease_resources_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_decrease_resources_tool.h 2014-09-15 07:27:30 +0000
> @@ -23,24 +23,24 @@
> #include "editor/tools/editor_tool.h"
>
> /// Decreases the resources of a node by a value.
> -struct Editor_Decrease_Resources_Tool : public Editor_Tool {
> - Editor_Decrease_Resources_Tool()
> - : Editor_Tool(*this, *this), m_cur_res(0), m_change_by(1)
> +struct EditorDecreaseResourcesTool : public EditorTool {
> + EditorDecreaseResourcesTool()
> + : EditorTool(*this, *this), m_cur_res(0), m_change_by(1)
> {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {
> return "pics/fsel_editor_decrease_resources.png";
> @@ -48,13 +48,13 @@
>
> int32_t get_change_by() const {return m_change_by;}
> void set_change_by(const int32_t n) {m_change_by = n;}
> - Widelands::Resource_Index get_cur_res() const {return m_cur_res;}
> - void set_cur_res(Widelands::Resource_Index const res) {
> + Widelands::ResourceIndex get_cur_res() const {return m_cur_res;}
> + void set_cur_res(Widelands::ResourceIndex const res) {
> m_cur_res = res;
> }
>
> private:
> - Widelands::Resource_Index m_cur_res;
> + Widelands::ResourceIndex m_cur_res;
> int32_t m_change_by;
> };
>
>
> === modified file 'src/editor/tools/editor_delete_bob_tool.cc'
> --- src/editor/tools/editor_delete_bob_tool.cc 2014-03-01 17:09:07 +0000
> +++ src/editor/tools/editor_delete_bob_tool.cc 2014-09-15 07:27:30 +0000
> @@ -28,12 +28,12 @@
> * Deletes the bob at the given location
> */
> int32_t
> -Editor_Delete_Bob_Tool::handle_click_impl(Widelands::Map& map,
> +EditorDeleteBobTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World&,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> - Widelands::Editor_Game_Base & egbase = parent.egbase();
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> + Widelands::EditorGameBase & egbase = parent.egbase();
> const int32_t radius = args.sel_radius;
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> @@ -51,18 +51,18 @@
> }
>
> int32_t
> -Editor_Delete_Bob_Tool::handle_undo_impl(Widelands::Map& map,
> +EditorDeleteBobTool::handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
>
> uint32_t ret = parent.tools.place_bob.handle_undo_impl(map, world, center, parent, args);
> args.obob_type.clear();
> return ret;
> }
>
> -Editor_Action_Args Editor_Delete_Bob_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorDeleteBobTool::format_args_impl(EditorInteractive & parent)
> {
> - return Editor_Tool::format_args_impl(parent);
> + return EditorTool::format_args_impl(parent);
> }
>
> === modified file 'src/editor/tools/editor_delete_bob_tool.h'
> --- src/editor/tools/editor_delete_bob_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_delete_bob_tool.h 2014-09-15 07:27:30 +0000
> @@ -23,22 +23,22 @@
> #include "editor/tools/editor_tool.h"
>
> /// Deletes bob from the map.
> -struct Editor_Delete_Bob_Tool : public Editor_Tool {
> - Editor_Delete_Bob_Tool() : Editor_Tool(*this, *this) {}
> +struct EditorDeleteBobTool : public EditorTool {
> + EditorDeleteBobTool() : EditorTool(*this, *this) {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {
> return "pics/fsel_editor_delete.png";
>
> === modified file 'src/editor/tools/editor_delete_immovable_tool.cc'
> --- src/editor/tools/editor_delete_immovable_tool.cc 2014-07-03 19:26:30 +0000
> +++ src/editor/tools/editor_delete_immovable_tool.cc 2014-09-15 07:27:30 +0000
> @@ -28,12 +28,12 @@
> /**
> * Deletes the immovable at the given location
> */
> -int32_t Editor_Delete_Immovable_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorDeleteImmovableTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World&,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> - Widelands::Editor_Game_Base & egbase = parent.egbase();
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> + Widelands::EditorGameBase & egbase = parent.egbase();
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> Widelands::Area<Widelands::FCoords>
> @@ -53,16 +53,16 @@
> return mr.radius() + 2;
> }
>
> -int32_t Editor_Delete_Immovable_Tool::handle_undo_impl(
> +int32_t EditorDeleteImmovableTool::handle_undo_impl(
> Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> return parent.tools.place_immovable.handle_undo_impl(map, world, center, parent, args);
> }
>
> -Editor_Action_Args Editor_Delete_Immovable_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorDeleteImmovableTool::format_args_impl(EditorInteractive & parent)
> {
> - return Editor_Tool::format_args_impl(parent);
> + return EditorTool::format_args_impl(parent);
> }
>
> === modified file 'src/editor/tools/editor_delete_immovable_tool.h'
> --- src/editor/tools/editor_delete_immovable_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_delete_immovable_tool.h 2014-09-15 07:27:30 +0000
> @@ -23,22 +23,22 @@
> #include "editor/tools/editor_tool.h"
>
> /// Deletes immovables from the map.
> -struct Editor_Delete_Immovable_Tool : public Editor_Tool {
> - Editor_Delete_Immovable_Tool() : Editor_Tool(*this, *this) {}
> +struct EditorDeleteImmovableTool : public EditorTool {
> + EditorDeleteImmovableTool() : EditorTool(*this, *this) {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {
> return "pics/fsel_editor_delete.png";
>
> === modified file 'src/editor/tools/editor_draw_tool.cc'
> --- src/editor/tools/editor_draw_tool.cc 2014-07-23 14:49:10 +0000
> +++ src/editor/tools/editor_draw_tool.cc 2014-09-15 07:27:30 +0000
> @@ -27,50 +27,50 @@
> // TODO(unknown): Saving every action in a list isn't very efficient.
> // A long list can take several seconds to undo/redo every action.
> // If someone has a better idea how to do this, implement it!
> -void Editor_Draw_Tool::add_action
> -(Editor_Tool_Action ac, Editor_Action_Args & args)
> +void EditorDrawTool::add_action
> +(EditorToolAction ac, EditorActionArgs & args)
> {
> - args.draw_actions.push_back(new Editor_Tool_Action(ac));
> + args.draw_actions.push_back(new EditorToolAction(ac));
> }
>
> int32_t
> -Editor_Draw_Tool::handle_click_impl(Widelands::Map& /* map */,
> +EditorDrawTool::handle_click_impl(Widelands::Map& /* map */,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<Widelands::Coords> /* center */,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> /* center */,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
>
> for
> - (std::list<Editor_Tool_Action *>::iterator i = args.draw_actions.begin();
> + (std::list<EditorToolAction *>::iterator i = args.draw_actions.begin();
> i != args.draw_actions.end();
> ++i)
> {
> (*i)->tool.handle_click
> - (static_cast<Editor_Tool::Tool_Index>((*i)->i),
> + (static_cast<EditorTool::ToolIndex>((*i)->i),
> (*i)->map, world, (*i)->center, (*i)->parent, *((*i)->args));
> }
> return args.draw_actions.size();
> }
>
> int32_t
> -Editor_Draw_Tool::handle_undo_impl(Widelands::Map& /* map */,
> +EditorDrawTool::handle_undo_impl(Widelands::Map& /* map */,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<Widelands::Coords> /* center */,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> /* center */,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> for
> - (std::list<Editor_Tool_Action *>::reverse_iterator i = args.draw_actions.rbegin();
> + (std::list<EditorToolAction *>::reverse_iterator i = args.draw_actions.rbegin();
> i != args.draw_actions.rend();
> ++i)
> {
> (*i)->tool.handle_undo
> - (static_cast<Editor_Tool::Tool_Index>((*i)->i),
> + (static_cast<EditorTool::ToolIndex>((*i)->i),
> (*i)->map, world, (*i)->center, (*i)->parent, *((*i)->args));
> }
> return args.draw_actions.size();
> }
>
> -Editor_Action_Args Editor_Draw_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorDrawTool::format_args_impl(EditorInteractive & parent)
> {
> - return Editor_Tool::format_args_impl(parent);
> + return EditorTool::format_args_impl(parent);
> }
>
> === modified file 'src/editor/tools/editor_draw_tool.h'
> --- src/editor/tools/editor_draw_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_draw_tool.h 2014-09-15 07:27:30 +0000
> @@ -25,28 +25,28 @@
>
> /// This is not a real editor tool. It serves to combine 'hold down mouse and move'
> /// tool actions in one class.
> -struct Editor_Draw_Tool : public Editor_Tool {
> - Editor_Draw_Tool() : Editor_Tool(*this, *this) {}
> +struct EditorDrawTool : public EditorTool {
> + EditorDrawTool() : EditorTool(*this, *this) {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {
> return "EDITOR_DRAW_TOOL";
> }
>
> - void add_action(Editor_Tool_Action ac, Editor_Action_Args & args);
> + void add_action(EditorToolAction ac, EditorActionArgs & args);
>
> };
>
>
> === modified file 'src/editor/tools/editor_history.cc'
> --- src/editor/tools/editor_history.cc 2014-07-20 07:43:07 +0000
> +++ src/editor/tools/editor_history.cc 2014-09-15 07:27:30 +0000
> @@ -25,9 +25,9 @@
> #include "editor/tools/editor_action_args.h"
> #include "editor/tools/editor_tool_action.h"
>
> -// === Editor_Action_Args === //
> +// === EditorActionArgs === //
>
> -Editor_Action_Args::Editor_Action_Args(Editor_Interactive & base):
> +EditorActionArgs::EditorActionArgs(EditorInteractive & base):
> sel_radius(base.get_sel_radius()),
> change_by(0),
> cur_res(0),
> @@ -36,7 +36,7 @@
> refcount(0)
> {}
>
> -Editor_Action_Args::~Editor_Action_Args()
> +EditorActionArgs::~EditorActionArgs()
> {
> while (!draw_actions.empty()) {
> delete draw_actions.back();
> @@ -53,20 +53,20 @@
> terrainType.clear();
> }
>
> -// === Editor_History === //
> +// === EditorHistory === //
>
> -uint32_t Editor_History::undo_action(const Widelands::World& world) {
> +uint32_t EditorHistory::undo_action(const Widelands::World& world) {
> if (undo_stack.empty())
> return 0;
>
> - Editor_Tool_Action uac = undo_stack.front();
> + EditorToolAction uac = undo_stack.front();
> undo_stack.pop_front();
> redo_stack.push_front(uac);
>
> m_undo_button.set_enabled(!undo_stack.empty());
> m_redo_button.set_enabled(true);
>
> - return uac.tool.handle_undo(static_cast<Editor_Tool::Tool_Index>(uac.i),
> + return uac.tool.handle_undo(static_cast<EditorTool::ToolIndex>(uac.i),
> uac.map,
> world,
> uac.center,
> @@ -74,18 +74,18 @@
> *uac.args);
> }
>
> -uint32_t Editor_History::redo_action(const Widelands::World& world) {
> +uint32_t EditorHistory::redo_action(const Widelands::World& world) {
> if (redo_stack.empty())
> return 0;
>
> - Editor_Tool_Action rac = redo_stack.front();
> + EditorToolAction rac = redo_stack.front();
> redo_stack.pop_front();
> undo_stack.push_front(rac);
>
> m_undo_button.set_enabled(true);
> m_redo_button.set_enabled(!redo_stack.empty());
>
> - return rac.tool.handle_click(static_cast<Editor_Tool::Tool_Index>(rac.i),
> + return rac.tool.handle_click(static_cast<EditorTool::ToolIndex>(rac.i),
> rac.map,
> world,
> rac.center,
> @@ -93,14 +93,14 @@
> *rac.args);
> }
>
> -uint32_t Editor_History::do_action(Editor_Tool& tool,
> - Editor_Tool::Tool_Index ind,
> +uint32_t EditorHistory::do_action(EditorTool& tool,
> + EditorTool::ToolIndex ind,
> Widelands::Map& map,
> const Widelands::World& world,
> - const Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& parent,
> + const Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& parent,
> bool draw) {
> - Editor_Tool_Action ac
> + EditorToolAction ac
> (tool, static_cast<uint32_t>(ind),
> map, center, parent, tool.format_args(ind, parent));
> if (draw && tool.is_unduable()) {
> @@ -108,10 +108,10 @@
> (undo_stack.empty() ||
> undo_stack.front().tool.get_sel_impl() != std::string(m_draw_tool.get_sel_impl()))
> {
> - Editor_Tool_Action da
> - (m_draw_tool, Editor_Tool::First,
> + EditorToolAction da
> + (m_draw_tool, EditorTool::First,
> map, center, parent,
> - m_draw_tool.format_args(Editor_Tool::First, parent));
> + m_draw_tool.format_args(EditorTool::First, parent));
>
> if (!undo_stack.empty()) {
> m_draw_tool.add_action(undo_stack.front(), *da.args);
> @@ -123,7 +123,7 @@
> m_undo_button.set_enabled(true);
> m_redo_button.set_enabled(false);
> }
> - dynamic_cast<Editor_Draw_Tool *>
> + dynamic_cast<EditorDrawTool *>
> (&(undo_stack.front().tool))->add_action(ac, *undo_stack.front().args);
> } else if (tool.is_unduable()) {
> redo_stack.clear();
> @@ -135,7 +135,7 @@
> }
>
>
> -void Editor_History::reset()
> +void EditorHistory::reset()
> {
> undo_stack.clear();
> redo_stack.clear();
>
> === modified file 'src/editor/tools/editor_history.h'
> --- src/editor/tools/editor_history.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_history.h 2014-09-15 07:27:30 +0000
> @@ -25,8 +25,8 @@
> #include "editor/tools/editor_draw_tool.h"
> #include "editor/tools/editor_tool.h"
>
> -//struct Editor_Action_Args;
> -struct Editor_Interactive;
> +//struct EditorActionArgs;
> +struct EditorInteractive;
> namespace UI {struct Button;}
>
> /**
> @@ -34,17 +34,17 @@
> * provide undo / redo functionality.
> * Do all tool action you want to make "undoable" using this class.
> */
> -struct Editor_History {
> +struct EditorHistory {
>
> - Editor_History(UI::Button & undo, UI::Button & redo):
> + EditorHistory(UI::Button & undo, UI::Button & redo):
> m_undo_button(undo), m_redo_button(redo) {}
>
> - uint32_t do_action(Editor_Tool& tool,
> - Editor_Tool::Tool_Index ind,
> + uint32_t do_action(EditorTool& tool,
> + EditorTool::ToolIndex ind,
> Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive& parent,
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive& parent,
> bool draw = false);
> uint32_t undo_action(const Widelands::World& world);
> uint32_t redo_action(const Widelands::World& world);
> @@ -57,10 +57,10 @@
> UI::Button & m_undo_button;
> UI::Button & m_redo_button;
>
> - Editor_Draw_Tool m_draw_tool;
> + EditorDrawTool m_draw_tool;
>
> - std::deque<Editor_Tool_Action> undo_stack;
> - std::deque<Editor_Tool_Action> redo_stack;
> + std::deque<EditorToolAction> undo_stack;
> + std::deque<EditorToolAction> redo_stack;
>
> };
>
>
> === modified file 'src/editor/tools/editor_increase_height_tool.cc'
> --- src/editor/tools/editor_increase_height_tool.cc 2014-03-01 17:09:07 +0000
> +++ src/editor/tools/editor_increase_height_tool.cc 2014-09-15 07:27:30 +0000
> @@ -25,11 +25,11 @@
> #include "logic/mapregion.h"
>
> /// Increases the heights by a value. Chages surrounding nodes if necessary.
> -int32_t Editor_Increase_Height_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorIncreaseHeightTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> if (args.origHights.empty()) {
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords>> mr(
> map,
> @@ -47,17 +47,17 @@
> args.change_by);
> }
>
> -int32_t Editor_Increase_Height_Tool::handle_undo_impl(Widelands::Map& map,
> +int32_t EditorIncreaseHeightTool::handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> return m_decrease_tool.handle_undo_impl(map, world, center, parent, args);
> }
>
> -Editor_Action_Args Editor_Increase_Height_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorIncreaseHeightTool::format_args_impl(EditorInteractive & parent)
> {
> - Editor_Action_Args a(parent);
> + EditorActionArgs a(parent);
> a.change_by = m_change_by;
> return a;
> }
>
> === modified file 'src/editor/tools/editor_increase_height_tool.h'
> --- src/editor/tools/editor_increase_height_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_increase_height_tool.h 2014-09-15 07:27:30 +0000
> @@ -24,29 +24,29 @@
> #include "editor/tools/editor_set_height_tool.h"
>
> /// Increases the height of a field by a value.
> -struct Editor_Increase_Height_Tool : public Editor_Tool {
> - Editor_Increase_Height_Tool
> - (Editor_Decrease_Height_Tool & the_decrease_tool,
> - Editor_Set_Height_Tool & the_set_tool)
> +struct EditorIncreaseHeightTool : public EditorTool {
> + EditorIncreaseHeightTool
> + (EditorDecreaseHeightTool & the_decrease_tool,
> + EditorSetHeightTool & the_set_tool)
> :
> - Editor_Tool(the_decrease_tool, the_set_tool),
> + EditorTool(the_decrease_tool, the_set_tool),
> m_decrease_tool(the_decrease_tool), m_set_tool(the_set_tool),
> m_change_by(1)
> {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {
> return "pics/fsel_editor_increase_height.png";
> @@ -55,14 +55,14 @@
> int32_t get_change_by() const {return m_change_by;}
> void set_change_by(const int32_t n) {m_change_by = n;}
>
> - Editor_Decrease_Height_Tool & decrease_tool() const {
> + EditorDecreaseHeightTool & decrease_tool() const {
> return m_decrease_tool;
> }
> - Editor_Set_Height_Tool & set_tool() const {return m_set_tool;}
> + EditorSetHeightTool & set_tool() const {return m_set_tool;}
>
> private:
> - Editor_Decrease_Height_Tool & m_decrease_tool;
> - Editor_Set_Height_Tool & m_set_tool;
> + EditorDecreaseHeightTool & m_decrease_tool;
> + EditorSetHeightTool & m_set_tool;
> int32_t m_change_by;
> };
>
>
> === modified file 'src/editor/tools/editor_increase_resources_tool.cc'
> --- src/editor/tools/editor_increase_resources_tool.cc 2014-07-20 07:43:07 +0000
> +++ src/editor/tools/editor_increase_resources_tool.cc 2014-09-15 07:27:30 +0000
> @@ -33,7 +33,7 @@
> namespace {
>
> int32_t resource_value(const Widelands::TerrainDescription& terrain,
> - const Widelands::Resource_Index resource) {
> + const Widelands::ResourceIndex resource) {
> if (!terrain.is_resource_valid(resource)) {
> return -1;
> }
> @@ -78,18 +78,18 @@
>
> /*
> ===========
> -Editor_Increase_Resources_Tool::handle_click_impl()
> +EditorIncreaseResourcesTool::handle_click_impl()
>
> increase the resources of the current field by one if
> there is not already another resource there.
> ===========
> */
> int32_t
> -Editor_Increase_Resources_Tool::handle_click_impl(Widelands::Map& map,
> +EditorIncreaseResourcesTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> OverlayManager & overlay_manager = map.overlay_manager();
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> @@ -137,18 +137,18 @@
> return mr.radius();
> }
>
> -int32_t Editor_Increase_Resources_Tool::handle_undo_impl(
> +int32_t EditorIncreaseResourcesTool::handle_undo_impl(
> Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> return m_set_tool.handle_undo_impl(map, world, center, parent, args);
> }
>
> -Editor_Action_Args Editor_Increase_Resources_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorIncreaseResourcesTool::format_args_impl(EditorInteractive & parent)
> {
> - Editor_Action_Args a(parent);
> + EditorActionArgs a(parent);
> a.change_by = m_change_by;
> a.cur_res = m_cur_res;
> return a;
>
> === modified file 'src/editor/tools/editor_increase_resources_tool.h'
> --- src/editor/tools/editor_increase_resources_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_increase_resources_tool.h 2014-09-15 07:27:30 +0000
> @@ -25,10 +25,10 @@
> #include "logic/widelands_geometry.h"
>
> /// Increases the resources of a node by a value.
> -struct Editor_Increase_Resources_Tool : public Editor_Tool {
> - Editor_Increase_Resources_Tool(Editor_Decrease_Resources_Tool& the_decrease_tool,
> - Editor_Set_Resources_Tool& the_set_to_tool)
> - : Editor_Tool(the_decrease_tool, the_set_to_tool),
> +struct EditorIncreaseResourcesTool : public EditorTool {
> + EditorIncreaseResourcesTool(EditorDecreaseResourcesTool& the_decrease_tool,
> + EditorSetResourcesTool& the_set_to_tool)
> + : EditorTool(the_decrease_tool, the_set_to_tool),
> m_decrease_tool(the_decrease_tool),
> m_set_tool(the_set_to_tool),
> m_change_by(1),
> @@ -37,17 +37,17 @@
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {
> return "pics/fsel_editor_increase_resources.png";
> @@ -55,21 +55,21 @@
>
> int32_t get_change_by() const {return m_change_by;}
> void set_change_by(const int32_t n) {m_change_by = n;}
> - Widelands::Resource_Index get_cur_res() const {return m_cur_res;}
> - void set_cur_res(Widelands::Resource_Index const res) {
> + Widelands::ResourceIndex get_cur_res() const {return m_cur_res;}
> + void set_cur_res(Widelands::ResourceIndex const res) {
> m_cur_res = res;
> }
>
> - Editor_Decrease_Resources_Tool & decrease_tool() const {
> + EditorDecreaseResourcesTool & decrease_tool() const {
> return m_decrease_tool;
> }
> - Editor_Set_Resources_Tool & set_tool() const {return m_set_tool;}
> + EditorSetResourcesTool & set_tool() const {return m_set_tool;}
>
> private:
> - Editor_Decrease_Resources_Tool & m_decrease_tool;
> - Editor_Set_Resources_Tool& m_set_tool;
> + EditorDecreaseResourcesTool & m_decrease_tool;
> + EditorSetResourcesTool& m_set_tool;
> int32_t m_change_by;
> - Widelands::Resource_Index m_cur_res;
> + Widelands::ResourceIndex m_cur_res;
> };
>
> int32_t Editor_Change_Resource_Tool_Callback
>
> === modified file 'src/editor/tools/editor_info_tool.cc'
> --- src/editor/tools/editor_info_tool.cc 2014-07-14 10:45:44 +0000
> +++ src/editor/tools/editor_info_tool.cc 2014-09-15 07:27:30 +0000
> @@ -32,17 +32,17 @@
> #include "ui_basic/window.h"
>
> /// Show a window with information about the pointed at node and triangle.
> -int32_t Editor_Info_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorInfoTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& /* args */) {
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& /* args */) {
> UI::Window * const w =
> new UI::Window
> (&parent, "field_information", 30, 30, 400, 200,
> _("Field Information"));
> - UI::Multiline_Textarea * const multiline_textarea =
> - new UI::Multiline_Textarea
> + UI::MultilineTextarea * const multiline_textarea =
> + new UI::MultilineTextarea
> (w, 0, 0, w->get_inner_w(), w->get_inner_h());
>
> Widelands::Field & f = map[center.node];
> @@ -105,7 +105,7 @@
> // *** Resources info
> buf += std::string("\n") + _("Resources:") + "\n";
>
> - Widelands::Resource_Index ridx = f.get_resources();
> + Widelands::ResourceIndex ridx = f.get_resources();
> int ramount = f.get_resources_amount();
>
> if (ramount > 0) {
>
> === modified file 'src/editor/tools/editor_info_tool.h'
> --- src/editor/tools/editor_info_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_info_tool.h 2014-09-15 07:27:30 +0000
> @@ -23,15 +23,15 @@
> #include "editor/tools/editor_tool.h"
>
> /// A simple tool to show information about the clicked node.
> -struct Editor_Info_Tool : public Editor_Tool {
> - Editor_Info_Tool() : Editor_Tool(*this, *this, false) {
> +struct EditorInfoTool : public EditorTool {
> + EditorInfoTool() : EditorTool(*this, *this, false) {
> }
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> char const* get_sel_impl() const override {
> return "pics/fsel_editor_info.png";
>
> === modified file 'src/editor/tools/editor_make_infrastructure_tool.cc'
> --- src/editor/tools/editor_make_infrastructure_tool.cc 2014-03-09 19:29:08 +0000
> +++ src/editor/tools/editor_make_infrastructure_tool.cc 2014-09-15 07:27:30 +0000
> @@ -33,7 +33,7 @@
> int32_t
> Editor_Make_Infrastructure_Tool_Callback
> (const Widelands::TCoords<Widelands::FCoords>& c,
> - Widelands::Editor_Game_Base& egbase,
> + Widelands::EditorGameBase& egbase,
> int32_t const player)
> {
> return egbase.player(player).get_buildcaps(c);
> @@ -46,11 +46,11 @@
> *
> * Obviously, this function ignores the sel radius
> */
> -int32_t Editor_Make_Infrastructure_Tool::handle_click_impl(Widelands::Map&,
> +int32_t EditorMakeInfrastructureTool::handle_click_impl(Widelands::Map&,
> const Widelands::World&,
> - Widelands::Node_and_Triangle<> const,
> - Editor_Interactive& parent,
> - Editor_Action_Args& /* args */) {
> + Widelands::NodeAndTriangle<> const,
> + EditorInteractive& parent,
> + EditorActionArgs& /* args */) {
> show_field_action
> (&parent, parent.egbase().get_player(m_player), &m_registry);
>
>
> === modified file 'src/editor/tools/editor_make_infrastructure_tool.h'
> --- src/editor/tools/editor_make_infrastructure_tool.h 2014-07-23 14:49:10 +0000
> +++ src/editor/tools/editor_make_infrastructure_tool.h 2014-09-15 07:27:30 +0000
> @@ -24,37 +24,37 @@
> #include "ui_basic/unique_window.h"
>
> namespace Widelands {
> -class Editor_Game_Base;
> +class EditorGameBase;
> } // namespace Widelands
>
> /**
> * This places immovables on the map
> */
> // TODO(unknown): Implement undo for this tool
> -struct Editor_Make_Infrastructure_Tool : public Editor_Tool {
> - Editor_Make_Infrastructure_Tool() : Editor_Tool(*this, *this, false), m_player(0) {}
> +struct EditorMakeInfrastructureTool : public EditorTool {
> + EditorMakeInfrastructureTool() : EditorTool(*this, *this, false), m_player(0) {}
>
> - void set_player(Widelands::Player_Number const n)
> + void set_player(Widelands::PlayerNumber const n)
> {m_player = n;}
> - Widelands::Player_Number get_player() const
> + Widelands::PlayerNumber get_player() const
> {return m_player;}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> const char * get_sel_impl() const override
> {return "pics/fsel.png";} // Standard sel icon, most complex tool of all
>
> private:
> - Widelands::Player_Number m_player;
> + Widelands::PlayerNumber m_player;
> UI::UniqueWindow::Registry m_registry;
> };
>
> int32_t Editor_Make_Infrastructure_Tool_Callback
> (const Widelands::TCoords<Widelands::FCoords>& c,
> - Widelands::Editor_Game_Base& egbase, int32_t const player);
> + Widelands::EditorGameBase& egbase, int32_t const player);
>
> #endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_MAKE_INFRASTRUCTURE_TOOL_H
>
> === modified file 'src/editor/tools/editor_noise_height_tool.cc'
> --- src/editor/tools/editor_noise_height_tool.cc 2014-03-01 17:09:07 +0000
> +++ src/editor/tools/editor_noise_height_tool.cc 2014-09-15 07:27:30 +0000
> @@ -27,11 +27,11 @@
> #include "logic/mapregion.h"
>
> /// Sets the heights to random values. Changes surrounding nodes if necessary.
> -int32_t Editor_Noise_Height_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorNoiseHeightTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> if (args.origHights.empty()) {
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> @@ -62,17 +62,17 @@
> }
>
> int32_t
> -Editor_Noise_Height_Tool::handle_undo_impl(Widelands::Map& map,
> +EditorNoiseHeightTool::handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> return m_set_tool.handle_undo_impl(map, world, center, parent, args);
> }
>
> -Editor_Action_Args Editor_Noise_Height_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorNoiseHeightTool::format_args_impl(EditorInteractive & parent)
> {
> - Editor_Action_Args a(parent);
> + EditorActionArgs a(parent);
> a.m_interval = m_interval;
> return a;
> }
>
> === modified file 'src/editor/tools/editor_noise_height_tool.h'
> --- src/editor/tools/editor_noise_height_tool.h 2014-07-26 16:37:37 +0000
> +++ src/editor/tools/editor_noise_height_tool.h 2014-09-15 07:27:30 +0000
> @@ -23,30 +23,30 @@
> #include "editor/tools/editor_set_height_tool.h"
>
> /// Set the height of a node to a random value within a defined interval.
> -struct Editor_Noise_Height_Tool : public Editor_Tool {
> - Editor_Noise_Height_Tool
> - (Editor_Set_Height_Tool & the_set_tool,
> +struct EditorNoiseHeightTool : public EditorTool {
> + EditorNoiseHeightTool
> + (EditorSetHeightTool & the_set_tool,
> const Widelands::HeightInterval the_interval =
> Widelands::HeightInterval(10, 14))
> :
> - Editor_Tool(the_set_tool, the_set_tool),
> + EditorTool(the_set_tool, the_set_tool),
> m_set_tool(the_set_tool),
> m_interval(the_interval)
> {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {
> return "pics/fsel_editor_noise_height.png";
> @@ -59,10 +59,10 @@
> m_interval = i;
> }
>
> - Editor_Set_Height_Tool & set_tool() const {return m_set_tool;}
> + EditorSetHeightTool & set_tool() const {return m_set_tool;}
>
> private:
> - Editor_Set_Height_Tool & m_set_tool;
> + EditorSetHeightTool & m_set_tool;
> Widelands::HeightInterval m_interval;
> };
>
>
> === modified file 'src/editor/tools/editor_place_bob_tool.cc'
> --- src/editor/tools/editor_place_bob_tool.cc 2014-07-20 07:43:07 +0000
> +++ src/editor/tools/editor_place_bob_tool.cc 2014-09-15 07:27:30 +0000
> @@ -30,11 +30,11 @@
> * Choses an object to place randomly from all enabled
> * and places this on the current field
> */
> -int32_t Editor_Place_Bob_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorPlaceBobTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
>
> if (get_nr_enabled() && args.obob_type.empty()) {
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> @@ -49,7 +49,7 @@
> }
>
> if (!args.nbob_type.empty()) {
> - Widelands::Editor_Game_Base & egbase = parent.egbase();
> + Widelands::EditorGameBase & egbase = parent.egbase();
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> Widelands::Area<Widelands::FCoords>
> @@ -70,13 +70,13 @@
> }
>
> int32_t
> -Editor_Place_Bob_Tool::handle_undo_impl(Widelands::Map& map,
> +EditorPlaceBobTool::handle_undo_impl(Widelands::Map& map,
> const Widelands::World&,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> if (!args.nbob_type.empty()) {
> - Widelands::Editor_Game_Base & egbase = parent.egbase();
> + Widelands::EditorGameBase & egbase = parent.egbase();
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> Widelands::Area<Widelands::FCoords>
> @@ -100,7 +100,7 @@
> return 0;
> }
>
> -Editor_Action_Args Editor_Place_Bob_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorPlaceBobTool::format_args_impl(EditorInteractive & parent)
> {
> - return Editor_Tool::format_args_impl(parent);
> + return EditorTool::format_args_impl(parent);
> }
>
> === modified file 'src/editor/tools/editor_place_bob_tool.h'
> --- src/editor/tools/editor_place_bob_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_place_bob_tool.h 2014-09-15 07:27:30 +0000
> @@ -24,24 +24,24 @@
> #include "editor/tools/multi_select.h"
>
> /// Places bobs on the map.
> -struct Editor_Place_Bob_Tool : public Editor_Tool, public MultiSelect {
> - Editor_Place_Bob_Tool(Editor_Delete_Bob_Tool & tool)
> - : Editor_Tool(tool, tool)
> +struct EditorPlaceBobTool : public EditorTool, public MultiSelect {
> + EditorPlaceBobTool(EditorDeleteBobTool & tool)
> + : EditorTool(tool, tool)
> {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {return "pics/fsel_editor_place_bob.png";}
> };
>
> === modified file 'src/editor/tools/editor_place_immovable_tool.cc'
> --- src/editor/tools/editor_place_immovable_tool.cc 2014-07-20 07:43:07 +0000
> +++ src/editor/tools/editor_place_immovable_tool.cc 2014-09-15 07:27:30 +0000
> @@ -32,15 +32,15 @@
> * Choses an object to place randomly from all enabled
> * and places this on the current field
> */
> -int32_t Editor_Place_Immovable_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorPlaceImmovableTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World&,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> const int32_t radius = args.sel_radius;
> if (!get_nr_enabled())
> return radius;
> - Widelands::Editor_Game_Base & egbase = parent.egbase();
> + Widelands::EditorGameBase & egbase = parent.egbase();
> if (args.oimmov_types.empty())
> {
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> @@ -73,17 +73,17 @@
> return radius + 2;
> }
>
> -int32_t Editor_Place_Immovable_Tool::handle_undo_impl(
> +int32_t EditorPlaceImmovableTool::handle_undo_impl(
> Widelands::Map& map,
> const Widelands::World&,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> const int32_t radius = args.sel_radius;
> if (args.oimmov_types.empty())
> return radius;
>
> - Widelands::Editor_Game_Base & egbase = parent.egbase();
> + Widelands::EditorGameBase & egbase = parent.egbase();
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> Widelands::Area<Widelands::FCoords>
> @@ -104,7 +104,7 @@
> return radius + 2;
> }
>
> -Editor_Action_Args Editor_Place_Immovable_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorPlaceImmovableTool::format_args_impl(EditorInteractive & parent)
> {
> - return Editor_Tool::format_args_impl(parent);
> + return EditorTool::format_args_impl(parent);
> }
>
> === modified file 'src/editor/tools/editor_place_immovable_tool.h'
> --- src/editor/tools/editor_place_immovable_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_place_immovable_tool.h 2014-09-15 07:27:30 +0000
> @@ -26,24 +26,24 @@
> /**
> * This places immovables on the map
> */
> -struct Editor_Place_Immovable_Tool : public Editor_Tool, public MultiSelect {
> - Editor_Place_Immovable_Tool(Editor_Delete_Immovable_Tool & tool)
> - : Editor_Tool(tool, tool)
> +struct EditorPlaceImmovableTool : public EditorTool, public MultiSelect {
> + EditorPlaceImmovableTool(EditorDeleteImmovableTool & tool)
> + : EditorTool(tool, tool)
> {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {
> return "pics/fsel_editor_place_immovable.png";
>
> === modified file 'src/editor/tools/editor_set_height_tool.cc'
> --- src/editor/tools/editor_set_height_tool.cc 2014-03-01 17:09:07 +0000
> +++ src/editor/tools/editor_set_height_tool.cc 2014-09-15 07:27:30 +0000
> @@ -26,11 +26,11 @@
> #include "logic/map.h"
> #include "logic/mapregion.h"
>
> -int32_t Editor_Set_Height_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorSetHeightTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> if (args.origHights.empty())
> {
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> @@ -47,11 +47,11 @@
> }
>
> int32_t
> -Editor_Set_Height_Tool::handle_undo_impl(Widelands::Map& map,
> +EditorSetHeightTool::handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> Widelands::Area<Widelands::FCoords>
> @@ -72,9 +72,9 @@
> return mr.radius() + 1;
> }
>
> -Editor_Action_Args Editor_Set_Height_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorSetHeightTool::format_args_impl(EditorInteractive & parent)
> {
> - Editor_Action_Args a(parent);
> + EditorActionArgs a(parent);
> a.m_interval = m_interval;
> return a;
> }
>
> === modified file 'src/editor/tools/editor_set_height_tool.h'
> --- src/editor/tools/editor_set_height_tool.h 2014-07-26 16:37:37 +0000
> +++ src/editor/tools/editor_set_height_tool.h 2014-09-15 07:27:30 +0000
> @@ -25,24 +25,24 @@
> #include "logic/field.h"
>
> /// Ensures that the height of a node is within an interval.
> -struct Editor_Set_Height_Tool : public Editor_Tool {
> - Editor_Set_Height_Tool()
> - : Editor_Tool(*this, *this), m_interval(10, 10)
> +struct EditorSetHeightTool : public EditorTool {
> + EditorSetHeightTool()
> + : EditorTool(*this, *this), m_interval(10, 10)
> {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {
> return "pics/fsel_editor_set_height.png";
>
> === modified file 'src/editor/tools/editor_set_origin_tool.cc'
> --- src/editor/tools/editor_set_origin_tool.cc 2014-03-09 19:29:08 +0000
> +++ src/editor/tools/editor_set_origin_tool.cc 2014-09-15 07:27:30 +0000
> @@ -24,11 +24,11 @@
> #include "wui/mapviewpixelconstants.h"
> #include "wui/overlay_manager.h"
>
> -int32_t Editor_Set_Origin_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorSetOriginTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World&,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive& eia,
> - Editor_Action_Args& /* args */) {
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive& eia,
> + EditorActionArgs& /* args */) {
> map.set_origin(center.node);
> eia.register_overlays();
> eia.set_rel_viewpoint
> @@ -40,11 +40,11 @@
> }
>
> int32_t
> -Editor_Set_Origin_Tool::handle_undo_impl(Widelands::Map& map,
> +EditorSetOriginTool::handle_undo_impl(Widelands::Map& map,
> const Widelands::World&,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& /* args */) {
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& parent,
> + EditorActionArgs& /* args */) {
> Widelands::Coords nc
> (map.get_width() - center.node.x,
> map.get_height() - center.node.y);
> @@ -58,7 +58,7 @@
> return 0;
> }
>
> -Editor_Action_Args Editor_Set_Origin_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorSetOriginTool::format_args_impl(EditorInteractive & parent)
> {
> - return Editor_Tool::format_args_impl(parent);
> + return EditorTool::format_args_impl(parent);
> }
>
> === modified file 'src/editor/tools/editor_set_origin_tool.h'
> --- src/editor/tools/editor_set_origin_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_set_origin_tool.h 2014-09-15 07:27:30 +0000
> @@ -24,22 +24,22 @@
> #include "logic/widelands.h"
>
> /// Sets the starting position of players.
> -struct Editor_Set_Origin_Tool : public Editor_Tool {
> - Editor_Set_Origin_Tool() : Editor_Tool(*this, *this) {}
> +struct EditorSetOriginTool : public EditorTool {
> + EditorSetOriginTool() : EditorTool(*this, *this) {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& eia,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& eia,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {return "pics/fsel.png";}
>
>
> === modified file 'src/editor/tools/editor_set_port_space_tool.cc'
> --- src/editor/tools/editor_set_port_space_tool.cc 2014-03-09 19:29:08 +0000
> +++ src/editor/tools/editor_set_port_space_tool.cc 2014-09-15 07:27:30 +0000
> @@ -43,23 +43,23 @@
> }
>
>
> -Editor_Set_Port_Space_Tool::Editor_Set_Port_Space_Tool
> -(Editor_Unset_Port_Space_Tool & the_unset_tool)
> - :
> - Editor_Tool(the_unset_tool, *this)
> -{}
> -
> -
> -Editor_Unset_Port_Space_Tool::Editor_Unset_Port_Space_Tool()
> - :
> - Editor_Tool(*this, *this)
> -{}
> -
> -int32_t Editor_Set_Port_Space_Tool::handle_click_impl(Map& map,
> +EditorSetPortSpaceTool::EditorSetPortSpaceTool
> +(EditorUnsetPortSpaceTool & the_unset_tool)
> + :
> + EditorTool(the_unset_tool, *this)
> +{}
> +
> +
> +EditorUnsetPortSpaceTool::EditorUnsetPortSpaceTool()
> + :
> + EditorTool(*this, *this)
> +{}
> +
> +int32_t EditorSetPortSpaceTool::handle_click_impl(Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive&,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive&,
> + EditorActionArgs& args) {
> assert(0 <= center.node.x);
> assert(center.node.x < map.get_width());
> assert(0 <= center.node.y);
> @@ -82,19 +82,19 @@
> return nr;
> }
>
> -int32_t Editor_Set_Port_Space_Tool::handle_undo_impl(Map& map,
> +int32_t EditorSetPortSpaceTool::handle_undo_impl(Map& map,
> const Widelands::World& world,
> - Node_and_Triangle<Coords> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + NodeAndTriangle<Coords> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> return parent.tools.unset_port_space.handle_click_impl(map, world, center, parent, args);
> }
>
> -int32_t Editor_Unset_Port_Space_Tool::handle_click_impl(Map& map,
> +int32_t EditorUnsetPortSpaceTool::handle_click_impl(Map& map,
> const Widelands::World& world,
> - Node_and_Triangle<> const center,
> - Editor_Interactive&,
> - Editor_Action_Args& args) {
> + NodeAndTriangle<> const center,
> + EditorInteractive&,
> + EditorActionArgs& args) {
> assert(0 <= center.node.x);
> assert(center.node.x < map.get_width());
> assert(0 <= center.node.y);
> @@ -117,10 +117,10 @@
> return nr;
> }
>
> -int32_t Editor_Unset_Port_Space_Tool::handle_undo_impl(Map& map,
> +int32_t EditorUnsetPortSpaceTool::handle_undo_impl(Map& map,
> const Widelands::World& world,
> - Node_and_Triangle<Coords> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) {
> + NodeAndTriangle<Coords> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) {
> return parent.tools.set_port_space.handle_click_impl(map, world, center, parent, args);
> }
>
> === modified file 'src/editor/tools/editor_set_port_space_tool.h'
> --- src/editor/tools/editor_set_port_space_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_set_port_space_tool.h 2014-09-15 07:27:30 +0000
> @@ -27,42 +27,42 @@
> #define FSEL_EUPS_FILENAME "pics/fsel_editor_unset_port_space.png"
>
> /// Unsets a buildspace for ports.
> -class Editor_Unset_Port_Space_Tool : public Editor_Tool {
> +class EditorUnsetPortSpaceTool : public EditorTool {
> public:
> - Editor_Unset_Port_Space_Tool();
> + EditorUnsetPortSpaceTool();
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> char const * get_sel_impl() const override {return FSEL_EUPS_FILENAME;}
> };
>
>
> /// Sets a buildspace for ports.
> -class Editor_Set_Port_Space_Tool : public Editor_Tool {
> +class EditorSetPortSpaceTool : public EditorTool {
> public:
> - Editor_Set_Port_Space_Tool(Editor_Unset_Port_Space_Tool &);
> + EditorSetPortSpaceTool(EditorUnsetPortSpaceTool &);
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> char const * get_sel_impl() const override {return FSEL_ESPS_FILENAME;}
> };
>
> === modified file 'src/editor/tools/editor_set_resources_tool.cc'
> --- src/editor/tools/editor_set_resources_tool.cc 2014-07-20 07:43:07 +0000
> +++ src/editor/tools/editor_set_resources_tool.cc 2014-09-15 07:27:30 +0000
> @@ -32,11 +32,11 @@
> /**
> * Sets the resources of the current to a fixed value
> */
> -int32_t Editor_Set_Resources_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorSetResourcesTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> OverlayManager & overlay_manager = map.overlay_manager();
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> @@ -79,11 +79,11 @@
> }
>
> int32_t
> -Editor_Set_Resources_Tool::handle_undo_impl(Widelands::Map& map,
> +EditorSetResourcesTool::handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> OverlayManager & overlay_manager = map.overlay_manager();
> Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
> (map,
> @@ -124,9 +124,9 @@
> return mr.radius();
> }
>
> -Editor_Action_Args Editor_Set_Resources_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorSetResourcesTool::format_args_impl(EditorInteractive & parent)
> {
> - Editor_Action_Args a(parent);
> + EditorActionArgs a(parent);
> a.cur_res = m_cur_res;
> a.set_to = m_set_to;
> return a;
>
> === modified file 'src/editor/tools/editor_set_resources_tool.h'
> --- src/editor/tools/editor_set_resources_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_set_resources_tool.h 2014-09-15 07:27:30 +0000
> @@ -23,24 +23,24 @@
> #include "editor/tools/editor_tool.h"
>
> /// Decreases the resources of a node by a value.
> -struct Editor_Set_Resources_Tool : public Editor_Tool {
> - Editor_Set_Resources_Tool()
> - : Editor_Tool(*this, *this), m_cur_res(0), m_set_to(0)
> +struct EditorSetResourcesTool : public EditorTool {
> + EditorSetResourcesTool()
> + : EditorTool(*this, *this), m_cur_res(0), m_set_to(0)
> {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {
> return "pics/fsel_editor_set_resources.png";
> @@ -48,12 +48,12 @@
>
> uint8_t get_set_to() const {return m_set_to;}
> void set_set_to(uint8_t const n) {m_set_to = n;}
> - Widelands::Resource_Index get_cur_res() const {return m_cur_res;}
> - void set_cur_res(Widelands::Resource_Index const res)
> + Widelands::ResourceIndex get_cur_res() const {return m_cur_res;}
> + void set_cur_res(Widelands::ResourceIndex const res)
> {m_cur_res = res;}
>
> private:
> - Widelands::Resource_Index m_cur_res;
> + Widelands::ResourceIndex m_cur_res;
> uint8_t m_set_to;
> };
>
>
> === modified file 'src/editor/tools/editor_set_starting_pos_tool.cc'
> --- src/editor/tools/editor_set_starting_pos_tool.cc 2014-06-05 05:40:53 +0000
> +++ src/editor/tools/editor_set_starting_pos_tool.cc 2014-09-15 07:27:30 +0000
> @@ -36,8 +36,8 @@
> (const Widelands::TCoords<Widelands::FCoords>& c, Widelands::Map& map)
> {
> // Area around already placed players
> - Widelands::Player_Number const nr_players = map.get_nrplayers();
> - for (Widelands::Player_Number p = 1, last = m_current_player - 1;; ++p) {
> + Widelands::PlayerNumber const nr_players = map.get_nrplayers();
> + for (Widelands::PlayerNumber p = 1, last = m_current_player - 1;; ++p) {
> for (; p <= last; ++p)
> if (Widelands::Coords const sp = map.get_starting_pos(p))
> if (map.calc_distance(sp, c) < MIN_PLACE_AROUND_PLAYERS)
> @@ -55,18 +55,18 @@
> return 0;
> }
>
> -Editor_Set_Starting_Pos_Tool::Editor_Set_Starting_Pos_Tool()
> - : Editor_Tool(*this, *this, false), m_current_sel_pic(nullptr)
> +EditorSetStartingPosTool::EditorSetStartingPosTool()
> + : EditorTool(*this, *this, false), m_current_sel_pic(nullptr)
> {
> m_current_player = 0;
> strcpy(fsel_picsname, FSEL_PIC_FILENAME);
> }
>
> -int32_t Editor_Set_Starting_Pos_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorSetStartingPosTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World&,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive&,
> - Editor_Action_Args&) {
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive&,
> + EditorActionArgs&) {
> assert(0 <= center.node.x);
> assert(center.node.x < map.get_width());
> assert(0 <= center.node.y);
> @@ -105,14 +105,14 @@
> return 1;
> }
>
> -Widelands::Player_Number Editor_Set_Starting_Pos_Tool::get_current_player
> +Widelands::PlayerNumber EditorSetStartingPosTool::get_current_player
> () const
> {
> return m_current_player;
> }
>
>
> -void Editor_Set_Starting_Pos_Tool::set_current_player(int32_t const i) {
> +void EditorSetStartingPosTool::set_current_player(int32_t const i) {
> m_current_player = i;
>
> fsel_picsname[28] = '0' + m_current_player / 10;
>
> === modified file 'src/editor/tools/editor_set_starting_pos_tool.h'
> --- src/editor/tools/editor_set_starting_pos_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_set_starting_pos_tool.h 2014-09-15 07:27:30 +0000
> @@ -31,18 +31,18 @@
> #define FSEL_PIC_FILENAME "pics/fsel_editor_set_player_00_pos.png"
>
> /// Sets the starting position of players.
> -struct Editor_Set_Starting_Pos_Tool : public Editor_Tool {
> - Editor_Set_Starting_Pos_Tool();
> +struct EditorSetStartingPosTool : public EditorTool {
> + EditorSetStartingPosTool();
>
> int32_t handle_click_impl(Widelands::Map&,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<>,
> - Editor_Interactive&,
> - Editor_Action_Args&) override;
> + Widelands::NodeAndTriangle<>,
> + EditorInteractive&,
> + EditorActionArgs&) override;
> char const * get_sel_impl() const override
> {return m_current_sel_pic;}
>
> - Widelands::Player_Number get_current_player() const;
> + Widelands::PlayerNumber get_current_player() const;
> void set_current_player(int32_t);
> bool has_size_one() const override {return true;}
>
>
> === modified file 'src/editor/tools/editor_set_terrain_tool.cc'
> --- src/editor/tools/editor_set_terrain_tool.cc 2014-07-20 07:43:07 +0000
> +++ src/editor/tools/editor_set_terrain_tool.cc 2014-09-15 07:27:30 +0000
> @@ -25,11 +25,11 @@
>
> using Widelands::TCoords;
>
> -int32_t Editor_Set_Terrain_Tool::handle_click_impl(Widelands::Map& map,
> +int32_t EditorSetTerrainTool::handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<> const center,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> assert
> (center.triangle.t == TCoords<>::D || center.triangle.t == TCoords<>::R);
> uint16_t const radius = args.sel_radius;
> @@ -57,7 +57,7 @@
> (Widelands::FCoords(map.get_fcoords(center.triangle)),
> static_cast<TCoords<Widelands::FCoords>::TriangleIndex>(center.triangle.t)),
> radius));
> - std::list<Widelands::Terrain_Index>::iterator i = args.terrainType.begin();
> + std::list<Widelands::TerrainIndex>::iterator i = args.terrainType.begin();
> do {
> max = std::max
> (max, map.change_terrain(world, mr.location(), *i));
> @@ -68,11 +68,11 @@
> }
>
> int32_t
> -Editor_Set_Terrain_Tool::handle_undo_impl(Widelands::Map& map,
> +EditorSetTerrainTool::handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<Widelands::Coords> center,
> - Editor_Interactive& /* parent */,
> - Editor_Action_Args& args) {
> + Widelands::NodeAndTriangle<Widelands::Coords> center,
> + EditorInteractive& /* parent */,
> + EditorActionArgs& args) {
> assert
> (center.triangle.t == TCoords<>::D || center.triangle.t == TCoords<>::R);
> uint16_t const radius = args.sel_radius;
> @@ -87,7 +87,7 @@
> (center.triangle.t)),
> radius));
>
> - std::list<Widelands::Terrain_Index>::iterator i = args.origTerrainType.begin();
> + std::list<Widelands::TerrainIndex>::iterator i = args.origTerrainType.begin();
> do {
> max = std::max
> (max, map.change_terrain(world, mr.location(), *i));
> @@ -97,7 +97,7 @@
> } else return radius;
> }
>
> -Editor_Action_Args Editor_Set_Terrain_Tool::format_args_impl(Editor_Interactive & parent)
> +EditorActionArgs EditorSetTerrainTool::format_args_impl(EditorInteractive & parent)
> {
> - return Editor_Tool::format_args_impl(parent);
> + return EditorTool::format_args_impl(parent);
> }
>
> === modified file 'src/editor/tools/editor_set_terrain_tool.h'
> --- src/editor/tools/editor_set_terrain_tool.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_set_terrain_tool.h 2014-09-15 07:27:30 +0000
> @@ -23,22 +23,22 @@
> #include "editor/tools/editor_tool.h"
> #include "editor/tools/multi_select.h"
>
> -struct Editor_Set_Terrain_Tool : public Editor_Tool, public MultiSelect {
> - Editor_Set_Terrain_Tool() : Editor_Tool(*this, *this) {}
> +struct EditorSetTerrainTool : public EditorTool, public MultiSelect {
> + EditorSetTerrainTool() : EditorTool(*this, *this) {}
>
> int32_t handle_click_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> int32_t handle_undo_impl(Widelands::Map& map,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<> center,
> - Editor_Interactive& parent,
> - Editor_Action_Args& args) override;
> + Widelands::NodeAndTriangle<> center,
> + EditorInteractive& parent,
> + EditorActionArgs& args) override;
>
> - Editor_Action_Args format_args_impl(Editor_Interactive & parent) override;
> + EditorActionArgs format_args_impl(EditorInteractive & parent) override;
>
> char const * get_sel_impl() const override {return "pics/fsel.png";}
> bool operates_on_triangles() const override {return true;}
>
> === modified file 'src/editor/tools/editor_tool.h'
> --- src/editor/tools/editor_tool.h 2014-07-14 19:48:07 +0000
> +++ src/editor/tools/editor_tool.h 2014-09-15 07:27:30 +0000
> @@ -26,7 +26,7 @@
> #include "editor/tools/editor_action_args.h"
> #include "logic/widelands_geometry.h"
>
> -struct Editor_Interactive;
> +struct EditorInteractive;
> namespace Widelands {
> class Map;
> class World;
> @@ -38,18 +38,18 @@
> * one function (like delete_building, place building, modify building are 3
> * tools).
> */
> -class Editor_Tool {
> +class EditorTool {
> public:
> - Editor_Tool(Editor_Tool & second, Editor_Tool & third, bool uda = true) :
> + EditorTool(EditorTool & second, EditorTool & third, bool uda = true) :
> m_second(second), m_third(third), undoable(uda)
> {}
> - virtual ~Editor_Tool() {}
> + virtual ~EditorTool() {}
>
> - enum Tool_Index {First, Second, Third};
> + enum ToolIndex {First, Second, Third};
> int32_t handle_click
> - (const Tool_Index i,
> - Widelands::Map & map, const Widelands::World& world, Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive & parent, Editor_Action_Args & args)
> + (const ToolIndex i,
> + Widelands::Map & map, const Widelands::World& world, Widelands::NodeAndTriangle<> const center,
> + EditorInteractive & parent, EditorActionArgs & args)
> {
> return
> (i == First ? *this : i == Second ? m_second : m_third)
> @@ -57,22 +57,22 @@
> }
>
> int32_t handle_undo
> - (const Tool_Index i,
> - Widelands::Map & map, const Widelands::World& world, Widelands::Node_and_Triangle<> const center,
> - Editor_Interactive & parent, Editor_Action_Args & args)
> + (const ToolIndex i,
> + Widelands::Map & map, const Widelands::World& world, Widelands::NodeAndTriangle<> const center,
> + EditorInteractive & parent, EditorActionArgs & args)
> {
> return
> (i == First ? *this : i == Second ? m_second : m_third)
> .handle_undo_impl(map, world, center, parent, args);
> }
>
> - const char * get_sel(const Tool_Index i) {
> + const char * get_sel(const ToolIndex i) {
> return
> (i == First ? *this : i == Second ? m_second : m_third)
> .get_sel_impl();
> }
>
> - Editor_Action_Args format_args(const Tool_Index i, Editor_Interactive & parent) {
> + EditorActionArgs format_args(const ToolIndex i, EditorInteractive & parent) {
> return
> (i == First ? *this : i == Second ? m_second : m_third)
> .format_args_impl(parent);
> @@ -80,30 +80,30 @@
>
> bool is_unduable() {return undoable;}
> virtual bool has_size_one() const {return false;}
> - virtual Editor_Action_Args format_args_impl(Editor_Interactive & parent) {
> - return Editor_Action_Args(parent);
> + virtual EditorActionArgs format_args_impl(EditorInteractive & parent) {
> + return EditorActionArgs(parent);
> }
> virtual int32_t handle_click_impl(Widelands::Map&,
> const Widelands::World& world,
> - Widelands::Node_and_Triangle<>,
> - Editor_Interactive&,
> - Editor_Action_Args&) = 0;
> + Widelands::NodeAndTriangle<>,
> + EditorInteractive&,
> + EditorActionArgs&) = 0;
> virtual int32_t handle_undo_impl(Widelands::Map&,
> const Widelands::World&,
> - Widelands::Node_and_Triangle<>,
> - Editor_Interactive&,
> - Editor_Action_Args&) {
> + Widelands::NodeAndTriangle<>,
> + EditorInteractive&,
> + EditorActionArgs&) {
> return 0;
> } // non unduable tools don't need to implement this.
> virtual const char * get_sel_impl() const = 0;
> virtual bool operates_on_triangles() const {return false;}
>
> protected:
> - Editor_Tool & m_second, & m_third;
> + EditorTool & m_second, & m_third;
> bool undoable;
>
> private:
> - DISALLOW_COPY_AND_ASSIGN(Editor_Tool);
> + DISALLOW_COPY_AND_ASSIGN(EditorTool);
> };
>
> #endif // end of include guard: WL_EDITOR_TOOLS_EDITOR_TOOL_H
>
> === modified file 'src/editor/tools/editor_tool_action.h'
> --- src/editor/tools/editor_tool_action.h 2014-07-05 16:41:51 +0000
> +++ src/editor/tools/editor_tool_action.h 2014-09-15 07:27:30 +0000
> @@ -23,41 +23,41 @@
> #include "editor/tools/editor_action_args.h"
> #include "logic/widelands_geometry.h"
>
> -class Editor_Tool;
> +class EditorTool;
> namespace Widelands {class map;}
> -struct Editor_Interactive;
> +struct EditorInteractive;
>
>
> /// Class to save an action done by an editor tool
> // implementations in editor_history.cc
> -struct Editor_Tool_Action {
> - Editor_Tool & tool;
> +struct EditorToolAction {
> + EditorTool & tool;
>
> uint32_t i;
> Widelands::Map & map;
> - Widelands::Node_and_Triangle<> center;
> - Editor_Interactive & parent;
> -
> - Editor_Action_Args * args;
> -
> - Editor_Tool_Action
> - (Editor_Tool & t, uint32_t ind,
> - Widelands::Map & m, Widelands::Node_and_Triangle<> c,
> - Editor_Interactive & p, Editor_Action_Args nargs)
> + Widelands::NodeAndTriangle<> center;
> + EditorInteractive & parent;
> +
> + EditorActionArgs * args;
> +
> + EditorToolAction
> + (EditorTool & t, uint32_t ind,
> + Widelands::Map & m, Widelands::NodeAndTriangle<> c,
> + EditorInteractive & p, EditorActionArgs nargs)
> : tool(t), i(ind), map(m), center(c), parent(p)
> {
> - args = new Editor_Action_Args(parent);
> + args = new EditorActionArgs(parent);
> *args = nargs;
> args->refcount++;
> }
>
> - ~Editor_Tool_Action() {
> + ~EditorToolAction() {
> if (args->refcount <= 1)
> delete args;
> else args->refcount--;
> }
>
> - Editor_Tool_Action(const Editor_Tool_Action & b):
> + EditorToolAction(const EditorToolAction & b):
> tool(b.tool), i(b.i), map(b.map),
> center(b.center), parent(b.parent), args(b.args)
> {args->refcount++;}
>
> === modified file 'src/editor/ui_menus/categorized_item_selection_menu.h'
> --- src/editor/ui_menus/categorized_item_selection_menu.h 2014-07-25 22:17:48 +0000
> +++ src/editor/ui_menus/categorized_item_selection_menu.h 2014-09-15 07:27:30 +0000
> @@ -82,7 +82,7 @@
> current_selection_names_(this, 0, 0, 0, 20, UI::Align_Center),
> tool_(tool)
> {
> - UI::Tab_Panel* tab_panel = new UI::Tab_Panel(this, 0, 0, nullptr);
> + UI::TabPanel* tab_panel = new UI::TabPanel(this, 0, 0, nullptr);
> add(tab_panel, UI::Align_Center);
>
> for (uint32_t category_index = 0; category_index < categories.get_nitems(); ++category_index) {
>
> === modified file 'src/editor/ui_menus/editor_main_menu.cc'
> --- src/editor/ui_menus/editor_main_menu.cc 2014-07-22 09:54:49 +0000
> +++ src/editor/ui_menus/editor_main_menu.cc 2014-09-15 07:27:30 +0000
> @@ -36,15 +36,15 @@
> #define vmargin margin
> #define vspacing 15
>
> -inline Editor_Interactive & Editor_Main_Menu::eia() {
> - return ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> +inline EditorInteractive & EditorMainMenu::eia() {
> + return ref_cast<EditorInteractive, UI::Panel>(*get_parent());
> }
>
> /**
> * Create all the buttons etc...
> */
> -Editor_Main_Menu::Editor_Main_Menu
> - (Editor_Interactive & parent, UI::UniqueWindow::Registry & registry)
> +EditorMainMenu::EditorMainMenu
> + (EditorInteractive & parent, UI::UniqueWindow::Registry & registry)
> :
> UI::UniqueWindow
> (&parent, "main_menu", ®istry, 2 * hmargin + width,
> @@ -85,11 +85,11 @@
> g_gr->images().get("pics/but0.png"),
> _("Exit Editor"))
> {
> - m_button_new_map.sigclicked.connect(boost::bind(&Editor_Main_Menu::new_map_btn, this));
> - m_button_new_random_map.sigclicked.connect(boost::bind(&Editor_Main_Menu::new_random_map_btn, this));
> - m_button_load_map.sigclicked.connect(boost::bind(&Editor_Main_Menu::load_btn, this));
> - m_button_save_map.sigclicked.connect(boost::bind(&Editor_Main_Menu::save_btn, this));
> - m_button_map_options.sigclicked.connect(boost::bind(&Editor_Main_Menu::map_options_btn, this));
> + m_button_new_map.sigclicked.connect(boost::bind(&EditorMainMenu::new_map_btn, this));
> + m_button_new_random_map.sigclicked.connect(boost::bind(&EditorMainMenu::new_random_map_btn, this));
> + m_button_load_map.sigclicked.connect(boost::bind(&EditorMainMenu::load_btn, this));
> + m_button_save_map.sigclicked.connect(boost::bind(&EditorMainMenu::save_btn, this));
> + m_button_map_options.sigclicked.connect(boost::bind(&EditorMainMenu::map_options_btn, this));
>
> m_window_readme.open_window = [this] {
> fileview_window(eia(), m_window_readme, "txts/editor_readme");
> @@ -97,7 +97,7 @@
> m_button_view_readme.sigclicked.connect(
> boost::bind(&UI::UniqueWindow::Registry::toggle, m_window_readme));
>
> - m_button_exit_editor.sigclicked.connect(boost::bind(&Editor_Main_Menu::exit_btn, this));
> + m_button_exit_editor.sigclicked.connect(boost::bind(&EditorMainMenu::exit_btn, this));
>
> // Put in the default position, if necessary
> if (get_usedefaultpos())
> @@ -107,27 +107,27 @@
> /**
> * Called, when buttons get clicked
> */
> -void Editor_Main_Menu::new_map_btn() {
> - new Main_Menu_New_Map(eia());
> - die();
> -}
> -
> -void Editor_Main_Menu::new_random_map_btn() {
> - new Main_Menu_New_Random_Map(eia());
> - die();
> -}
> -
> -void Editor_Main_Menu::load_btn() {
> - new Main_Menu_Load_Map(eia());
> - die();
> -}
> -
> -void Editor_Main_Menu::save_btn() {
> - new Main_Menu_Save_Map(eia());
> - die();
> -}
> -void Editor_Main_Menu::map_options_btn() {
> - new Main_Menu_Map_Options(eia());
> - die();
> -}
> -void Editor_Main_Menu::exit_btn() {eia().exit();}
> +void EditorMainMenu::new_map_btn() {
> + new MainMenuNewMap(eia());
> + die();
> +}
> +
> +void EditorMainMenu::new_random_map_btn() {
> + new MainMenuNewRandomMap(eia());
> + die();
> +}
> +
> +void EditorMainMenu::load_btn() {
> + new MainMenuLoadMap(eia());
> + die();
> +}
> +
> +void EditorMainMenu::save_btn() {
> + new MainMenuSaveMap(eia());
> + die();
> +}
> +void EditorMainMenu::map_options_btn() {
> + new MainMenuMapOptions(eia());
> + die();
> +}
> +void EditorMainMenu::exit_btn() {eia().exit();}
>
> === modified file 'src/editor/ui_menus/editor_main_menu.h'
> --- src/editor/ui_menus/editor_main_menu.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_main_menu.h 2014-09-15 07:27:30 +0000
> @@ -23,16 +23,16 @@
> #include "ui_basic/button.h"
> #include "ui_basic/unique_window.h"
>
> -struct Editor_Interactive;
> +struct EditorInteractive;
>
> /**
> * This represents the main menu
> */
> -struct Editor_Main_Menu : public UI::UniqueWindow {
> - Editor_Main_Menu(Editor_Interactive &, UI::UniqueWindow::Registry &);
> +struct EditorMainMenu : public UI::UniqueWindow {
> + EditorMainMenu(EditorInteractive &, UI::UniqueWindow::Registry &);
>
> private:
> - Editor_Interactive & eia();
> + EditorInteractive & eia();
> UI::Button m_button_new_map;
> UI::Button m_button_new_random_map;
> UI::Button m_button_load_map;
>
> === modified file 'src/editor/ui_menus/editor_main_menu_load_map.cc'
> --- src/editor/ui_menus/editor_main_menu_load_map.cc 2014-07-20 07:43:07 +0000
> +++ src/editor/ui_menus/editor_main_menu_load_map.cc 2014-09-15 07:27:30 +0000
> @@ -43,12 +43,12 @@
> #include "ui_basic/textarea.h"
> #include "wui/overlay_manager.h"
>
> -using Widelands::WL_Map_Loader;
> +using Widelands::WidelandsMapLoader;
>
> /**
> * Create all the buttons etc...
> */
> -Main_Menu_Load_Map::Main_Menu_Load_Map(Editor_Interactive & parent)
> +MainMenuLoadMap::MainMenuLoadMap(EditorInteractive & parent)
> : UI::Window(&parent, "load_map_menu", 0, 0, 500, 300, _("Load Map"))
> {
> int32_t const spacing = 5;
> @@ -61,8 +61,8 @@
> (this,
> posx, posy,
> get_inner_w() / 2 - spacing, get_inner_h() - spacing - offsy - 40);
> - m_ls->selected.connect(boost::bind(&Main_Menu_Load_Map::selected, this, _1));
> - m_ls->double_clicked.connect(boost::bind(&Main_Menu_Load_Map::double_clicked, this, _1));
> + m_ls->selected.connect(boost::bind(&MainMenuLoadMap::selected, this, _1));
> + m_ls->double_clicked.connect(boost::bind(&MainMenuLoadMap::double_clicked, this, _1));
>
> posx = get_inner_w() / 2 + spacing;
> posy += 20;
> @@ -98,7 +98,7 @@
> new UI::Textarea
> (this, posx, posy, 70, 20, _("Descr:"), UI::Align_CenterLeft);
> m_descr =
> - new UI::Multiline_Textarea
> + new UI::MultilineTextarea
> (this,
> posx + 70, posy,
> get_inner_w() - posx - spacing - 70,
> @@ -114,14 +114,14 @@
> _("OK"),
> std::string(),
> false);
> - m_ok_btn->sigclicked.connect(boost::bind(&Main_Menu_Load_Map::clicked_ok, this));
> + m_ok_btn->sigclicked.connect(boost::bind(&MainMenuLoadMap::clicked_ok, this));
>
> UI::Button * cancelbtn = new UI::Button
> (this, "cancel",
> posx, posy, 80, 20,
> g_gr->images().get("pics/but1.png"),
> _("Cancel"));
> - cancelbtn->sigclicked.connect(boost::bind(&Main_Menu_Load_Map::die, this));
> + cancelbtn->sigclicked.connect(boost::bind(&MainMenuLoadMap::die, this));
>
> m_basedir = "maps";
> m_curdir = "maps";
> @@ -133,16 +133,16 @@
> }
>
>
> -void Main_Menu_Load_Map::clicked_ok() {
> +void MainMenuLoadMap::clicked_ok() {
> const char * const filename(m_ls->get_selected());
>
> - if (g_fs->IsDirectory(filename) && !WL_Map_Loader::is_widelands_map(filename)) {
> + if (g_fs->IsDirectory(filename) && !WidelandsMapLoader::is_widelands_map(filename)) {
> m_curdir = filename;
> m_ls->clear();
> m_mapfiles.clear();
> fill_list();
> } else {
> - ref_cast<Editor_Interactive, UI::Panel>(*get_parent()).load(filename);
> + ref_cast<EditorInteractive, UI::Panel>(*get_parent()).load(filename);
> die();
> }
> }
> @@ -150,15 +150,15 @@
> /**
> * Called when a entry is selected
> */
> -void Main_Menu_Load_Map::selected(uint32_t) {
> +void MainMenuLoadMap::selected(uint32_t) {
> const char * const name = m_ls->get_selected();
>
> m_ok_btn->set_enabled(true);
>
> - if (!g_fs->IsDirectory(name) || WL_Map_Loader::is_widelands_map(name)) {
> + if (!g_fs->IsDirectory(name) || WidelandsMapLoader::is_widelands_map(name)) {
> Widelands::Map map;
> {
> - std::unique_ptr<Widelands::Map_Loader> map_loader = map.get_correct_loader(name);
> + std::unique_ptr<Widelands::MapLoader> map_loader = map.get_correct_loader(name);
> map_loader->preload_map(true); // This has worked before, no problem.
> }
>
> @@ -187,12 +187,12 @@
> /**
> * An entry has been doubleclicked
> */
> -void Main_Menu_Load_Map::double_clicked(uint32_t) {clicked_ok();}
> +void MainMenuLoadMap::double_clicked(uint32_t) {clicked_ok();}
>
> /**
> * fill the file list
> */
> -void Main_Menu_Load_Map::fill_list() {
> +void MainMenuLoadMap::fill_list() {
> // Fill it with all files we find.
> m_mapfiles = g_fs->ListDirectory(m_curdir);
>
> @@ -212,9 +212,9 @@
> g_gr->images().get("pics/ls_dir.png"));
> }
>
> - const filenameset_t::const_iterator mapfiles_end = m_mapfiles.end();
> + const FilenameSet::const_iterator mapfiles_end = m_mapfiles.end();
> for
> - (filenameset_t::const_iterator pname = m_mapfiles.begin();
> + (FilenameSet::const_iterator pname = m_mapfiles.begin();
> pname != mapfiles_end;
> ++pname)
> {
> @@ -223,7 +223,7 @@
> (strcmp(FileSystem::FS_Filename(name), ".") &&
> strcmp(FileSystem::FS_Filename(name), "..") &&
> g_fs->IsDirectory(name) &&
> - !WL_Map_Loader::is_widelands_map(name))
> + !WidelandsMapLoader::is_widelands_map(name))
>
> m_ls->add
> (FileSystem::FS_Filename(name),
> @@ -234,12 +234,12 @@
> Widelands::Map map;
>
> for
> - (filenameset_t::const_iterator pname = m_mapfiles.begin();
> + (FilenameSet::const_iterator pname = m_mapfiles.begin();
> pname != mapfiles_end;
> ++pname)
> {
> char const * const name = pname->c_str();
> - std::unique_ptr<Widelands::Map_Loader> map_loader = map.get_correct_loader(name);
> + std::unique_ptr<Widelands::MapLoader> map_loader = map.get_correct_loader(name);
> if (map_loader.get() != nullptr) {
> try {
> map_loader->preload_map(true);
> @@ -247,9 +247,9 @@
> (FileSystem::FS_Filename(name),
> name,
> g_gr->images().get
> - (dynamic_cast<WL_Map_Loader*>(map_loader.get())
> + (dynamic_cast<WidelandsMapLoader*>(map_loader.get())
> ? "pics/ls_wlmap.png" : "pics/ls_s2map.png"));
> - } catch (const _wexception &) {} // we simply skip illegal entries
> + } catch (const WException &) {} // we simply skip illegal entries
> }
> }
>
>
> === modified file 'src/editor/ui_menus/editor_main_menu_load_map.h'
> --- src/editor/ui_menus/editor_main_menu_load_map.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_main_menu_load_map.h 2014-09-15 07:27:30 +0000
> @@ -23,19 +23,19 @@
> #include "io/filesystem/filesystem.h"
> #include "ui_basic/window.h"
>
> -struct Editor_Interactive;
> +struct EditorInteractive;
> namespace UI {
> struct Button;
> template <typename T> struct Listselect;
> struct Textarea;
> -struct Multiline_Textarea;
> +struct MultilineTextarea;
> }
>
> /**
> * Choose a filename and save your brand new created map
> */
> -struct Main_Menu_Load_Map : public UI::Window {
> - Main_Menu_Load_Map(Editor_Interactive &);
> +struct MainMenuLoadMap : public UI::Window {
> + MainMenuLoadMap(EditorInteractive &);
>
> private:
> void clicked_ok();
> @@ -45,14 +45,14 @@
> void fill_list();
>
> UI::Textarea * m_name, * m_author, * m_size, * m_nrplayers;
> - UI::Multiline_Textarea * m_descr;
> + UI::MultilineTextarea * m_descr;
> UI::Listselect<const char *> * m_ls;
> UI::Button * m_ok_btn;
>
> std::string m_basedir;
> std::string m_curdir;
> std::string m_parentdir;
> - filenameset_t m_mapfiles;
> + FilenameSet m_mapfiles;
> };
>
> #endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_LOAD_MAP_H
>
> === modified file 'src/editor/ui_menus/editor_main_menu_map_options.cc'
> --- src/editor/ui_menus/editor_main_menu_map_options.cc 2014-07-14 10:45:44 +0000
> +++ src/editor/ui_menus/editor_main_menu_map_options.cc 2014-09-15 07:27:30 +0000
> @@ -32,15 +32,15 @@
> #include "ui_basic/textarea.h"
>
>
> -inline Editor_Interactive & Main_Menu_Map_Options::eia() {
> - return ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> +inline EditorInteractive & MainMenuMapOptions::eia() {
> + return ref_cast<EditorInteractive, UI::Panel>(*get_parent());
> }
>
>
> /**
> * Create all the buttons etc...
> */
> -Main_Menu_Map_Options::Main_Menu_Map_Options(Editor_Interactive & parent)
> +MainMenuMapOptions::MainMenuMapOptions(EditorInteractive & parent)
> :
> UI::Window
> (&parent, "map_options",
> @@ -61,7 +61,7 @@
> posx + ta->get_w() + spacing, posy,
> get_inner_w() - (posx + ta->get_w() + spacing) - spacing, 20,
> g_gr->images().get("pics/but1.png"));
> - m_name->changed.connect(boost::bind(&Main_Menu_Map_Options::changed, this, 0));
> + m_name->changed.connect(boost::bind(&MainMenuMapOptions::changed, this, 0));
> posy += height + spacing;
> ta = new UI::Textarea(this, posx, posy - 2, _("Size:"));
> m_size =
> @@ -79,15 +79,15 @@
> posx + ta->get_w() + spacing, posy,
> get_inner_w() - (posx + ta->get_w() + spacing) - spacing, 20,
> g_gr->images().get("pics/but1.png"));
> - m_author->changed.connect(boost::bind(&Main_Menu_Map_Options::changed, this, 1));
> + m_author->changed.connect(boost::bind(&MainMenuMapOptions::changed, this, 1));
> posy += height + spacing;
> m_descr =
> - new UI::Multiline_Editbox
> + new UI::MultilineEditbox
> (this,
> posx, posy,
> get_inner_w() - spacing - posx, get_inner_h() - 25 - spacing - posy,
> parent.egbase().map().get_description());
> - m_descr->changed.connect(boost::bind(&Main_Menu_Map_Options::editbox_changed, this));
> + m_descr->changed.connect(boost::bind(&MainMenuMapOptions::editbox_changed, this));
>
> UI::Button * btn =
> new UI::Button
> @@ -100,8 +100,8 @@
> "be the top-left corner of a generated minimap."));
> btn->sigclicked.connect
> (boost::bind
> - (&Editor_Interactive::select_tool, &parent,
> - boost::ref(parent.tools.set_origin), Editor_Tool::First));
> + (&EditorInteractive::select_tool, &parent,
> + boost::ref(parent.tools.set_origin), EditorTool::First));
>
> update();
> }
> @@ -110,7 +110,7 @@
> * Updates all UI::Textareas in the UI::Window to represent currently
> * set values
> */
> -void Main_Menu_Map_Options::update() {
> +void MainMenuMapOptions::update() {
> const Widelands::Map & map = eia().egbase().map();
>
> char buf[200];
> @@ -127,7 +127,7 @@
> /**
> * Called when one of the editboxes are changed
> */
> -void Main_Menu_Map_Options::changed(int32_t const id) {
> +void MainMenuMapOptions::changed(int32_t const id) {
> if (id == 0) {
> eia().egbase().map().set_name(m_name->text().c_str());
> } else if (id == 1) {
> @@ -141,6 +141,6 @@
> /**
> * Called when the editbox has changed
> */
> -void Main_Menu_Map_Options::editbox_changed() {
> +void MainMenuMapOptions::editbox_changed() {
> eia().egbase().map().set_description(m_descr->get_text().c_str());
> }
>
> === modified file 'src/editor/ui_menus/editor_main_menu_map_options.h'
> --- src/editor/ui_menus/editor_main_menu_map_options.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_main_menu_map_options.h 2014-09-15 07:27:30 +0000
> @@ -23,10 +23,10 @@
> #include "ui_basic/button.h"
> #include "ui_basic/window.h"
>
> -struct Editor_Interactive;
> +struct EditorInteractive;
> namespace UI {
> struct EditBox;
> -struct Multiline_Editbox;
> +struct MultilineEditbox;
> struct Textarea;
> }
>
> @@ -35,14 +35,14 @@
> * about the current map are displayed and you can change
> * author, name and description
> */
> -struct Main_Menu_Map_Options : public UI::Window {
> - Main_Menu_Map_Options(Editor_Interactive &);
> +struct MainMenuMapOptions : public UI::Window {
> + MainMenuMapOptions(EditorInteractive &);
>
> private:
> - Editor_Interactive & eia();
> + EditorInteractive & eia();
> void changed(int32_t);
> void editbox_changed();
> - UI::Multiline_Editbox * m_descr;
> + UI::MultilineEditbox * m_descr;
> UI::Textarea * m_nrplayers, * m_size;
> UI::EditBox * m_name, * m_author;
> void update();
>
> === modified file 'src/editor/ui_menus/editor_main_menu_new_map.cc'
> --- src/editor/ui_menus/editor_main_menu_new_map.cc 2014-06-18 13:20:33 +0000
> +++ src/editor/ui_menus/editor_main_menu_new_map.cc 2014-09-15 07:27:30 +0000
> @@ -38,7 +38,7 @@
>
> using Widelands::NUMBER_OF_MAP_DIMENSIONS;
>
> -Main_Menu_New_Map::Main_Menu_New_Map(Editor_Interactive & parent)
> +MainMenuNewMap::MainMenuNewMap(EditorInteractive & parent)
> :
> UI::Window
> (&parent, "new_map_menu",
> @@ -68,14 +68,14 @@
> get_inner_w() - spacing - 20, posy, 20, 20,
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_up.png"));
> - widthupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 0));
> + widthupbtn->sigclicked.connect(boost::bind(&MainMenuNewMap::button_clicked, this, 0));
>
> UI::Button * widthdownbtn = new UI::Button
> (this, "width_down",
> posx, posy, 20, 20,
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_down.png"));
> - widthdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 1));
> + widthdownbtn->sigclicked.connect(boost::bind(&MainMenuNewMap::button_clicked, this, 1));
>
> posy += 20 + spacing + spacing;
>
> @@ -89,14 +89,14 @@
> get_inner_w() - spacing - 20, posy, 20, 20,
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_up.png"));
> - heightupbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 2));
> + heightupbtn->sigclicked.connect(boost::bind(&MainMenuNewMap::button_clicked, this, 2));
>
> UI::Button * heightdownbtn = new UI::Button
> (this, "height_down",
> posx, posy, 20, 20,
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_down.png"));
> - heightdownbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::button_clicked, this, 3));
> + heightdownbtn->sigclicked.connect(boost::bind(&MainMenuNewMap::button_clicked, this, 3));
>
> posy += 20 + spacing + spacing;
>
> @@ -107,14 +107,14 @@
> posx, posy, width, height,
> g_gr->images().get("pics/but0.png"),
> _("Create Map"));
> - createbtn->sigclicked.connect(boost::bind(&Main_Menu_New_Map::clicked_create_map, this));
> + createbtn->sigclicked.connect(boost::bind(&MainMenuNewMap::clicked_create_map, this));
> }
>
>
> /**
> * Called, when button get clicked
> */
> -void Main_Menu_New_Map::button_clicked(int32_t n) {
> +void MainMenuNewMap::button_clicked(int32_t n) {
> switch (n) {
> case 0: ++m_w; break;
> case 1: --m_w; break;
> @@ -139,10 +139,10 @@
> m_height->set_text(buffer);
> }
>
> -void Main_Menu_New_Map::clicked_create_map() {
> - Editor_Interactive & eia =
> - ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> - Widelands::Editor_Game_Base & egbase = eia.egbase();
> +void MainMenuNewMap::clicked_create_map() {
> + EditorInteractive & eia =
> + ref_cast<EditorInteractive, UI::Panel>(*get_parent());
> + Widelands::EditorGameBase & egbase = eia.egbase();
> Widelands::Map & map = egbase.map();
> UI::ProgressWindow loader;
>
>
> === modified file 'src/editor/ui_menus/editor_main_menu_new_map.h'
> --- src/editor/ui_menus/editor_main_menu_new_map.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_main_menu_new_map.h 2014-09-15 07:27:30 +0000
> @@ -24,7 +24,7 @@
>
> #include "ui_basic/window.h"
>
> -struct Editor_Interactive;
> +struct EditorInteractive;
> namespace UI {
> struct Button;
> struct Textarea;
> @@ -35,8 +35,8 @@
> * the user to choose the new world and a few other
> * things like size, world ....
> */
> -struct Main_Menu_New_Map : public UI::Window {
> - Main_Menu_New_Map(Editor_Interactive &);
> +struct MainMenuNewMap : public UI::Window {
> + MainMenuNewMap(EditorInteractive &);
>
> private:
> UI::Textarea * m_width, * m_height;
>
> === modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
> --- src/editor/ui_menus/editor_main_menu_random_map.cc 2014-07-05 14:22:44 +0000
> +++ src/editor/ui_menus/editor_main_menu_random_map.cc 2014-09-15 07:27:30 +0000
> @@ -41,7 +41,7 @@
>
> using namespace Widelands;
>
> -Main_Menu_New_Random_Map::Main_Menu_New_Random_Map(Editor_Interactive& parent) :
> +MainMenuNewRandomMap::MainMenuNewRandomMap(EditorInteractive& parent) :
> UI::Window(&parent,
> "random_map_menu",
> (parent.get_w() - 260) / 2,
> @@ -83,7 +83,7 @@
> width, 20,
> g_gr->images().get("pics/but1.png"));
> m_nrEditbox->changed.connect
> - (boost::bind(&Main_Menu_New_Random_Map::nr_edit_box_changed, this));
> + (boost::bind(&MainMenuNewRandomMap::nr_edit_box_changed, this));
> RNG rng;
> rng.seed(clock());
> rng.rand();
> @@ -111,7 +111,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_up.png"));
> widthupbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, MAP_W_PLUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::MAP_W_PLUS));
>
> UI::Button * widthdownbtn = new UI::Button
> (this, "width_down",
> @@ -119,7 +119,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_down.png"));
> widthdownbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, MAP_W_MINUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::MAP_W_MINUS));
>
> snprintf
> (buffer, sizeof(buffer), _("Width: %u"), Widelands::MAP_DIMENSIONS[m_w]);
> @@ -141,7 +141,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_up.png"));
> heightupbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, MAP_H_PLUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::MAP_H_PLUS));
>
> UI::Button * heightdownbtn = new UI::Button
> (this, "height_down",
> @@ -149,7 +149,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_down.png"));
> heightdownbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, MAP_H_MINUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::MAP_H_MINUS));
>
> posy += 20 + spacing + spacing;
>
> @@ -162,7 +162,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_up.png"));
> waterupbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, WATER_PLUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::WATER_PLUS));
>
> UI::Button * waterdownbtn = new UI::Button
> (this, "water_down",
> @@ -170,7 +170,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_down.png"));
> waterdownbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, WATER_MINUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::WATER_MINUS));
>
> snprintf(buffer, sizeof(buffer), _("Water: %u %%"), m_waterval);
> m_water = new UI::Textarea(this, posx + spacing + 20, posy, buffer);
> @@ -187,7 +187,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_up.png"));
> landupbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, LAND_PLUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::LAND_PLUS));
>
> UI::Button * landdownbtn = new UI::Button
> (this, "land_down",
> @@ -195,7 +195,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_down.png"));
> landdownbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, LAND_MINUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::LAND_MINUS));
>
> snprintf
> (buffer, sizeof(buffer), _("Land: %u %%"), m_landval);
> @@ -213,7 +213,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_up.png"));
> wastelandupbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, WASTE_PLUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::WASTE_PLUS));
>
> UI::Button * wastelanddownbtn = new UI::Button
> (this, "wasteland_down",
> @@ -221,7 +221,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_down.png"));
> wastelanddownbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, WASTE_MINUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::WASTE_MINUS));
>
> snprintf
> (buffer, sizeof(buffer), _("Wasteland: %u %%"), m_wastelandval);
> @@ -248,7 +248,7 @@
> m_island_mode = new UI::Checkbox(this, pos);
> m_island_mode->set_state(true);
> m_island_mode->changed.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, SWITCH_ISLAND_MODE));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::SWITCH_ISLAND_MODE));
>
> new UI::Textarea(this, posx, posy, _("Island mode:"));
> posy += height + spacing;
> @@ -271,7 +271,7 @@
> posx, posy, width, height,
> g_gr->images().get("pics/but1.png"),
> m_res_amounts[m_res_amount].c_str());
> - m_res->sigclicked.connect(boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, SWITCH_RES));
> + m_res->sigclicked.connect(boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::SWITCH_RES));
>
> posy += height + spacing + spacing + spacing;
>
> @@ -282,7 +282,7 @@
> g_gr->images().get("pics/but1.png"),
> m_world_descriptions[m_current_world].descrname);
> m_world->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, SWITCH_WORLD));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::SWITCH_WORLD));
>
> posy += height + spacing + spacing + spacing;
>
> @@ -299,7 +299,7 @@
> g_gr->images().get("pics/but1.png"));
> m_idEditbox->setText("abcd-efgh-ijkl-mnop");
> m_idEditbox->changed.connect
> - (boost::bind(&Main_Menu_New_Random_Map::id_edit_box_changed, this));
> + (boost::bind(&MainMenuNewRandomMap::id_edit_box_changed, this));
> posy += height + spacing + spacing + spacing;
>
>
> @@ -312,7 +312,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_up.png"));
> playerupbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, PLAYER_PLUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::PLAYER_PLUS));
>
> UI::Button * playerdownbtn = new UI::Button
> (this, "player_down",
> @@ -320,7 +320,7 @@
> g_gr->images().get("pics/but1.png"),
> g_gr->images().get("pics/scrollbar_down.png"));
> playerdownbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_New_Random_Map::button_clicked, this, PLAYER_MINUS));
> + (boost::bind(&MainMenuNewRandomMap::button_clicked, this, ButtonId::PLAYER_MINUS));
>
> snprintf(buffer, sizeof(buffer), _("Players: %u"), m_pn);
> m_players = new UI::Textarea(this, posx + spacing + 20, posy, buffer);
> @@ -336,7 +336,7 @@
> posx, posy, width, height,
> g_gr->images().get("pics/but0.png"),
> _("Generate Map"));
> - m_goButton->sigclicked.connect(boost::bind(&Main_Menu_New_Random_Map::clicked_create_map, this));
> + m_goButton->sigclicked.connect(boost::bind(&MainMenuNewRandomMap::clicked_create_map, this));
> posy += height + spacing;
>
> set_inner_size(get_inner_w(), posy);
> @@ -349,65 +349,65 @@
> /**
> * Called, when button get clicked
> */
> -void Main_Menu_New_Random_Map::button_clicked(Main_Menu_New_Random_Map::ButtonID n) {
> +void MainMenuNewRandomMap::button_clicked(MainMenuNewRandomMap::ButtonId n) {
> switch (n) {
> - case MAP_W_PLUS: ++m_w; break;
> - case MAP_W_MINUS:
> + case ButtonId::MAP_W_PLUS: ++m_w; break;
> + case ButtonId::MAP_W_MINUS:
> --m_w;
> if (m_w >= 0 && m_pn > m_w + 2)
> --m_pn;
> break;
> - case MAP_H_PLUS: ++m_h; break;
> - case MAP_H_MINUS:
> + case ButtonId::MAP_H_PLUS: ++m_h; break;
> + case ButtonId::MAP_H_MINUS:
> --m_h;
> if (m_h >= 0 && m_pn > m_h + 2)
> --m_pn;
> break;
> - case PLAYER_PLUS:
> + case ButtonId::PLAYER_PLUS:
> // Only higher the player number, if there is enough space
> if (m_pn < MAX_PLAYERS && m_pn < m_w + 2 && m_pn < m_h + 2)
> ++m_pn;
> break;
> - case PLAYER_MINUS:
> + case ButtonId::PLAYER_MINUS:
> if (m_pn > 1)
> --m_pn;
> break;
> - case WATER_PLUS:
> + case ButtonId::WATER_PLUS:
> if (m_waterval < 60)
> m_waterval += 5;
> if (m_landval + m_waterval > 100)
> m_landval -= 5;
> break;
> - case WATER_MINUS:
> + case ButtonId::WATER_MINUS:
> if (m_waterval > 0)
> m_waterval -= 5;
> break;
> - case LAND_PLUS:
> + case ButtonId::LAND_PLUS:
> if (m_landval < 100)
> m_landval += 5;
> if (m_waterval + m_landval > 100)
> m_waterval -= 5;
> break;
> - case LAND_MINUS:
> + case ButtonId::LAND_MINUS:
> if (m_landval > 0)
> m_landval -= 5;
> break;
> - case SWITCH_WORLD:
> + case ButtonId::SWITCH_WORLD:
> ++ m_current_world;
> m_current_world %= m_world_descriptions.size();
> m_world->set_title(m_world_descriptions[m_current_world].descrname);
> break;
> - case SWITCH_ISLAND_MODE:
> + case ButtonId::SWITCH_ISLAND_MODE:
> break;
> - case WASTE_PLUS:
> + case ButtonId::WASTE_PLUS:
> if (m_wastelandval < 70)
> m_wastelandval += 10;
> break;
> - case WASTE_MINUS:
> + case ButtonId::WASTE_MINUS:
> if (m_wastelandval > 0)
> m_wastelandval -= 10;
> break;
> - case SWITCH_RES:
> + case ButtonId::SWITCH_RES:
> ++ m_res_amount;
> if (m_res_amount == m_res_amounts.size())
> m_res_amount = 0;
> @@ -450,10 +450,10 @@
> nr_edit_box_changed(); // Update ID String
> }
>
> -void Main_Menu_New_Random_Map::clicked_create_map() {
> - Editor_Interactive & eia =
> - ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> - Widelands::Editor_Game_Base & egbase = eia.egbase();
> +void MainMenuNewRandomMap::clicked_create_map() {
> + EditorInteractive & eia =
> + ref_cast<EditorInteractive, UI::Panel>(*get_parent());
> + Widelands::EditorGameBase & egbase = eia.egbase();
> Widelands::Map & map = egbase.map();
> UI::ProgressWindow loader;
>
> @@ -493,7 +493,7 @@
> die();
> }
>
> -void Main_Menu_New_Random_Map::id_edit_box_changed()
> +void MainMenuNewRandomMap::id_edit_box_changed()
> {
> UniqueRandomMapInfo mapInfo;
>
> @@ -523,13 +523,13 @@
> m_res->set_title(m_res_amounts[m_res_amount].c_str());
>
> // Update other values in UI as well
> - button_clicked(static_cast<ButtonID>(-1));
> + button_clicked(static_cast<ButtonId>(-1));
>
> m_goButton->set_enabled(true);
> }
> }
>
> -void Main_Menu_New_Random_Map::nr_edit_box_changed()
> +void MainMenuNewRandomMap::nr_edit_box_changed()
> {
>
> try {
> @@ -557,7 +557,7 @@
> }
> }
>
> -void Main_Menu_New_Random_Map::set_map_info
> +void MainMenuNewRandomMap::set_map_info
> (Widelands::UniqueRandomMapInfo & mapInfo) const
> {
> mapInfo.h = Widelands::MAP_DIMENSIONS[m_h];
> @@ -569,7 +569,7 @@
> mapInfo.islandMode = m_island_mode->get_state();
> mapInfo.numPlayers = m_pn;
> mapInfo.resource_amount = static_cast
> - <Widelands::UniqueRandomMapInfo::Resource_Amount>
> + <Widelands::UniqueRandomMapInfo::ResourceAmount>
> (m_res_amount);
> mapInfo.world_name = m_world_descriptions[m_current_world].name;
> }
>
> === modified file 'src/editor/ui_menus/editor_main_menu_random_map.h'
> --- src/editor/ui_menus/editor_main_menu_random_map.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_main_menu_random_map.h 2014-09-15 07:27:30 +0000
> @@ -30,7 +30,7 @@
> struct UniqueRandomMapInfo;
> }
>
> -struct Editor_Interactive;
> +struct EditorInteractive;
> namespace UI {
> template <typename T, typename ID> struct IDButton;
> struct Textarea;
> @@ -41,10 +41,10 @@
> * the user to choose the new world and a few other
> * things like size, world ....
> */
> -struct Main_Menu_New_Random_Map : public UI::Window {
> - Main_Menu_New_Random_Map(Editor_Interactive &);
> +struct MainMenuNewRandomMap : public UI::Window {
> + MainMenuNewRandomMap(EditorInteractive &);
>
> - typedef enum {
> + enum class ButtonId: uint8_t {
> MAP_W_PLUS,
> MAP_W_MINUS,
> MAP_H_PLUS,
> @@ -60,7 +60,7 @@
> SWITCH_ISLAND_MODE,
> SWITCH_RES,
> SWITCH_WORLD
> - } ButtonID;
> + };
>
> private:
> struct WorldDescription {
> @@ -85,7 +85,7 @@
> UI::EditBox * m_nrEditbox;
> UI::EditBox * m_idEditbox;
>
> - void button_clicked(ButtonID);
> + void button_clicked(ButtonId);
> void clicked_create_map();
> void id_edit_box_changed();
> void nr_edit_box_changed();
>
> === modified file 'src/editor/ui_menus/editor_main_menu_save_map.cc'
> --- src/editor/ui_menus/editor_main_menu_save_map.cc 2014-07-20 07:43:07 +0000
> +++ src/editor/ui_menus/editor_main_menu_save_map.cc 2014-09-15 07:27:30 +0000
> @@ -35,8 +35,8 @@
> #include "io/filesystem/filesystem.h"
> #include "io/filesystem/layered_filesystem.h"
> #include "io/filesystem/zip_filesystem.h"
> +#include "map_io/map_saver.h"
> #include "map_io/widelands_map_loader.h"
> -#include "map_io/widelands_map_saver.h"
> #include "profile/profile.h"
> #include "ui_basic/button.h"
> #include "ui_basic/editbox.h"
> @@ -45,12 +45,12 @@
> #include "ui_basic/multilinetextarea.h"
> #include "ui_basic/textarea.h"
>
> -inline Editor_Interactive & Main_Menu_Save_Map::eia() {
> - return ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> +inline EditorInteractive & MainMenuSaveMap::eia() {
> + return ref_cast<EditorInteractive, UI::Panel>(*get_parent());
> }
>
>
> -Main_Menu_Save_Map::Main_Menu_Save_Map(Editor_Interactive & parent)
> +MainMenuSaveMap::MainMenuSaveMap(EditorInteractive & parent)
> : UI::Window(&parent, "save_map_menu", 0, 0, 500, 330, _("Save Map"))
> {
> int32_t const spacing = 5;
> @@ -64,8 +64,8 @@
> (this,
> posx, posy,
> get_inner_w() / 2 - spacing, get_inner_h() - spacing - offsy - 60);
> - m_ls->clicked.connect(boost::bind(&Main_Menu_Save_Map::clicked_item, this, _1));
> - m_ls->double_clicked.connect(boost::bind(&Main_Menu_Save_Map::double_clicked_item, this, _1));
> + m_ls->clicked.connect(boost::bind(&MainMenuSaveMap::clicked_item, this, _1));
> + m_ls->double_clicked.connect(boost::bind(&MainMenuSaveMap::double_clicked_item, this, _1));
> m_editbox =
> new UI::EditBox
> (this,
> @@ -73,7 +73,7 @@
> get_inner_w() / 2 - spacing, 20,
> g_gr->images().get("pics/but1.png"));
> m_editbox->setText(parent.egbase().map().get_name());
> - m_editbox->changed.connect(boost::bind(&Main_Menu_Save_Map::edit_box_changed, this));
> + m_editbox->changed.connect(boost::bind(&MainMenuSaveMap::edit_box_changed, this));
>
> posx = get_inner_w() / 2 + spacing;
> posy += 20;
> @@ -108,7 +108,7 @@
> new UI::Textarea
> (this, posx, posy, 70, 20, _("Descr: "), UI::Align_CenterLeft);
> m_descr =
> - new UI::Multiline_Textarea
> + new UI::MultilineTextarea
> (this,
> posx + 70, posy,
> get_inner_w() - posx - spacing - 70,
> @@ -123,14 +123,14 @@
> get_inner_w() / 2 - spacing - 80, posy, 80, 20,
> g_gr->images().get("pics/but0.png"),
> _("OK"));
> - m_ok_btn->sigclicked.connect(boost::bind(&Main_Menu_Save_Map::clicked_ok, boost::ref(*this)));
> + m_ok_btn->sigclicked.connect(boost::bind(&MainMenuSaveMap::clicked_ok, boost::ref(*this)));
>
> UI::Button * cancelbtn = new UI::Button
> (this, "cancel",
> posx, posy, 80, 20,
> g_gr->images().get("pics/but1.png"),
> _("Cancel"));
> - cancelbtn->sigclicked.connect(boost::bind(&Main_Menu_Save_Map::die, boost::ref(*this)));
> + cancelbtn->sigclicked.connect(boost::bind(&MainMenuSaveMap::die, boost::ref(*this)));
>
> UI::Button * make_directorybtn = new UI::Button
> (this, "make_directory",
> @@ -138,7 +138,7 @@
> g_gr->images().get("pics/but1.png"),
> _("Make Directory"));
> make_directorybtn->sigclicked.connect
> - (boost::bind(&Main_Menu_Save_Map::clicked_make_directory, boost::ref(*this)));
> + (boost::bind(&MainMenuSaveMap::clicked_make_directory, boost::ref(*this)));
>
>
> m_basedir = "maps";
> @@ -154,7 +154,7 @@
> /**
> * Called when the ok button was pressed or a file in list was double clicked.
> */
> -void Main_Menu_Save_Map::clicked_ok() {
> +void MainMenuSaveMap::clicked_ok() {
> assert(m_ok_btn->enabled());
> std::string filename = m_editbox->text();
>
> @@ -164,7 +164,7 @@
> if
> (g_fs->IsDirectory(filename.c_str())
> &&
> - !Widelands::WL_Map_Loader::is_widelands_map(filename))
> + !Widelands::WidelandsMapLoader::is_widelands_map(filename))
> {
> m_curdir = g_fs->FS_CanonicalizeName(filename);
> m_ls->clear();
> @@ -195,8 +195,8 @@
> /**
> * Called, when the make directory button was clicked.
> */
> -void Main_Menu_Save_Map::clicked_make_directory() {
> - Main_Menu_Save_Map_Make_Directory md(this, _("unnamed"));
> +void MainMenuSaveMap::clicked_make_directory() {
> + MainMenuSaveMapMakeDirectory md(this, _("unnamed"));
> if (md.run()) {
> g_fs->EnsureDirectoryExists(m_basedir);
> // create directory
> @@ -213,13 +213,13 @@
> /**
> * called when an item was selected
> */
> -void Main_Menu_Save_Map::clicked_item(uint32_t) {
> +void MainMenuSaveMap::clicked_item(uint32_t) {
> const char * const name = m_ls->get_selected();
>
> - if (Widelands::WL_Map_Loader::is_widelands_map(name)) {
> + if (Widelands::WidelandsMapLoader::is_widelands_map(name)) {
> Widelands::Map map;
> {
> - std::unique_ptr<Widelands::Map_Loader> const ml
> + std::unique_ptr<Widelands::MapLoader> const ml
> (map.get_correct_loader(name));
> ml->preload_map(true); // This has worked before, no problem
> }
> @@ -258,10 +258,10 @@
> /**
> * An Item has been doubleclicked
> */
> -void Main_Menu_Save_Map::double_clicked_item(uint32_t) {
> +void MainMenuSaveMap::double_clicked_item(uint32_t) {
> const char * const name = m_ls->get_selected();
>
> - if (g_fs->IsDirectory(name) && !Widelands::WL_Map_Loader::is_widelands_map(name)) {
> + if (g_fs->IsDirectory(name) && !Widelands::WidelandsMapLoader::is_widelands_map(name)) {
> m_curdir = name;
> m_ls->clear();
> m_mapfiles.clear();
> @@ -273,7 +273,7 @@
> /**
> * fill the file list
> */
> -void Main_Menu_Save_Map::fill_list() {
> +void MainMenuSaveMap::fill_list() {
> // Fill it with all files we find.
> m_mapfiles = g_fs->ListDirectory(m_curdir);
>
> @@ -293,9 +293,9 @@
> g_gr->images().get("pics/ls_dir.png"));
> }
>
> - const filenameset_t::const_iterator mapfiles_end = m_mapfiles.end();
> + const FilenameSet::const_iterator mapfiles_end = m_mapfiles.end();
> for
> - (filenameset_t::const_iterator pname = m_mapfiles.begin();
> + (FilenameSet::const_iterator pname = m_mapfiles.begin();
> pname != mapfiles_end;
> ++pname)
> {
> @@ -304,7 +304,7 @@
> (strcmp(FileSystem::FS_Filename(name), ".") &&
> strcmp(FileSystem::FS_Filename(name), "..") &&
> g_fs->IsDirectory(name) &&
> - !Widelands::WL_Map_Loader::is_widelands_map(name))
> + !Widelands::WidelandsMapLoader::is_widelands_map(name))
>
> m_ls->add
> (FileSystem::FS_Filename(name),
> @@ -315,22 +315,22 @@
> Widelands::Map map;
>
> for
> - (filenameset_t::const_iterator pname = m_mapfiles.begin();
> + (FilenameSet::const_iterator pname = m_mapfiles.begin();
> pname != mapfiles_end;
> ++pname)
> {
> char const * const name = pname->c_str();
>
> // we do not list S2 files since we only write wmf
> - std::unique_ptr<Widelands::Map_Loader> ml(map.get_correct_loader(name));
> - if (upcast(Widelands::WL_Map_Loader, wml, ml.get())) {
> + std::unique_ptr<Widelands::MapLoader> ml(map.get_correct_loader(name));
> + if (upcast(Widelands::WidelandsMapLoader, wml, ml.get())) {
> try {
> wml->preload_map(true);
> m_ls->add
> (FileSystem::FS_Filename(name),
> name,
> g_gr->images().get("pics/ls_wlmap.png"));
> - } catch (const _wexception &) {} // we simply skip illegal entries
> + } catch (const WException &) {} // we simply skip illegal entries
> }
> }
> if (m_ls->size())
> @@ -340,7 +340,7 @@
> /**
> * The editbox was changed. Enable ok button
> */
> -void Main_Menu_Save_Map::edit_box_changed() {
> +void MainMenuSaveMap::edit_box_changed() {
> m_ok_btn->set_enabled(m_editbox->text().size());
> }
>
> @@ -351,7 +351,7 @@
> * returns true if dialog should close, false if it
> * should stay open
> */
> -bool Main_Menu_Save_Map::save_map(std::string filename, bool binary) {
> +bool MainMenuSaveMap::save_map(std::string filename, bool binary) {
> // Make sure that the base directory exists.
> g_fs->EnsureDirectoryExists(m_basedir);
>
> @@ -387,7 +387,7 @@
>
> std::unique_ptr<FileSystem> fs
> (g_fs->CreateSubFileSystem(complete_filename, binary ? FileSystem::ZIP : FileSystem::DIR));
> - Widelands::Map_Saver wms(*fs, eia().egbase());
> + Widelands::MapSaver wms(*fs, eia().egbase());
> try {
> wms.save();
> eia().set_need_save(false);
>
> === modified file 'src/editor/ui_menus/editor_main_menu_save_map.h'
> --- src/editor/ui_menus/editor_main_menu_save_map.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_main_menu_save_map.h 2014-09-15 07:27:30 +0000
> @@ -23,23 +23,23 @@
> #include "io/filesystem/filesystem.h"
> #include "ui_basic/window.h"
>
> -struct Editor_Interactive;
> +struct EditorInteractive;
> namespace UI {
> struct Button;
> struct EditBox;
> template <typename T> struct Listselect;
> -struct Multiline_Textarea;
> +struct MultilineTextarea;
> struct Textarea;
> }
>
> /**
> * Choose a filename and save your brand new created map
> */
> -struct Main_Menu_Save_Map : public UI::Window {
> - Main_Menu_Save_Map(Editor_Interactive &);
> +struct MainMenuSaveMap : public UI::Window {
> + MainMenuSaveMap(EditorInteractive &);
>
> private:
> - Editor_Interactive & eia();
> + EditorInteractive & eia();
> void clicked_ok ();
> void clicked_make_directory();
> void clicked_item(uint32_t);
> @@ -51,14 +51,14 @@
>
> UI::EditBox * m_editbox;
> UI::Textarea * m_name, * m_author, * m_size, * m_nrplayers;
> - UI::Multiline_Textarea * m_descr;
> + UI::MultilineTextarea * m_descr;
> UI::Listselect<const char *> * m_ls;
> UI::Button * m_ok_btn;
>
> std::string m_basedir;
> std::string m_curdir;
> std::string m_parentdir;
> - filenameset_t m_mapfiles;
> + FilenameSet m_mapfiles;
> };
>
> #endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_MAIN_MENU_SAVE_MAP_H
>
> === modified file 'src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc'
> --- src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc 2014-07-05 14:22:44 +0000
> +++ src/editor/ui_menus/editor_main_menu_save_map_make_directory.cc 2014-09-15 07:27:30 +0000
> @@ -26,7 +26,7 @@
> #include "ui_basic/textarea.h"
> #include "ui_basic/window.h"
>
> -Main_Menu_Save_Map_Make_Directory::Main_Menu_Save_Map_Make_Directory
> +MainMenuSaveMapMakeDirectory::MainMenuSaveMapMakeDirectory
> (UI::Panel * const parent, char const * dirname)
> :
> UI::Window(parent, "make_directory", 0, 0, 230, 120, _("Make Directory"))
> @@ -44,7 +44,7 @@
> g_gr->images().get("pics/but1.png"));
> m_edit->setText(dirname);
> m_dirname = dirname;
> - m_edit->changed.connect(boost::bind(&Main_Menu_Save_Map_Make_Directory::edit_changed, this));
> + m_edit->changed.connect(boost::bind(&MainMenuSaveMapMakeDirectory::edit_changed, this));
>
> posy = get_inner_h() - 30;
>
> @@ -57,7 +57,7 @@
> std::string(),
> m_dirname.size());
> m_ok_button->sigclicked.connect
> - (boost::bind(&Main_Menu_Save_Map_Make_Directory::end_modal, boost::ref(*this), 1));
> + (boost::bind(&MainMenuSaveMapMakeDirectory::end_modal, boost::ref(*this), 1));
>
> UI::Button * cancelbtn = new UI::Button
> (this, "cancel",
> @@ -65,7 +65,7 @@
> g_gr->images().get("pics/but1.png"),
> _("Cancel"));
> cancelbtn->sigclicked.connect
> - (boost::bind(&Main_Menu_Save_Map_Make_Directory::end_modal, boost::ref(*this), 0));
> + (boost::bind(&MainMenuSaveMapMakeDirectory::end_modal, boost::ref(*this), 0));
>
> center_to_parent();
> }
> @@ -74,7 +74,7 @@
> /**
> * Editbox changed
> */
> -void Main_Menu_Save_Map_Make_Directory::edit_changed() {
> +void MainMenuSaveMapMakeDirectory::edit_changed() {
> const std::string & text = m_edit->text();
> if (text.size()) {
> m_ok_button->set_enabled(true);
>
> === modified file 'src/editor/ui_menus/editor_main_menu_save_map_make_directory.h'
> --- src/editor/ui_menus/editor_main_menu_save_map_make_directory.h 2014-07-23 14:49:10 +0000
> +++ src/editor/ui_menus/editor_main_menu_save_map_make_directory.h 2014-09-15 07:27:30 +0000
> @@ -36,8 +36,8 @@
> *
> */
> // TODO(unknown): This should be moved to src/ui, it's not specific to the editor
> -struct Main_Menu_Save_Map_Make_Directory : public UI::Window {
> - Main_Menu_Save_Map_Make_Directory(UI::Panel *, char const *);
> +struct MainMenuSaveMapMakeDirectory : public UI::Window {
> + MainMenuSaveMapMakeDirectory(UI::Panel *, char const *);
>
> char const * get_dirname() {return m_dirname.c_str();}
>
>
> === modified file 'src/editor/ui_menus/editor_player_menu.cc'
> --- src/editor/ui_menus/editor_player_menu.cc 2014-07-25 13:45:18 +0000
> +++ src/editor/ui_menus/editor_player_menu.cc 2014-09-15 07:27:30 +0000
> @@ -38,8 +38,8 @@
>
> #define UNDEFINED_TRIBE_NAME "<undefined>"
>
> -Editor_Player_Menu::Editor_Player_Menu
> - (Editor_Interactive & parent, UI::UniqueWindow::Registry & registry)
> +EditorPlayerMenu::EditorPlayerMenu
> + (EditorInteractive & parent, UI::UniqueWindow::Registry & registry)
> :
> UI::UniqueWindow
> (&parent, "players_menu", ®istry, 340, 400, _("Player Options")),
> @@ -58,15 +58,15 @@
> _("Remove last player"),
> 1 < parent.egbase().map().get_nrplayers())
> {
> - m_add_player.sigclicked.connect(boost::bind(&Editor_Player_Menu::clicked_add_player, boost::ref(*this)));
> + m_add_player.sigclicked.connect(boost::bind(&EditorPlayerMenu::clicked_add_player, boost::ref(*this)));
> m_remove_last_player.sigclicked.connect
> - (boost::bind(&Editor_Player_Menu::clicked_remove_last_player, boost::ref(*this)));
> + (boost::bind(&EditorPlayerMenu::clicked_remove_last_player, boost::ref(*this)));
>
> int32_t const spacing = 5;
> int32_t const width = 20;
> int32_t posy = 0;
>
> - m_tribes = Widelands::Tribe_Descr::get_all_tribenames();
> + m_tribes = Widelands::TribeDescr::get_all_tribenames();
>
> set_inner_size(375, 135);
>
> @@ -82,7 +82,7 @@
>
> m_posy = posy;
>
> - for (Widelands::Player_Number i = 0; i < MAX_PLAYERS; ++i) {
> + for (Widelands::PlayerNumber i = 0; i < MAX_PLAYERS; ++i) {
> m_plr_names [i] = nullptr;
> m_plr_set_pos_buts [i] = nullptr;
> m_plr_set_tribes_buts[i] = nullptr;
> @@ -98,21 +98,21 @@
> * Think function. Some things may change while this window
> * is open
> */
> -void Editor_Player_Menu::think() {
> +void EditorPlayerMenu::think() {
> update();
> }
>
> /**
> * Update all
> */
> -void Editor_Player_Menu::update() {
> +void EditorPlayerMenu::update() {
> if (is_minimal())
> return;
>
> Widelands::Map & map =
> - ref_cast<Editor_Interactive const, UI::Panel const>(*get_parent())
> + ref_cast<EditorInteractive const, UI::Panel const>(*get_parent())
> .egbase().map();
> - Widelands::Player_Number const nr_players = map.get_nrplayers();
> + Widelands::PlayerNumber const nr_players = map.get_nrplayers();
> {
> assert(nr_players <= 99); // 2 decimal digits
> char text[3];
> @@ -128,7 +128,7 @@
> }
>
> // Now remove all the unneeded stuff.
> - for (Widelands::Player_Number i = nr_players; i < MAX_PLAYERS; ++i) {
> + for (Widelands::PlayerNumber i = nr_players; i < MAX_PLAYERS; ++i) {
> delete m_plr_names [i]; m_plr_names [i] = nullptr;
> delete m_plr_set_pos_buts [i]; m_plr_set_pos_buts [i] = nullptr;
> delete m_plr_set_tribes_buts[i]; m_plr_set_tribes_buts[i] = nullptr;
> @@ -145,7 +145,7 @@
> (this, posx, posy, 140, size,
> g_gr->images().get("pics/but0.png"));
> m_plr_names[p - 1]->changed.connect
> - (boost::bind(&Editor_Player_Menu::name_changed, this, p - 1));
> + (boost::bind(&EditorPlayerMenu::name_changed, this, p - 1));
> posx += 140 + spacing;
> m_plr_names[p - 1]->setText(map.get_scenario_player_name(p));
> }
> @@ -158,7 +158,7 @@
> g_gr->images().get("pics/but0.png"),
> "");
> m_plr_set_tribes_buts[p - 1]->sigclicked.connect
> - (boost::bind(&Editor_Player_Menu::player_tribe_clicked, boost::ref(*this), p - 1));
> + (boost::bind(&EditorPlayerMenu::player_tribe_clicked, boost::ref(*this), p - 1));
> posx += 140 + spacing;
> }
> if (map.get_scenario_player_tribe(p) != UNDEFINED_TRIBE_NAME)
> @@ -183,7 +183,7 @@
> nullptr,
> "");
> m_plr_set_pos_buts[p - 1]->sigclicked.connect
> - (boost::bind(&Editor_Player_Menu::set_starting_pos_clicked, boost::ref(*this), p));
> + (boost::bind(&EditorPlayerMenu::set_starting_pos_clicked, boost::ref(*this), p));
> }
> char text[] = "pics/fsel_editor_set_player_00_pos.png";
> text[28] += p / 10;
> @@ -194,11 +194,11 @@
> set_inner_size(get_inner_w(), posy + spacing);
> }
>
> -void Editor_Player_Menu::clicked_add_player() {
> - Editor_Interactive & menu =
> - ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> +void EditorPlayerMenu::clicked_add_player() {
> + EditorInteractive & menu =
> + ref_cast<EditorInteractive, UI::Panel>(*get_parent());
> Widelands::Map & map = menu.egbase().map();
> - Widelands::Player_Number const nr_players = map.get_nrplayers() + 1;
> + Widelands::PlayerNumber const nr_players = map.get_nrplayers() + 1;
> assert(nr_players <= MAX_PLAYERS);
> map.set_nrplayers(nr_players);
> { // register new default name for this players
> @@ -219,12 +219,12 @@
> }
>
>
> -void Editor_Player_Menu::clicked_remove_last_player() {
> - Editor_Interactive & menu =
> - ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> +void EditorPlayerMenu::clicked_remove_last_player() {
> + EditorInteractive & menu =
> + ref_cast<EditorInteractive, UI::Panel>(*get_parent());
> Widelands::Map & map = menu.egbase().map();
> - Widelands::Player_Number const old_nr_players = map.get_nrplayers();
> - Widelands::Player_Number const nr_players = old_nr_players - 1;
> + Widelands::PlayerNumber const old_nr_players = map.get_nrplayers();
> + Widelands::PlayerNumber const nr_players = old_nr_players - 1;
> assert(1 <= nr_players);
>
> if (!menu.is_player_tribe_referenced(old_nr_players)) {
> @@ -247,16 +247,16 @@
>
> /*
> ==============
> -Editor_Player_Menu::clicked_up_down()
> +EditorPlayerMenu::clicked_up_down()
>
> called when a button is clicked
> ==============
> */
> -// void Editor_Player_Menu::clicked_up_down(int8_t change) {
> -// Editor_Interactive & parent =
> -// dynamic_cast<Editor_Interactive &>(*get_parent());
> +// void EditorPlayerMenu::clicked_up_down(int8_t change) {
> +// EditorInteractive & parent =
> +// dynamic_cast<EditorInteractive &>(*get_parent());
> // Widelands::Map & map = parent.egbase().map();
> -// Widelands::Player_Number nr_players = map.get_nrplayers();
> +// Widelands::PlayerNumber nr_players = map.get_nrplayers();
> // // Up down button
> // nr_players += change;
> // if (nr_players<1) nr_players=1;
> @@ -306,12 +306,12 @@
> /**
> * Player Tribe Button clicked
> */
> -void Editor_Player_Menu::player_tribe_clicked(uint8_t n) {
> - Editor_Interactive & menu =
> - ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> +void EditorPlayerMenu::player_tribe_clicked(uint8_t n) {
> + EditorInteractive & menu =
> + ref_cast<EditorInteractive, UI::Panel>(*get_parent());
> if (!menu.is_player_tribe_referenced(n + 1)) {
> std::string t = m_plr_set_tribes_buts[n]->get_title();
> - if (!Widelands::Tribe_Descr::exists_tribe(t))
> + if (!Widelands::TribeDescr::exists_tribe(t))
> throw wexception
> ("Map defines tribe %s, but it does not exist!", t.c_str());
> uint32_t i;
> @@ -338,20 +338,20 @@
> /**
> * Set Current Start Position button selected
> */
> -void Editor_Player_Menu::set_starting_pos_clicked(uint8_t n) {
> - Editor_Interactive & menu =
> - ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> +void EditorPlayerMenu::set_starting_pos_clicked(uint8_t n) {
> + EditorInteractive & menu =
> + ref_cast<EditorInteractive, UI::Panel>(*get_parent());
> // jump to the current node
> Widelands::Map & map = menu.egbase().map();
> if (Widelands::Coords const sp = map.get_starting_pos(n))
> menu.move_view_to(sp);
>
> // select tool set mplayer
> - menu.select_tool(menu.tools.set_starting_pos, Editor_Tool::First);
> + menu.select_tool(menu.tools.set_starting_pos, EditorTool::First);
> menu.tools.set_starting_pos.set_current_player(n);
>
> // reselect tool, so everything is in a defined state
> - menu.select_tool(menu.tools.current(), Editor_Tool::First);
> + menu.select_tool(menu.tools.current(), EditorTool::First);
>
> // Register callback function to make sure that only valid locations are
> // selected.
> @@ -364,11 +364,11 @@
> /**
> * Player name has changed
> */
> -void Editor_Player_Menu::name_changed(int32_t m) {
> +void EditorPlayerMenu::name_changed(int32_t m) {
> // Player name has been changed.
> std::string text = m_plr_names[m]->text();
> - Editor_Interactive & menu =
> - ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> + EditorInteractive & menu =
> + ref_cast<EditorInteractive, UI::Panel>(*get_parent());
> Widelands::Map & map = menu.egbase().map();
> if (text == "") {
> text = map.get_scenario_player_name(m + 1);
> @@ -382,12 +382,12 @@
> /*
> * Make infrastructure button clicked
> */
> -void Editor_Player_Menu::make_infrastructure_clicked(uint8_t n) {
> - Editor_Interactive & parent =
> - dynamic_cast<Editor_Interactive &>(*get_parent());
> +void EditorPlayerMenu::make_infrastructure_clicked(uint8_t n) {
> + EditorInteractive & parent =
> + dynamic_cast<EditorInteractive &>(*get_parent());
> // Check if starting position is valid (was checked before
> // so must be true)
> - Widelands::Editor_Game_Base & egbase = parent.egbase();
> + Widelands::EditorGameBase & egbase = parent.egbase();
> Widelands::Map & map = egbase.map();
> OverlayManager & overlay_manager = map.overlay_manager();
> const Widelands::Coords start_pos = map.get_starting_pos(n);
> @@ -409,20 +409,20 @@
> // If the player is already created in the editor, this means
> // that there might be already a hq placed somewhere. This needs to be
> // deleted before a starting position change can occure
> - const Widelands::Player_Number player_number = p->player_number();
> + const Widelands::PlayerNumber player_number = p->player_number();
> const Widelands::Coords starting_pos = map.get_starting_pos(player_number);
> Widelands::BaseImmovable * const imm = map[starting_pos].get_immovable();
> if (!imm) {
> // place HQ
> - const Widelands::Tribe_Descr & tribe = p->tribe();
> - const Widelands::Building_Index idx =
> + const Widelands::TribeDescr & tribe = p->tribe();
> + const Widelands::BuildingIndex idx =
> tribe.building_index("headquarters");
> if (idx == Widelands::INVALID_INDEX)
> throw wexception("Tribe %s lacks headquarters", tribe.name().c_str());
> // Widelands::Warehouse & headquarter = dynamic_cast<Widelands::Warehouse &>
> // (egbase.warp_building(starting_pos, player_number, idx));
> // egbase.conquer_area
> - // (Player_Area
> + // (PlayerArea
> // (player_number, Area(starting_pos, headquarter.get_conquers())));
> // tribe.load_warehouse_with_start_wares(editor, headquarter);
>
> @@ -438,7 +438,7 @@
> (start_pos, g_gr->images().get(picsname));
> }
>
> - parent.select_tool(parent.tools.make_infrastructure, Editor_Tool::First);
> + parent.select_tool(parent.tools.make_infrastructure, EditorTool::First);
> parent.tools.make_infrastructure.set_player(n);
> overlay_manager.register_overlay_callback_function(
> boost::bind(&Editor_Make_Infrastructure_Tool_Callback, _1, boost::ref(egbase), n));
>
> === modified file 'src/editor/ui_menus/editor_player_menu.h'
> --- src/editor/ui_menus/editor_player_menu.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_player_menu.h 2014-09-15 07:27:30 +0000
> @@ -30,18 +30,18 @@
> #include "ui_basic/unique_window.h"
>
>
> -struct Editor_Interactive;
> +struct EditorInteractive;
> namespace UI {
> struct Textarea;
> struct EditBox;
> struct Button;
> }
>
> -class Editor_Player_Menu : public UI::UniqueWindow {
> +class EditorPlayerMenu : public UI::UniqueWindow {
> public:
> - Editor_Player_Menu
> - (Editor_Interactive &, UI::UniqueWindow::Registry &);
> - virtual ~Editor_Player_Menu() {}
> + EditorPlayerMenu
> + (EditorInteractive &, UI::UniqueWindow::Registry &);
> + virtual ~EditorPlayerMenu() {}
>
> private:
> UI::UniqueWindow::Registry m_allow_buildings_menu;
>
> === modified file 'src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.cc'
> --- src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.cc 2014-07-28 16:59:54 +0000
> +++ src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.cc 2014-09-15 07:27:30 +0000
> @@ -25,7 +25,7 @@
> #include "logic/player.h"
> #include "logic/tribe.h"
>
> -using Widelands::Building_Index;
> +using Widelands::BuildingIndex;
>
> /**
> * Create all the buttons etc...
> @@ -41,8 +41,8 @@
> #define middle_button_width 40
> #define middle_button_height 20
> #define label_height 20
> -Editor_Player_Menu_Allowed_Buildings_Menu::
> -Editor_Player_Menu_Allowed_Buildings_Menu
> +EditorPlayerMenuAllowedBuildingsMenu::
> +EditorPlayerMenuAllowedBuildingsMenu
> (UI::Panel * parent,
> Widelands::Player & player,
> UI::UniqueWindow::Registry * registry)
> @@ -95,22 +95,22 @@
> false)
> {
> m_forbid_button.sigclicked.connect
> - (boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::clicked, boost::ref(*this), false));
> + (boost::bind(&EditorPlayerMenuAllowedBuildingsMenu::clicked, boost::ref(*this), false));
> m_allow_button.sigclicked.connect
> - (boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::clicked, boost::ref(*this), true));
> + (boost::bind(&EditorPlayerMenuAllowedBuildingsMenu::clicked, boost::ref(*this), true));
>
> m_allowed.selected.connect
> - (boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::allowed_selected, this, _1));
> + (boost::bind(&EditorPlayerMenuAllowedBuildingsMenu::allowed_selected, this, _1));
> m_allowed.double_clicked.connect
> - (boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::allowed_double_clicked, this, _1));
> + (boost::bind(&EditorPlayerMenuAllowedBuildingsMenu::allowed_double_clicked, this, _1));
> m_forbidden.selected.connect
> - (boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::forbidden_selected, this, _1));
> + (boost::bind(&EditorPlayerMenuAllowedBuildingsMenu::forbidden_selected, this, _1));
> m_forbidden.double_clicked.connect
> - (boost::bind(&Editor_Player_Menu_Allowed_Buildings_Menu::forbidden_double_clicked, this, _1));
> + (boost::bind(&EditorPlayerMenuAllowedBuildingsMenu::forbidden_double_clicked, this, _1));
>
> - const Widelands::Tribe_Descr & tribe = player.tribe();
> - Building_Index const nr_buildings = tribe.get_nrbuildings();
> - for (Building_Index i = 0; i < nr_buildings; ++i) {
> + const Widelands::TribeDescr & tribe = player.tribe();
> + BuildingIndex const nr_buildings = tribe.get_nrbuildings();
> + for (BuildingIndex i = 0; i < nr_buildings; ++i) {
> const Widelands::BuildingDescr & building =
> *tribe.get_building_descr(i);
> if (!building.is_enhanced() && !building.is_buildable())
> @@ -127,13 +127,13 @@
> * Updates all UI::Textareas in the UI::Window to represent currently
> * set values
> */
> -void Editor_Player_Menu_Allowed_Buildings_Menu::update() {}
> +void EditorPlayerMenuAllowedBuildingsMenu::update() {}
>
> /**
> * Unregister from the registry pointer
> */
> -Editor_Player_Menu_Allowed_Buildings_Menu::
> -~Editor_Player_Menu_Allowed_Buildings_Menu
> +EditorPlayerMenuAllowedBuildingsMenu::
> +~EditorPlayerMenuAllowedBuildingsMenu
> ()
> {}
>
> @@ -142,16 +142,16 @@
> * UI Action callback functions
> */
>
> -void Editor_Player_Menu_Allowed_Buildings_Menu::clicked(const bool allow) {
> - UI::Listselect<Building_Index> & source = allow ? m_forbidden : m_allowed;
> - UI::Listselect<Building_Index> & target = allow ? m_allowed : m_forbidden;
> +void EditorPlayerMenuAllowedBuildingsMenu::clicked(const bool allow) {
> + UI::Listselect<BuildingIndex> & source = allow ? m_forbidden : m_allowed;
> + UI::Listselect<BuildingIndex> & target = allow ? m_allowed : m_forbidden;
>
> assert // The button should have been disabled if nothing is selected.
> (source.selection_index()
> !=
> UI::Listselect<intptr_t>::no_selection_index());
>
> - Building_Index const building_index = source.get_selected();
> + BuildingIndex const building_index = source.get_selected();
> source.remove_selected();
> const Widelands::BuildingDescr & building =
> *m_player.tribe().get_building_descr(building_index);
> @@ -163,26 +163,26 @@
> m_player.allow_building_type(building_index, allow);
> }
>
> -void Editor_Player_Menu_Allowed_Buildings_Menu::
> +void EditorPlayerMenuAllowedBuildingsMenu::
> allowed_selected(uint32_t index)
> {
> m_forbid_button.set_enabled
> (index != UI::Listselect<intptr_t>::no_selection_index());
> }
>
> -void Editor_Player_Menu_Allowed_Buildings_Menu::
> +void EditorPlayerMenuAllowedBuildingsMenu::
> forbidden_selected(uint32_t index)
> {
> m_allow_button.set_enabled
> (index != UI::Listselect<intptr_t>::no_selection_index());
> }
>
> -void Editor_Player_Menu_Allowed_Buildings_Menu::allowed_double_clicked(uint32_t)
> +void EditorPlayerMenuAllowedBuildingsMenu::allowed_double_clicked(uint32_t)
> {
> clicked(false);
> }
>
> -void Editor_Player_Menu_Allowed_Buildings_Menu::
> +void EditorPlayerMenuAllowedBuildingsMenu::
> forbidden_double_clicked(uint32_t)
> {
> clicked(true);
>
> === modified file 'src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.h'
> --- src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_player_menu_allowed_buildings_menu.h 2014-09-15 07:27:30 +0000
> @@ -33,15 +33,15 @@
> * for this player for this scenario. Used to throttle AI and
> * to advance technology slowly through the missions
> */
> -struct Editor_Player_Menu_Allowed_Buildings_Menu : public UI::UniqueWindow {
> - Editor_Player_Menu_Allowed_Buildings_Menu
> +struct EditorPlayerMenuAllowedBuildingsMenu : public UI::UniqueWindow {
> + EditorPlayerMenuAllowedBuildingsMenu
> (UI::Panel * parent, Widelands::Player &, UI::UniqueWindow::Registry *);
> - virtual ~Editor_Player_Menu_Allowed_Buildings_Menu();
> + virtual ~EditorPlayerMenuAllowedBuildingsMenu();
>
> private:
> Widelands::Player & m_player;
> UI::Textarea m_allowed_label, m_forbidden_label;
> - UI::Listselect<Widelands::Building_Index> m_allowed, m_forbidden;
> + UI::Listselect<Widelands::BuildingIndex> m_allowed, m_forbidden;
> UI::Button m_forbid_button, m_allow_button;
> void allowed_selected (uint32_t);
> void forbidden_selected (uint32_t);
>
> === modified file 'src/editor/ui_menus/editor_tool_change_height_options_menu.cc'
> --- src/editor/ui_menus/editor_tool_change_height_options_menu.cc 2014-07-26 16:37:37 +0000
> +++ src/editor/ui_menus/editor_tool_change_height_options_menu.cc 2014-09-15 07:27:30 +0000
> @@ -31,12 +31,12 @@
>
> #define width 20
> #define height 20
> -Editor_Tool_Change_Height_Options_Menu::Editor_Tool_Change_Height_Options_Menu
> - (Editor_Interactive & parent,
> - Editor_Increase_Height_Tool & increase_tool,
> +EditorToolChangeHeightOptionsMenu::EditorToolChangeHeightOptionsMenu
> + (EditorInteractive & parent,
> + EditorIncreaseHeightTool & increase_tool,
> UI::UniqueWindow::Registry & registry)
> :
> - Editor_Tool_Options_Menu
> + EditorToolOptionsMenu
> (parent, registry, 250, 135, _("Height Tools Options")),
> m_increase_tool(increase_tool),
> m_change_by_label
> @@ -105,14 +105,14 @@
> {
> m_change_by_increase.sigclicked.connect
> (boost::bind
> - (&Editor_Tool_Change_Height_Options_Menu::clicked_change_by_increment, boost::ref(*this)));
> + (&EditorToolChangeHeightOptionsMenu::clicked_change_by_increment, boost::ref(*this)));
> m_change_by_decrease.sigclicked.connect
> (boost::bind
> - (&Editor_Tool_Change_Height_Options_Menu::clicked_change_by_decrement, boost::ref(*this)));
> + (&EditorToolChangeHeightOptionsMenu::clicked_change_by_decrement, boost::ref(*this)));
> m_set_to_increase.sigclicked.connect
> - (boost::bind(&Editor_Tool_Change_Height_Options_Menu::clicked_setto_increment, boost::ref(*this)));
> + (boost::bind(&EditorToolChangeHeightOptionsMenu::clicked_setto_increment, boost::ref(*this)));
> m_set_to_decrease.sigclicked.connect
> - (boost::bind(&Editor_Tool_Change_Height_Options_Menu::clicked_setto_decrement, boost::ref(*this)));
> + (boost::bind(&EditorToolChangeHeightOptionsMenu::clicked_setto_decrement, boost::ref(*this)));
>
> m_change_by_increase.set_repeating(true);
> m_change_by_decrease.set_repeating(true);
> @@ -122,7 +122,7 @@
> }
>
>
> -void Editor_Tool_Change_Height_Options_Menu::clicked_change_by_decrement() {
> +void EditorToolChangeHeightOptionsMenu::clicked_change_by_decrement() {
> int32_t change_by = m_increase_tool.get_change_by();
> assert(change_by == m_increase_tool.decrease_tool().get_change_by());
> assert(1 < change_by);
> @@ -138,7 +138,7 @@
> }
>
>
> -void Editor_Tool_Change_Height_Options_Menu::clicked_change_by_increment() {
> +void EditorToolChangeHeightOptionsMenu::clicked_change_by_increment() {
> int32_t change_by = m_increase_tool.get_change_by();
> assert(change_by == m_increase_tool.decrease_tool().get_change_by());
> assert(change_by < MAX_FIELD_HEIGHT_DIFF);
> @@ -154,7 +154,7 @@
> }
>
>
> -void Editor_Tool_Change_Height_Options_Menu::clicked_setto_decrement() {
> +void EditorToolChangeHeightOptionsMenu::clicked_setto_decrement() {
> Widelands::Field::Height setto =
> m_increase_tool.set_tool().get_interval().min;
> assert(setto == m_increase_tool.set_tool().get_interval().max);
> @@ -171,7 +171,7 @@
> }
>
>
> -void Editor_Tool_Change_Height_Options_Menu::clicked_setto_increment() {
> +void EditorToolChangeHeightOptionsMenu::clicked_setto_increment() {
> Widelands::Field::Height setto =
> m_increase_tool.set_tool().get_interval().min;
> assert(setto == m_increase_tool.set_tool().get_interval().max);
> @@ -189,7 +189,7 @@
>
>
> /// Update all the textareas, so that they represent the correct values.
> -void Editor_Tool_Change_Height_Options_Menu::update() {
> +void EditorToolChangeHeightOptionsMenu::update() {
> char buf[250];
> sprintf(buf, "%i", m_increase_tool.get_change_by());
> m_change_by_value.set_text(buf);
>
> === modified file 'src/editor/ui_menus/editor_tool_change_height_options_menu.h'
> --- src/editor/ui_menus/editor_tool_change_height_options_menu.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_tool_change_height_options_menu.h 2014-09-15 07:27:30 +0000
> @@ -24,19 +24,19 @@
> #include "ui_basic/button.h"
> #include "ui_basic/textarea.h"
>
> -struct Editor_Interactive;
> -struct Editor_Increase_Height_Tool;
> +struct EditorInteractive;
> +struct EditorIncreaseHeightTool;
>
> -struct Editor_Tool_Change_Height_Options_Menu :
> - public Editor_Tool_Options_Menu
> +struct EditorToolChangeHeightOptionsMenu :
> + public EditorToolOptionsMenu
> {
> - Editor_Tool_Change_Height_Options_Menu
> - (Editor_Interactive &,
> - Editor_Increase_Height_Tool &,
> + EditorToolChangeHeightOptionsMenu
> + (EditorInteractive &,
> + EditorIncreaseHeightTool &,
> UI::UniqueWindow::Registry &);
>
> private:
> - Editor_Increase_Height_Tool & m_increase_tool;
> + EditorIncreaseHeightTool & m_increase_tool;
> UI::Textarea m_change_by_label;
> UI::Button m_change_by_increase, m_change_by_decrease;
> UI::Textarea m_change_by_value;
>
> === modified file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.cc'
> --- src/editor/ui_menus/editor_tool_change_resources_options_menu.cc 2014-07-14 10:45:44 +0000
> +++ src/editor/ui_menus/editor_tool_change_resources_options_menu.cc 2014-09-15 07:27:30 +0000
> @@ -36,13 +36,13 @@
> const static int BUTTON_WIDTH = 20;
> const static int BUTTON_HEIGHT = 20;
>
> -Editor_Tool_Change_Resources_Options_Menu::
> -Editor_Tool_Change_Resources_Options_Menu
> - (Editor_Interactive & parent,
> - Editor_Increase_Resources_Tool & increase_tool,
> +EditorToolChangeResourcesOptionsMenu::
> +EditorToolChangeResourcesOptionsMenu
> + (EditorInteractive & parent,
> + EditorIncreaseResourcesTool & increase_tool,
> UI::UniqueWindow::Registry & registry)
> :
> - Editor_Tool_Options_Menu
> + EditorToolOptionsMenu
> (parent, registry, 250, 120, _("Resources")),
> m_change_by_label
> (this,
> @@ -102,22 +102,22 @@
> {
> m_change_by_increase.sigclicked.connect
> (boost::bind
> - (&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
> + (&EditorToolChangeResourcesOptionsMenu::clicked_button,
> boost::ref(*this),
> Change_By_Increase));
> m_change_by_decrease.sigclicked.connect
> (boost::bind
> - (&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
> + (&EditorToolChangeResourcesOptionsMenu::clicked_button,
> boost::ref(*this),
> Change_By_Decrease));
> m_set_to_increase.sigclicked.connect
> (boost::bind
> - (&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
> + (&EditorToolChangeResourcesOptionsMenu::clicked_button,
> boost::ref(*this),
> Set_To_Increase));
> m_set_to_decrease.sigclicked.connect
> (boost::bind
> - (&Editor_Tool_Change_Resources_Options_Menu::clicked_button,
> + (&EditorToolChangeResourcesOptionsMenu::clicked_button,
> boost::ref(*this),
> Set_To_Decrease));
>
> @@ -126,11 +126,11 @@
> m_set_to_increase .set_repeating(true);
> m_set_to_decrease .set_repeating(true);
> const Widelands::World & world = parent.egbase().world();
> - Widelands::Resource_Index const nr_resources = world.get_nr_resources();
> + Widelands::ResourceIndex const nr_resources = world.get_nr_resources();
>
> // Find the maximal width and height for the resource pictures.
> uint16_t resource_pic_max_width = 0, resource_pic_max_height = 0;
> - for (Widelands::Resource_Index i = 0; i < nr_resources; ++i) {
> + for (Widelands::ResourceIndex i = 0; i < nr_resources; ++i) {
> const Image* pic = g_gr->images().get(world.get_resource(i)->get_editor_pic(100000));
> resource_pic_max_width = std::max(resource_pic_max_width, pic->width());
> resource_pic_max_height = std::max(resource_pic_max_height, pic->height());
> @@ -142,15 +142,15 @@
> (resource_pic_max_width + spacing());
>
> m_radiogroup.changed.connect
> - (boost::bind(&Editor_Tool_Change_Resources_Options_Menu::selected, this));
> + (boost::bind(&EditorToolChangeResourcesOptionsMenu::selected, this));
> m_radiogroup.clicked.connect
> - (boost::bind(&Editor_Tool_Change_Resources_Options_Menu::selected, this));
> + (boost::bind(&EditorToolChangeResourcesOptionsMenu::selected, this));
>
> uint16_t cur_x = 0;
> Point pos
> (hmargin(), m_set_to_value.get_y() + m_set_to_value.get_h() + vspacing());
> for
> - (Widelands::Resource_Index i = 0;
> + (Widelands::ResourceIndex i = 0;
> i < nr_resources;
> pos.x += resource_pic_max_width + hspacing(), ++cur_x, ++i)
> {
> @@ -175,7 +175,7 @@
> }
>
>
> -void Editor_Tool_Change_Resources_Options_Menu::clicked_button(Button const n)
> +void EditorToolChangeResourcesOptionsMenu::clicked_button(Button const n)
> {
> assert
> (m_increase_tool.get_change_by()
> @@ -205,14 +205,14 @@
> /**
> * called when a resource has been selected
> */
> -void Editor_Tool_Change_Resources_Options_Menu::selected() {
> +void EditorToolChangeResourcesOptionsMenu::selected() {
> const int32_t n = m_radiogroup.get_state();
>
> m_increase_tool.set_tool().set_cur_res(n);
> m_increase_tool.set_cur_res(n);
> m_increase_tool.decrease_tool().set_cur_res(n);
>
> - Widelands::Editor_Game_Base& egbase = ref_cast<Editor_Interactive, UI::Panel>(*get_parent()).egbase();
> + Widelands::EditorGameBase& egbase = ref_cast<EditorInteractive, UI::Panel>(*get_parent()).egbase();
> Widelands::Map & map = egbase.map();
> map.overlay_manager().register_overlay_callback_function(
> boost::bind(&Editor_Change_Resource_Tool_Callback, _1, boost::ref(map), boost::ref(egbase.world()), n));
> @@ -225,7 +225,7 @@
> /**
> * Update all the textareas, so that they represent the correct values
> */
> -void Editor_Tool_Change_Resources_Options_Menu::update() {
> +void EditorToolChangeResourcesOptionsMenu::update() {
> char buf[250];
> sprintf(buf, "%i", m_increase_tool.get_change_by());
> m_change_by_value.set_text(buf);
> @@ -233,7 +233,7 @@
> m_set_to_value.set_text(buf);
>
> m_cur_selection.set_text
> - (ref_cast<Editor_Interactive, UI::Panel>(*get_parent()).egbase()
> + (ref_cast<EditorInteractive, UI::Panel>(*get_parent()).egbase()
> .world().get_resource(m_increase_tool.set_tool().get_cur_res())->descname());
> m_cur_selection.set_pos
> (Point
>
> === modified file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.h'
> --- src/editor/ui_menus/editor_tool_change_resources_options_menu.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_tool_change_resources_options_menu.h 2014-09-15 07:27:30 +0000
> @@ -25,15 +25,15 @@
> #include "ui_basic/radiobutton.h"
> #include "ui_basic/textarea.h"
>
> -struct Editor_Interactive;
> -struct Editor_Increase_Resources_Tool;
> +struct EditorInteractive;
> +struct EditorIncreaseResourcesTool;
>
> -struct Editor_Tool_Change_Resources_Options_Menu :
> - public Editor_Tool_Options_Menu
> +struct EditorToolChangeResourcesOptionsMenu :
> + public EditorToolOptionsMenu
> {
> - Editor_Tool_Change_Resources_Options_Menu
> - (Editor_Interactive &,
> - Editor_Increase_Resources_Tool &,
> + EditorToolChangeResourcesOptionsMenu
> + (EditorInteractive &,
> + EditorIncreaseResourcesTool &,
> UI::UniqueWindow::Registry &);
>
> private:
> @@ -52,7 +52,7 @@
> UI::Textarea m_set_to_value;
> UI::Textarea m_cur_selection;
> UI::Radiogroup m_radiogroup;
> - Editor_Increase_Resources_Tool & m_increase_tool;
> + EditorIncreaseResourcesTool & m_increase_tool;
> };
>
> #endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_TOOL_CHANGE_RESOURCES_OPTIONS_MENU_H
>
> === modified file 'src/editor/ui_menus/editor_tool_menu.cc'
> --- src/editor/ui_menus/editor_tool_menu.cc 2014-07-14 10:45:44 +0000
> +++ src/editor/ui_menus/editor_tool_menu.cc 2014-09-15 07:27:30 +0000
> @@ -40,8 +40,8 @@
> #include "ui_basic/radiobutton.h"
> #include "ui_basic/textarea.h"
>
> -Editor_Tool_Menu::Editor_Tool_Menu
> - (Editor_Interactive & parent, UI::UniqueWindow::Registry & registry)
> +EditorToolMenu::EditorToolMenu
> + (EditorInteractive & parent, UI::UniqueWindow::Registry & registry)
> :
> UI::UniqueWindow(&parent, "tool_menu", ®istry, 350, 400, _("Tools"))
> {
> @@ -74,7 +74,7 @@
> (offs.x + (width + spacing) * num_tools, offs.y + (height + spacing));
>
> {
> - const Editor_Tool & current = parent.tools.current();
> + const EditorTool & current = parent.tools.current();
> m_radioselect.set_state
> (¤t == &parent.tools.noise_height ? 1 :
> ¤t == &parent.tools.set_terrain ? 2 :
> @@ -85,8 +85,8 @@
> 0);
> }
>
> - m_radioselect.changed.connect(boost::bind(&Editor_Tool_Menu::changed_to, this));
> - m_radioselect.clicked.connect(boost::bind(&Editor_Tool_Menu::changed_to, this));
> + m_radioselect.changed.connect(boost::bind(&EditorToolMenu::changed_to, this));
> + m_radioselect.clicked.connect(boost::bind(&EditorToolMenu::changed_to, this));
>
> if (get_usedefaultpos())
> center_to_parent();
> @@ -95,13 +95,13 @@
> /**
> * Called when the radiogroup changes or is reclicked
> */
> -void Editor_Tool_Menu::changed_to() {
> +void EditorToolMenu::changed_to() {
> const int32_t n = m_radioselect.get_state();
>
> - Editor_Interactive & parent =
> - ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> + EditorInteractive & parent =
> + ref_cast<EditorInteractive, UI::Panel>(*get_parent());
>
> - Editor_Tool * current_tool_pointer = nullptr;
> + EditorTool * current_tool_pointer = nullptr;
> UI::UniqueWindow::Registry * current_registry_pointer = nullptr;
> switch (n) {
> case 0:
> @@ -137,7 +137,7 @@
> break;
> }
>
> - parent.select_tool(*current_tool_pointer, Editor_Tool::First);
> + parent.select_tool(*current_tool_pointer, EditorTool::First);
> if (current_tool_pointer == &parent.tools.set_port_space) {
> // Set correct overlay
> Widelands::Map & map = parent.egbase().map();
> @@ -157,37 +157,37 @@
> } else
> switch (n) { // create window
> case 0:
> - new Editor_Tool_Change_Height_Options_Menu
> + new EditorToolChangeHeightOptionsMenu
> (parent,
> parent.tools.increase_height,
> *current_registry_pointer);
> break;
> case 1:
> - new Editor_Tool_Noise_Height_Options_Menu
> + new EditorToolNoiseHeightOptionsMenu
> (parent,
> parent.tools.noise_height,
> *current_registry_pointer);
> break;
> case 2:
> - new Editor_Tool_Set_Terrain_Options_Menu
> + new EditorToolSetTerrainOptionsMenu
> (parent,
> parent.tools.set_terrain,
> *current_registry_pointer);
> break;
> case 3:
> - new Editor_Tool_Place_Immovable_Options_Menu
> + new EditorToolPlaceImmovableOptionsMenu
> (parent,
> parent.tools.place_immovable,
> *current_registry_pointer);
> break;
> case 4:
> - new Editor_Tool_Place_Bob_Options_Menu
> + new EditorToolPlaceBobOptionsMenu
> (parent,
> parent.tools.place_bob,
> *current_registry_pointer);
> break;
> case 5:
> - new Editor_Tool_Change_Resources_Options_Menu
> + new EditorToolChangeResourcesOptionsMenu
> (parent,
> parent.tools.increase_resources,
> *current_registry_pointer);
>
> === modified file 'src/editor/ui_menus/editor_tool_menu.h'
> --- src/editor/ui_menus/editor_tool_menu.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_tool_menu.h 2014-09-15 07:27:30 +0000
> @@ -25,8 +25,8 @@
> #include "ui_basic/unique_window.h"
>
> /// The tool selection window/menu.
> -struct Editor_Tool_Menu : public UI::UniqueWindow {
> - Editor_Tool_Menu(Editor_Interactive &, UI::UniqueWindow::Registry &);
> +struct EditorToolMenu : public UI::UniqueWindow {
> + EditorToolMenu(EditorInteractive &, UI::UniqueWindow::Registry &);
>
> private:
> UI::Radiogroup m_radioselect;
>
> === modified file 'src/editor/ui_menus/editor_tool_noise_height_options_menu.cc'
> --- src/editor/ui_menus/editor_tool_noise_height_options_menu.cc 2014-07-26 16:37:37 +0000
> +++ src/editor/ui_menus/editor_tool_noise_height_options_menu.cc 2014-09-15 07:27:30 +0000
> @@ -34,12 +34,12 @@
>
> #define width 20
> #define height 20
> -Editor_Tool_Noise_Height_Options_Menu::Editor_Tool_Noise_Height_Options_Menu
> - (Editor_Interactive & parent,
> - Editor_Noise_Height_Tool & noise_tool,
> +EditorToolNoiseHeightOptionsMenu::EditorToolNoiseHeightOptionsMenu
> + (EditorInteractive & parent,
> + EditorNoiseHeightTool & noise_tool,
> UI::UniqueWindow::Registry & registry)
> :
> - Editor_Tool_Options_Menu
> + EditorToolOptionsMenu
> (parent, registry, 250, 3 * height + 4 * vspacing() + 2 * vmargin(), _("Noise Height Options")),
> m_noise_tool(noise_tool),
> m_lower_label
> @@ -116,17 +116,17 @@
> noise_tool.set_tool().get_interval().max < MAX_FIELD_HEIGHT)
> {
> m_lower_increase.sigclicked.connect
> - (boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_lower_increase, boost::ref(*this)));
> + (boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_lower_increase, boost::ref(*this)));
> m_lower_decrease.sigclicked.connect
> - (boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_lower_decrease, boost::ref(*this)));
> + (boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_lower_decrease, boost::ref(*this)));
> m_upper_increase.sigclicked.connect
> - (boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_upper_increase, boost::ref(*this)));
> + (boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_upper_increase, boost::ref(*this)));
> m_upper_decrease.sigclicked.connect
> - (boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_upper_decrease, boost::ref(*this)));
> + (boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_upper_decrease, boost::ref(*this)));
> m_setto_increase.sigclicked.connect
> - (boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_setto_increase, boost::ref(*this)));
> + (boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_setto_increase, boost::ref(*this)));
> m_setto_decrease.sigclicked.connect
> - (boost::bind(&Editor_Tool_Noise_Height_Options_Menu::clicked_setto_decrease, boost::ref(*this)));
> + (boost::bind(&EditorToolNoiseHeightOptionsMenu::clicked_setto_decrease, boost::ref(*this)));
>
> m_lower_increase.set_repeating(true);
> m_lower_decrease.set_repeating(true);
> @@ -140,7 +140,7 @@
> /**
> * Update all textareas
> */
> -void Editor_Tool_Noise_Height_Options_Menu::update() {
> +void EditorToolNoiseHeightOptionsMenu::update() {
> char buffer[200];
> const Widelands::HeightInterval height_interval = m_noise_tool.get_interval();
> snprintf(buffer, sizeof(buffer), _("Minimum: %u"), height_interval.min);
> @@ -157,7 +157,7 @@
> }
>
>
> -void Editor_Tool_Noise_Height_Options_Menu::clicked_lower_decrease() {
> +void EditorToolNoiseHeightOptionsMenu::clicked_lower_decrease() {
> Widelands::HeightInterval height_interval = m_noise_tool.get_interval();
>
> assert(height_interval.valid());
> @@ -174,7 +174,7 @@
> }
>
>
> -void Editor_Tool_Noise_Height_Options_Menu::clicked_lower_increase() {
> +void EditorToolNoiseHeightOptionsMenu::clicked_lower_increase() {
> Widelands::HeightInterval height_interval = m_noise_tool.get_interval();
>
> assert(height_interval.valid());
> @@ -195,7 +195,7 @@
> }
>
>
> -void Editor_Tool_Noise_Height_Options_Menu::clicked_upper_decrease() {
> +void EditorToolNoiseHeightOptionsMenu::clicked_upper_decrease() {
> Widelands::HeightInterval height_interval = m_noise_tool.get_interval();
>
> assert(height_interval.valid());
> @@ -215,7 +215,7 @@
> }
>
>
> -void Editor_Tool_Noise_Height_Options_Menu::clicked_upper_increase() {
> +void EditorToolNoiseHeightOptionsMenu::clicked_upper_increase() {
> Widelands::HeightInterval height_interval = m_noise_tool.get_interval();
>
> assert(m_noise_tool.get_interval().valid());
> @@ -232,8 +232,8 @@
> }
>
>
> -void Editor_Tool_Noise_Height_Options_Menu::clicked_setto_decrease() {
> - Editor_Set_Height_Tool & set_tool = m_noise_tool.set_tool();
> +void EditorToolNoiseHeightOptionsMenu::clicked_setto_decrease() {
> + EditorSetHeightTool & set_tool = m_noise_tool.set_tool();
> Field::Height h = set_tool.get_interval().min;
>
> assert(h == set_tool.get_interval().max);
> @@ -248,8 +248,8 @@
> }
>
>
> -void Editor_Tool_Noise_Height_Options_Menu::clicked_setto_increase() {
> - Editor_Set_Height_Tool & set_tool = m_noise_tool.set_tool();
> +void EditorToolNoiseHeightOptionsMenu::clicked_setto_increase() {
> + EditorSetHeightTool & set_tool = m_noise_tool.set_tool();
> Field::Height h = set_tool.get_interval().min;
>
> assert(h == set_tool.get_interval().max);
>
> === modified file 'src/editor/ui_menus/editor_tool_noise_height_options_menu.h'
> --- src/editor/ui_menus/editor_tool_noise_height_options_menu.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_tool_noise_height_options_menu.h 2014-09-15 07:27:30 +0000
> @@ -24,17 +24,17 @@
> #include "ui_basic/button.h"
> #include "ui_basic/textarea.h"
>
> -struct Editor_Interactive;
> -struct Editor_Noise_Height_Tool;
> +struct EditorInteractive;
> +struct EditorNoiseHeightTool;
>
> -struct Editor_Tool_Noise_Height_Options_Menu : public Editor_Tool_Options_Menu {
> - Editor_Tool_Noise_Height_Options_Menu
> - (Editor_Interactive &,
> - Editor_Noise_Height_Tool &,
> +struct EditorToolNoiseHeightOptionsMenu : public EditorToolOptionsMenu {
> + EditorToolNoiseHeightOptionsMenu
> + (EditorInteractive &,
> + EditorNoiseHeightTool &,
> UI::UniqueWindow::Registry &);
>
> private:
> - Editor_Noise_Height_Tool & m_noise_tool;
> + EditorNoiseHeightTool & m_noise_tool;
> UI::Textarea m_lower_label, m_upper_label;
> UI::Button m_lower_decrease, m_lower_increase, m_upper_decrease, m_upper_increase;
> UI::Textarea m_set_label;
>
> === modified file 'src/editor/ui_menus/editor_tool_options_menu.cc'
> --- src/editor/ui_menus/editor_tool_options_menu.cc 2013-07-26 20:19:36 +0000
> +++ src/editor/ui_menus/editor_tool_options_menu.cc 2014-09-15 07:27:30 +0000
> @@ -19,8 +19,8 @@
>
> #include "editor/ui_menus/editor_tool_options_menu.h"
>
> -Editor_Tool_Options_Menu::Editor_Tool_Options_Menu
> - (Editor_Interactive & parent,
> +EditorToolOptionsMenu::EditorToolOptionsMenu
> + (EditorInteractive & parent,
> UI::UniqueWindow::Registry & registry,
> uint32_t const width, uint32_t const height,
> char const * const title)
> @@ -34,7 +34,7 @@
> }
>
>
> -void Editor_Tool_Options_Menu::select_correct_tool() {
> - ref_cast<Editor_Interactive, UI::Panel>(*get_parent())
> - .select_tool(*m_current_pointer, Editor_Tool::First);
> +void EditorToolOptionsMenu::select_correct_tool() {
> + ref_cast<EditorInteractive, UI::Panel>(*get_parent())
> + .select_tool(*m_current_pointer, EditorTool::First);
> }
>
> === modified file 'src/editor/ui_menus/editor_tool_options_menu.h'
> --- src/editor/ui_menus/editor_tool_options_menu.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_tool_options_menu.h 2014-09-15 07:27:30 +0000
> @@ -23,9 +23,9 @@
> #include "editor/editorinteractive.h"
> #include "ui_basic/unique_window.h"
>
> -struct Editor_Tool_Options_Menu : public UI::UniqueWindow {
> - Editor_Tool_Options_Menu
> - (Editor_Interactive & parent,
> +struct EditorToolOptionsMenu : public UI::UniqueWindow {
> + EditorToolOptionsMenu
> + (EditorInteractive & parent,
> UI::UniqueWindow::Registry &,
> const uint32_t widht, const uint32_t height,
> char const * title);
> @@ -43,7 +43,7 @@
> uint32_t vmargin () const {return spacing();}
>
> private:
> - Editor_Tool * m_current_pointer;
> + EditorTool * m_current_pointer;
> };
>
> #endif // end of include guard: WL_EDITOR_UI_MENUS_EDITOR_TOOL_OPTIONS_MENU_H
>
> === modified file 'src/editor/ui_menus/editor_tool_place_bob_options_menu.cc'
> --- src/editor/ui_menus/editor_tool_place_bob_options_menu.cc 2014-07-28 17:12:07 +0000
> +++ src/editor/ui_menus/editor_tool_place_bob_options_menu.cc 2014-09-15 07:27:30 +0000
> @@ -37,12 +37,12 @@
> #include "wlapplication.h"
>
>
> -Editor_Tool_Place_Bob_Options_Menu::Editor_Tool_Place_Bob_Options_Menu
> - (Editor_Interactive & parent,
> - Editor_Place_Bob_Tool & pit,
> +EditorToolPlaceBobOptionsMenu::EditorToolPlaceBobOptionsMenu
> + (EditorInteractive & parent,
> + EditorPlaceBobTool & pit,
> UI::UniqueWindow::Registry & registry)
> :
> -Editor_Tool_Options_Menu(parent, registry, 100, 100, _("Animals")),
> +EditorToolOptionsMenu(parent, registry, 100, 100, _("Animals")),
>
> m_tabpanel (this, 0, 0, g_gr->images().get("pics/but1.png")),
> m_pit (pit),
> @@ -98,7 +98,7 @@
>
> cb.set_desired_size(width, height);
> cb.set_state(m_pit.is_enabled(i));
> - cb.changedto.connect(boost::bind(&Editor_Tool_Place_Bob_Options_Menu::clicked, this, i, _1));
> + cb.changedto.connect(boost::bind(&EditorToolPlaceBobOptionsMenu::clicked, this, i, _1));
> m_checkboxes.push_back(&cb);
> box->add(&cb, UI::Align_Left);
> box->add_space(space);
> @@ -114,7 +114,7 @@
> /**
> * This is called when one of the state boxes is toggled
> */
> -void Editor_Tool_Place_Bob_Options_Menu::clicked
> +void EditorToolPlaceBobOptionsMenu::clicked
> (int32_t const n, bool const t)
> {
> if (m_click_recursion_protect)
>
> === modified file 'src/editor/ui_menus/editor_tool_place_bob_options_menu.h'
> --- src/editor/ui_menus/editor_tool_place_bob_options_menu.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_tool_place_bob_options_menu.h 2014-09-15 07:27:30 +0000
> @@ -25,19 +25,19 @@
> #include "editor/ui_menus/editor_tool_options_menu.h"
> #include "ui_basic/tabpanel.h"
>
> -struct Editor_Place_Bob_Tool;
> +struct EditorPlaceBobTool;
> namespace UI {struct Checkbox;}
>
> -struct Editor_Tool_Place_Bob_Options_Menu : public Editor_Tool_Options_Menu {
> - Editor_Tool_Place_Bob_Options_Menu
> - (Editor_Interactive &,
> - Editor_Place_Bob_Tool &,
> +struct EditorToolPlaceBobOptionsMenu : public EditorToolOptionsMenu {
> + EditorToolPlaceBobOptionsMenu
> + (EditorInteractive &,
> + EditorPlaceBobTool &,
> UI::UniqueWindow::Registry &);
>
> private:
> - UI::Tab_Panel m_tabpanel;
> + UI::TabPanel m_tabpanel;
> std::vector<UI::Checkbox *> m_checkboxes;
> - Editor_Place_Bob_Tool & m_pit;
> + EditorPlaceBobTool & m_pit;
> void clicked(int32_t, bool);
> bool m_click_recursion_protect;
> };
>
> === modified file 'src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc'
> --- src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc 2014-07-28 16:59:54 +0000
> +++ src/editor/ui_menus/editor_tool_place_immovable_options_menu.cc 2014-09-15 07:27:30 +0000
> @@ -51,14 +51,14 @@
>
> } // namespace
>
> -Editor_Tool_Place_Immovable_Options_Menu::Editor_Tool_Place_Immovable_Options_Menu(
> - Editor_Interactive& parent,
> - Editor_Place_Immovable_Tool& tool,
> +EditorToolPlaceImmovableOptionsMenu::EditorToolPlaceImmovableOptionsMenu(
> + EditorInteractive& parent,
> + EditorPlaceImmovableTool& tool,
> UI::UniqueWindow::Registry& registry)
> - : Editor_Tool_Options_Menu(parent, registry, 0, 0, _("Immovable Select")) {
> + : EditorToolOptionsMenu(parent, registry, 0, 0, _("Immovable Select")) {
> const Widelands::World& world = parent.egbase().world();
> multi_select_menu_.reset(
> - new CategorizedItemSelectionMenu<Widelands::ImmovableDescr, Editor_Place_Immovable_Tool>(
> + new CategorizedItemSelectionMenu<Widelands::ImmovableDescr, EditorPlaceImmovableTool>(
> this,
> world.editor_immovable_categories(),
> world.immovables(),
> @@ -70,5 +70,5 @@
> set_center_panel(multi_select_menu_.get());
> }
>
> -Editor_Tool_Place_Immovable_Options_Menu::~Editor_Tool_Place_Immovable_Options_Menu() {
> +EditorToolPlaceImmovableOptionsMenu::~EditorToolPlaceImmovableOptionsMenu() {
> }
>
> === modified file 'src/editor/ui_menus/editor_tool_place_immovable_options_menu.h'
> --- src/editor/ui_menus/editor_tool_place_immovable_options_menu.h 2014-07-28 16:59:54 +0000
> +++ src/editor/ui_menus/editor_tool_place_immovable_options_menu.h 2014-09-15 07:27:30 +0000
> @@ -27,16 +27,16 @@
> #include "editor/ui_menus/editor_tool_options_menu.h"
> #include "editor/tools/editor_place_immovable_tool.h"
>
> -struct Editor_Interactive;
> +struct EditorInteractive;
>
> -struct Editor_Tool_Place_Immovable_Options_Menu : public Editor_Tool_Options_Menu {
> - Editor_Tool_Place_Immovable_Options_Menu(Editor_Interactive&,
> - Editor_Place_Immovable_Tool&,
> +struct EditorToolPlaceImmovableOptionsMenu : public EditorToolOptionsMenu {
> + EditorToolPlaceImmovableOptionsMenu(EditorInteractive&,
> + EditorPlaceImmovableTool&,
> UI::UniqueWindow::Registry&);
> - virtual ~Editor_Tool_Place_Immovable_Options_Menu();
> + virtual ~EditorToolPlaceImmovableOptionsMenu();
>
> private:
> - std::unique_ptr<CategorizedItemSelectionMenu<Widelands::ImmovableDescr, Editor_Place_Immovable_Tool>>
> + std::unique_ptr<CategorizedItemSelectionMenu<Widelands::ImmovableDescr, EditorPlaceImmovableTool>>
> multi_select_menu_;
> };
>
>
> === modified file 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc'
> --- src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc 2014-07-05 14:22:44 +0000
> +++ src/editor/ui_menus/editor_tool_set_terrain_options_menu.cc 2014-09-15 07:27:30 +0000
> @@ -114,12 +114,12 @@
>
> } // namespace
>
> -Editor_Tool_Set_Terrain_Options_Menu::Editor_Tool_Set_Terrain_Options_Menu(
> - Editor_Interactive& parent, Editor_Set_Terrain_Tool& tool, UI::UniqueWindow::Registry& registry)
> - : Editor_Tool_Options_Menu(parent, registry, 0, 0, _("Terrain Select")) {
> +EditorToolSetTerrainOptionsMenu::EditorToolSetTerrainOptionsMenu(
> + EditorInteractive& parent, EditorSetTerrainTool& tool, UI::UniqueWindow::Registry& registry)
> + : EditorToolOptionsMenu(parent, registry, 0, 0, _("Terrain Select")) {
> const Widelands::World& world = parent.egbase().world();
> multi_select_menu_.reset(
> - new CategorizedItemSelectionMenu<Widelands::TerrainDescription, Editor_Set_Terrain_Tool>(
> + new CategorizedItemSelectionMenu<Widelands::TerrainDescription, EditorSetTerrainTool>(
> this,
> world.editor_terrain_categories(),
> world.terrains(),
> @@ -131,5 +131,5 @@
> set_center_panel(multi_select_menu_.get());
> }
>
> -Editor_Tool_Set_Terrain_Options_Menu::~Editor_Tool_Set_Terrain_Options_Menu() {
> +EditorToolSetTerrainOptionsMenu::~EditorToolSetTerrainOptionsMenu() {
> }
>
> === modified file 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.h'
> --- src/editor/ui_menus/editor_tool_set_terrain_options_menu.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_tool_set_terrain_options_menu.h 2014-09-15 07:27:30 +0000
> @@ -29,17 +29,17 @@
> #include "logic/world/terrain_description.h"
> #include "ui_basic/textarea.h"
>
> -struct Editor_Interactive;
> -struct Editor_Set_Terrain_Tool;
> +struct EditorInteractive;
> +struct EditorSetTerrainTool;
>
> -struct Editor_Tool_Set_Terrain_Options_Menu : public Editor_Tool_Options_Menu {
> - Editor_Tool_Set_Terrain_Options_Menu(Editor_Interactive&,
> - Editor_Set_Terrain_Tool&,
> +struct EditorToolSetTerrainOptionsMenu : public EditorToolOptionsMenu {
> + EditorToolSetTerrainOptionsMenu(EditorInteractive&,
> + EditorSetTerrainTool&,
> UI::UniqueWindow::Registry&);
> - virtual ~Editor_Tool_Set_Terrain_Options_Menu();
> + virtual ~EditorToolSetTerrainOptionsMenu();
>
> private:
> - std::unique_ptr<CategorizedItemSelectionMenu<Widelands::TerrainDescription, Editor_Set_Terrain_Tool>>
> + std::unique_ptr<CategorizedItemSelectionMenu<Widelands::TerrainDescription, EditorSetTerrainTool>>
> multi_select_menu_;
> std::vector<std::unique_ptr<const Image>> offscreen_images_;
> };
>
> === modified file 'src/editor/ui_menus/editor_toolsize_menu.cc'
> --- src/editor/ui_menus/editor_toolsize_menu.cc 2014-07-14 10:45:44 +0000
> +++ src/editor/ui_menus/editor_toolsize_menu.cc 2014-09-15 07:27:30 +0000
> @@ -26,16 +26,16 @@
> #include "editor/tools/editor_tool.h"
> #include "graphic/graphic.h"
>
> -inline Editor_Interactive & Editor_Toolsize_Menu::eia() {
> - return ref_cast<Editor_Interactive, UI::Panel>(*get_parent());
> +inline EditorInteractive & EditorToolsizeMenu::eia() {
> + return ref_cast<EditorInteractive, UI::Panel>(*get_parent());
> }
>
>
> /**
> * Create all the buttons etc...
> */
> -Editor_Toolsize_Menu::Editor_Toolsize_Menu
> - (Editor_Interactive & parent, UI::UniqueWindow::Registry & registry)
> +EditorToolsizeMenu::EditorToolsizeMenu
> + (EditorInteractive & parent, UI::UniqueWindow::Registry & registry)
> :
> UI::UniqueWindow
> (&parent, "toolsize_menu", ®istry, 250, 50, _("Tool Size")),
> @@ -55,8 +55,8 @@
> std::string(),
> 0 < parent.get_sel_radius())
> {
> - m_increase.sigclicked.connect(boost::bind(&Editor_Toolsize_Menu::increase_radius, boost::ref(*this)));
> - m_decrease.sigclicked.connect(boost::bind(&Editor_Toolsize_Menu::decrease_radius, boost::ref(*this)));
> + m_increase.sigclicked.connect(boost::bind(&EditorToolsizeMenu::increase_radius, boost::ref(*this)));
> + m_decrease.sigclicked.connect(boost::bind(&EditorToolsizeMenu::decrease_radius, boost::ref(*this)));
>
> m_increase.set_repeating(true);
> m_decrease.set_repeating(true);
> @@ -67,7 +67,7 @@
> }
>
>
> -void Editor_Toolsize_Menu::update(uint32_t const val) {
> +void EditorToolsizeMenu::update(uint32_t const val) {
> eia().set_sel_radius(val);
> m_decrease.set_enabled(0 < val);
> m_increase.set_enabled (val < MAX_TOOL_AREA);
> @@ -77,11 +77,11 @@
> }
>
>
> -void Editor_Toolsize_Menu::decrease_radius() {
> +void EditorToolsizeMenu::decrease_radius() {
> assert(0 < eia().get_sel_radius());
> update(eia().get_sel_radius() - 1);
> }
> -void Editor_Toolsize_Menu::increase_radius() {
> +void EditorToolsizeMenu::increase_radius() {
> assert(eia().get_sel_radius() < MAX_TOOL_AREA);
> update(eia().get_sel_radius() + 1);
> }
>
> === modified file 'src/editor/ui_menus/editor_toolsize_menu.h'
> --- src/editor/ui_menus/editor_toolsize_menu.h 2014-07-05 16:41:51 +0000
> +++ src/editor/ui_menus/editor_toolsize_menu.h 2014-09-15 07:27:30 +0000
> @@ -25,16 +25,16 @@
> #include "ui_basic/unique_window.h"
>
>
> -struct Editor_Interactive;
> +struct EditorInteractive;
>
>
> /// The tool size window/menu.
> -struct Editor_Toolsize_Menu : public UI::UniqueWindow {
> - Editor_Toolsize_Menu(Editor_Interactive &, UI::UniqueWindow::Registry &);
> +struct EditorToolsizeMenu : public UI::UniqueWindow {
> + EditorToolsizeMenu(EditorInteractive &, UI::UniqueWindow::Registry &);
> void update(uint32_t);
>
> private:
> - Editor_Interactive & eia();
> + EditorInteractive & eia();
> void decrease_radius();
> void increase_radius();
>
>
> === modified file 'src/game_io/CMakeLists.txt'
> --- src/game_io/CMakeLists.txt 2014-07-05 13:14:42 +0000
> +++ src/game_io/CMakeLists.txt 2014-09-15 07:27:30 +0000
> @@ -1,22 +1,22 @@
> wl_library(game_io
> SRCS
> - game_cmd_queue_data_packet.cc
> - game_cmd_queue_data_packet.h
> + game_cmd_queue_packet.cc
> + game_cmd_queue_packet.h
> game_data_packet.h
> - game_game_class_data_packet.cc
> - game_game_class_data_packet.h
> - game_interactive_player_data_packet.cc
> - game_interactive_player_data_packet.h
> + game_class_packet.cc
> + game_class_packet.h
> + game_interactive_player_packet.cc
> + game_interactive_player_packet.h
> game_loader.cc
> game_loader.h
> - game_map_data_packet.cc
> - game_map_data_packet.h
> - game_player_economies_data_packet.cc
> - game_player_economies_data_packet.h
> - game_player_info_data_packet.cc
> - game_player_info_data_packet.h
> - game_preload_data_packet.cc
> - game_preload_data_packet.h
> + game_map_packet.cc
> + game_map_packet.h
> + game_player_economies_packet.cc
> + game_player_economies_packet.h
> + game_player_info_packet.cc
> + game_player_info_packet.h
> + game_preload_packet.cc
> + game_preload_packet.h
> game_saver.cc
> game_saver.h
> DEPENDS
>
> === renamed file 'src/game_io/game_game_class_data_packet.cc' => 'src/game_io/game_class_packet.cc'
> --- src/game_io/game_game_class_data_packet.cc 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_class_packet.cc 2014-09-15 07:27:30 +0000
> @@ -17,7 +17,7 @@
> *
> */
>
> -#include "game_io/game_game_class_data_packet.h"
> +#include "game_io/game_class_packet.h"
>
> #include "io/fileread.h"
> #include "io/filewrite.h"
> @@ -29,8 +29,8 @@
> #define CURRENT_PACKET_VERSION 2
>
>
> -void Game_Game_Class_Data_Packet::Read
> - (FileSystem & fs, Game & game, MapMapObjectLoader *)
> +void GameClassPacket::Read
> + (FileSystem & fs, Game & game, MapObjectLoader *)
> {
> try {
> FileRead fr;
> @@ -40,18 +40,18 @@
> fr.Signed16(); // This used to be game speed
> game.gametime_ = fr.Unsigned32();
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const _wexception & e) {
> - throw game_data_error("game class: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("game class: %s", e.what());
> }
> }
>
> /*
> * Write Function
> */
> -void Game_Game_Class_Data_Packet::Write
> - (FileSystem & fs, Game & game, MapMapObjectSaver * const)
> +void GameClassPacket::Write
> + (FileSystem & fs, Game & game, MapObjectSaver * const)
> {
> FileWrite fw;
>
> @@ -79,7 +79,7 @@
> // Objects are loaded and saved by map
>
> // Tribes and wares are handled by map
> - // Interactive_Base doesn't need saving
> + // InteractiveBase doesn't need saving
>
> // Map is handled by map saving
>
>
> === renamed file 'src/game_io/game_game_class_data_packet.h' => 'src/game_io/game_class_packet.h'
> --- src/game_io/game_game_class_data_packet.h 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_class_packet.h 2014-09-15 07:27:30 +0000
> @@ -17,8 +17,8 @@
> *
> */
>
> -#ifndef WL_GAME_IO_GAME_GAME_CLASS_DATA_PACKET_H
> -#define WL_GAME_IO_GAME_GAME_CLASS_DATA_PACKET_H
> +#ifndef WL_GAME_IO_GAME_CLASS_PACKET_H
> +#define WL_GAME_IO_GAME_CLASS_PACKET_H
>
> #include "game_io/game_data_packet.h"
>
> @@ -28,11 +28,11 @@
> * This contains all the preload data needed to identify
> * a game for a user (for example in a listbox)
> */
> -struct Game_Game_Class_Data_Packet : public Game_Data_Packet {
> - void Read (FileSystem &, Game &, MapMapObjectLoader * = nullptr) override;
> - void Write(FileSystem &, Game &, MapMapObjectSaver * = nullptr) override;
> +struct GameClassPacket : public GameDataPacket {
> + void Read (FileSystem &, Game &, MapObjectLoader * = nullptr) override;
> + void Write(FileSystem &, Game &, MapObjectSaver * = nullptr) override;
> };
>
> }
>
> -#endif // end of include guard: WL_GAME_IO_GAME_GAME_CLASS_DATA_PACKET_H
> +#endif // end of include guard: WL_GAME_IO_GAME_CLASS_PACKET_H
>
> === renamed file 'src/game_io/game_cmd_queue_data_packet.cc' => 'src/game_io/game_cmd_queue_packet.cc'
> --- src/game_io/game_cmd_queue_data_packet.cc 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_cmd_queue_packet.cc 2014-09-15 07:27:30 +0000
> @@ -17,7 +17,7 @@
> *
> */
>
> -#include "game_io/game_cmd_queue_data_packet.h"
> +#include "game_io/game_cmd_queue_packet.h"
>
> #include "base/macros.h"
> #include "io/fileread.h"
> @@ -32,15 +32,15 @@
> #define CURRENT_PACKET_VERSION 2
>
>
> -void Game_Cmd_Queue_Data_Packet::Read
> - (FileSystem & fs, Game & game, MapMapObjectLoader * const ol)
> +void GameCmdQueuePacket::Read
> + (FileSystem & fs, Game & game, MapObjectLoader * const ol)
> {
> try {
> FileRead fr;
> fr.Open(fs, "binary/cmd_queue");
> uint16_t const packet_version = fr.Unsigned16();
> if (packet_version == CURRENT_PACKET_VERSION) {
> - Cmd_Queue & cmdq = game.cmdqueue();
> + CmdQueue & cmdq = game.cmdqueue();
>
> // nothing to be done for m_game
>
> @@ -56,7 +56,7 @@
> if (!packet_id)
> break;
>
> - Cmd_Queue::cmditem item;
> + CmdQueue::CmdItem item;
> item.category = fr.Signed32();
> item.serial = fr.Unsigned32();
>
> @@ -71,7 +71,7 @@
> }
>
> GameLogicCommand & cmd =
> - Queue_Cmd_Factory::create_correct_queue_command(packet_id);
> + QueueCmdFactory::create_correct_queue_command(packet_id);
> cmd.Read(fr, game, *ol);
>
> item.cmd = &cmd;
> @@ -80,23 +80,23 @@
> ++ cmdq.m_ncmds;
> }
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const _wexception & e) {
> - throw game_data_error("command queue: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("command queue: %s", e.what());
> }
> }
>
>
> -void Game_Cmd_Queue_Data_Packet::Write
> - (FileSystem & fs, Game & game, MapMapObjectSaver * const os)
> +void GameCmdQueuePacket::Write
> + (FileSystem & fs, Game & game, MapObjectSaver * const os)
> {
> FileWrite fw;
>
> // Now packet version
> fw.Unsigned16(CURRENT_PACKET_VERSION);
>
> - const Cmd_Queue & cmdq = game.cmdqueue();
> + const CmdQueue & cmdq = game.cmdqueue();
>
> // nothing to be done for m_game
>
> @@ -111,10 +111,10 @@
>
> while (nhandled < cmdq.m_ncmds) {
> // Make a copy, so we can pop stuff
> - std::priority_queue<Cmd_Queue::cmditem> p = cmdq.m_cmds[time % CMD_QUEUE_BUCKET_SIZE];
> + std::priority_queue<CmdQueue::CmdItem> p = cmdq.m_cmds[time % CMD_QUEUE_BUCKET_SIZE];
>
> while (!p.empty()) {
> - const Cmd_Queue::cmditem & it = p.top();
> + const CmdQueue::CmdItem & it = p.top();
> if (it.cmd->duetime() == time) {
> if (upcast(GameLogicCommand, cmd, it.cmd)) {
> // The id (aka command type)
>
> === renamed file 'src/game_io/game_cmd_queue_data_packet.h' => 'src/game_io/game_cmd_queue_packet.h'
> --- src/game_io/game_cmd_queue_data_packet.h 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_cmd_queue_packet.h 2014-09-15 07:27:30 +0000
> @@ -17,8 +17,8 @@
> *
> */
>
> -#ifndef WL_GAME_IO_GAME_CMD_QUEUE_DATA_PACKET_H
> -#define WL_GAME_IO_GAME_CMD_QUEUE_DATA_PACKET_H
> +#ifndef WL_GAME_IO_GAME_CMD_QUEUE_PACKET_H
> +#define WL_GAME_IO_GAME_CMD_QUEUE_PACKET_H
>
> #include "game_io/game_data_packet.h"
>
> @@ -30,11 +30,11 @@
> * This contains all the preload data needed to identify
> * a game for a user (for example in a listbox)
> */
> -struct Game_Cmd_Queue_Data_Packet : public Game_Data_Packet {
> - void Read (FileSystem &, Game &, MapMapObjectLoader * = nullptr) override;
> - void Write(FileSystem &, Game &, MapMapObjectSaver * = nullptr) override;
> +struct GameCmdQueuePacket : public GameDataPacket {
> + void Read (FileSystem &, Game &, MapObjectLoader * = nullptr) override;
> + void Write(FileSystem &, Game &, MapObjectSaver * = nullptr) override;
> };
>
> }
>
> -#endif // end of include guard: WL_GAME_IO_GAME_CMD_QUEUE_DATA_PACKET_H
> +#endif // end of include guard: WL_GAME_IO_GAME_CMD_QUEUE_PACKET_H
>
> === modified file 'src/game_io/game_data_packet.h'
> --- src/game_io/game_data_packet.h 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_data_packet.h 2014-09-15 07:27:30 +0000
> @@ -27,8 +27,8 @@
> namespace Widelands {
>
> class Game;
> -class MapMapObjectLoader;
> -struct MapMapObjectSaver;
> +class MapObjectLoader;
> +struct MapObjectSaver;
>
> /*
> ========================================
> @@ -38,10 +38,10 @@
>
> ========================================
> */
> -struct Game_Data_Packet {
> - virtual ~Game_Data_Packet() {}
> - virtual void Read (FileSystem &, Game &, MapMapObjectLoader * = nullptr) = 0;
> - virtual void Write(FileSystem &, Game &, MapMapObjectSaver * = nullptr) = 0;
> +struct GameDataPacket {
> + virtual ~GameDataPacket() {}
> + virtual void Read (FileSystem &, Game &, MapObjectLoader * = nullptr) = 0;
> + virtual void Write(FileSystem &, Game &, MapObjectSaver * = nullptr) = 0;
> };
>
> }
>
> === renamed file 'src/game_io/game_interactive_player_data_packet.cc' => 'src/game_io/game_interactive_player_packet.cc'
> --- src/game_io/game_interactive_player_data_packet.cc 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_interactive_player_packet.cc 2014-09-15 07:27:30 +0000
> @@ -17,7 +17,7 @@
> *
> */
>
> -#include "game_io/game_interactive_player_data_packet.h"
> +#include "game_io/game_interactive_player_packet.h"
>
> #include "io/fileread.h"
> #include "io/filewrite.h"
> @@ -34,17 +34,17 @@
> #define CURRENT_PACKET_VERSION 2
>
>
> -void Game_Interactive_Player_Data_Packet::Read
> - (FileSystem & fs, Game & game, MapMapObjectLoader *)
> +void GameInteractivePlayerPacket::Read
> + (FileSystem & fs, Game & game, MapObjectLoader *)
> {
> try {
> FileRead fr;
> fr.Open(fs, "binary/interactive_player");
> uint16_t const packet_version = fr.Unsigned16();
> if (packet_version == CURRENT_PACKET_VERSION) {
> - Player_Number player_number = fr.Unsigned8();
> + PlayerNumber player_number = fr.Unsigned8();
> if (!(0 < player_number && player_number <= game.map().get_nrplayers())) {
> - throw game_data_error("Invalid player number: %i.", player_number);
> + throw GameDataError("Invalid player number: %i.", player_number);
> }
>
> if (!game.get_player(player_number)) {
> @@ -52,52 +52,52 @@
> // and the slot for player 1 was not used in the game.
> // So now we try to create an InteractivePlayer object for another
> // player instead.
> - const Player_Number max = game.map().get_nrplayers();
> + const PlayerNumber max = game.map().get_nrplayers();
> for (player_number = 1; player_number <= max; ++player_number)
> if (game.get_player(player_number))
> break;
> if (player_number > max)
> - throw game_data_error("The game has no players!");
> + throw GameDataError("The game has no players!");
> }
> int32_t const x = fr.Unsigned16();
> int32_t const y = fr.Unsigned16();
> uint32_t const display_flags = fr.Unsigned32();
>
> - if (Interactive_Base * const ibase = game.get_ibase()) {
> + if (InteractiveBase * const ibase = game.get_ibase()) {
> ibase->set_viewpoint(Point(x, y), true);
>
> uint32_t const loaded_df =
> - Interactive_Base::dfShowCensus |
> - Interactive_Base::dfShowStatistics;
> + InteractiveBase::dfShowCensus |
> + InteractiveBase::dfShowStatistics;
> uint32_t const olddf = ibase->get_display_flags();
> uint32_t const realdf =
> (olddf & ~loaded_df) | (display_flags & loaded_df);
> ibase->set_display_flags(realdf);
> }
> - if (Interactive_Player * const ipl = game.get_ipl()) {
> + if (InteractivePlayer * const ipl = game.get_ipl()) {
> ipl->set_player_number(player_number);
> }
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const _wexception & e) {
> - throw game_data_error("interactive player: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("interactive player: %s", e.what());
> }
> }
>
> /*
> * Write Function
> */
> -void Game_Interactive_Player_Data_Packet::Write
> - (FileSystem & fs, Game & game, MapMapObjectSaver * const)
> +void GameInteractivePlayerPacket::Write
> + (FileSystem & fs, Game & game, MapObjectSaver * const)
> {
> FileWrite fw;
>
> // Now packet version
> fw.Unsigned16(CURRENT_PACKET_VERSION);
>
> - Interactive_Base * const ibase = game.get_ibase();
> - Interactive_Player * const iplayer = game.get_ipl();
> + InteractiveBase * const ibase = game.get_ibase();
> + InteractivePlayer * const iplayer = game.get_ipl();
>
> // Player number
> fw.Unsigned8(iplayer ? iplayer->player_number() : 1);
>
> === renamed file 'src/game_io/game_interactive_player_data_packet.h' => 'src/game_io/game_interactive_player_packet.h'
> --- src/game_io/game_interactive_player_data_packet.h 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_interactive_player_packet.h 2014-09-15 07:27:30 +0000
> @@ -17,8 +17,8 @@
> *
> */
>
> -#ifndef WL_GAME_IO_GAME_INTERACTIVE_PLAYER_DATA_PACKET_H
> -#define WL_GAME_IO_GAME_INTERACTIVE_PLAYER_DATA_PACKET_H
> +#ifndef WL_GAME_IO_GAME_INTERACTIVE_PLAYER_PACKET_H
> +#define WL_GAME_IO_GAME_INTERACTIVE_PLAYER_PACKET_H
>
> #include "game_io/game_data_packet.h"
>
> @@ -28,11 +28,11 @@
> * Information about the interactive player. Mostly scrollpos,
> * player number and so on
> */
> -struct Game_Interactive_Player_Data_Packet : public Game_Data_Packet {
> - void Read (FileSystem &, Game &, MapMapObjectLoader * = nullptr) override;
> - void Write(FileSystem &, Game &, MapMapObjectSaver * = nullptr) override;
> +struct GameInteractivePlayerPacket : public GameDataPacket {
> + void Read (FileSystem &, Game &, MapObjectLoader * = nullptr) override;
> + void Write(FileSystem &, Game &, MapObjectSaver * = nullptr) override;
> };
>
> }
>
> -#endif // end of include guard: WL_GAME_IO_GAME_INTERACTIVE_PLAYER_DATA_PACKET_H
> +#endif // end of include guard: WL_GAME_IO_GAME_INTERACTIVE_PLAYER_PACKET_H
>
> === modified file 'src/game_io/game_loader.cc'
> --- src/game_io/game_loader.cc 2014-07-28 14:23:03 +0000
> +++ src/game_io/game_loader.cc 2014-09-15 07:27:30 +0000
> @@ -24,34 +24,34 @@
>
> #include "base/log.h"
> #include "base/scoped_timer.h"
> -#include "game_io/game_cmd_queue_data_packet.h"
> -#include "game_io/game_game_class_data_packet.h"
> -#include "game_io/game_interactive_player_data_packet.h"
> -#include "game_io/game_map_data_packet.h"
> -#include "game_io/game_player_economies_data_packet.h"
> -#include "game_io/game_player_info_data_packet.h"
> -#include "game_io/game_preload_data_packet.h"
> +#include "game_io/game_class_packet.h"
> +#include "game_io/game_cmd_queue_packet.h"
> +#include "game_io/game_interactive_player_packet.h"
> +#include "game_io/game_map_packet.h"
> +#include "game_io/game_player_economies_packet.h"
> +#include "game_io/game_player_info_packet.h"
> +#include "game_io/game_preload_packet.h"
> #include "io/filesystem/layered_filesystem.h"
> #include "logic/cmd_expire_message.h"
> #include "logic/game.h"
> #include "logic/player.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> +#include "map_io/map_object_loader.h"
>
> namespace Widelands {
>
> -Game_Loader::Game_Loader(const std::string & path, Game & game) :
> +GameLoader::GameLoader(const std::string & path, Game & game) :
> m_fs(*g_fs->MakeSubFileSystem(path)), m_game(game)
> {}
>
>
> -Game_Loader::~Game_Loader() {
> +GameLoader::~GameLoader() {
> delete &m_fs;
> }
>
> /*
> * This function preloads a game
> */
> -int32_t Game_Loader::preload_game(Game_Preload_Data_Packet & mp) {
> +int32_t GameLoader::preload_game(GamePreloadPacket & mp) {
> // Load elemental data block
> mp.Read(m_fs, m_game, nullptr);
>
> @@ -61,53 +61,53 @@
> /*
> * Load the complete file
> */
> -int32_t Game_Loader::load_game(bool const multiplayer) {
> - ScopedTimer timer("Game_Loader::load() took %ums");
> +int32_t GameLoader::load_game(bool const multiplayer) {
> + ScopedTimer timer("GameLoader::load() took %ums");
>
> log("Game: Reading Preload Data ... ");
> - {Game_Preload_Data_Packet p; p.Read(m_fs, m_game);}
> + {GamePreloadPacket p; p.Read(m_fs, m_game);}
> log("took %ums\n", timer.ms_since_last_query());
>
> log("Game: Reading Game Class Data ... ");
> - {Game_Game_Class_Data_Packet p; p.Read(m_fs, m_game);}
> + {GameClassPacket p; p.Read(m_fs, m_game);}
> log("took %ums\n", timer.ms_since_last_query());
>
> log("Game: Reading Map Data ... ");
> - Game_Map_Data_Packet M; M.Read(m_fs, m_game);
> + GameMapPacket M; M.Read(m_fs, m_game);
> log("Game: Reading Map Data took %ums\n", timer.ms_since_last_query());
>
> log("Game: Reading Player Info ... ");
> - {Game_Player_Info_Data_Packet p; p.Read(m_fs, m_game);}
> + {GamePlayerInfoPacket p; p.Read(m_fs, m_game);}
> log("Game: Reading Player Info took %ums\n", timer.ms_since_last_query());
>
> log("Game: Calling Read_Complete()\n");
> M.Read_Complete(m_game);
> log("Game: Read_Complete took: %ums\n", timer.ms_since_last_query());
>
> - MapMapObjectLoader * const mol = M.get_map_object_loader();
> + MapObjectLoader * const mol = M.get_map_object_loader();
>
> log("Game: Reading Player Economies Info ... ");
> - {Game_Player_Economies_Data_Packet p; p.Read(m_fs, m_game, mol);}
> + {GamePlayerEconomiesPacket p; p.Read(m_fs, m_game, mol);}
> log("took %ums\n", timer.ms_since_last_query());
>
> log("Game: Reading Command Queue Data ... ");
> - {Game_Cmd_Queue_Data_Packet p; p.Read(m_fs, m_game, mol);}
> + {GameCmdQueuePacket p; p.Read(m_fs, m_game, mol);}
> log("took %ums\n", timer.ms_since_last_query());
>
> // This must be after the command queue has been read.
> log("Game: Parsing messages ... ");
> - Player_Number const nr_players = m_game.map().get_nrplayers();
> + PlayerNumber const nr_players = m_game.map().get_nrplayers();
> iterate_players_existing_const(p, nr_players, m_game, player) {
> const MessageQueue & messages = player->messages();
> - for (std::pair<Message_Id, Message *> temp_message : messages) {
> + for (std::pair<MessageId, Message *> temp_message : messages) {
> Message* m = temp_message.second;
> - Message_Id m_id = temp_message.first;
> + MessageId m_id = temp_message.first;
>
> // Renew expire commands
> Duration const duration = m->duration();
> if (duration != Forever()) {
> m_game.cmdqueue().enqueue
> - (new Cmd_ExpireMessage
> + (new CmdExpireMessage
> (m->sent() + duration, p, m_id));
> }
> // Renew MapObject connections
> @@ -128,7 +128,7 @@
> // player.
> if (!multiplayer) {
> log("Game: Reading Interactive Player Data ... ");
> - {Game_Interactive_Player_Data_Packet p; p.Read(m_fs, m_game, mol);}
> + {GameInteractivePlayerPacket p; p.Read(m_fs, m_game, mol);}
> log("took %ums\n", timer.ms_since_last_query());
> }
>
>
> === modified file 'src/game_io/game_loader.h'
> --- src/game_io/game_loader.h 2014-07-05 16:41:51 +0000
> +++ src/game_io/game_loader.h 2014-09-15 07:27:30 +0000
> @@ -29,17 +29,17 @@
> namespace Widelands {
>
> class Game;
> -struct Game_Preload_Data_Packet;
> +struct GamePreloadPacket;
>
> /*
> * This class reads a complete state
> * of a game out to a file.
> */
> -struct Game_Loader {
> - Game_Loader(const std::string & path, Game &);
> - ~Game_Loader();
> +struct GameLoader {
> + GameLoader(const std::string & path, Game &);
> + ~GameLoader();
>
> - int32_t preload_game(Game_Preload_Data_Packet &);
> + int32_t preload_game(GamePreloadPacket &);
> int32_t load_game(bool multiplayer = false);
>
> private:
>
> === renamed file 'src/game_io/game_map_data_packet.cc' => 'src/game_io/game_map_packet.cc'
> --- src/game_io/game_map_data_packet.cc 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_map_packet.cc 2014-09-15 07:27:30 +0000
> @@ -17,33 +17,33 @@
> *
> */
>
> -#include "game_io/game_map_data_packet.h"
> +#include "game_io/game_map_packet.h"
>
> #include <memory>
>
> #include "io/filesystem/filesystem.h"
> #include "logic/game.h"
> #include "logic/game_data_error.h"
> +#include "map_io/map_saver.h"
> #include "map_io/widelands_map_loader.h"
> -#include "map_io/widelands_map_saver.h"
>
> namespace Widelands {
>
> -Game_Map_Data_Packet::~Game_Map_Data_Packet() {
> +GameMapPacket::~GameMapPacket() {
> delete m_wms;
> delete m_wml;
> }
>
> -void Game_Map_Data_Packet::Read
> - (FileSystem & fs, Game & game, MapMapObjectLoader * const)
> +void GameMapPacket::Read
> + (FileSystem & fs, Game & game, MapObjectLoader * const)
> {
> if (!fs.FileExists("map") || !fs.IsDirectory("map"))
> - throw game_data_error("no map");
> + throw GameDataError("no map");
>
> // Now Load the map as it would be a normal map saving.
> delete m_wml;
>
> - m_wml = new WL_Map_Loader(fs.MakeSubFileSystem("map"), &game.map());
> + m_wml = new WidelandsMapLoader(fs.MakeSubFileSystem("map"), &game.map());
>
> m_wml->preload_map(true);
>
> @@ -53,14 +53,14 @@
> }
>
>
> -void Game_Map_Data_Packet::Read_Complete(Game & game) {
> +void GameMapPacket::Read_Complete(Game & game) {
> m_wml->load_map_complete(game, true);
> m_mol = m_wml->get_map_object_loader();
> }
>
>
> -void Game_Map_Data_Packet::Write
> - (FileSystem & fs, Game & game, MapMapObjectSaver * const)
> +void GameMapPacket::Write
> + (FileSystem & fs, Game & game, MapObjectSaver * const)
> {
>
> std::unique_ptr<FileSystem> mapfs
> @@ -68,7 +68,7 @@
>
> // Now Write the map as it would be a normal map saving.
> delete m_wms;
> - m_wms = new Map_Saver(*mapfs, game);
> + m_wms = new MapSaver(*mapfs, game);
> m_wms->save();
> m_mos = m_wms->get_map_object_saver();
> }
>
> === renamed file 'src/game_io/game_map_data_packet.h' => 'src/game_io/game_map_packet.h'
> --- src/game_io/game_map_data_packet.h 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_map_packet.h 2014-09-15 07:27:30 +0000
> @@ -17,41 +17,41 @@
> *
> */
>
> -#ifndef WL_GAME_IO_GAME_MAP_DATA_PACKET_H
> -#define WL_GAME_IO_GAME_MAP_DATA_PACKET_H
> +#ifndef WL_GAME_IO_GAME_MAP_PACKET_H
> +#define WL_GAME_IO_GAME_MAP_PACKET_H
>
> #include "game_io/game_data_packet.h"
>
> namespace Widelands {
>
> -struct Map_Saver;
> -struct WL_Map_Loader;
> +struct MapSaver;
> +struct WidelandsMapLoader;
>
> /*
> - * This is just a wrapper around Map_Saver and Map_Loader
> + * This is just a wrapper around MapSaver and MapLoader
> */
> -struct Game_Map_Data_Packet : public Game_Data_Packet {
> - Game_Map_Data_Packet() : m_mos(nullptr), m_mol(nullptr), m_wms(nullptr), m_wml(nullptr) {}
> - virtual ~Game_Map_Data_Packet();
> +struct GameMapPacket : public GameDataPacket {
> + GameMapPacket() : m_mos(nullptr), m_mol(nullptr), m_wms(nullptr), m_wml(nullptr) {}
> + virtual ~GameMapPacket();
>
>
> /// Ensures that the world gets loaded but does not much more.
> - void Read (FileSystem &, Game &, MapMapObjectLoader * = nullptr) override;
> + void Read (FileSystem &, Game &, MapObjectLoader * = nullptr) override;
>
> void Read_Complete(Game &); /// Loads the rest of the map.
>
> - void Write(FileSystem &, Game &, MapMapObjectSaver * = nullptr) override;
> + void Write(FileSystem &, Game &, MapObjectSaver * = nullptr) override;
>
> - MapMapObjectSaver * get_map_object_saver () {return m_mos;}
> - MapMapObjectLoader * get_map_object_loader() {return m_mol;}
> + MapObjectSaver * get_map_object_saver () {return m_mos;}
> + MapObjectLoader * get_map_object_loader() {return m_mol;}
>
> private:
> - MapMapObjectSaver * m_mos;
> - MapMapObjectLoader * m_mol;
> - Map_Saver * m_wms;
> - WL_Map_Loader * m_wml;
> + MapObjectSaver * m_mos;
> + MapObjectLoader * m_mol;
> + MapSaver * m_wms;
> + WidelandsMapLoader * m_wml;
> };
>
> }
>
> -#endif // end of include guard: WL_GAME_IO_GAME_MAP_DATA_PACKET_H
> +#endif // end of include guard: WL_GAME_IO_GAME_MAP_PACKET_H
>
> === renamed file 'src/game_io/game_player_economies_data_packet.cc' => 'src/game_io/game_player_economies_packet.cc'
> --- src/game_io/game_player_economies_data_packet.cc 2014-08-02 11:12:20 +0000
> +++ src/game_io/game_player_economies_packet.cc 2014-09-15 07:27:30 +0000
> @@ -17,7 +17,7 @@
> *
> */
>
> -#include "game_io/game_player_economies_data_packet.h"
> +#include "game_io/game_player_economies_packet.h"
>
> #include "base/macros.h"
> #include "economy/economy_data_packet.h"
> @@ -35,13 +35,13 @@
> #define CURRENT_PACKET_VERSION 3
>
>
> -void Game_Player_Economies_Data_Packet::Read
> - (FileSystem & fs, Game & game, MapMapObjectLoader *)
> +void GamePlayerEconomiesPacket::Read
> + (FileSystem & fs, Game & game, MapObjectLoader *)
> {
> try {
> const Map & map = game.map();
> - Map_Index const max_index = map.max_index();
> - Player_Number const nr_players = map.get_nrplayers();
> + MapIndex const max_index = map.max_index();
> + PlayerNumber const nr_players = map.get_nrplayers();
>
> FileRead fr;
> fr.Open(fs, "binary/player_economies");
> @@ -57,7 +57,7 @@
> EconomyDataPacket d(flag->get_economy());
> d.Read(fr);
> } else {
> - throw game_data_error("there is no flag at the specified location");
> + throw GameDataError("there is no flag at the specified location");
> }
> } else {
> bool read_this_economy = false;
> @@ -73,26 +73,26 @@
> bob = bob->get_next_bob();
> }
> if (!read_this_economy) {
> - throw game_data_error("there is no ship at this location.");
> + throw GameDataError("there is no ship at this location.");
> }
> }
> }
> - } catch (const _wexception & e) {
> - throw game_data_error("player %u: %s", p, e.what());
> + } catch (const WException & e) {
> + throw GameDataError("player %u: %s", p, e.what());
> }
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const _wexception & e) {
> - throw game_data_error("economies: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("economies: %s", e.what());
> }
> }
>
> /*
> * Write Function
> */
> -void Game_Player_Economies_Data_Packet::Write
> - (FileSystem & fs, Game & game, MapMapObjectSaver * const)
> +void GamePlayerEconomiesPacket::Write
> + (FileSystem & fs, Game & game, MapObjectSaver * const)
> {
> FileWrite fw;
>
> @@ -100,7 +100,7 @@
>
> const Map & map = game.map();
> const Field & field_0 = map[0];
> - Player_Number const nr_players = map.get_nrplayers();
> + PlayerNumber const nr_players = map.get_nrplayers();
> iterate_players_existing_const(p, nr_players, game, player) {
> const Player::Economies & economies = player->m_economies;
> for (Economy * temp_economy : economies) {
>
> === renamed file 'src/game_io/game_player_economies_data_packet.h' => 'src/game_io/game_player_economies_packet.h'
> --- src/game_io/game_player_economies_data_packet.h 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_player_economies_packet.h 2014-09-15 07:27:30 +0000
> @@ -17,8 +17,8 @@
> *
> */
>
> -#ifndef WL_GAME_IO_GAME_PLAYER_ECONOMIES_DATA_PACKET_H
> -#define WL_GAME_IO_GAME_PLAYER_ECONOMIES_DATA_PACKET_H
> +#ifndef WL_GAME_IO_GAME_PLAYER_ECONOMIES_PACKET_H
> +#define WL_GAME_IO_GAME_PLAYER_ECONOMIES_PACKET_H
>
> #include "game_io/game_data_packet.h"
>
> @@ -27,11 +27,11 @@
> /*
> * how many and which economies does a player have?
> */
> -struct Game_Player_Economies_Data_Packet : public Game_Data_Packet {
> - void Read (FileSystem &, Game &, MapMapObjectLoader * = nullptr) override;
> - void Write(FileSystem &, Game &, MapMapObjectSaver * = nullptr) override;
> +struct GamePlayerEconomiesPacket : public GameDataPacket {
> + void Read (FileSystem &, Game &, MapObjectLoader * = nullptr) override;
> + void Write(FileSystem &, Game &, MapObjectSaver * = nullptr) override;
> };
>
> }
>
> -#endif // end of include guard: WL_GAME_IO_GAME_PLAYER_ECONOMIES_DATA_PACKET_H
> +#endif // end of include guard: WL_GAME_IO_GAME_PLAYER_ECONOMIES_PACKET_H
>
> === renamed file 'src/game_io/game_player_info_data_packet.cc' => 'src/game_io/game_player_info_packet.cc'
> --- src/game_io/game_player_info_data_packet.cc 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_player_info_packet.cc 2014-09-15 07:27:30 +0000
> @@ -17,7 +17,7 @@
> *
> */
>
> -#include "game_io/game_player_info_data_packet.h"
> +#include "game_io/game_player_info_packet.h"
>
> #include "io/fileread.h"
> #include "io/filewrite.h"
> @@ -33,8 +33,8 @@
> #define CURRENT_PACKET_VERSION 15
>
>
> -void Game_Player_Info_Data_Packet::Read
> - (FileSystem & fs, Game & game, MapMapObjectLoader *)
> +void GamePlayerInfoPacket::Read
> + (FileSystem & fs, Game & game, MapObjectLoader *)
> {
> try {
> FileRead fr;
> @@ -49,7 +49,7 @@
>
> int32_t const plnum = fr.Unsigned8();
> if (plnum < 1 || MAX_PLAYERS < plnum)
> - throw game_data_error
> + throw GameDataError
> ("player number (%i) is out of range (1 .. %u)",
> plnum, MAX_PLAYERS);
> Widelands::TeamNumber team = 0;
> @@ -89,16 +89,16 @@
> else
> game.ReadStatistics(fr, 4);
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const _wexception & e) {
> - throw game_data_error("player info: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("player info: %s", e.what());
> }
> }
>
>
> -void Game_Player_Info_Data_Packet::Write
> - (FileSystem & fs, Game & game, MapMapObjectSaver *)
> +void GamePlayerInfoPacket::Write
> + (FileSystem & fs, Game & game, MapObjectSaver *)
> {
> FileWrite fw;
>
> @@ -106,7 +106,7 @@
> fw.Unsigned16(CURRENT_PACKET_VERSION);
>
> // Number of (potential) players
> - Player_Number const nr_players = game.map().get_nrplayers();
> + PlayerNumber const nr_players = game.map().get_nrplayers();
> fw.Unsigned16(nr_players);
> iterate_players_existing_const(p, nr_players, game, plr) {
> fw.Unsigned8(1); // Player is in game.
>
> === renamed file 'src/game_io/game_player_info_data_packet.h' => 'src/game_io/game_player_info_packet.h'
> --- src/game_io/game_player_info_data_packet.h 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_player_info_packet.h 2014-09-15 07:27:30 +0000
> @@ -17,8 +17,8 @@
> *
> */
>
> -#ifndef WL_GAME_IO_GAME_PLAYER_INFO_DATA_PACKET_H
> -#define WL_GAME_IO_GAME_PLAYER_INFO_DATA_PACKET_H
> +#ifndef WL_GAME_IO_GAME_PLAYER_INFO_PACKET_H
> +#define WL_GAME_IO_GAME_PLAYER_INFO_PACKET_H
>
> #include "game_io/game_data_packet.h"
>
> @@ -28,11 +28,11 @@
> * This contains all the preload data needed to identify
> * a game for a user (for example in a listbox)
> */
> -struct Game_Player_Info_Data_Packet : public Game_Data_Packet {
> - void Read (FileSystem &, Game &, MapMapObjectLoader * = nullptr) override;
> - void Write(FileSystem &, Game &, MapMapObjectSaver * = nullptr) override;
> +struct GamePlayerInfoPacket : public GameDataPacket {
> + void Read (FileSystem &, Game &, MapObjectLoader * = nullptr) override;
> + void Write(FileSystem &, Game &, MapObjectSaver * = nullptr) override;
> };
>
> }
>
> -#endif // end of include guard: WL_GAME_IO_GAME_PLAYER_INFO_DATA_PACKET_H
> +#endif // end of include guard: WL_GAME_IO_GAME_PLAYER_INFO_PACKET_H
>
> === renamed file 'src/game_io/game_preload_data_packet.cc' => 'src/game_io/game_preload_packet.cc'
> --- src/game_io/game_preload_data_packet.cc 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_preload_packet.cc 2014-09-15 07:27:30 +0000
> @@ -17,7 +17,7 @@
> *
> */
>
> -#include "game_io/game_preload_data_packet.h"
> +#include "game_io/game_preload_packet.h"
>
> #include <memory>
>
> @@ -45,8 +45,8 @@
> #define MINIMAP_FILENAME "minimap.png"
>
>
> -void Game_Preload_Data_Packet::Read
> - (FileSystem & fs, Game &, MapMapObjectLoader * const)
> +void GamePreloadPacket::Read
> + (FileSystem & fs, Game &, MapObjectLoader * const)
> {
> try {
> Profile prof;
> @@ -66,23 +66,23 @@
> m_minimap_path = MINIMAP_FILENAME;
> }
> } else {
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %i", packet_version);
> }
> - } catch (const _wexception & e) {
> - throw game_data_error("preload: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("preload: %s", e.what());
> }
> }
>
>
> -void Game_Preload_Data_Packet::Write
> - (FileSystem & fs, Game & game, MapMapObjectSaver * const)
> +void GamePreloadPacket::Write
> + (FileSystem & fs, Game & game, MapObjectSaver * const)
> {
>
> Profile prof;
> Section & s = prof.create_section("global");
>
> - Interactive_Player const * const ipl = game.get_ipl();
> + InteractivePlayer const * const ipl = game.get_ipl();
>
> s.set_int ("packet_version", CURRENT_PACKET_VERSION);
>
> @@ -96,7 +96,7 @@
> s.set_int("player_nr", ipl->player_number());
> } else {
> // Pretend that the first player saved the game
> - for (Widelands::Player_Number p = 1; p <= map.get_nrplayers(); ++p) {
> + for (Widelands::PlayerNumber p = 1; p <= map.get_nrplayers(); ++p) {
> if (game.get_player(p)) {
> s.set_int("player_nr", p);
> break;
>
> === renamed file 'src/game_io/game_preload_data_packet.h' => 'src/game_io/game_preload_packet.h'
> --- src/game_io/game_preload_data_packet.h 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_preload_packet.h 2014-09-15 07:27:30 +0000
> @@ -17,8 +17,8 @@
> *
> */
>
> -#ifndef WL_GAME_IO_GAME_PRELOAD_DATA_PACKET_H
> -#define WL_GAME_IO_GAME_PRELOAD_DATA_PACKET_H
> +#ifndef WL_GAME_IO_GAME_PRELOAD_PACKET_H
> +#define WL_GAME_IO_GAME_PRELOAD_PACKET_H
>
> #include <cstring>
> #include <string>
> @@ -31,9 +31,9 @@
> * This contains all the preload data needed to identify
> * a game for a user (for example in a listbox)
> */
> -struct Game_Preload_Data_Packet : public Game_Data_Packet {
> - void Read (FileSystem &, Game &, MapMapObjectLoader * = nullptr) override;
> - void Write(FileSystem &, Game &, MapMapObjectSaver * = nullptr) override;
> +struct GamePreloadPacket : public GameDataPacket {
> + void Read (FileSystem &, Game &, MapObjectLoader * = nullptr) override;
> + void Write(FileSystem &, Game &, MapObjectSaver * = nullptr) override;
>
> char const * get_mapname() {return m_mapname.c_str();}
> std::string get_background() {return m_background;}
> @@ -56,4 +56,4 @@
>
> }
>
> -#endif // end of include guard: WL_GAME_IO_GAME_PRELOAD_DATA_PACKET_H
> +#endif // end of include guard: WL_GAME_IO_GAME_PRELOAD_PACKET_H
>
> === modified file 'src/game_io/game_saver.cc'
> --- src/game_io/game_saver.cc 2014-07-28 14:17:07 +0000
> +++ src/game_io/game_saver.cc 2014-09-15 07:27:30 +0000
> @@ -21,58 +21,58 @@
>
> #include "base/log.h"
> #include "base/scoped_timer.h"
> -#include "game_io/game_cmd_queue_data_packet.h"
> -#include "game_io/game_game_class_data_packet.h"
> -#include "game_io/game_interactive_player_data_packet.h"
> -#include "game_io/game_map_data_packet.h"
> -#include "game_io/game_player_economies_data_packet.h"
> -#include "game_io/game_player_info_data_packet.h"
> -#include "game_io/game_preload_data_packet.h"
> +#include "game_io/game_class_packet.h"
> +#include "game_io/game_cmd_queue_packet.h"
> +#include "game_io/game_interactive_player_packet.h"
> +#include "game_io/game_map_packet.h"
> +#include "game_io/game_player_economies_packet.h"
> +#include "game_io/game_player_info_packet.h"
> +#include "game_io/game_preload_packet.h"
> #include "io/filesystem/filesystem.h"
> #include "logic/game.h"
>
> namespace Widelands {
>
> -Game_Saver::Game_Saver(FileSystem & fs, Game & game) : m_fs(fs), m_game(game) {
> +GameSaver::GameSaver(FileSystem & fs, Game & game) : m_fs(fs), m_game(game) {
> }
>
>
> /*
> * The core save function
> */
> -void Game_Saver::save() {
> - ScopedTimer timer("Game_Saver::save() took %ums");
> +void GameSaver::save() {
> + ScopedTimer timer("GameSaver::save() took %ums");
>
> m_fs.EnsureDirectoryExists("binary");
>
> log("Game: Writing Preload Data ... ");
> - {Game_Preload_Data_Packet p; p.Write(m_fs, m_game, nullptr);}
> + {GamePreloadPacket p; p.Write(m_fs, m_game, nullptr);}
> log("took %ums\n", timer.ms_since_last_query());
>
> log("Game: Writing Game Class Data ... ");
> - {Game_Game_Class_Data_Packet p; p.Write(m_fs, m_game, nullptr);}
> + {GameClassPacket p; p.Write(m_fs, m_game, nullptr);}
> log("took %ums\n", timer.ms_since_last_query());
>
> log("Game: Writing Player Info ... ");
> - {Game_Player_Info_Data_Packet p; p.Write(m_fs, m_game, nullptr);}
> + {GamePlayerInfoPacket p; p.Write(m_fs, m_game, nullptr);}
> log("took %ums\n", timer.ms_since_last_query());
>
> log("Game: Writing Map Data!\n");
> - Game_Map_Data_Packet M; M.Write(m_fs, m_game, nullptr);
> + GameMapPacket M; M.Write(m_fs, m_game, nullptr);
> log("Game: Writing Map Data took %ums\n", timer.ms_since_last_query());
>
> - MapMapObjectSaver * const mos = M.get_map_object_saver();
> + MapObjectSaver * const mos = M.get_map_object_saver();
>
> log("Game: Writing Player Economies Info ... ");
> - {Game_Player_Economies_Data_Packet p; p.Write(m_fs, m_game, mos);}
> + {GamePlayerEconomiesPacket p; p.Write(m_fs, m_game, mos);}
> log("took %ums\n", timer.ms_since_last_query());
>
> log("Game: Writing Command Queue Data ... ");
> - {Game_Cmd_Queue_Data_Packet p; p.Write(m_fs, m_game, mos);}
> + {GameCmdQueuePacket p; p.Write(m_fs, m_game, mos);}
> log("took %ums\n", timer.ms_since_last_query());
>
> log("Game: Writing Interactive Player Data ... ");
> - {Game_Interactive_Player_Data_Packet p; p.Write(m_fs, m_game, mos);}
> + {GameInteractivePlayerPacket p; p.Write(m_fs, m_game, mos);}
> log("took %ums\n", timer.ms_since_last_query());
> }
>
>
> === modified file 'src/game_io/game_saver.h'
> --- src/game_io/game_saver.h 2014-07-05 16:41:51 +0000
> +++ src/game_io/game_saver.h 2014-09-15 07:27:30 +0000
> @@ -37,8 +37,8 @@
> * so little to save, that everything is done by this class
> */
>
> -struct Game_Saver {
> - Game_Saver(FileSystem &, Game &);
> +struct GameSaver {
> + GameSaver(FileSystem &, Game &);
>
> void save();
>
>
> === modified file 'src/graphic/animation.cc'
> --- src/graphic/animation.cc 2014-07-28 14:08:41 +0000
> +++ src/graphic/animation.cc 2014-09-15 07:27:30 +0000
> @@ -58,7 +58,6 @@
> /// A class that makes iteration over filename_?.png templates easy.
> class NumberGlob {
> public:
> - typedef uint32_t type;
> NumberGlob(const std::string& pictmp);
>
> /// If there is a next filename, puts it in 's' and returns true.
>
> === modified file 'src/graphic/font.cc'
> --- src/graphic/font.cc 2014-07-05 14:22:44 +0000
> +++ src/graphic/font.cc 2014-09-15 07:27:30 +0000
> @@ -38,7 +38,7 @@
> }
> };
>
> -typedef std::map<FontDescr, UI::Font *> FontMap;
> +using FontMap = std::map<FontDescr, UI::Font *>;
>
> FontMap g_fontmap;
>
>
> === modified file 'src/graphic/font_handler.cc'
> --- src/graphic/font_handler.cc 2014-07-20 07:44:53 +0000
> +++ src/graphic/font_handler.cc 2014-09-15 07:27:30 +0000
> @@ -60,8 +60,8 @@
>
> } // namespace
>
> -/// The global unique \ref Font_Handler object
> -Font_Handler * g_fh = nullptr;
> +/// The global unique \ref FontHandler object
> +FontHandler * g_fh = nullptr;
>
> /**
> * The line cache stores unprocessed rendered lines of text.
> @@ -79,14 +79,14 @@
> /*@}*/
> };
>
> -typedef std::list<LineCacheEntry> LineCache;
> +using LineCache = std::list<LineCacheEntry>;
>
> static const unsigned MaxLineCacheSize = 500;
>
> /**
> - * Internal data of the \ref Font_Handler.
> + * Internal data of the \ref FontHandler.
> */
> -struct Font_Handler::Data {
> +struct FontHandler::Data {
> LineCache linecache;
>
> const LineCacheEntry & get_line(const TextStyle & style, const std::string & text);
> @@ -105,25 +105,25 @@
> /**
> * Plain Constructor
> */
> -Font_Handler::Font_Handler() :
> +FontHandler::FontHandler() :
> d(new Data)
> {
> }
>
>
> -Font_Handler::~Font_Handler() {
> +FontHandler::~FontHandler() {
> flush();
> Font::shutdown();
> }
>
> -void Font_Handler::flush() {
> +void FontHandler::flush() {
> d.reset(new Data);
> }
>
> /*
> * Returns the height of the font, in pixels.
> */
> -uint32_t Font_Handler::get_fontheight
> +uint32_t FontHandler::get_fontheight
> (const std::string & name, int32_t const size)
> {
> TTF_Font * const f = Font::get(name, size)->get_ttf_font();
> @@ -141,7 +141,7 @@
> *
> * If there is no pre-existing cache entry, a new one is created.
> */
> -const LineCacheEntry & Font_Handler::Data::get_line(const UI::TextStyle & style, const std::string & text)
> +const LineCacheEntry & FontHandler::Data::get_line(const UI::TextStyle & style, const std::string & text)
> {
> for (LineCache::iterator it = linecache.begin(); it != linecache.end(); ++it) {
> if (it->style != style || it->text != text)
> @@ -172,7 +172,7 @@
> * Render the image of a \ref LineCacheEntry whose key data has
> * already been filled in.
> */
> -void Font_Handler::Data::render_line(LineCacheEntry & lce)
> +void FontHandler::Data::render_line(LineCacheEntry & lce)
> {
> TTF_Font * font = lce.style.font->get_ttf_font();
> SDL_Color sdl_fg = {lce.style.fg.r, lce.style.fg.g, lce.style.fg.b, 0};
> @@ -191,7 +191,7 @@
> SDL_Surface* text_surface = TTF_RenderUTF8_Blended(font, lce.text.c_str(), sdl_fg);
> if (!text_surface) {
> log
> - ("Font_Handler::render_line, an error : %s\n",
> + ("FontHandler::render_line, an error : %s\n",
> TTF_GetError());
> log("Text was: '%s'\n", lce.text.c_str());
> return;
> @@ -205,7 +205,7 @@
> /**
> * Draw unwrapped, single-line text (i.e. no line breaks).
> */
> -void Font_Handler::draw_text
> +void FontHandler::draw_text
> (RenderTarget & dst,
> const TextStyle & style,
> Point dstpoint,
> @@ -230,7 +230,7 @@
> /**
> * Draw unwrapped, un-aligned single-line text at the given point, and return the width of the text.
> */
> -uint32_t Font_Handler::draw_text_raw
> +uint32_t FontHandler::draw_text_raw
> (RenderTarget & dst,
> const UI::TextStyle & style,
> Point dstpoint,
> @@ -249,7 +249,7 @@
> * Compute the total size of the given text, when wrapped to the given
> * maximum width and rendered in the given text style.
> */
> -void Font_Handler::get_size
> +void FontHandler::get_size
> (const TextStyle & textstyle,
> const std::string & text,
> uint32_t & w, uint32_t & h,
> @@ -264,7 +264,7 @@
> /**
> * Calculates size of a given text.
> */
> -void Font_Handler::get_size
> +void FontHandler::get_size
> (const std::string & fontname, int32_t const fontsize,
> const std::string & text,
> uint32_t & w, uint32_t & h,
>
> === modified file 'src/graphic/font_handler.h'
> --- src/graphic/font_handler.h 2014-07-05 16:41:51 +0000
> +++ src/graphic/font_handler.h 2014-09-15 07:27:30 +0000
> @@ -36,9 +36,9 @@
> /**
> * Main class for string rendering. Manages the cache of pre-rendered strings.
> */
> -struct Font_Handler {
> - Font_Handler();
> - ~Font_Handler();
> +struct FontHandler {
> + FontHandler();
> + ~FontHandler();
>
> void draw_text
> (RenderTarget &,
> @@ -69,7 +69,7 @@
> std::unique_ptr<Data> d;
> };
>
> -extern Font_Handler * g_fh;
> +extern FontHandler * g_fh;
>
> }
>
>
> === modified file 'src/graphic/font_handler1.cc'
> --- src/graphic/font_handler1.cc 2014-07-26 10:43:23 +0000
> +++ src/graphic/font_handler1.cc 2014-09-15 07:27:30 +0000
> @@ -85,11 +85,11 @@
> // Utility class to render a rich text string. The returned string is cached in
> // the ImageCache, so repeated calls to render with the same arguments should not
> // be a problem.
> -class Font_Handler1 : public IFont_Handler1 {
> +class FontHandler1 : public IFontHandler1 {
> public:
> - Font_Handler1(ImageCache* image_cache, SurfaceCache* surface_cache, RT::Renderer* renderer) :
> + FontHandler1(ImageCache* image_cache, SurfaceCache* surface_cache, RT::Renderer* renderer) :
> surface_cache_(surface_cache), image_cache_(image_cache), renderer_(renderer) {}
> - virtual ~Font_Handler1() {}
> + virtual ~FontHandler1() {}
>
> const Image* render(const string& text, uint16_t w = 0) override {
> const string hash = boost::lexical_cast<string>(w) + text;
> @@ -109,11 +109,11 @@
> std::unique_ptr<RT::Renderer> renderer_;
> };
>
> -IFont_Handler1 * create_fonthandler(Graphic* gr) {
> - return new Font_Handler1(
> +IFontHandler1 * create_fonthandler(Graphic* gr) {
> + return new FontHandler1(
> &gr->images(), &gr->surfaces(), new RT::Renderer(&gr->images(), &gr->surfaces()));
> }
>
> -IFont_Handler1 * g_fh1 = nullptr;
> +IFontHandler1 * g_fh1 = nullptr;
>
> } // namespace UI
>
> === modified file 'src/graphic/font_handler1.h'
> --- src/graphic/font_handler1.h 2014-07-22 09:54:49 +0000
> +++ src/graphic/font_handler1.h 2014-09-15 07:27:30 +0000
> @@ -37,10 +37,10 @@
> /**
> * Main class for string rendering. Manages the cache of pre-rendered strings.
> */
> -class IFont_Handler1 {
> +class IFontHandler1 {
> public:
> - IFont_Handler1() = default;
> - virtual ~IFont_Handler1() {}
> + IFontHandler1() = default;
> + virtual ~IFontHandler1() {}
>
> /*
> * Renders the given text into an image. The image is cached and therefore
> @@ -48,13 +48,13 @@
> */
> virtual const Image* render(const std::string& text, uint16_t w = 0) = 0;
>
> - DISALLOW_COPY_AND_ASSIGN(IFont_Handler1);
> + DISALLOW_COPY_AND_ASSIGN(IFontHandler1);
> };
>
> -// Create a new Font_Handler1. Ownership for the objects is not taken.
> -IFont_Handler1 * create_fonthandler(Graphic* gr);
> +// Create a new FontHandler1. Ownership for the objects is not taken.
> +IFontHandler1 * create_fonthandler(Graphic* gr);
>
> -extern IFont_Handler1 * g_fh1;
> +extern IFontHandler1 * g_fh1;
>
> }
>
>
> === modified file 'src/graphic/image_cache.h'
> --- src/graphic/image_cache.h 2014-07-15 05:12:37 +0000
> +++ src/graphic/image_cache.h 2014-09-15 07:27:30 +0000
> @@ -57,7 +57,7 @@
> bool has(const std::string& hash) const;
>
> private:
> - typedef std::map<std::string, const Image*> ImageMap;
> + using ImageMap = std::map<std::string, const Image*>;
>
> ImageMap images_; /// hash of cached filename/image pairs
> SurfaceCache* const surface_cache_; // Not owned.
>
> === modified file 'src/graphic/image_io.h'
> --- src/graphic/image_io.h 2014-07-14 10:45:44 +0000
> +++ src/graphic/image_io.h 2014-09-15 07:27:30 +0000
> @@ -29,13 +29,13 @@
> class Surface;
> struct SDL_Surface;
>
> -class ImageNotFound : public _wexception {
> +class ImageNotFound : public WException {
> public:
> ImageNotFound(const std::string& fn) : wexception("Image not found: %s", fn.c_str()) {
> }
> };
>
> -class ImageLoadingError : public _wexception {
> +class ImageLoadingError : public WException {
> public:
> ImageLoadingError(const std::string& fn, const std::string& reason)
> : wexception("Error loading %s: %s", fn.c_str(), reason.c_str()) {
>
> === modified file 'src/graphic/render/gamerenderer.cc'
> --- src/graphic/render/gamerenderer.cc 2014-07-28 16:59:54 +0000
> +++ src/graphic/render/gamerenderer.cc 2014-09-15 07:27:30 +0000
> @@ -39,7 +39,7 @@
>
> void GameRenderer::rendermap
> (RenderTarget & dst,
> - const Widelands::Editor_Game_Base & egbase,
> + const Widelands::EditorGameBase & egbase,
> const Widelands::Player & player,
> const Point & viewofs)
> {
> @@ -53,7 +53,7 @@
>
> void GameRenderer::rendermap
> (RenderTarget & dst,
> - const Widelands::Editor_Game_Base & egbase,
> + const Widelands::EditorGameBase & egbase,
> const Point & viewofs)
> {
> m_dst = &dst;
> @@ -112,7 +112,7 @@
> pos[d] += m_dst_offset;
> }
>
> - Player_Number owner_number[4];
> + PlayerNumber owner_number[4];
> bool isborder[4];
> Vision vision[4] = {2, 2, 2, 2};
> for (uint32_t d = 0; d < 4; ++d)
> @@ -165,15 +165,15 @@
> if
> (f_pl.constructionsite.becomes)
> {
> - const Player::Constructionsite_Information & csinf = f_pl.constructionsite;
> + const Player::ConstructionsiteInformation & csinf = f_pl.constructionsite;
> // draw the partly finished constructionsite
> uint32_t anim_idx;
> try {
> anim_idx = csinf.becomes->get_animation("build");
> - } catch (MapObjectDescr::Animation_Nonexistent &) {
> + } catch (MapObjectDescr::AnimationNonexistent &) {
> try {
> anim_idx = csinf.becomes->get_animation("unoccupied");
> - } catch (MapObjectDescr::Animation_Nonexistent) {
> + } catch (MapObjectDescr::AnimationNonexistent) {
> anim_idx = csinf.becomes->get_animation("idle");
> }
> }
> @@ -201,7 +201,7 @@
> uint32_t a;
> try {
> a = csinf.was->get_animation("unoccupied");
> - } catch (MapObjectDescr::Animation_Nonexistent &) {
> + } catch (MapObjectDescr::AnimationNonexistent &) {
> a = csinf.was->get_animation("idle");
> }
> m_dst->drawanimrect
> @@ -214,7 +214,7 @@
> uint32_t pic;
> try {
> pic = building->get_animation("unoccupied");
> - } catch (MapObjectDescr::Animation_Nonexistent &) {
> + } catch (MapObjectDescr::AnimationNonexistent &) {
> pic = building->get_animation("idle");
> }
> m_dst->drawanim(pos[F], pic, 0, owner);
> @@ -228,15 +228,15 @@
>
> {
> // Render overlays on the node
> - OverlayManager::Overlay_Info overlay_info[MAX_OVERLAYS_PER_NODE];
> + OverlayManager::OverlayInfo overlay_info[MAX_OVERLAYS_PER_NODE];
>
> - const OverlayManager::Overlay_Info * const end =
> + const OverlayManager::OverlayInfo * const end =
> overlay_info
> +
> map.overlay_manager().get_overlays(coords[F], overlay_info);
>
> for
> - (const OverlayManager::Overlay_Info * it = overlay_info;
> + (const OverlayManager::OverlayInfo * it = overlay_info;
> it < end;
> ++it)
> m_dst->blit(pos[F] - it->hotspot, it->pic);
> @@ -244,8 +244,8 @@
>
> {
> // Render overlays on the R triangle
> - OverlayManager::Overlay_Info overlay_info[MAX_OVERLAYS_PER_TRIANGLE];
> - OverlayManager::Overlay_Info const * end =
> + OverlayManager::OverlayInfo overlay_info[MAX_OVERLAYS_PER_TRIANGLE];
> + OverlayManager::OverlayInfo const * end =
> overlay_info
> +
> map.overlay_manager().get_overlays
> @@ -256,7 +256,7 @@
> (pos[F].y + pos[R].y + pos[BR].y) / 3);
>
> for
> - (OverlayManager::Overlay_Info const * it = overlay_info;
> + (OverlayManager::OverlayInfo const * it = overlay_info;
> it < end;
> ++it)
> m_dst->blit(tripos - it->hotspot, it->pic);
> @@ -264,8 +264,8 @@
>
> {
> // Render overlays on the D triangle
> - OverlayManager::Overlay_Info overlay_info[MAX_OVERLAYS_PER_TRIANGLE];
> - OverlayManager::Overlay_Info const * end =
> + OverlayManager::OverlayInfo overlay_info[MAX_OVERLAYS_PER_TRIANGLE];
> + OverlayManager::OverlayInfo const * end =
> overlay_info
> +
> map.overlay_manager().get_overlays
> @@ -276,7 +276,7 @@
> (pos[F].y + pos[BL].y + pos[BR].y) / 3);
>
> for
> - (OverlayManager::Overlay_Info const * it = overlay_info;
> + (OverlayManager::OverlayInfo const * it = overlay_info;
> it < end;
> ++it)
> m_dst->blit(tripos - it->hotspot, it->pic);
>
> === modified file 'src/graphic/render/gamerenderer.h'
> --- src/graphic/render/gamerenderer.h 2014-07-14 19:48:07 +0000
> +++ src/graphic/render/gamerenderer.h 2014-09-15 07:27:30 +0000
> @@ -27,7 +27,7 @@
>
> namespace Widelands {
> class Player;
> - class Editor_Game_Base;
> + class EditorGameBase;
> }
>
> class RenderTarget;
> @@ -56,7 +56,7 @@
> */
> void rendermap
> (RenderTarget & dst,
> - const Widelands::Editor_Game_Base & egbase,
> + const Widelands::EditorGameBase & egbase,
> const Widelands::Player & player,
> const Point & viewofs);
>
> @@ -66,7 +66,7 @@
> */
> void rendermap
> (RenderTarget & dst,
> - const Widelands::Editor_Game_Base & egbase,
> + const Widelands::EditorGameBase & egbase,
> const Point & viewofs);
>
> protected:
> @@ -81,7 +81,7 @@
> */
> /*@{*/
> RenderTarget * m_dst;
> - Widelands::Editor_Game_Base const * m_egbase;
> + Widelands::EditorGameBase const * m_egbase;
> Widelands::Player const * m_player;
>
> /// Translation from map pixel coordinates to @ref m_dst pixel coordinates
>
> === modified file 'src/graphic/render/gamerenderer_gl.cc'
> --- src/graphic/render/gamerenderer_gl.cc 2014-07-14 10:45:44 +0000
> +++ src/graphic/render/gamerenderer_gl.cc 2014-09-15 07:27:30 +0000
> @@ -170,7 +170,7 @@
> vtx.color[3] = 255;
> }
>
> -void GameRendererGL::count_terrain_base(Terrain_Index ter)
> +void GameRendererGL::count_terrain_base(TerrainIndex ter)
> {
> if (ter >= m_terrain_freq.size())
> m_terrain_freq.resize(ter + 1);
> @@ -178,7 +178,7 @@
> }
>
> void GameRendererGL::add_terrain_base_triangle
> - (Terrain_Index ter, const Coords & p1, const Coords & p2, const Coords & p3)
> + (TerrainIndex ter, const Coords & p1, const Coords & p2, const Coords & p3)
> {
> uint32_t index = m_patch_indices_indexs[ter];
> m_patch_indices[index++] = patch_index(p1);
> @@ -210,8 +210,8 @@
> Coords ncoords(coords);
> map.normalize_coords(ncoords);
> FCoords fcoords = map.get_fcoords(ncoords);
> - Terrain_Index ter_d = fcoords.field->get_terrains().d;
> - Terrain_Index ter_r = fcoords.field->get_terrains().r;
> + TerrainIndex ter_d = fcoords.field->get_terrains().d;
> + TerrainIndex ter_r = fcoords.field->get_terrains().r;
>
> if (onlyscan) {
> count_terrain_base(ter_d);
> @@ -233,14 +233,14 @@
>
> void GameRendererGL::prepare_terrain_base()
> {
> - static_assert(sizeof(basevertex) == 32, "assert(sizeof(basevertex) == 32) failed.");
> + static_assert(sizeof(BaseVertex) == 32, "assert(sizeof(basevertex) == 32) failed.");
>
> uint32_t reqsize = m_patch_size.w * m_patch_size.h;
> if (reqsize > 0x10000)
> throw wexception("Too many vertices; decrease screen resolution");
>
> if (reqsize > m_patch_vertices_size) {
> - m_patch_vertices.reset(new basevertex[reqsize]);
> + m_patch_vertices.reset(new BaseVertex[reqsize]);
> m_patch_vertices_size = reqsize;
> }
>
> @@ -261,12 +261,12 @@
> }
>
> m_patch_indices_indexs.resize(m_terrain_freq.size());
> - for (Terrain_Index ter = 0; ter < m_terrain_freq.size(); ++ter)
> + for (TerrainIndex ter = 0; ter < m_terrain_freq.size(); ++ter)
> m_patch_indices_indexs[ter] = 3 * m_terrain_freq_cum[ter];
>
> collect_terrain_base(false);
>
> - for (Terrain_Index ter = 0; ter < m_terrain_freq.size(); ++ter) {
> + for (TerrainIndex ter = 0; ter < m_terrain_freq.size(); ++ter) {
> assert(m_patch_indices_indexs[ter] == 3 * (m_terrain_freq_cum[ter] + m_terrain_freq[ter]));
> }
> }
> @@ -278,9 +278,9 @@
> glMatrixMode(GL_TEXTURE);
> glLoadIdentity();
>
> - glVertexPointer(2, GL_FLOAT, sizeof(basevertex), &m_patch_vertices[0].x);
> - glTexCoordPointer(2, GL_FLOAT, sizeof(basevertex), &m_patch_vertices[0].tcx);
> - glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(basevertex), &m_patch_vertices[0].color);
> + glVertexPointer(2, GL_FLOAT, sizeof(BaseVertex), &m_patch_vertices[0].x);
> + glTexCoordPointer(2, GL_FLOAT, sizeof(BaseVertex), &m_patch_vertices[0].tcx);
> + glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(BaseVertex), &m_patch_vertices[0].color);
> glEnableClientState(GL_VERTEX_ARRAY);
> glEnableClientState(GL_TEXTURE_COORD_ARRAY);
> glEnableClientState(GL_COLOR_ARRAY);
> @@ -288,7 +288,7 @@
> glColor3f(1.0, 1.0, 1.0);
> glDisable(GL_BLEND);
>
> - for (Terrain_Index ter = 0; ter < m_terrain_freq.size(); ++ter) {
> + for (TerrainIndex ter = 0; ter < m_terrain_freq.size(); ++ter) {
> if (!m_terrain_freq[ter])
> continue;
>
> @@ -309,7 +309,7 @@
> }
>
> void GameRendererGL::add_terrain_dither_triangle
> - (bool onlyscan, Terrain_Index ter, const Coords & edge1, const Coords & edge2, const Coords & opposite)
> + (bool onlyscan, TerrainIndex ter, const Coords & edge1, const Coords & edge2, const Coords & opposite)
> {
> if (onlyscan) {
> assert(ter < m_terrain_edge_freq.size());
> @@ -346,12 +346,12 @@
> map.normalize_coords(ncoords);
> FCoords fcoords = map.get_fcoords(ncoords);
>
> - Terrain_Index ter_d = fcoords.field->get_terrains().d;
> - Terrain_Index ter_r = fcoords.field->get_terrains().r;
> - Terrain_Index ter_u = map.tr_n(fcoords).field->get_terrains().d;
> - Terrain_Index ter_rr = map.r_n(fcoords).field->get_terrains().d;
> - Terrain_Index ter_l = map.l_n(fcoords).field->get_terrains().r;
> - Terrain_Index ter_dd = map.bl_n(fcoords).field->get_terrains().r;
> + TerrainIndex ter_d = fcoords.field->get_terrains().d;
> + TerrainIndex ter_r = fcoords.field->get_terrains().r;
> + TerrainIndex ter_u = map.tr_n(fcoords).field->get_terrains().d;
> + TerrainIndex ter_rr = map.r_n(fcoords).field->get_terrains().d;
> + TerrainIndex ter_l = map.l_n(fcoords).field->get_terrains().r;
> + TerrainIndex ter_dd = map.bl_n(fcoords).field->get_terrains().r;
> int32_t lyr_d = world.terrain_descr(ter_d).dither_layer();
> int32_t lyr_r = world.terrain_descr(ter_r).dither_layer();
> int32_t lyr_u = world.terrain_descr(ter_u).dither_layer();
> @@ -404,7 +404,7 @@
> */
> void GameRendererGL::prepare_terrain_dither()
> {
> - static_assert(sizeof(dithervertex) == 32, "assert(sizeof(dithervertex) == 32) failed.");
> + static_assert(sizeof(DitherVertex) == 32, "assert(sizeof(dithervertex) == 32) failed.");
>
> m_terrain_edge_freq.assign(m_terrain_edge_freq.size(), 0);
>
> @@ -412,23 +412,23 @@
>
> uint32_t nrtriangles = 0;
> m_terrain_edge_freq_cum.resize(m_terrain_edge_freq.size());
> - for (Terrain_Index ter = 0; ter < m_terrain_edge_freq.size(); ++ter) {
> + for (TerrainIndex ter = 0; ter < m_terrain_edge_freq.size(); ++ter) {
> m_terrain_edge_freq_cum[ter] = nrtriangles;
> nrtriangles += m_terrain_edge_freq[ter];
> }
>
> if (3 * nrtriangles > m_edge_vertices_size) {
> - m_edge_vertices.reset(new dithervertex[3 * nrtriangles]);
> + m_edge_vertices.reset(new DitherVertex[3 * nrtriangles]);
> m_edge_vertices_size = 3 * nrtriangles;
> }
>
> m_terrain_edge_indexs.resize(m_terrain_edge_freq_cum.size());
> - for (Terrain_Index ter = 0; ter < m_terrain_edge_freq.size(); ++ter)
> + for (TerrainIndex ter = 0; ter < m_terrain_edge_freq.size(); ++ter)
> m_terrain_edge_indexs[ter] = 3 * m_terrain_edge_freq_cum[ter];
>
> collect_terrain_dither(false);
>
> - for (Terrain_Index ter = 0; ter < m_terrain_edge_freq.size(); ++ter) {
> + for (TerrainIndex ter = 0; ter < m_terrain_edge_freq.size(); ++ter) {
> assert(m_terrain_edge_indexs[ter] == 3 * (m_terrain_edge_freq_cum[ter] + m_terrain_edge_freq[ter]));
> }
> }
> @@ -438,16 +438,16 @@
> if (m_edge_vertices_size == 0)
> return;
>
> - glVertexPointer(2, GL_FLOAT, sizeof(dithervertex), &m_edge_vertices[0].x);
> - glTexCoordPointer(2, GL_FLOAT, sizeof(dithervertex), &m_edge_vertices[0].tcx);
> - glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(dithervertex), &m_edge_vertices[0].color);
> + glVertexPointer(2, GL_FLOAT, sizeof(DitherVertex), &m_edge_vertices[0].x);
> + glTexCoordPointer(2, GL_FLOAT, sizeof(DitherVertex), &m_edge_vertices[0].tcx);
> + glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(DitherVertex), &m_edge_vertices[0].color);
> glEnableClientState(GL_VERTEX_ARRAY);
> glEnableClientState(GL_TEXTURE_COORD_ARRAY);
> glEnableClientState(GL_COLOR_ARRAY);
>
> glActiveTextureARB(GL_TEXTURE1_ARB);
> glClientActiveTextureARB(GL_TEXTURE1_ARB);
> - glTexCoordPointer(2, GL_FLOAT, sizeof(dithervertex), &m_edge_vertices[0].edgex);
> + glTexCoordPointer(2, GL_FLOAT, sizeof(DitherVertex), &m_edge_vertices[0].edgex);
> glEnableClientState(GL_TEXTURE_COORD_ARRAY);
> GLuint edge = get_dither_edge_texture()->get_gl_texture();
> glBindTexture(GL_TEXTURE_2D, edge);
> @@ -465,7 +465,7 @@
> glEnable(GL_BLEND);
> glBlendFunc(GL_ONE_MINUS_SRC_ALPHA, GL_SRC_ALPHA);
>
> - for (Terrain_Index ter = 0; ter < m_terrain_freq.size(); ++ter) {
> + for (TerrainIndex ter = 0; ter < m_terrain_freq.size(); ++ter) {
> if (!m_terrain_edge_freq[ter])
> continue;
>
> @@ -528,7 +528,7 @@
>
> uint32_t nrquads = m_road_freq[0] + m_road_freq[1];
> if (4 * nrquads > m_road_vertices_size) {
> - m_road_vertices.reset(new basevertex[4 * nrquads]);
> + m_road_vertices.reset(new BaseVertex[4 * nrquads]);
> m_road_vertices_size = 4 * nrquads;
> }
>
> @@ -546,7 +546,7 @@
> uint8_t road = (roads >> Road_East) & Road_Mask;
> if (road >= Road_Normal && road <= Road_Busy) {
> uint32_t index = indexs[road - Road_Normal];
> - basevertex start, end;
> + BaseVertex start, end;
> compute_basevertex(Coords(fx, fy), start);
> compute_basevertex(Coords(fx + 1, fy), end);
> m_road_vertices[index] = start;
> @@ -571,7 +571,7 @@
> road = (roads >> Road_SouthEast) & Road_Mask;
> if (road >= Road_Normal && road <= Road_Busy) {
> uint32_t index = indexs[road - Road_Normal];
> - basevertex start, end;
> + BaseVertex start, end;
> compute_basevertex(Coords(fx, fy), start);
> compute_basevertex(Coords(fx + (fy & 1), fy + 1), end);
> m_road_vertices[index] = start;
> @@ -596,7 +596,7 @@
> road = (roads >> Road_SouthWest) & Road_Mask;
> if (road >= Road_Normal && road <= Road_Busy) {
> uint32_t index = indexs[road - Road_Normal];
> - basevertex start, end;
> + BaseVertex start, end;
> compute_basevertex(Coords(fx, fy), start);
> compute_basevertex(Coords(fx + (fy & 1) - 1, fy + 1), end);
> m_road_vertices[index] = start;
> @@ -636,9 +636,9 @@
> dynamic_cast<const GLSurfaceTexture &>
> (g_gr->get_road_texture(Widelands::Road_Busy)).get_gl_texture();
>
> - glVertexPointer(2, GL_FLOAT, sizeof(basevertex), &m_road_vertices[0].x);
> - glTexCoordPointer(2, GL_FLOAT, sizeof(basevertex), &m_road_vertices[0].tcx);
> - glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(basevertex), &m_road_vertices[0].color);
> + glVertexPointer(2, GL_FLOAT, sizeof(BaseVertex), &m_road_vertices[0].x);
> + glTexCoordPointer(2, GL_FLOAT, sizeof(BaseVertex), &m_road_vertices[0].tcx);
> + glColorPointer(4, GL_UNSIGNED_BYTE, sizeof(BaseVertex), &m_road_vertices[0].color);
> glEnableClientState(GL_VERTEX_ARRAY);
> glEnableClientState(GL_TEXTURE_COORD_ARRAY);
> glEnableClientState(GL_COLOR_ARRAY);
>
> === modified file 'src/graphic/render/gamerenderer_gl.h'
> --- src/graphic/render/gamerenderer_gl.h 2014-07-05 16:41:51 +0000
> +++ src/graphic/render/gamerenderer_gl.h 2014-09-15 07:27:30 +0000
> @@ -45,7 +45,7 @@
> virtual ~GameRendererGL();
>
> private:
> - struct basevertex {
> + struct BaseVertex {
> float x;
> float y;
> float tcx;
> @@ -54,7 +54,7 @@
> uint32_t pad[3];
> };
>
> - struct dithervertex {
> + struct DitherVertex {
> float x;
> float y;
> float tcx;
> @@ -70,15 +70,15 @@
> void draw() override;
> void prepare_terrain_base();
> void collect_terrain_base(bool onlyscan);
> - void count_terrain_base(Widelands::Terrain_Index ter);
> + void count_terrain_base(Widelands::TerrainIndex ter);
> void add_terrain_base_triangle
> - (Widelands::Terrain_Index ter,
> + (Widelands::TerrainIndex ter,
> const Widelands::Coords & p1, const Widelands::Coords & p2, const Widelands::Coords & p3);
> void draw_terrain_base();
> void prepare_terrain_dither();
> void collect_terrain_dither(bool onlyscan);
> void add_terrain_dither_triangle
> - (bool onlyscan, Widelands::Terrain_Index ter,
> + (bool onlyscan, Widelands::TerrainIndex ter,
> const Widelands::Coords & edge1, const Widelands::Coords & edge2,
> const Widelands::Coords & opposite);
> void draw_terrain_dither();
> @@ -106,21 +106,21 @@
> Point m_surface_offset;
>
> Rect m_patch_size;
> - std::unique_ptr<basevertex[]> m_patch_vertices;
> + std::unique_ptr<BaseVertex[]> m_patch_vertices;
> uint32_t m_patch_vertices_size;
> std::unique_ptr<uint16_t[]> m_patch_indices;
> uint32_t m_patch_indices_size;
> std::vector<uint32_t> m_patch_indices_indexs;
> std::vector<uint32_t> m_terrain_freq;
> std::vector<uint32_t> m_terrain_freq_cum;
> - std::unique_ptr<dithervertex[]> m_edge_vertices;
> + std::unique_ptr<DitherVertex[]> m_edge_vertices;
> uint32_t m_edge_vertices_size;
> std::vector<uint32_t> m_terrain_edge_freq;
> std::vector<uint32_t> m_terrain_edge_freq_cum;
> std::vector<uint32_t> m_terrain_edge_indexs;
>
> uint32_t m_road_freq[2];
> - std::unique_ptr<basevertex[]> m_road_vertices;
> + std::unique_ptr<BaseVertex[]> m_road_vertices;
> uint32_t m_road_vertices_size;
> /*@}*/
> };
>
> === modified file 'src/graphic/render/gamerenderer_sdl.cc'
> --- src/graphic/render/gamerenderer_sdl.cc 2014-07-14 10:45:44 +0000
> +++ src/graphic/render/gamerenderer_sdl.cc 2014-09-15 07:27:30 +0000
> @@ -98,13 +98,13 @@
> // Calculate safe (bounded) field coordinates and get field pointers
> map.normalize_coords(r);
> map.normalize_coords(br);
> - Map_Index r_index = Map::get_index (r, mapwidth);
> + MapIndex r_index = Map::get_index (r, mapwidth);
> r.field = &map[r_index];
> - Map_Index br_index = Map::get_index(br, mapwidth);
> + MapIndex br_index = Map::get_index(br, mapwidth);
> br.field = &map[br_index];
> FCoords tr;
> map.get_tln(r, &tr);
> - Map_Index tr_index = tr.field - &map[0];
> + MapIndex tr_index = tr.field - &map[0];
>
> const Texture * f_r_texture;
>
> @@ -122,8 +122,8 @@
> const FCoords f = r;
> const int32_t f_posx = r_posx;
> const int32_t bl_posx = br_posx;
> - Map_Index f_index = r_index;
> - Map_Index bl_index = br_index;
> + MapIndex f_index = r_index;
> + MapIndex bl_index = br_index;
> move_r(mapwidth, tr, tr_index);
> move_r(mapwidth, r, r_index);
> move_r(mapwidth, br, br_index);
>
> === modified file 'src/graphic/render/minimaprenderer.cc'
> --- src/graphic/render/minimaprenderer.cc 2014-07-25 13:45:18 +0000
> +++ src/graphic/render/minimaprenderer.cc 2014-09-15 07:27:30 +0000
> @@ -54,8 +54,8 @@
>
> // Returns the color to be used in the minimap for the given field.
> inline uint32_t calc_minimap_color
> - (const SDL_PixelFormat& format, const Widelands::Editor_Game_Base& egbase,
> - const Widelands::FCoords& f, MiniMapLayer layers, Widelands::Player_Number owner,
> + (const SDL_PixelFormat& format, const Widelands::EditorGameBase& egbase,
> + const Widelands::FCoords& f, MiniMapLayer layers, Widelands::PlayerNumber owner,
> bool see_details)
> {
> uint32_t pixelcolor = 0;
> @@ -154,7 +154,7 @@
>
> // Does the actual work of drawing the minimap.
> void draw_minimap_int
> - (Surface* surface, const Widelands::Editor_Game_Base& egbase,
> + (Surface* surface, const Widelands::EditorGameBase& egbase,
> const Widelands::Player* player, const Point& viewpoint, MiniMapLayer layers)
> {
> const Widelands::Map & map = egbase.map();
> @@ -195,7 +195,7 @@
> (viewpoint.x, viewpoint.y + (layers & MiniMapLayer::Zoom2 ? y / 2 : y)));
> map.normalize_coords(f);
> f.field = &map[f];
> - Widelands::Map_Index i = Widelands::Map::get_index(f, mapwidth);
> + Widelands::MapIndex i = Widelands::Map::get_index(f, mapwidth);
> for (uint32_t x = 0; x < surface_w; ++x, pix += sizeof(uint32_t)) {
> if (x % 2 || !(layers & MiniMapLayer::Zoom2))
> move_r(mapwidth, f, i);
> @@ -222,7 +222,7 @@
> (layers & MiniMapLayer::Zoom2 ? y / 2 : y)));
> map.normalize_coords(f);
> f.field = &map[f];
> - Widelands::Map_Index i = Widelands::Map::get_index(f, mapwidth);
> + Widelands::MapIndex i = Widelands::Map::get_index(f, mapwidth);
> for (uint32_t x = 0; x < surface_w; ++x, pix += sizeof(uint32_t)) {
> if (x % 2 || !(layers & MiniMapLayer::Zoom2))
> move_r(mapwidth, f, i);
> @@ -258,7 +258,7 @@
>
> } // namespace
>
> -std::unique_ptr<Surface> draw_minimap(const Editor_Game_Base& egbase,
> +std::unique_ptr<Surface> draw_minimap(const EditorGameBase& egbase,
> const Player* player,
> const Point& viewpoint,
> MiniMapLayer layers) {
> @@ -284,7 +284,7 @@
> }
>
> void write_minimap_image
> - (const Editor_Game_Base& egbase, const Player* player, const Point& gviewpoint, MiniMapLayer layers,
> + (const EditorGameBase& egbase, const Player* player, const Point& gviewpoint, MiniMapLayer layers,
> ::StreamWrite* const streamwrite)
> {
> assert(streamwrite != nullptr);
>
> === modified file 'src/graphic/render/minimaprenderer.h'
> --- src/graphic/render/minimaprenderer.h 2014-07-12 12:25:21 +0000
> +++ src/graphic/render/minimaprenderer.h 2014-09-15 07:27:30 +0000
> @@ -28,7 +28,7 @@
>
> namespace Widelands {
> class Player;
> - class Editor_Game_Base;
> + class EditorGameBase;
> }
>
> // Layers for selecting what do display on the minimap.
> @@ -57,13 +57,13 @@
> /// point of view.
> /// \param viewpoint: top left corner in map coordinates
> std::unique_ptr<Surface> draw_minimap
> - (const Widelands::Editor_Game_Base& egbase, const Widelands::Player* player,
> + (const Widelands::EditorGameBase& egbase, const Widelands::Player* player,
> const Point& viewpoint, MiniMapLayer layers);
>
> /// Render the minimap to a file. 1 pixel will be used for each fields.
> /// \param viewpoint : The game point of view as returned by interactive_base.get_viewpoint();
> void write_minimap_image
> - (const Widelands::Editor_Game_Base& egbase, Widelands::Player const* player,
> + (const Widelands::EditorGameBase& egbase, Widelands::Player const* player,
> const Point& viewpoint, MiniMapLayer layers, StreamWrite* const streamwrite);
>
> #endif // end of include guard: WL_GRAPHIC_RENDER_MINIMAPRENDERER_H
>
> === modified file 'src/graphic/rendertarget.cc'
> --- src/graphic/rendertarget.cc 2014-07-28 14:08:41 +0000
> +++ src/graphic/rendertarget.cc 2014-09-15 07:27:30 +0000
> @@ -266,7 +266,7 @@
>
> /**
> * Draws a frame of an animation at the given location
> - * Plays sound effect that is registered with this frame (the Sound_Handler
> + * Plays sound effect that is registered with this frame (the SoundHandler
> * decides if the fx really does get played)
> *
> * \param dstx, dsty the on-screen location of the animation hot spot
> @@ -291,7 +291,7 @@
> anim.blit(time, dstpt, srcrc, player ? &player->get_playercolor() : NULL, m_surface);
>
> // Look if there is a sound effect registered for this frame and trigger
> - // the effect (see Sound_Handler::stereo_position).
> + // the effect (see SoundHandler::stereo_position).
> anim.trigger_soundfx(time, 128);
> }
>
>
> === modified file 'src/graphic/richtext.cc'
> --- src/graphic/richtext.cc 2014-07-26 10:43:23 +0000
> +++ src/graphic/richtext.cc 2014-09-15 07:27:30 +0000
> @@ -185,7 +185,7 @@
> RichTextImpl & rti;
>
> /// Current richtext block
> - std::vector<Richtext_Block>::iterator richtext;
> + std::vector<RichtextBlock>::iterator richtext;
>
> /// Extent of images in the current richtext block
> /*@{*/
> @@ -203,7 +203,7 @@
> uint32_t linewidth;
>
> /// Current text block
> - std::vector<Text_Block>::const_iterator textblock;
> + std::vector<TextBlock>::const_iterator textblock;
> TextStyle style;
> uint32_t spacewidth;
> uint32_t linespacing;
> @@ -311,8 +311,8 @@
> {
> m->clear();
>
> - std::vector<Richtext_Block> blocks;
> - Text_Parser p;
> + std::vector<RichtextBlock> blocks;
> + TextParser p;
> std::string copy(rtext);
> p.parse(copy, blocks);
>
> @@ -322,7 +322,7 @@
> TextBuilder text(*m);
>
> for (text.richtext = blocks.begin(); text.richtext != blocks.end(); ++text.richtext) {
> - const std::vector<Text_Block> & cur_text_blocks = text.richtext->get_text_blocks();
> + const std::vector<TextBlock> & cur_text_blocks = text.richtext->get_text_blocks();
> const std::vector<std::string> & cur_block_images = text.richtext->get_images();
>
> // First obtain the data of all images of this richtext block and prepare
>
> === modified file 'src/graphic/surface_cache.cc'
> --- src/graphic/surface_cache.cc 2014-07-26 10:43:23 +0000
> +++ src/graphic/surface_cache.cc 2014-09-15 07:27:30 +0000
> @@ -47,7 +47,7 @@
> private:
> void drop();
>
> - typedef list<string> AccessHistory;
> + using AccessHistory = list<string>;
> struct Entry {
> Entry(Surface* gs, const AccessHistory::iterator& it, bool transient) :
> surface(gs), is_transient(transient), last_access(SDL_GetTicks()), list_iterator(it) {}
> @@ -57,7 +57,7 @@
> uint32_t last_access; // Mainly for debugging and analysis.
> const AccessHistory::iterator list_iterator; // Only valid if is_transient is true.
> };
> - typedef map<string, Entry*> Container;
> + using Container = map<string, Entry*>;
>
> uint32_t max_transient_memory_;
> uint32_t used_transient_memory_;
>
> === modified file 'src/graphic/text/font_io.cc'
> --- src/graphic/text/font_io.cc 2014-07-14 10:45:44 +0000
> +++ src/graphic/text/font_io.cc 2014-09-15 07:27:30 +0000
> @@ -57,6 +57,6 @@
> throw BadFont((boost::format("Font loading error for %s, %i pts: %s") % face % ptsize %
> TTF_GetError()).str());
>
> - return new SDLTTF_Font(font, face, ptsize, memory.release());
> + return new SdlTtfFont(font, face, ptsize, memory.release());
> }
> }
>
> === modified file 'src/graphic/text/rt_errors.h'
> --- src/graphic/text/rt_errors.h 2014-07-26 10:43:23 +0000
> +++ src/graphic/text/rt_errors.h 2014-09-15 07:27:30 +0000
> @@ -43,7 +43,7 @@
>
> DEF_ERR(AttributeNotFound)
> DEF_ERR(BadFont)
> -DEF_ERR(EOT)
> +DEF_ERR(EndOfText)
> DEF_ERR(InvalidColor)
> DEF_ERR(RenderError)
> DEF_ERR(SyntaxError)
>
> === modified file 'src/graphic/text/rt_errors_impl.h'
> --- src/graphic/text/rt_errors_impl.h 2014-07-14 10:45:44 +0000
> +++ src/graphic/text/rt_errors_impl.h 2014-09-15 07:27:30 +0000
> @@ -26,8 +26,8 @@
>
> namespace RT {
>
> -struct SyntaxError_Impl : public SyntaxError {
> - SyntaxError_Impl(size_t line, size_t col, std::string expected, std::string got, std::string next_chars)
> +struct SyntaxErrorImpl : public SyntaxError {
> + SyntaxErrorImpl(size_t line, size_t col, std::string expected, std::string got, std::string next_chars)
> : SyntaxError
> ((boost::format("Syntax error at %1%:%2%: expected %3%, got '%4%'. String continues with: '%5%'")
> % line % col % expected % got % next_chars)
>
> === modified file 'src/graphic/text/rt_parse.cc'
> --- src/graphic/text/rt_parse.cc 2014-07-20 07:44:53 +0000
> +++ src/graphic/text/rt_parse.cc 2014-09-15 07:27:30 +0000
> @@ -120,7 +120,7 @@
> void Tag::m_parse_attribute(TextStream & ts, std::unordered_set<std::string> & allowed_attrs) {
> std::string aname = ts.till_any("=");
> if (!allowed_attrs.count(aname))
> - throw SyntaxError_Impl(ts.line(), ts.col(), "an allowed attribute", aname, ts.peek(100));
> + throw SyntaxErrorImpl(ts.line(), ts.col(), "an allowed attribute", aname, ts.peek(100));
>
> ts.skip(1);
>
> @@ -139,7 +139,7 @@
> std::string text = ts.till_any("<");
> if (text != "") {
> if (!tc.text_allowed)
> - throw SyntaxError_Impl(line, col, "no text, as only tags are allowed here", text, ts.peek(100));
> + throw SyntaxErrorImpl(line, col, "no text, as only tags are allowed here", text, ts.peek(100));
> m_childs.push_back(new Child(text));
> }
>
> @@ -150,9 +150,9 @@
> line = ts.line(); col = ts.col(); size_t cpos = ts.pos();
> child->parse(ts, tcs, allowed_tags);
> if (!tc.allowed_childs.count(child->name()))
> - throw SyntaxError_Impl(line, col, "an allowed tag", child->name(), ts.peek(100, cpos));
> + throw SyntaxErrorImpl(line, col, "an allowed tag", child->name(), ts.peek(100, cpos));
> if (!allowed_tags.empty() && !allowed_tags.count(child->name()))
> - throw SyntaxError_Impl(line, col, "an allowed tag", child->name(), ts.peek(100, cpos));
> + throw SyntaxErrorImpl(line, col, "an allowed tag", child->name(), ts.peek(100, cpos));
>
> m_childs.push_back(new Child(child));
> }
>
> === modified file 'src/graphic/text/rt_parse.h'
> --- src/graphic/text/rt_parse.h 2014-07-14 10:45:44 +0000
> +++ src/graphic/text/rt_parse.h 2014-09-15 07:27:30 +0000
> @@ -74,12 +74,12 @@
> bool text_allowed;
> bool has_closing_tag;
> };
> -typedef std::unordered_map<std::string, TagConstraint> TagConstraints;
> -typedef std::set<std::string> TagSet;
> +using TagConstraints = std::unordered_map<std::string, TagConstraint>;
> +using TagSet = std::set<std::string>;
>
> class Tag {
> public:
> - typedef std::vector<Child*> ChildList;
> + using ChildList = std::vector<Child*>;
>
> ~Tag();
>
>
> === modified file 'src/graphic/text/rt_render.cc'
> --- src/graphic/text/rt_render.cc 2014-07-26 10:43:23 +0000
> +++ src/graphic/text/rt_render.cc 2014-09-15 07:27:30 +0000
> @@ -580,8 +580,8 @@
> return size < o.size || (size == o.size && face < o.face);
> }
> };
> - typedef map<FontDescr, IFont*> FontMap;
> - typedef pair<const FontDescr, IFont*> FontMapPair;
> + using FontMap = map<FontDescr, IFont*>;
> + using FontMapPair = pair<const FontDescr, IFont*>;
>
> FontMap m_fontmap;
> };
> @@ -925,8 +925,9 @@
> {
> return new T(tag, fc, ns, image_cache);
> }
> -typedef map<const string, TagHandler* (*)
> - (Tag& tag, FontCache& fc, NodeStyle& ns, ImageCache* image_cache)> TagHandlerMap;
> +using TagHandlerMap = map<const string, TagHandler* (*)
> + (Tag& tag, FontCache& fc, NodeStyle& ns, ImageCache* image_cache)>;
> +
> TagHandler* create_taghandler(Tag& tag, FontCache& fc, NodeStyle& ns, ImageCache* image_cache) {
> static TagHandlerMap map;
> if (map.empty()) {
>
> === modified file 'src/graphic/text/rt_render.h'
> --- src/graphic/text/rt_render.h 2014-07-14 10:45:44 +0000
> +++ src/graphic/text/rt_render.h 2014-09-15 07:27:30 +0000
> @@ -77,7 +77,7 @@
> * This is the rendering engine. The returned images are not owned by the
> * caller.
> */
> -typedef std::set<std::string> TagSet;
> +using TagSet = std::set<std::string>;
> class Renderer {
> public:
> // Ownership is not taken.
>
> === modified file 'src/graphic/text/sdl_ttf_font.cc'
> --- src/graphic/text/sdl_ttf_font.cc 2014-07-20 07:44:53 +0000
> +++ src/graphic/text/sdl_ttf_font.cc 2014-09-15 07:27:30 +0000
> @@ -35,17 +35,17 @@
>
> namespace RT {
>
> -SDLTTF_Font::SDLTTF_Font(TTF_Font * font, const string& face, int ptsize, string* ttf_memory_block) :
> +SdlTtfFont::SdlTtfFont(TTF_Font * font, const string& face, int ptsize, string* ttf_memory_block) :
> font_(font), style_(TTF_STYLE_NORMAL), font_name_(face), ptsize_(ptsize),
> ttf_file_memory_block_(ttf_memory_block) {
> }
>
> -SDLTTF_Font::~SDLTTF_Font() {
> +SdlTtfFont::~SdlTtfFont() {
> TTF_CloseFont(font_);
> font_ = nullptr;
> }
>
> -void SDLTTF_Font::dimensions(const string& txt, int style, uint16_t * gw, uint16_t * gh) {
> +void SdlTtfFont::dimensions(const string& txt, int style, uint16_t * gw, uint16_t * gh) {
> m_set_style(style);
>
> int w, h;
> @@ -57,7 +57,7 @@
> *gw = w; *gh = h;
> }
>
> -const Surface& SDLTTF_Font::render
> +const Surface& SdlTtfFont::render
> (const string& txt, const RGBColor& clr, int style, SurfaceCache* surface_cache) {
> const string hash =
> (boost::format("%s:%s:%i:%02x%02x%02x:%i") % font_name_ % ptsize_ % txt %
> @@ -121,14 +121,14 @@
> return *surface_cache->insert(hash, Surface::create(text_surface), true);
> }
>
> -uint16_t SDLTTF_Font::ascent(int style) const {
> +uint16_t SdlTtfFont::ascent(int style) const {
> uint16_t rv = TTF_FontAscent(font_);
> if (style & SHADOW)
> rv += SHADOW_OFFSET;
> return rv;
> }
>
> -void SDLTTF_Font::m_set_style(int style) {
> +void SdlTtfFont::m_set_style(int style) {
> // Those must have been handled by loading the correct font.
> assert(!(style & BOLD));
> assert(!(style & ITALIC));
>
> === modified file 'src/graphic/text/sdl_ttf_font.h'
> --- src/graphic/text/sdl_ttf_font.h 2014-07-26 10:43:23 +0000
> +++ src/graphic/text/sdl_ttf_font.h 2014-09-15 07:27:30 +0000
> @@ -30,11 +30,11 @@
> namespace RT {
>
> // Implementation of a Font object using SDL_ttf.
> -class SDLTTF_Font : public IFont {
> +class SdlTtfFont : public IFont {
> public:
> - SDLTTF_Font
> + SdlTtfFont
> (TTF_Font* ttf, const std::string& face, int ptsize, std::string* ttf_memory_block);
> - virtual ~SDLTTF_Font();
> + virtual ~SdlTtfFont();
>
> void dimensions(const std::string&, int, uint16_t * w, uint16_t * h) override;
> const Surface& render(const std::string&, const RGBColor& clr, int, SurfaceCache*) override;
>
> === modified file 'src/graphic/text/textstream.cc'
> --- src/graphic/text/textstream.cc 2014-07-20 07:44:53 +0000
> +++ src/graphic/text/textstream.cc 2014-09-15 07:27:30 +0000
> @@ -28,9 +28,9 @@
>
> namespace RT {
>
> -struct EOT_Impl : public EOT {
> - EOT_Impl(size_t pos, string text)
> - : EOT((format("Unexpected End of Text, starting at %1%. Text is: '%2%'") % pos % text).str())
> +struct EndOfTextImpl : public EndOfText {
> + EndOfTextImpl(size_t pos, string text)
> + : EndOfText((format("Unexpected End of Text, starting at %1%. Text is: '%2%'") % pos % text).str())
> {}
> };
>
> @@ -77,7 +77,7 @@
> skip_ws();
>
> if (peek(n.size()) != n)
> - throw SyntaxError_Impl(m_lineno, m_col, (format("'%s'") % n).str(), peek(n.size()), peek(100));
> + throw SyntaxErrorImpl(m_lineno, m_col, (format("'%s'") % n).str(), peek(n.size()), peek(100));
> m_consume(n.size());
> }
>
> @@ -108,7 +108,7 @@
> ++j;
> }
> if (!found)
> - throw EOT_Impl(started_at, peek(100, started_at));
> + throw EndOfTextImpl(started_at, peek(100, started_at));
> m_consume(j - started_at);
>
> return rv;
> @@ -121,7 +121,7 @@
> string rv;
> try {
> rv = till_any(chars);
> - } catch (EOT_Impl &) {
> + } catch (EndOfTextImpl &) {
> rv = m_t.substr(m_i, m_end - m_i);
> m_consume(m_end + 1 - m_i);
> }
>
> === modified file 'src/graphic/text_parser.cc'
> --- src/graphic/text_parser.cc 2014-07-25 20:40:51 +0000
> +++ src/graphic/text_parser.cc 2014-09-15 07:27:30 +0000
> @@ -30,12 +30,12 @@
>
> namespace UI {
>
> -Richtext_Block::Richtext_Block() :
> +RichtextBlock::RichtextBlock() :
> m_image_align(Align_Left),
> m_text_align (Align_Left)
> {}
>
> -Richtext_Block::Richtext_Block(const Richtext_Block & src) {
> +RichtextBlock::RichtextBlock(const RichtextBlock & src) {
> m_images.clear();
> m_text_blocks.clear();
> for (uint32_t i = 0; i < src.m_images.size(); ++i)
> @@ -46,7 +46,7 @@
> m_text_align = src.m_text_align;
> }
>
> -Text_Block::Text_Block() {
> +TextBlock::TextBlock() {
> m_font_size = 10;
> m_font_color = RGBColor(255, 255, 0);
> m_font_weight = "normal";
> @@ -56,14 +56,14 @@
> m_line_spacing = 0;
> }
>
> -void Text_Parser::parse
> +void TextParser::parse
> (std::string & text,
> - std::vector<Richtext_Block> & blocks)
> + std::vector<RichtextBlock> & blocks)
> {
> bool more_richtext_blocks = true;
> //First while loop parses all richtext blocks (images)
> while (more_richtext_blocks) {
> - Richtext_Block new_richtext_block;
> + RichtextBlock new_richtext_block;
> std::string unparsed_text;
> std::string richtext_format;
>
> @@ -77,13 +77,13 @@
> std::string("</rt>"));
> parse_richtexttext_attributes(richtext_format, &new_richtext_block);
>
> - std::vector<Text_Block> text_blocks;
> + std::vector<TextBlock> text_blocks;
>
> //Second while loop parses all textblocks of current richtext block
> bool more_text_blocks = true;
> while (more_text_blocks) {
> std::string block_format;
> - Text_Block new_block;
> + TextBlock new_block;
>
> std::vector<std::string> words;
> std::vector<std::vector<std::string>::size_type> line_breaks;
> @@ -102,7 +102,7 @@
> }
> }
>
> -bool Text_Parser::parse_textblock
> +bool TextParser::parse_textblock
> (std::string & block,
> std::string & block_format,
> std::vector<std::string> & words,
> @@ -144,7 +144,7 @@
> return extract_more;
> }
>
> -void Text_Parser::split_words(const std::string & in, std::vector<std::string>* plist)
> +void TextParser::split_words(const std::string & in, std::vector<std::string>* plist)
> {
> std::string::size_type pos = 0;
>
> @@ -165,7 +165,7 @@
> }
> }
>
> -bool Text_Parser::extract_format_block
> +bool TextParser::extract_format_block
> (std::string & block,
> std::string & block_text,
> std::string & block_format,
> @@ -212,8 +212,8 @@
> return block.find(block_start) != std::string::npos;
> }
>
> -void Text_Parser::parse_richtexttext_attributes
> - (std::string format, Richtext_Block * const element)
> +void TextParser::parse_richtexttext_attributes
> + (std::string format, RichtextBlock * const element)
> {
> if (format.empty())
> return;
> @@ -243,8 +243,8 @@
> }
> }
>
> -void Text_Parser::parse_text_attributes
> - (std::string format, Text_Block & element)
> +void TextParser::parse_text_attributes
> + (std::string format, TextBlock & element)
> {
> if (format.empty())
> return;
> @@ -290,7 +290,7 @@
> }
> }
>
> -Align Text_Parser::set_align(const std::string & align) {
> +Align TextParser::set_align(const std::string & align) {
> return
> align == "right" ? Align_Right :
> align == "center" ? Align_HCenter :
>
> === modified file 'src/graphic/text_parser.h'
> --- src/graphic/text_parser.h 2014-07-05 16:41:51 +0000
> +++ src/graphic/text_parser.h 2014-09-15 07:27:30 +0000
> @@ -33,8 +33,8 @@
> * Has uniform font style, contains text pre-split into words, and keeps track of
> * manual line breaks (<br>) in a separate structure.
> */
> -struct Text_Block {
> - Text_Block();
> +struct TextBlock {
> + TextBlock();
> // Copy and assignement operators are autogenerated.
>
> void set_font_size(int32_t const font_size) {m_font_size = font_size;}
> @@ -101,9 +101,9 @@
> std::vector<std::vector<std::string>::size_type> m_line_breaks;
> };
>
> -struct Richtext_Block {
> - Richtext_Block();
> - Richtext_Block(const Richtext_Block & src);
> +struct RichtextBlock {
> + RichtextBlock();
> + RichtextBlock(const RichtextBlock & src);
>
> void set_images(const std::vector<std::string> & images) {
> m_images = images;
> @@ -116,31 +116,31 @@
> void set_text_align(Align const text_align) {m_text_align = text_align;}
> Align get_text_align() const {return m_text_align;}
>
> - void set_text_blocks(const std::vector<Text_Block> & text_blocks) {
> + void set_text_blocks(const std::vector<TextBlock> & text_blocks) {
> m_text_blocks = text_blocks;
> }
> - const std::vector<Text_Block> & get_text_blocks() const {
> + const std::vector<TextBlock> & get_text_blocks() const {
> return m_text_blocks;
> }
> private:
> std::vector<std::string> m_images;
> - std::vector<Text_Block> m_text_blocks;
> + std::vector<TextBlock> m_text_blocks;
> Align m_image_align;
> Align m_text_align;
> };
>
> -struct Text_Parser {
> +struct TextParser {
> void parse
> (std::string & text,
> - std::vector<Richtext_Block> & blocks);
> + std::vector<RichtextBlock> & blocks);
> private:
> - void parse_richtexttext_attributes(std::string format, Richtext_Block *);
> + void parse_richtexttext_attributes(std::string format, RichtextBlock *);
> bool parse_textblock
> (std::string & block,
> std::string & block_format,
> std::vector<std::string> & words,
> std::vector<std::vector<std::string>::size_type> & line_breaks);
> - void parse_text_attributes(std::string format, Text_Block &);
> + void parse_text_attributes(std::string format, TextBlock &);
> bool extract_format_block
> (std ::string & block,
> std ::string & block_text,
>
> === modified file 'src/io/fileread.cc'
> --- src/io/fileread.cc 2014-07-20 07:44:22 +0000
> +++ src/io/fileread.cc 2014-09-15 07:27:30 +0000
> @@ -60,7 +60,7 @@
> void FileRead::SetFilePos(Pos const pos) {
> assert(data_);
> if (pos >= length_)
> - throw File_Boundary_Exceeded();
> + throw FileBoundaryExceeded();
> filepos_ = pos;
> }
>
> @@ -85,7 +85,7 @@
> filepos_ += bytes;
> }
> if (length_ < i + bytes)
> - throw File_Boundary_Exceeded();
> + throw FileBoundaryExceeded();
> return data_ + i;
> }
>
> @@ -94,13 +94,13 @@
>
> Pos i = pos.isNull() ? filepos_ : pos;
> if (i >= length_)
> - throw File_Boundary_Exceeded();
> + throw FileBoundaryExceeded();
> char* const result = data_ + i;
> for (char* p = result; *p; ++p, ++i) {
> }
> ++i; // beyond the null
> if (i > (length_ + 1)) // allow EOF as end marker for string
> - throw File_Boundary_Exceeded();
> + throw FileBoundaryExceeded();
> if (pos.isNull())
> filepos_ = i;
> return result;
> @@ -121,7 +121,7 @@
> if (data_[filepos_] == '\n')
> break;
> else
> - throw typename StreamRead::_data_error("CR not immediately followed by LF");
> + throw typename StreamRead::DataError("CR not immediately followed by LF");
> }
> data_[filepos_] = '\0';
> ++filepos_;
>
> === modified file 'src/io/fileread.h'
> --- src/io/fileread.h 2014-07-26 16:16:21 +0000
> +++ src/io/fileread.h 2014-09-15 07:27:30 +0000
> @@ -61,8 +61,8 @@
> size_t pos;
> };
>
> - struct File_Boundary_Exceeded : public StreamRead::_data_error {
> - File_Boundary_Exceeded() : StreamRead::_data_error("end of file") {
> + struct FileBoundaryExceeded : public StreamRead::DataError {
> + FileBoundaryExceeded() : StreamRead::DataError("end of file") {
> }
> };
>
>
> === modified file 'src/io/filesystem/disk_filesystem.cc'
> --- src/io/filesystem/disk_filesystem.cc 2014-07-25 22:17:48 +0000
> +++ src/io/filesystem/disk_filesystem.cc 2014-09-15 07:27:30 +0000
> @@ -252,9 +252,9 @@
> assert(fspath.m_exists); //TODO(unknown): throw an exception instead
> assert(fspath.m_isDirectory); //TODO(unknown): throw an exception instead
>
> - filenameset_t files = ListDirectory(file);
> + FilenameSet files = ListDirectory(file);
> for
> - (filenameset_t::iterator pname = files.begin();
> + (FilenameSet::iterator pname = files.begin();
> pname != files.end();
> ++pname)
> {
> @@ -332,7 +332,7 @@
> #endif
> ==
> -1)
> - throw DirectoryCannotCreate_error
> + throw DirectoryCannotCreateError
> ("RealFSImpl::MakeDirectory",
> dirname,
> strerror(errno));
> @@ -345,7 +345,7 @@
> void * RealFSImpl::Load(const std::string & fname, size_t & length) {
> const std::string fullname = FS_CanonicalizeName(fname);
> if (IsDirectory(fullname)) {
> - throw File_error("RealFSImpl::Load", fullname.c_str());
> + throw FileError("RealFSImpl::Load", fullname.c_str());
> }
>
> FILE * file = nullptr;
> @@ -354,7 +354,7 @@
> try {
> file = fopen(fullname.c_str(), "rb");
> if (!file)
> - throw File_error("RealFSImpl::Load", fullname.c_str());
> + throw FileError("RealFSImpl::Load", fullname.c_str());
>
> // determine the size of the file (rather quirky, but it doesn't require
> // potentially unportable functions)
>
> === modified file 'src/io/filesystem/filesystem.cc'
> --- src/io/filesystem/filesystem.cc 2014-07-25 13:45:18 +0000
> +++ src/io/filesystem/filesystem.cc 2014-09-15 07:27:30 +0000
> @@ -145,7 +145,7 @@
> char cwd[PATH_MAX + 1];
> char * const result = getcwd(cwd, PATH_MAX);
> if (! result)
> - throw File_error("FileSystem::getWorkingDirectory()", "widelands", "can not run getcwd");
> + throw FileError("FileSystem::getWorkingDirectory()", "widelands", "can not run getcwd");
>
> return std::string(cwd);
> }
> @@ -352,13 +352,13 @@
> }
>
> /// Create a filesystem from a zipfile or a real directory
> -/// \throw FileNotFound_error if root does not exist, is some kind of special
> +/// \throw FileNotFoundError if root does not exist, is some kind of special
> /// file, loops around (via symlinks) or is too long for the OS/filesystem.
> -/// \throw FileAccessDenied_error if the OS denies access (of course ;-)
> +/// \throw FileAccessDeniedError if the OS denies access (of course ;-)
> /// \throw FileTypeError if root is neither a directory or regular file
> -// TODO(unknown): Catch FileType_error in all users
> +// TODO(unknown): Catch FileTypeError in all users
> // TODO(unknown): Check for existence before doing anything with the file/dir
> -// TODO(unknown): Catch FileNotFound_error in all users
> +// TODO(unknown): Catch FileNotFoundError in all users
> // TODO(unknown): throw FileTypeError if root is not a zipfile (exception from
> // ZipFilesystem)
> FileSystem & FileSystem::Create(const std::string & root)
> @@ -375,10 +375,10 @@
> #endif
> errno == ENAMETOOLONG)
> {
> - throw FileNotFound_error("FileSystem::Create", root);
> + throw FileNotFoundError("FileSystem::Create", root);
> }
> if (errno == EACCES)
> - throw FileAccessDenied_error("FileSystem::Create", root);
> + throw FileAccessDeniedError("FileSystem::Create", root);
> }
>
> if (S_ISDIR(statinfo.st_mode)) {
> @@ -388,7 +388,7 @@
> return *new ZipFilesystem(root);
> }
>
> - throw FileType_error
> + throw FileTypeError
> ("FileSystem::Create", root,
> "cannot create virtual filesystem from file or directory");
> }
>
> === modified file 'src/io/filesystem/filesystem.h'
> --- src/io/filesystem/filesystem.h 2014-07-25 11:14:03 +0000
> +++ src/io/filesystem/filesystem.h 2014-09-15 07:27:30 +0000
> @@ -31,7 +31,7 @@
>
> #include "io/filesystem/filesystem_exceptions.h"
>
> -typedef std::set<std::string> filenameset_t;
> +using FilenameSet = std::set<std::string>;
>
> class StreamRead;
> class StreamWrite;
>
> === modified file 'src/io/filesystem/filesystem_exceptions.h'
> --- src/io/filesystem/filesystem_exceptions.h 2014-07-05 16:41:51 +0000
> +++ src/io/filesystem/filesystem_exceptions.h 2014-09-15 07:27:30 +0000
> @@ -26,8 +26,8 @@
> /**
> * Generic problem when dealing with a file or directory
> */
> -struct File_error : public std::runtime_error {
> - explicit File_error
> +struct FileError : public std::runtime_error {
> + explicit FileError
> (const std::string & thrower,
> const std::string & filename,
> const std::string & message = "problem with file/directory")
> @@ -48,39 +48,39 @@
> * A file/directory could not be found. Either it really does not exist or there
> * are problems with the path, e.g. loops or nonexistent path components
> */
> -struct FileNotFound_error : public File_error {
> - explicit FileNotFound_error
> +struct FileNotFoundError : public FileError {
> + explicit FileNotFoundError
> (const std::string & thrower,
> const std::string & filename,
> const std::string & message = "could not find file or directory")
>
> - : File_error(thrower, filename, message)
> + : FileError(thrower, filename, message)
> {}
> };
>
> /**
> * The file/directory is of an unexpected type. Reasons can be given via message
> */
> -struct FileType_error : public File_error {
> - explicit FileType_error
> +struct FileTypeError : public FileError {
> + explicit FileTypeError
> (const std::string & thrower,
> const std::string & filename,
> const std::string & message = "file or directory has wrong type")
>
> - : File_error(thrower, filename, message)
> + : FileError(thrower, filename, message)
> {}
> };
>
> /**
> * The operating system denied access to the file/directory in question
> */
> -struct FileAccessDenied_error : public File_error {
> - explicit FileAccessDenied_error
> +struct FileAccessDeniedError : public FileError {
> + explicit FileAccessDeniedError
> (const std::string & thrower,
> const std::string & filename,
> const std::string & message = "access denied on file or directory")
>
> - : File_error(thrower, filename, message)
> + : FileError(thrower, filename, message)
> {}
> };
>
> @@ -88,13 +88,13 @@
> * The directory cannot be created
> */
>
> -struct DirectoryCannotCreate_error : public File_error {
> - explicit DirectoryCannotCreate_error
> +struct DirectoryCannotCreateError : public FileError {
> + explicit DirectoryCannotCreateError
> (const std::string & thrower,
> const std::string & dirname,
> const std::string & message = "cannot create directory")
>
> - : File_error(thrower, dirname, message)
> + : FileError(thrower, dirname, message)
> {}
> };
> #endif // end of include guard: WL_IO_FILESYSTEM_FILESYSTEM_EXCEPTIONS_H
>
> === modified file 'src/io/filesystem/layered_filesystem.cc'
> --- src/io/filesystem/layered_filesystem.cc 2014-07-25 13:45:18 +0000
> +++ src/io/filesystem/layered_filesystem.cc 2014-09-15 07:27:30 +0000
> @@ -79,12 +79,12 @@
> */
> std::set<std::string> LayeredFileSystem::ListDirectory(const std::string& path) {
> std::set<std::string> results;
> - filenameset_t files;
> + FilenameSet files;
> //check home system first
> if (m_home) {
> files = m_home->ListDirectory(path);
> for
> - (filenameset_t::iterator fnit = files.begin();
> + (FilenameSet::iterator fnit = files.begin();
> fnit != files.end();
> ++fnit)
> results.insert(*fnit);
> @@ -93,7 +93,7 @@
> for (auto it = m_filesystems.rbegin(); it != m_filesystems.rend(); ++it) {
> files = (*it)->ListDirectory(path);
>
> - for (filenameset_t::iterator fnit = files.begin(); fnit != files.end(); ++fnit)
> + for (FilenameSet::iterator fnit = files.begin(); fnit != files.end(); ++fnit)
> results.insert(*fnit);
> }
> return results;
> @@ -143,7 +143,7 @@
> if ((*it)->FileExists(fname))
> return (*it)->Load(fname, length);
>
> - throw FileNotFound_error("Could not find file", fname);
> + throw FileNotFoundError("Could not find file", fname);
> }
>
> /**
> @@ -175,7 +175,7 @@
> if ((*it)->FileExists(fname))
> return (*it)->OpenStreamRead(fname);
>
> - throw FileNotFound_error("Could not find file", fname);
> + throw FileNotFoundError("Could not find file", fname);
> }
>
> /**
>
> === modified file 'src/io/filesystem/zip_exceptions.h'
> --- src/io/filesystem/zip_exceptions.h 2014-07-05 16:41:51 +0000
> +++ src/io/filesystem/zip_exceptions.h 2014-09-15 07:27:30 +0000
> @@ -26,12 +26,12 @@
> * Zip specific problems when working \e inside a zipfile.
> *
> * Problems with the zipfile itself or normal file operations should throw
> - * File_error or one of it's descendants with an appropriate message. E.g.:
> - * throw FileNotFound_error("ZipFilesystem::Load", fname,
> + * FileError or one of it's descendants with an appropriate message. E.g.:
> + * throw FileNotFoundError("ZipFilesystem::Load", fname,
> * "couldn't open file (from zipfile "+m_zipfilename+")");
> */
> -struct ZipOperation_error : public std::logic_error {
> - ZipOperation_error
> +struct ZipOperationError : public std::logic_error {
> + ZipOperationError
> (const std::string & thrower,
> const std::string & filename,
> const std::string & zipfilename,
>
> === modified file 'src/io/filesystem/zip_filesystem.cc'
> --- src/io/filesystem/zip_filesystem.cc 2014-07-26 10:43:23 +0000
> +++ src/io/filesystem/zip_filesystem.cc 2014-09-15 07:27:30 +0000
> @@ -198,7 +198,7 @@
>
> /**
> * Make a new Subfilesystem in this
> - * \throw ZipOperation_error
> + * \throw ZipOperationError
> */
> // TODO(unknown): type should be recognized automatically,
> // see Filesystem::Create
> @@ -207,7 +207,7 @@
> assert(!FileExists(path));
>
> if (type != FileSystem::DIR)
> - throw ZipOperation_error
> + throw ZipOperationError
> ("ZipFilesystem::CreateSubFileSystem",
> path, m_zipfilename,
> "can not create ZipFilesystem inside another ZipFilesystem");
> @@ -229,10 +229,10 @@
> }
> /**
> * Remove a number of files
> - * kthrow ZipOperation_error
> + * \throw ZipOperationError
> */
> void ZipFilesystem::Unlink(const std::string & filename) {
> - throw ZipOperation_error
> + throw ZipOperationError
> ("ZipFilesystem::Unlink",
> filename,
> m_zipfilename,
> @@ -295,10 +295,10 @@
> case ZIP_OK:
> break;
> case ZIP_ERRNO:
> - throw File_error
> + throw FileError
> ("ZipFilesystem::MakeDirectory", complete_filename, strerror(errno));
> default:
> - throw File_error
> + throw FileError
> ("ZipFilesystem::MakeDirectory", complete_filename);
> }
>
> @@ -307,11 +307,11 @@
>
> /**
> * Read the given file into alloced memory; called by FileRead::Open.
> - * \throw FileNotFound_error if the file couldn't be opened.
> + * \throw FileNotFoundError if the file couldn't be opened.
> */
> void * ZipFilesystem::Load(const std::string & fname, size_t & length) {
> if (!FileExists(fname.c_str()) || IsDirectory(fname.c_str()))
> - throw ZipOperation_error
> + throw ZipOperationError
> ("ZipFilesystem::Load",
> fname,
> m_zipfilename,
> @@ -329,7 +329,7 @@
> unzCloseCurrentFile(m_unzipfile);
> char buf[200];
> snprintf(buf, sizeof(buf), "read error %i", len);
> - throw ZipOperation_error
> + throw ZipOperationError
> ("ZipFilesystem::Load",
> fname,
> m_zipfilename,
> @@ -388,7 +388,7 @@
> case ZIP_OK:
> break;
> default:
> - throw ZipOperation_error
> + throw ZipOperationError
> ("ZipFilesystem::Write", complete_filename, m_zipfilename);
> }
>
> @@ -396,10 +396,10 @@
> case ZIP_OK:
> break;
> case ZIP_ERRNO:
> - throw File_error
> + throw FileError
> ("ZipFilesystem::Write", complete_filename, strerror(errno));
> default:
> - throw File_error
> + throw FileError
> ("ZipFilesystem::Write", complete_filename);
> }
>
> @@ -420,10 +420,10 @@
> {
> int copied = unzReadCurrentFile(m_unzipfile, data, bufsize);
> if (copied < 0) {
> - throw new _data_error("Failed to read from zip file");
> + throw new DataError("Failed to read from zip file");
> }
> if (copied == 0) {
> - throw new _data_error("End of file reaced while reading zip");
> + throw new DataError("End of file reaced while reading zip");
> }
> return copied;
> }
> @@ -434,7 +434,7 @@
>
> StreamRead* ZipFilesystem::OpenStreamRead(const std::string& fname) {
> if (!FileExists(fname.c_str()) || IsDirectory(fname.c_str()))
> - throw ZipOperation_error
> + throw ZipOperationError
> ("ZipFilesystem::Load",
> fname,
> m_zipfilename,
> @@ -447,7 +447,7 @@
> case ZIP_OK:
> break;
> default:
> - throw ZipOperation_error
> + throw ZipOperationError
> ("ZipFilesystem: Failed to open streamwrite", fname, m_zipfilename);
> }
> return new ZipStreamRead(m_unzipfile, this);
> @@ -500,7 +500,7 @@
> case ZIP_OK:
> break;
> default:
> - throw ZipOperation_error
> + throw ZipOperationError
> ("ZipFilesystem: Failed to open streamwrite", complete_filename, m_zipfilename);
> }
> return new ZipStreamWrite(m_zipfile, this);
> @@ -539,7 +539,7 @@
>
> /**
> * Open a zipfile for extraction
> - * \throw FileType_error
> + * \throw FileTypeError
> */
> void ZipFilesystem::m_OpenUnzip() {
> if (m_state == STATE_UNZIPPPING)
> @@ -549,7 +549,7 @@
>
> m_unzipfile = unzOpen(m_zipfilename.c_str());
> if (!m_unzipfile)
> - throw FileType_error
> + throw FileTypeError
> ("ZipFilesystem::m_OpenUnzip", m_zipfilename, "not a .zip file");
>
> m_state = STATE_UNZIPPPING;
>
> === modified file 'src/io/filewrite.h'
> --- src/io/filewrite.h 2014-07-14 10:45:44 +0000
> +++ src/io/filewrite.h 2014-09-15 07:27:30 +0000
> @@ -62,7 +62,7 @@
> };
>
> struct Exception {};
> - struct Buffer_Overflow : public Exception {};
> + struct BufferOverflow : public Exception {};
>
> /// Set the buffer to empty.
> FileWrite();
>
> === modified file 'src/io/streamread.cc'
> --- src/io/streamread.cc 2014-06-01 18:00:48 +0000
> +++ src/io/streamread.cc 2014-09-15 07:27:30 +0000
> @@ -27,7 +27,7 @@
>
> StreamRead::~StreamRead() {}
>
> -StreamRead::_data_error::_data_error(char const * const fmt, ...) {
> +StreamRead::DataError::DataError(char const * const fmt, ...) {
> char buffer[256];
> {
> va_list va;
>
> === modified file 'src/io/streamread.h'
> --- src/io/streamread.h 2014-07-26 16:16:21 +0000
> +++ src/io/streamread.h 2014-09-15 07:27:30 +0000
> @@ -72,10 +72,10 @@
>
> /// Base of all exceptions that are caused by errors in the data that is
> /// read.
> - struct _data_error : public _wexception {
> - _data_error(char const * const fmt, ...) PRINTF_FORMAT(2, 3);
> + struct DataError : public WException {
> + DataError(char const * const fmt, ...) PRINTF_FORMAT(2, 3);
> };
> -#define data_error(...) _data_error(__VA_ARGS__)
> +#define data_error(...) DataError(__VA_ARGS__)
>
> private:
> DISALLOW_COPY_AND_ASSIGN(StreamRead);
>
> === modified file 'src/logic/CMakeLists.txt'
> --- src/logic/CMakeLists.txt 2014-07-28 17:12:07 +0000
> +++ src/logic/CMakeLists.txt 2014-09-15 07:27:30 +0000
> @@ -176,7 +176,7 @@
> soldier.h
> soldier_counts.h
> soldiercontrol.h
> - tattribute.h
> + training_attribute.h
> trainingsite.cc
> trainingsite.h
> tribe.cc
>
> === modified file 'src/logic/battle.cc'
> --- src/logic/battle.cc 2014-07-28 16:59:54 +0000
> +++ src/logic/battle.cc 2014-09-15 07:27:30 +0000
> @@ -29,8 +29,8 @@
> #include "logic/game.h"
> #include "logic/player.h"
> #include "logic/soldier.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
>
> namespace Widelands {
>
> @@ -77,29 +77,29 @@
> }
>
>
> -void Battle::init (Editor_Game_Base & egbase)
> +void Battle::init (EditorGameBase & egbase)
> {
> MapObject::init(egbase);
>
> m_creationtime = egbase.get_gametime();
>
> if (Battle* battle = m_first ->getBattle())
> - battle->cancel(ref_cast<Game, Editor_Game_Base>(egbase), *m_first);
> - m_first->setBattle(ref_cast<Game, Editor_Game_Base>(egbase), this);
> + battle->cancel(ref_cast<Game, EditorGameBase>(egbase), *m_first);
> + m_first->setBattle(ref_cast<Game, EditorGameBase>(egbase), this);
> if (Battle* battle = m_second->getBattle())
> - battle->cancel(ref_cast<Game, Editor_Game_Base>(egbase), *m_second);
> - m_second->setBattle(ref_cast<Game, Editor_Game_Base>(egbase), this);
> + battle->cancel(ref_cast<Game, EditorGameBase>(egbase), *m_second);
> + m_second->setBattle(ref_cast<Game, EditorGameBase>(egbase), this);
> }
>
>
> -void Battle::cleanup (Editor_Game_Base & egbase)
> +void Battle::cleanup (EditorGameBase & egbase)
> {
> if (m_first) {
> - m_first ->setBattle(ref_cast<Game, Editor_Game_Base>(egbase), nullptr);
> + m_first ->setBattle(ref_cast<Game, EditorGameBase>(egbase), nullptr);
> m_first = nullptr;
> }
> if (m_second) {
> - m_second->setBattle(ref_cast<Game, Editor_Game_Base>(egbase), nullptr);
> + m_second->setBattle(ref_cast<Game, EditorGameBase>(egbase), nullptr);
> m_second = nullptr;
> }
>
> @@ -365,22 +365,22 @@
> if (m_first)
> try {
> battle.m_first = &mol().get<Soldier>(m_first);
> - } catch (const _wexception & e) {
> + } catch (const WException & e) {
> throw wexception("soldier 1 (%u): %s", m_first, e.what());
> }
> if (m_second)
> try {
> battle.m_second = &mol().get<Soldier>(m_second);
> - } catch (const _wexception & e) {
> + } catch (const WException & e) {
> throw wexception("soldier 2 (%u): %s", m_second, e.what());
> }
> - } catch (const _wexception & e) {
> + } catch (const WException & e) {
> throw wexception("battle: %s", e.what());
> }
> }
>
> void Battle::save
> - (Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw)
> + (EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw)
> {
> fw.Unsigned8(HeaderBattle);
> fw.Unsigned8(BATTLE_SAVEGAME_VERSION);
> @@ -399,7 +399,7 @@
>
>
> MapObject::Loader * Battle::load
> - (Editor_Game_Base & egbase, MapMapObjectLoader & mol, FileRead & fr)
> + (EditorGameBase & egbase, MapObjectLoader & mol, FileRead & fr)
> {
> std::unique_ptr<Loader> loader(new Loader);
>
> @@ -411,7 +411,7 @@
> loader->init(egbase, mol, *new Battle);
> loader->load(fr, version);
> } else
> - throw game_data_error("unknown/unhandled version %u", version);
> + throw GameDataError("unknown/unhandled version %u", version);
> } catch (const std::exception & e) {
> throw wexception("Loading Battle: %s", e.what());
> }
>
> === modified file 'src/logic/battle.h'
> --- src/logic/battle.h 2014-07-28 16:59:54 +0000
> +++ src/logic/battle.h 2014-09-15 07:27:30 +0000
> @@ -52,12 +52,12 @@
> Battle(Game &, Soldier &, Soldier &); // to create a new battle in the game
>
> // Implements MapObject.
> - void init(Editor_Game_Base &) override;
> - void cleanup(Editor_Game_Base &) override;
> + void init(EditorGameBase &) override;
> + void cleanup(EditorGameBase &) override;
> bool has_new_save_support() override {return true;}
> - void save(Editor_Game_Base &, MapMapObjectSaver &, FileWrite &) override;
> + void save(EditorGameBase &, MapObjectSaver &, FileWrite &) override;
> static MapObject::Loader * load
> - (Editor_Game_Base &, MapMapObjectLoader &, FileRead &);
> + (EditorGameBase &, MapObjectLoader &, FileRead &);
>
> // Cancel this battle immediately and schedule destruction.
> void cancel(Game &, Soldier &);
>
> === modified file 'src/logic/bill_of_materials.h'
> --- src/logic/bill_of_materials.h 2014-07-20 07:45:17 +0000
> +++ src/logic/bill_of_materials.h 2014-09-15 07:27:30 +0000
> @@ -25,15 +25,15 @@
> #include "logic/widelands.h"
>
> namespace Widelands {
> -typedef std::pair<Ware_Index, uint32_t> WareAmount;
> -typedef std::vector<WareAmount> BillOfMaterials;
> +using WareAmount = std::pair<WareIndex, uint32_t>;
> +using BillOfMaterials = std::vector<WareAmount>;
>
> // range structure for iterating ware range with index
> -struct ware_range
> +struct WareRange
> {
> - ware_range(const BillOfMaterials & range) :
> + WareRange(const BillOfMaterials & range) :
> i(0), current(range.begin()), end(range.end()) {}
> - ware_range & operator++ () {
> + WareRange & operator++ () {
> ++i; ++current; return *this;
> }
> bool empty() const {return current == end;}
>
> === modified file 'src/logic/bob.cc'
> --- src/logic/bob.cc 2014-07-28 17:12:07 +0000
> +++ src/logic/bob.cc 2014-09-15 07:27:30 +0000
> @@ -42,8 +42,8 @@
> #include "logic/soldier.h"
> #include "logic/tribe.h"
> #include "logic/widelands_geometry_io.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
> #include "profile/profile.h"
> #include "wui/mapviewpixelconstants.h"
>
> @@ -52,7 +52,7 @@
>
> BobDescr::BobDescr(MapObjectType type, const std::string& init_name,
> const std::string& init_descname,
> - Tribe_Descr const* tribe)
> + TribeDescr const* tribe)
> :
> MapObjectDescr(type, init_name, init_descname),
> owner_tribe_ (tribe)
> @@ -82,7 +82,7 @@
> * Create a bob of this type
> */
> Bob & BobDescr::create
> - (Editor_Game_Base & egbase,
> + (EditorGameBase & egbase,
> Player * const owner,
> const Coords & coords)
> const
> @@ -132,7 +132,7 @@
> *
> * \note Make sure you call this from derived classes!
> */
> -void Bob::init(Editor_Game_Base & egbase)
> +void Bob::init(EditorGameBase & egbase)
> {
> MapObject::init(egbase);
>
> @@ -147,10 +147,10 @@
> /**
> * Perform independent cleanup as necessary.
> */
> -void Bob::cleanup(Editor_Game_Base & egbase)
> +void Bob::cleanup(EditorGameBase & egbase)
> {
> while (!m_stack.empty()) // bobs in the editor do not have tasks
> - do_pop_task(ref_cast<Game, Editor_Game_Base>(egbase));
> + do_pop_task(ref_cast<Game, EditorGameBase>(egbase));
>
> set_owner(nullptr); // implicitly remove ourselves from owner's map
>
> @@ -475,7 +475,7 @@
> std::forward_as_tuple(b.coord.y, b.coord.x);
> }
> };
> - typedef std::map<CoordData, bool, CoordOrdering> Cache;
> + using Cache = std::map<CoordData, bool, CoordOrdering>;
>
> BlockedTracker(Game & game, Bob & bob, const Coords & finaldest)
> : m_game(game), m_bob(bob), m_map(game.map()), m_finaldest(finaldest)
> @@ -694,7 +694,7 @@
> return pop_task(game);
>
> if
> - (static_cast<Path::Step_Vector::size_type>(state.ivar1)
> + (static_cast<Path::StepVector::size_type>(state.ivar1)
> >=
> path->get_nsteps())
> {
> @@ -712,7 +712,7 @@
> if
> (state.ivar2
> &&
> - static_cast<Path::Step_Vector::size_type>(state.ivar1) + 1
> + static_cast<Path::StepVector::size_type>(state.ivar1) + 1
> ==
> path->get_nsteps())
> {
> @@ -777,7 +777,7 @@
> ///
> /// pos is the location, in pixels, of the node m_position (height is already
> /// taken into account).
> -Point Bob::calc_drawpos(const Editor_Game_Base & game, const Point pos) const
> +Point Bob::calc_drawpos(const EditorGameBase & game, const Point pos) const
> {
> const Map & map = game.get_map();
> const FCoords end = m_position;
> @@ -848,7 +848,7 @@
> /// Note that the current node is actually the node that we are walking to, not
> /// the the one that we start from.
> void Bob::draw
> - (const Editor_Game_Base & egbase, RenderTarget & dst, const Point& pos) const
> + (const EditorGameBase & egbase, RenderTarget & dst, const Point& pos) const
> {
> if (m_anim)
> dst.drawanim
> @@ -862,7 +862,7 @@
> /**
> * Set a looping animation, starting now.
> */
> -void Bob::set_animation(Editor_Game_Base & egbase, uint32_t const anim)
> +void Bob::set_animation(EditorGameBase & egbase, uint32_t const anim)
> {
> m_anim = anim;
> m_animstart = egbase.get_gametime();
> @@ -955,7 +955,7 @@
> * Performs the necessary (un)linking in the \ref Field structures and
> * updates the owner's viewing area, if the bob has an owner.
> */
> -void Bob::set_position(Editor_Game_Base & egbase, const Coords & coords)
> +void Bob::set_position(EditorGameBase & egbase, const Coords & coords)
> {
> FCoords oldposition = m_position;
>
> @@ -996,7 +996,7 @@
> }
>
> /// Give debug information.
> -void Bob::log_general_info(const Editor_Game_Base & egbase)
> +void Bob::log_general_info(const EditorGameBase & egbase)
> {
> molog("Owner: %p\n", m_owner);
> molog("Postition: (%i, %i)\n", m_position.x, m_position.y);
> @@ -1038,13 +1038,13 @@
> molog("\n* path: %p\n", m_stack[i].path);
> if (m_stack[i].path) {
> const Path & path = *m_stack[i].path;
> - Path::Step_Vector::size_type nr_steps = path.get_nsteps();
> + Path::StepVector::size_type nr_steps = path.get_nsteps();
> molog
> ("** Path length: %lu\n",
> static_cast<long unsigned int>(nr_steps));
> molog("** Start: (%i, %i)\n", path.get_start().x, path.get_start().y);
> molog("** End: (%i, %i)\n", path.get_end().x, path.get_end().y);
> - for (Path::Step_Vector::size_type j = 0; j < nr_steps; ++j)
> + for (Path::StepVector::size_type j = 0; j < nr_steps; ++j)
> molog
> ("** Step %lu/%lu: %i\n",
> static_cast<long unsigned int>(j + 1),
> @@ -1077,19 +1077,19 @@
>
> uint8_t version = fr.Unsigned8();
> if (version != BOB_SAVEGAME_VERSION)
> - throw game_data_error("unknown/unhandled version: %u", version);
> + throw GameDataError("unknown/unhandled version: %u", version);
>
> Bob & bob = get<Bob>();
>
> - if (Player_Number owner_number = fr.Unsigned8()) {
> + if (PlayerNumber owner_number = fr.Unsigned8()) {
> if (owner_number > egbase().map().get_nrplayers())
> - throw game_data_error
> + throw GameDataError
> ("owner number is %u but there are only %u players",
> owner_number, egbase().map().get_nrplayers());
>
> Player * owner = egbase().get_player(owner_number);
> if (!owner)
> - throw game_data_error("owning player %u does not exist", owner_number);
> + throw GameDataError("owning player %u does not exist", owner_number);
>
> bob.set_owner(owner);
> }
> @@ -1185,16 +1185,16 @@
> if (name == "movepath") return &taskMovepath;
> if (name == "idle") return &taskIdle;
>
> - throw game_data_error("unknown bob task '%s'", name.c_str());
> + throw GameDataError("unknown bob task '%s'", name.c_str());
> }
>
> const BobProgramBase * Bob::Loader::get_program(const std::string & name)
> {
> - throw game_data_error("unknown bob program '%s'", name.c_str());
> + throw GameDataError("unknown bob program '%s'", name.c_str());
> }
>
> void Bob::save
> - (Editor_Game_Base & eg, MapMapObjectSaver & mos, FileWrite & fw)
> + (EditorGameBase & eg, MapObjectSaver & mos, FileWrite & fw)
> {
> MapObject::save(eg, mos, fw);
>
>
> === modified file 'src/logic/bob.h'
> --- src/logic/bob.h 2014-07-28 14:17:07 +0000
> +++ src/logic/bob.h 2014-09-15 07:27:30 +0000
> @@ -35,7 +35,7 @@
> class Map;
> struct Route;
> struct Transfer;
> -struct Tribe_Descr;
> +struct TribeDescr;
>
>
> /**
> @@ -53,17 +53,17 @@
> // Description for the Bob class.
> class BobDescr : public MapObjectDescr {
> public:
> - friend struct Map_Bobdata_Data_Packet;
> + friend struct MapBobdataPacket;
>
> BobDescr(MapObjectType type,
> const std::string& init_name,
> const std::string& init_descname,
> - Tribe_Descr const* tribe);
> + TribeDescr const* tribe);
> ~BobDescr() override {}
>
> - Bob& create(Editor_Game_Base&, Player* owner, const Coords&) const;
> + Bob& create(EditorGameBase&, Player* owner, const Coords&) const;
>
> - Tribe_Descr const* get_owner_tribe() const {
> + TribeDescr const* get_owner_tribe() const {
> return owner_tribe_;
> }
>
> @@ -76,7 +76,7 @@
> virtual Bob& create_object() const = 0;
>
> private:
> - const Tribe_Descr* const owner_tribe_; // nullptr if world bob
> + const TribeDescr* const owner_tribe_; // nullptr if world bob
> DISALLOW_COPY_AND_ASSIGN(BobDescr);
> };
>
> @@ -153,12 +153,12 @@
> class Bob : public MapObject {
> public:
> friend class Map;
> - friend struct Map_Bobdata_Data_Packet;
> - friend struct Map_Bob_Data_Packet;
> + friend struct MapBobdataPacket;
> + friend struct MapBobPacket;
>
> struct State;
> - typedef void (Bob::*Ptr)(Game &, State &);
> - typedef void (Bob::*PtrSignal)(Game &, State &, const std::string &);
> + using Ptr = void (Bob::*)(Game &, State &);
> + using PtrSignal = void (Bob::*)(Game &, State &, const std::string &);
>
> /// \see struct Bob for in-depth explanation
> struct Task {
> @@ -212,7 +212,7 @@
> int32_t ivar1;
> int32_t ivar2;
> union {int32_t ivar3; uint32_t ui32var3;};
> - Object_Ptr objvar1;
> + ObjectPointer objvar1;
> std::string svar1;
>
> Coords coords;
> @@ -227,16 +227,16 @@
> uint32_t get_current_anim() const {return m_anim;}
> int32_t get_animstart() const {return m_animstart;}
>
> - void init(Editor_Game_Base &) override;
> - void cleanup(Editor_Game_Base &) override;
> + void init(EditorGameBase &) override;
> + void cleanup(EditorGameBase &) override;
> void act(Game &, uint32_t data) override;
> void schedule_destroy(Game &);
> void schedule_act(Game &, uint32_t tdelta);
> void skip_act();
> - Point calc_drawpos(const Editor_Game_Base &, Point) const;
> + Point calc_drawpos(const EditorGameBase &, Point) const;
> void set_owner(Player *);
> Player * get_owner() const {return m_owner;}
> - void set_position(Editor_Game_Base &, const Coords &);
> + void set_position(EditorGameBase &, const Coords &);
> const FCoords & get_position() const {return m_position;}
> Bob * get_next_bob() const {return m_linknext;}
>
> @@ -248,10 +248,10 @@
> virtual bool checkNodeBlocked(Game &, const FCoords &, bool commit);
>
> virtual void draw
> - (const Editor_Game_Base &, RenderTarget &, const Point&) const;
> + (const EditorGameBase &, RenderTarget &, const Point&) const;
>
> // For debug
> - void log_general_info(const Editor_Game_Base &) override;
> + void log_general_info(const EditorGameBase &) override;
>
> // default tasks
> void reset_tasks(Game &);
> @@ -308,7 +308,7 @@
> virtual void init_auto_task(Game &) {}
>
> // low level animation and walking handling
> - void set_animation(Editor_Game_Base &, uint32_t anim);
> + void set_animation(EditorGameBase &, uint32_t anim);
>
> /// \return true if we're currently walking
> bool is_walking() {return m_walking != IDLE;}
> @@ -405,7 +405,7 @@
> public:
> bool has_new_save_support() override {return true;}
>
> - void save(Editor_Game_Base &, MapMapObjectSaver &, FileWrite &) override;
> + void save(EditorGameBase &, MapObjectSaver &, FileWrite &) override;
> // Pure Bobs cannot be loaded
> };
>
>
> === modified file 'src/logic/buildcost.cc'
> --- src/logic/buildcost.cc 2014-07-20 07:45:17 +0000
> +++ src/logic/buildcost.cc 2014-09-15 07:27:30 +0000
> @@ -27,11 +27,11 @@
>
> namespace Widelands {
>
> -void Buildcost::parse(const Tribe_Descr & tribe, Section & buildcost_s)
> +void Buildcost::parse(const TribeDescr & tribe, Section & buildcost_s)
> {
> while (Section::Value const * const val = buildcost_s.get_next_val())
> try {
> - Ware_Index const idx = tribe.ware_index(val->get_name());
> + WareIndex const idx = tribe.ware_index(val->get_name());
> if (idx != INVALID_INDEX) {
> if (count(idx))
> throw wexception
> @@ -40,11 +40,11 @@
> int32_t const value = val->get_int();
> if (value < 1 || 255 < value)
> throw wexception("count is out of range 1 .. 255");
> - insert(std::pair<Ware_Index, uint8_t>(idx, value));
> + insert(std::pair<WareIndex, uint8_t>(idx, value));
> } else
> throw wexception
> ("tribe does not define a ware type with this name");
> - } catch (const _wexception & e) {
> + } catch (const WException & e) {
> throw wexception
> ("[buildcost] \"%s=%s\": %s",
> val->get_name(), val->get_string(), e.what());
> @@ -62,7 +62,7 @@
> return sum;
> }
>
> -void Buildcost::save(FileWrite& fw, const Widelands::Tribe_Descr& tribe) const {
> +void Buildcost::save(FileWrite& fw, const Widelands::TribeDescr& tribe) const {
> for (const_iterator it = begin(); it != end(); ++it) {
> fw.CString(tribe.get_ware_descr(it->first)->name());
> fw.Unsigned8(it->second);
> @@ -70,7 +70,7 @@
> fw.CString("");
> }
>
> -void Buildcost::load(FileRead& fr, const Widelands::Tribe_Descr& tribe) {
> +void Buildcost::load(FileRead& fr, const Widelands::TribeDescr& tribe) {
> clear();
>
> for (;;) {
> @@ -78,7 +78,7 @@
> if (name.empty())
> break;
>
> - Ware_Index index = tribe.ware_index(name);
> + WareIndex index = tribe.ware_index(name);
> if (index == INVALID_INDEX) {
> log("buildcost: tribe %s does not define ware %s", tribe.name().c_str(), name.c_str());
> fr.Unsigned8();
>
> === modified file 'src/logic/buildcost.h'
> --- src/logic/buildcost.h 2014-07-05 16:41:51 +0000
> +++ src/logic/buildcost.h 2014-09-15 07:27:30 +0000
> @@ -30,15 +30,15 @@
>
> namespace Widelands {
>
> -struct Tribe_Descr;
> +struct TribeDescr;
>
> -struct Buildcost : std::map<Ware_Index, uint8_t> {
> - void parse(const Tribe_Descr & tribe, Section & buildcost_s);
> +struct Buildcost : std::map<WareIndex, uint8_t> {
> + void parse(const TribeDescr & tribe, Section & buildcost_s);
>
> uint32_t total() const;
>
> - void save(FileWrite & fw, const Tribe_Descr & tribe) const;
> - void load(FileRead & fw, const Tribe_Descr & tribe);
> + void save(FileWrite & fw, const TribeDescr & tribe) const;
> + void load(FileRead & fw, const TribeDescr & tribe);
> };
>
> } // namespace Widelands
>
> === modified file 'src/logic/building.cc'
> --- src/logic/building.cc 2014-08-01 12:57:17 +0000
> +++ src/logic/building.cc 2014-09-15 07:27:30 +0000
> @@ -54,7 +54,7 @@
> BuildingDescr::BuildingDescr
> (const MapObjectType _type, char const * const _name, char const * const _descname,
> const std::string & directory, Profile & prof, Section & global_s,
> - const Tribe_Descr & _descr)
> + const TribeDescr & _descr)
> :
> MapObjectDescr(_type, _name, _descname),
> m_tribe (_descr),
> @@ -82,11 +82,11 @@
> m_size = BaseImmovable::BIG;
> m_port = true;
> } else
> - throw game_data_error
> + throw GameDataError
> ("expected %s but found \"%s\"",
> "{\"small\"|\"medium\"|\"big\"|\"port\"|\"mine\"}", string);
> - } catch (const _wexception & e) {
> - throw game_data_error("size: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("size: %s", e.what());
> }
>
> m_helptext_script = directory + "/help.lua";
> @@ -103,7 +103,7 @@
> std::string const target_name = enVal->get_string();
> if (target_name == name())
> throw wexception("enhancement to same type");
> - Building_Index const en_i = tribe().building_index(target_name);
> + BuildingIndex const en_i = tribe().building_index(target_name);
> if (en_i != INVALID_INDEX) {
> m_enhancement = en_i;
>
> @@ -175,7 +175,7 @@
>
>
> Building & BuildingDescr::create
> - (Editor_Game_Base & egbase,
> + (EditorGameBase & egbase,
> Player & owner,
> Coords const pos,
> bool const construct,
> @@ -186,7 +186,7 @@
> Building & b = construct ? create_constructionsite() : create_object();
> b.m_position = pos;
> b.set_owner(&owner);
> - for (Building_Index idx : former_buildings) {
> + for (BuildingIndex idx : former_buildings) {
> b.m_old_buildings.push_back(idx);
> }
> if (loading) {
> @@ -277,7 +277,7 @@
> hide_options();
> }
>
> -void Building::load_finish(Editor_Game_Base & egbase) {
> +void Building::load_finish(EditorGameBase & egbase) {
> auto should_be_deleted = [&egbase, this](const OPtr<Worker>& optr) {
> Worker & worker = *optr.get(egbase);
> OPtr<PlayerImmovable> const worker_location = worker.get_location();
> @@ -347,7 +347,7 @@
> return caps;
> }
>
> -void Building::start_animation(Editor_Game_Base & egbase, uint32_t const anim)
> +void Building::start_animation(EditorGameBase & egbase, uint32_t const anim)
> {
> m_anim = anim;
> m_animstart = egbase.get_gametime();
> @@ -359,7 +359,7 @@
> derived class' init.
> ===============
> */
> -void Building::init(Editor_Game_Base & egbase)
> +void Building::init(EditorGameBase & egbase)
> {
> PlayerImmovable::init(egbase);
>
> @@ -403,7 +403,7 @@
> }
>
>
> -void Building::cleanup(Editor_Game_Base & egbase)
> +void Building::cleanup(EditorGameBase & egbase)
> {
> if (m_defeating_player) {
> Player & defeating_player = egbase.player(m_defeating_player);
> @@ -461,7 +461,7 @@
> * Return all positions on the map that we occupy
> */
> BaseImmovable::PositionList Building::get_positions
> - (const Editor_Game_Base & egbase) const
> + (const EditorGameBase & egbase) const
> {
> PositionList rv;
>
> @@ -489,11 +489,11 @@
> applicable.
> ===============
> */
> -void Building::destroy(Editor_Game_Base & egbase)
> +void Building::destroy(EditorGameBase & egbase)
> {
> const bool fire = burn_on_destroy();
> const Coords pos = m_position;
> - const Tribe_Descr & t = descr().tribe();
> + const TribeDescr & t = descr().tribe();
> PlayerImmovable::destroy(egbase);
> // We are deleted. Only use stack variables beyond this point
> if (fire)
> @@ -563,7 +563,7 @@
> }
>
>
> -WaresQueue & Building::waresqueue(Ware_Index const wi) {
> +WaresQueue & Building::waresqueue(WareIndex const wi) {
> throw wexception("%s (%u) has no WaresQueue for %u", descr().name().c_str(), serial(), wi);
> }
>
> @@ -630,7 +630,7 @@
> */
> void Building::leave_skip(Game &, Worker & w)
> {
> - Leave_Queue::iterator const it =
> + LeaveQueue::iterator const it =
> std::find(m_leave_queue.begin(), m_leave_queue.end(), &w);
>
> if (it != m_leave_queue.end())
> @@ -702,7 +702,7 @@
> ===============
> */
> void Building::draw
> - (const Editor_Game_Base& game, RenderTarget& dst, const FCoords& coords, const Point& pos)
> + (const EditorGameBase& game, RenderTarget& dst, const FCoords& coords, const Point& pos)
> {
> if (coords == m_position) { // draw big buildings only once
> dst.drawanim
> @@ -722,22 +722,22 @@
> ===============
> */
> void Building::draw_help
> - (const Editor_Game_Base& game, RenderTarget& dst, const FCoords&, const Point& pos)
> + (const EditorGameBase& game, RenderTarget& dst, const FCoords&, const Point& pos)
> {
> - const Interactive_GameBase & igbase =
> - ref_cast<Interactive_GameBase const, Interactive_Base const>
> + const InteractiveGameBase & igbase =
> + ref_cast<InteractiveGameBase const, InteractiveBase const>
> (*game.get_ibase());
> uint32_t const dpyflags = igbase.get_display_flags();
>
> - if (dpyflags & Interactive_Base::dfShowCensus) {
> + if (dpyflags & InteractiveBase::dfShowCensus) {
> const std::string info = info_string(igbase.building_census_format());
> if (!info.empty()) {
> dst.blit(pos - Point(0, 48), UI::g_fh1->render(info), CM_Normal, UI::Align_Center);
> }
> }
>
> - if (dpyflags & Interactive_Base::dfShowStatistics) {
> - if (upcast(Interactive_Player const, iplayer, &igbase))
> + if (dpyflags & InteractiveBase::dfShowStatistics) {
> + if (upcast(InteractivePlayer const, iplayer, &igbase))
> if
> (!iplayer->player().see_all() &&
> iplayer->player().is_hostile(*get_owner()))
> @@ -750,13 +750,13 @@
> }
>
> int32_t Building::get_priority
> - (WareWorker type, Ware_Index const ware_index, bool adjust) const
> + (WareWorker type, WareIndex const ware_index, bool adjust) const
> {
> int32_t priority = DEFAULT_PRIORITY;
> if (type == wwWARE) {
> // if priority is defined for specific ware,
> // combine base priority and ware priority
> - std::map<Ware_Index, int32_t>::const_iterator it =
> + std::map<WareIndex, int32_t>::const_iterator it =
> m_ware_priorities.find(ware_index);
> if (it != m_ware_priorities.end())
> priority = adjust
> @@ -772,12 +772,12 @@
> * priorities are identified by ware type and index
> */
> void Building::collect_priorities
> - (std::map<int32_t, std::map<Ware_Index, int32_t> > & p) const
> + (std::map<int32_t, std::map<WareIndex, int32_t> > & p) const
> {
> if (m_ware_priorities.empty())
> return;
> - std::map<Ware_Index, int32_t> & ware_priorities = p[wwWARE];
> - std::map<Ware_Index, int32_t>::const_iterator it;
> + std::map<WareIndex, int32_t> & ware_priorities = p[wwWARE];
> + std::map<WareIndex, int32_t>::const_iterator it;
> for (it = m_ware_priorities.begin(); it != m_ware_priorities.end(); ++it) {
> if (it->second == DEFAULT_PRIORITY)
> continue;
> @@ -790,7 +790,7 @@
> */
> void Building::set_priority
> (int32_t const type,
> - Ware_Index const ware_index,
> + WareIndex const ware_index,
> int32_t const new_priority)
> {
> if (type == wwWARE) {
> @@ -799,7 +799,7 @@
> }
>
>
> -void Building::log_general_info(const Editor_Game_Base & egbase) {
> +void Building::log_general_info(const EditorGameBase & egbase) {
> PlayerImmovable::log_general_info(egbase);
>
> molog("m_position: (%i, %i)\n", m_position.x, m_position.y);
>
> === modified file 'src/logic/building.h'
> --- src/logic/building.h 2014-08-02 10:14:12 +0000
> +++ src/logic/building.h 2014-09-15 07:27:30 +0000
> @@ -38,7 +38,7 @@
>
> namespace UI {class Window;}
> struct BuildingHints;
> -class Interactive_GameBase;
> +class InteractiveGameBase;
> class Profile;
> class Image;
>
> @@ -46,7 +46,7 @@
>
> struct Flag;
> struct Message;
> -struct Tribe_Descr;
> +struct TribeDescr;
> class WaresQueue;
>
> class Building;
> @@ -59,12 +59,12 @@
> * Common to all buildings!
> */
> struct BuildingDescr : public MapObjectDescr {
> - typedef std::vector<Building_Index> FormerBuildings;
> + using FormerBuildings = std::vector<BuildingIndex>;
>
> BuildingDescr
> (MapObjectType type, char const * _name, char const * _descname,
> const std::string & directory, Profile &, Section & global_s,
> - const Tribe_Descr &);
> + const TribeDescr &);
> ~BuildingDescr() override {}
>
> bool is_buildable () const {return m_buildable;}
> @@ -100,7 +100,7 @@
>
> // Returns the enhancement this building can become or
> // INVALID_INDEX if it cannot be enhanced.
> - const Building_Index & enhancement() const {return m_enhancement;}
> + const BuildingIndex & enhancement() const {return m_enhancement;}
>
> /// Create a building of this type in the game. Calls init, which does
> /// different things for different types of buildings (such as conquering
> @@ -110,7 +110,7 @@
> /// Does not perform any sanity checks.
> /// If former_buildings is not empty this is an enhancing.
> Building & create
> - (Editor_Game_Base &,
> + (EditorGameBase &,
> Player &,
> Coords,
> bool construct,
> @@ -124,8 +124,8 @@
> bool has_help_text() const {return m_helptext_script != "";}
> std::string helptext_script() const {return m_helptext_script;}
>
> - const Tribe_Descr & tribe() const {return m_tribe;}
> - Workarea_Info m_workarea_info;
> + const TribeDescr & tribe() const {return m_tribe;}
> + WorkareaInfo m_workarea_info;
>
> virtual int32_t suitability(const Map &, FCoords) const;
> const BuildingHints & hints() const {return m_hints;}
> @@ -135,7 +135,7 @@
> Building & create_constructionsite() const;
>
> private:
> - const Tribe_Descr & m_tribe;
> + const TribeDescr & m_tribe;
> bool m_buildable; // the player can build this himself
> bool m_destructible; // the player can destruct this himself
> Buildcost m_buildcost;
> @@ -147,7 +147,7 @@
> int32_t m_size; // size of the building
> bool m_mine;
> bool m_port;
> - Building_Index m_enhancement;
> + BuildingIndex m_enhancement;
> bool m_enhanced_building; // if it is one, it is bulldozable
> BuildingHints m_hints; // hints (knowledge) for computer players
> bool m_global; // whether this is a "global" building
> @@ -161,7 +161,7 @@
>
> class Building : public PlayerImmovable {
> friend struct BuildingDescr;
> - friend class Map_Buildingdata_Data_Packet;
> + friend class MapBuildingdataPacket;
>
> MO_DESCR(BuildingDescr)
>
> @@ -173,13 +173,13 @@
> PCap_Enhancable = 1 << 2, // can be enhanced to something
> };
>
> - typedef std::vector<Building_Index> FormerBuildings;
> + using FormerBuildings = std::vector<BuildingIndex>;
>
> public:
> Building(const BuildingDescr &);
> virtual ~Building();
>
> - void load_finish(Editor_Game_Base &) override;
> + void load_finish(EditorGameBase &) override;
>
> int32_t get_size () const override;
> bool get_passable() const override;
> @@ -192,7 +192,7 @@
> virtual uint32_t get_playercaps() const;
>
> virtual Coords get_position() const {return m_position;}
> - PositionList get_positions (const Editor_Game_Base &) const override;
> + PositionList get_positions (const EditorGameBase &) const override;
>
> std::string info_string(const std::string & format);
>
> @@ -203,15 +203,15 @@
> return m_statistics_string;
> }
>
> - /// \returns the queue for a ware type or \throws _wexception.
> - virtual WaresQueue & waresqueue(Ware_Index);
> + /// \returns the queue for a ware type or \throws WException.
> + virtual WaresQueue & waresqueue(WareIndex);
>
> virtual bool burn_on_destroy();
> - void destroy(Editor_Game_Base &) override;
> + void destroy(EditorGameBase &) override;
>
> - void show_options(Interactive_GameBase &, bool avoid_fastclick = false, Point pos = Point(- 1, - 1));
> + void show_options(InteractiveGameBase &, bool avoid_fastclick = false, Point pos = Point(- 1, - 1));
> void hide_options();
> - void refresh_options(Interactive_GameBase &);
> + void refresh_options(InteractiveGameBase &);
>
> virtual bool fetch_from_flag(Game &);
> virtual bool get_building_work(Game &, Worker &, bool success);
> @@ -225,11 +225,11 @@
> // DEFAULT_PRIORITY and LOW_PRIORITY are returned, otherwise numerical
> // values adjusted to the preciousness of the ware in general are returned.
> virtual int32_t get_priority
> - (WareWorker type, Ware_Index, bool adjust = true) const;
> - void set_priority(int32_t type, Ware_Index ware_index, int32_t new_priority);
> + (WareWorker type, WareIndex, bool adjust = true) const;
> + void set_priority(int32_t type, WareIndex ware_index, int32_t new_priority);
>
> void collect_priorities
> - (std::map<int32_t, std::map<Ware_Index, int32_t> > & p) const;
> + (std::map<int32_t, std::map<WareIndex, int32_t> > & p) const;
>
> /**
> * The former buildings vector keeps track of all former buildings
> @@ -242,14 +242,14 @@
> return m_old_buildings;
> }
>
> - void log_general_info(const Editor_Game_Base &) override;
> + void log_general_info(const EditorGameBase &) override;
>
> // Use on training sites only.
> virtual void change_train_priority(uint32_t, int32_t) {}
> virtual void switch_train_mode () {}
>
> - /// Stores the Player_Number of the player who has defeated this building.
> - void set_defeating_player(Player_Number const player_number) {
> + /// Stores the PlayerNumber of the player who has defeated this building.
> + void set_defeating_player(PlayerNumber const player_number) {
> m_defeating_player = player_number;
> }
>
> @@ -272,17 +272,17 @@
> virtual void update_statistics_string(std::string*) {
> }
>
> - void start_animation(Editor_Game_Base &, uint32_t anim);
> + void start_animation(EditorGameBase &, uint32_t anim);
>
> - void init(Editor_Game_Base &) override;
> - void cleanup(Editor_Game_Base &) override;
> + void init(EditorGameBase &) override;
> + void cleanup(EditorGameBase &) override;
> void act(Game &, uint32_t data) override;
>
> - void draw(const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&) override;
> - void draw_help(const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&);
> + void draw(const EditorGameBase &, RenderTarget &, const FCoords&, const Point&) override;
> + void draw_help(const EditorGameBase &, RenderTarget &, const FCoords&, const Point&);
>
> virtual void create_options_window
> - (Interactive_GameBase &, UI::Window * & registry)
> + (InteractiveGameBase &, UI::Window * & registry)
> = 0;
>
> void set_seeing(bool see);
> @@ -294,16 +294,16 @@
> uint32_t m_anim;
> int32_t m_animstart;
>
> - typedef std::vector<OPtr<Worker> > Leave_Queue;
> - Leave_Queue m_leave_queue; // FIFO queue of workers leaving the building
> + using LeaveQueue = std::vector<OPtr<Worker>>;
> + LeaveQueue m_leave_queue; // FIFO queue of workers leaving the building
> uint32_t m_leave_time; // when to wake the next one from leave queue
> - Object_Ptr m_leave_allow; // worker that is allowed to leave now
> + ObjectPointer m_leave_allow; // worker that is allowed to leave now
>
> // The player who has defeated this building.
> - Player_Number m_defeating_player;
> + PlayerNumber m_defeating_player;
>
> int32_t m_priority; // base priority
> - std::map<Ware_Index, int32_t> m_ware_priorities;
> + std::map<WareIndex, int32_t> m_ware_priorities;
>
> /// Whether we see our vision_range area based on workers in the building
> bool m_seeing;
>
> === modified file 'src/logic/campaign_visibility.cc'
> --- src/logic/campaign_visibility.cc 2014-07-05 13:23:43 +0000
> +++ src/logic/campaign_visibility.cc 2014-09-15 07:27:30 +0000
> @@ -31,7 +31,7 @@
> /**
> * Get the path of campaign visibility save-file
> */
> -std::string Campaign_visibility_save::get_path()
> +std::string CampaignVisibilitySave::get_path()
> {
> std::string savepath = "save";
> g_fs->EnsureDirectoryExists(savepath); // Make sure save directory exists
> @@ -62,7 +62,7 @@
> /**
> * Create the campaign visibility save-file of the user
> */
> -void Campaign_visibility_save::make_campvis(const std::string & savepath)
> +void CampaignVisibilitySave::make_campvis(const std::string & savepath)
> {
> // Only prepare campvis-file -> data will be written via update_campvis
> Profile campvis(savepath.c_str());
> @@ -78,7 +78,7 @@
> /**
> * Update the campaign visibility save-file of the user
> */
> -void Campaign_visibility_save::update_campvis(const std::string & savepath)
> +void CampaignVisibilitySave::update_campvis(const std::string & savepath)
> {
> // Variable declaration
> int32_t i = 0;
> @@ -163,7 +163,7 @@
> * \param entry entry to be changed
> * \param visible should the map be visible?
> */
> -void Campaign_visibility_save::set_campaign_visibility
> +void CampaignVisibilitySave::set_campaign_visibility
> (const std::string & entry, bool visible)
> {
> std::string savepath = get_path();
> @@ -181,7 +181,7 @@
> * \param entry entry to be changed
> * \param visible should the map be visible?
> */
> -void Campaign_visibility_save::set_map_visibility
> +void CampaignVisibilitySave::set_map_visibility
> (const std::string & entry, bool visible)
> {
> std::string savepath = get_path();
>
> === modified file 'src/logic/campaign_visibility.h'
> --- src/logic/campaign_visibility.h 2014-07-05 16:41:51 +0000
> +++ src/logic/campaign_visibility.h 2014-09-15 07:27:30 +0000
> @@ -25,7 +25,7 @@
>
> #include <stdint.h>
>
> -struct Campaign_visibility_save {
> +struct CampaignVisibilitySave {
> std::string get_path();
> void set_campaign_visibility(const std::string &, bool);
> void set_map_visibility (const std::string &, bool);
>
> === modified file 'src/logic/carrier.cc'
> --- src/logic/carrier.cc 2014-07-28 16:59:54 +0000
> +++ src/logic/carrier.cc 2014-09-15 07:27:30 +0000
> @@ -569,7 +569,7 @@
> (game, path, idx, descr().get_right_walk_anims(does_carry_ware()));
> }
>
> -void Carrier::log_general_info(const Widelands::Editor_Game_Base & egbase)
> +void Carrier::log_general_info(const Widelands::EditorGameBase & egbase)
> {
> molog("Carrier at %i,%i\n", get_position().x, get_position().y);
>
> @@ -598,7 +598,7 @@
>
> uint8_t version = fr.Unsigned8();
> if (version != CARRIER_SAVEGAME_VERSION)
> - throw game_data_error("unknown/unhandled version %u", version);
> + throw GameDataError("unknown/unhandled version %u", version);
>
> Carrier & carrier = get<Carrier>();
> carrier.m_promised_pickup_to = fr.Signed32();
> @@ -617,7 +617,7 @@
> }
>
> void Carrier::do_save
> - (Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw)
> + (EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw)
> {
> Worker::do_save(egbase, mos, fw);
>
>
> === modified file 'src/logic/carrier.h'
> --- src/logic/carrier.h 2014-07-28 16:59:54 +0000
> +++ src/logic/carrier.h 2014-09-15 07:27:30 +0000
> @@ -31,7 +31,7 @@
> const std::string& directory,
> Profile& prof,
> Section& global_s,
> - const Tribe_Descr& _tribe)
> + const TribeDescr& _tribe)
> :
> WorkerDescr(MapObjectType::CARRIER, _name, _descname, directory, prof, global_s, _tribe)
> {
> @@ -49,7 +49,7 @@
> * Carrier is a worker who is employed by a Road.
> */
> struct Carrier : public Worker {
> - friend struct Map_Bobdata_Data_Packet;
> + friend struct MapBobdataPacket;
>
> MO_DESCR(CarrierDescr)
>
> @@ -65,7 +65,7 @@
> void start_task_transport(Game &, int32_t fromflag);
> bool start_task_walktoflag(Game &, int32_t flag, bool offset = false);
>
> - void log_general_info(const Editor_Game_Base &) override;
> + void log_general_info(const EditorGameBase &) override;
>
> static Task const taskRoad;
>
> @@ -110,7 +110,7 @@
>
> public:
> virtual void do_save
> - (Editor_Game_Base &, MapMapObjectSaver &, FileWrite &) override;
> + (EditorGameBase &, MapObjectSaver &, FileWrite &) override;
> };
>
> }
>
> === modified file 'src/logic/checkstep.h'
> --- src/logic/checkstep.h 2014-07-05 16:41:51 +0000
> +++ src/logic/checkstep.h 2014-09-15 07:27:30 +0000
> @@ -194,11 +194,11 @@
> bool reachabledest(Map &, FCoords dest) const;
>
> private:
> - // It is OK to use Coords::ordering_functor because the ordering of the set
> + // It is OK to use Coords::OrderingFunctor because the ordering of the set
> // does not matter, as long as it is system independent (for parallel
> // simulation).
> // The only thing that matters is whether a location is in the set.
> - std::set<Coords, Coords::ordering_functor> m_allowed_locations;
> + std::set<Coords, Coords::OrderingFunctor> m_allowed_locations;
> };
>
>
>
> === modified file 'src/logic/cmd_calculate_statistics.cc'
> --- src/logic/cmd_calculate_statistics.cc 2014-07-28 14:17:07 +0000
> +++ src/logic/cmd_calculate_statistics.cc 2014-09-15 07:27:30 +0000
> @@ -27,30 +27,30 @@
>
> namespace Widelands {
>
> -void Cmd_CalculateStatistics::execute (Game & game) {
> +void CmdCalculateStatistics::execute (Game & game) {
> game.sample_statistics();
> game.enqueue_command
> - (new Cmd_CalculateStatistics
> + (new CmdCalculateStatistics
> (game.get_gametime() + STATISTICS_SAMPLE_TIME));
> }
>
> #define CMD_CALCULATE_STATISTICS_VERSION 1
> -void Cmd_CalculateStatistics::Read
> - (FileRead & fr, Editor_Game_Base & egbase, MapMapObjectLoader & mol)
> +void CmdCalculateStatistics::Read
> + (FileRead & fr, EditorGameBase & egbase, MapObjectLoader & mol)
> {
> try {
> uint16_t const packet_version = fr.Unsigned16();
> if (packet_version == CMD_CALCULATE_STATISTICS_VERSION) {
> GameLogicCommand::Read(fr, egbase, mol);
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const _wexception & e) {
> - throw game_data_error("calculate statistics function: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("calculate statistics function: %s", e.what());
> }
> }
> -void Cmd_CalculateStatistics::Write
> - (FileWrite & fw, Editor_Game_Base & egbase, MapMapObjectSaver & mos)
> +void CmdCalculateStatistics::Write
> + (FileWrite & fw, EditorGameBase & egbase, MapObjectSaver & mos)
> {
> fw.Unsigned16(CMD_CALCULATE_STATISTICS_VERSION);
> GameLogicCommand::Write(fw, egbase, mos);
>
> === modified file 'src/logic/cmd_calculate_statistics.h'
> --- src/logic/cmd_calculate_statistics.h 2014-07-28 14:17:07 +0000
> +++ src/logic/cmd_calculate_statistics.h 2014-09-15 07:27:30 +0000
> @@ -27,14 +27,14 @@
>
> namespace Widelands {
>
> -struct Cmd_CalculateStatistics : public GameLogicCommand {
> - Cmd_CalculateStatistics() : GameLogicCommand(0) {} // For savegame loading
> - Cmd_CalculateStatistics(int32_t const _duetime) :
> +struct CmdCalculateStatistics : public GameLogicCommand {
> + CmdCalculateStatistics() : GameLogicCommand(0) {} // For savegame loading
> + CmdCalculateStatistics(int32_t const _duetime) :
> GameLogicCommand(_duetime) {}
>
> // Write these commands to a file (for savegames)
> - void Write(FileWrite &, Editor_Game_Base &, MapMapObjectSaver &) override;
> - void Read (FileRead &, Editor_Game_Base &, MapMapObjectLoader &) override;
> + void Write(FileWrite &, EditorGameBase &, MapObjectSaver &) override;
> + void Read (FileRead &, EditorGameBase &, MapObjectLoader &) override;
>
> uint8_t id() const override {return QUEUE_CMD_CALCULATE_STATISTICS;}
> void execute(Game &) override;
>
> === modified file 'src/logic/cmd_expire_message.cc'
> --- src/logic/cmd_expire_message.cc 2013-07-26 20:19:36 +0000
> +++ src/logic/cmd_expire_message.cc 2014-09-15 07:27:30 +0000
> @@ -24,7 +24,7 @@
>
> namespace Widelands {
>
> -void Cmd_ExpireMessage::execute(Game & game) {
> +void CmdExpireMessage::execute(Game & game) {
> game.player(player).messages().expire_message(message);
> }
>
>
> === modified file 'src/logic/cmd_expire_message.h'
> --- src/logic/cmd_expire_message.h 2014-07-26 10:43:23 +0000
> +++ src/logic/cmd_expire_message.h 2014-09-15 07:27:30 +0000
> @@ -35,9 +35,9 @@
> /// command and then when loading, checking that one exists for each message
> /// and if not, warn and recreate it. Such redundancy would also waste space in
> /// the savegame.
> -struct Cmd_ExpireMessage : public Command {
> - Cmd_ExpireMessage
> - (int32_t const t, Player_Number const p, Message_Id const m)
> +struct CmdExpireMessage : public Command {
> + CmdExpireMessage
> + (int32_t const t, PlayerNumber const p, MessageId const m)
> : Command(t), player(p), message(m)
> {}
>
> @@ -45,8 +45,8 @@
> uint8_t id() const override {return QUEUE_CMD_EXPIREMESSAGE;}
>
> private:
> - Player_Number player;
> - Message_Id message;
> + PlayerNumber player;
> + MessageId message;
> };
>
> }
>
> === modified file 'src/logic/cmd_incorporate.cc'
> --- src/logic/cmd_incorporate.cc 2014-07-28 14:17:07 +0000
> +++ src/logic/cmd_incorporate.cc 2014-09-15 07:27:30 +0000
> @@ -23,13 +23,13 @@
> #include "base/wexception.h"
> #include "io/fileread.h"
> #include "io/filewrite.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
>
> namespace Widelands {
>
> -void Cmd_Incorporate::Read
> - (FileRead & fr, Editor_Game_Base & egbase, MapMapObjectLoader & mol)
> +void CmdIncorporate::Read
> + (FileRead & fr, EditorGameBase & egbase, MapObjectLoader & mol)
> {
> try {
> uint16_t const packet_version = fr.Unsigned16();
> @@ -38,20 +38,20 @@
> uint32_t const worker_serial = fr.Unsigned32();
> try {
> worker = &mol.get<Worker>(worker_serial);
> - } catch (const _wexception & e) {
> + } catch (const WException & e) {
> throw wexception("worker %u: %s", worker_serial, e.what());
> }
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const _wexception & e) {
> + } catch (const WException & e) {
> throw wexception("incorporate: %s", e.what());
> }
> }
>
>
> -void Cmd_Incorporate::Write
> - (FileWrite & fw, Editor_Game_Base & egbase, MapMapObjectSaver & mos)
> +void CmdIncorporate::Write
> + (FileWrite & fw, EditorGameBase & egbase, MapObjectSaver & mos)
> {
> // First, write version
> fw.Unsigned16(CMD_INCORPORATE_VERSION);
>
> === modified file 'src/logic/cmd_incorporate.h'
> --- src/logic/cmd_incorporate.h 2014-07-28 14:17:07 +0000
> +++ src/logic/cmd_incorporate.h 2014-09-15 07:27:30 +0000
> @@ -27,16 +27,16 @@
>
> #define CMD_INCORPORATE_VERSION 1
>
> -struct Cmd_Incorporate : public GameLogicCommand {
> - Cmd_Incorporate() : GameLogicCommand(0), worker(nullptr) {} // For savegame loading
> - Cmd_Incorporate (int32_t const t, Worker * const w)
> +struct CmdIncorporate : public GameLogicCommand {
> + CmdIncorporate() : GameLogicCommand(0), worker(nullptr) {} // For savegame loading
> + CmdIncorporate (int32_t const t, Worker * const w)
> : GameLogicCommand(t), worker(w)
> {}
>
> void execute (Game & game) override {worker->incorporate(game);}
>
> - void Write(FileWrite &, Editor_Game_Base &, MapMapObjectSaver &) override;
> - void Read (FileRead &, Editor_Game_Base &, MapMapObjectLoader &) override;
> + void Write(FileWrite &, EditorGameBase &, MapObjectSaver &) override;
> + void Read (FileRead &, EditorGameBase &, MapObjectLoader &) override;
>
> uint8_t id() const override {return QUEUE_CMD_INCORPORATE;}
>
>
> === modified file 'src/logic/cmd_luacoroutine.cc'
> --- src/logic/cmd_luacoroutine.cc 2014-07-28 14:17:07 +0000
> +++ src/logic/cmd_luacoroutine.cc 2014-09-15 07:27:30 +0000
> @@ -32,12 +32,12 @@
>
> namespace Widelands {
>
> -void Cmd_LuaCoroutine::execute (Game & game) {
> +void CmdLuaCoroutine::execute (Game & game) {
> try {
> int rv = m_cr->resume();
> const uint32_t sleeptime = m_cr->pop_uint32();
> if (rv == LuaCoroutine::YIELDED) {
> - game.enqueue_command(new Widelands::Cmd_LuaCoroutine(sleeptime, m_cr));
> + game.enqueue_command(new Widelands::CmdLuaCoroutine(sleeptime, m_cr));
> m_cr = nullptr; // Remove our ownership so we don't delete.
> } else if (rv == LuaCoroutine::DONE) {
> delete m_cr;
> @@ -59,7 +59,7 @@
> }
>
> #define CMD_LUACOROUTINE_VERSION 3
> -void Cmd_LuaCoroutine::Read(FileRead& fr, Editor_Game_Base& egbase, MapMapObjectLoader& mol) {
> +void CmdLuaCoroutine::Read(FileRead& fr, EditorGameBase& egbase, MapObjectLoader& mol) {
> try {
> uint16_t const packet_version = fr.Unsigned16();
> if (packet_version == CMD_LUACOROUTINE_VERSION) {
> @@ -72,14 +72,14 @@
>
> m_cr = lgi->read_coroutine(fr);
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const _wexception & e) {
> - throw game_data_error("lua function: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("lua function: %s", e.what());
> }
> }
> -void Cmd_LuaCoroutine::Write
> - (FileWrite & fw, Editor_Game_Base & egbase, MapMapObjectSaver & mos)
> +void CmdLuaCoroutine::Write
> + (FileWrite & fw, EditorGameBase & egbase, MapObjectSaver & mos)
> {
> fw.Unsigned16(CMD_LUACOROUTINE_VERSION);
> GameLogicCommand::Write(fw, egbase, mos);
>
> === modified file 'src/logic/cmd_luacoroutine.h'
> --- src/logic/cmd_luacoroutine.h 2014-07-28 14:17:07 +0000
> +++ src/logic/cmd_luacoroutine.h 2014-09-15 07:27:30 +0000
> @@ -28,18 +28,18 @@
>
> namespace Widelands {
>
> -struct Cmd_LuaCoroutine : public GameLogicCommand {
> - Cmd_LuaCoroutine() : GameLogicCommand(0), m_cr(nullptr) {} // For savegame loading
> - Cmd_LuaCoroutine(int32_t const _duetime, LuaCoroutine * const cr) :
> +struct CmdLuaCoroutine : public GameLogicCommand {
> + CmdLuaCoroutine() : GameLogicCommand(0), m_cr(nullptr) {} // For savegame loading
> + CmdLuaCoroutine(int32_t const _duetime, LuaCoroutine * const cr) :
> GameLogicCommand(_duetime), m_cr(cr) {}
>
> - ~Cmd_LuaCoroutine() {
> + ~CmdLuaCoroutine() {
> delete m_cr;
> }
>
> // Write these commands to a file (for savegames)
> - void Write(FileWrite &, Editor_Game_Base &, MapMapObjectSaver &) override;
> - void Read (FileRead &, Editor_Game_Base &, MapMapObjectLoader &) override;
> + void Write(FileWrite &, EditorGameBase &, MapObjectSaver &) override;
> + void Read (FileRead &, EditorGameBase &, MapObjectLoader &) override;
>
> uint8_t id() const override {return QUEUE_CMD_LUACOROUTINE;}
>
>
> === modified file 'src/logic/cmd_luascript.cc'
> --- src/logic/cmd_luascript.cc 2014-07-28 14:17:07 +0000
> +++ src/logic/cmd_luascript.cc 2014-09-15 07:27:30 +0000
> @@ -29,7 +29,7 @@
>
> namespace Widelands {
>
> -void Cmd_LuaScript::execute (Game & game) {
> +void CmdLuaScript::execute (Game & game) {
> log("Trying to run: %s: ", script_.c_str());
> try {
> game.lua().run_script(script_);
> @@ -38,15 +38,15 @@
> log("not found.\n");
> return;
> } catch (LuaError & e) {
> - throw game_data_error("lua: %s", e.what());
> + throw GameDataError("lua: %s", e.what());
> }
> log("done\n");
> return;
> }
>
> #define CMD_LUASCRIPT_VERSION 1
> -void Cmd_LuaScript::Read
> - (FileRead & fr, Editor_Game_Base & egbase, MapMapObjectLoader & mol)
> +void CmdLuaScript::Read
> + (FileRead & fr, EditorGameBase & egbase, MapObjectLoader & mol)
> {
> try {
> uint16_t const packet_version = fr.Unsigned16();
> @@ -54,14 +54,14 @@
> GameLogicCommand::Read(fr, egbase, mol);
> script_ = fr.String();
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const _wexception & e) {
> - throw game_data_error("lua: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("lua: %s", e.what());
> }
> }
> -void Cmd_LuaScript::Write
> - (FileWrite & fw, Editor_Game_Base & egbase, MapMapObjectSaver & mos)
> +void CmdLuaScript::Write
> + (FileWrite & fw, EditorGameBase & egbase, MapObjectSaver & mos)
> {
> fw.Unsigned16(CMD_LUASCRIPT_VERSION);
> GameLogicCommand::Write(fw, egbase, mos);
>
> === modified file 'src/logic/cmd_luascript.h'
> --- src/logic/cmd_luascript.h 2014-07-28 14:17:07 +0000
> +++ src/logic/cmd_luascript.h 2014-09-15 07:27:30 +0000
> @@ -26,15 +26,15 @@
>
> namespace Widelands {
>
> -struct Cmd_LuaScript : public GameLogicCommand {
> - Cmd_LuaScript() : GameLogicCommand(0) {} // For savegame loading
> - Cmd_LuaScript
> +struct CmdLuaScript : public GameLogicCommand {
> + CmdLuaScript() : GameLogicCommand(0) {} // For savegame loading
> + CmdLuaScript
> (int32_t const _duetime, const std::string& script) :
> GameLogicCommand(_duetime), script_(script) {}
>
> // Write these commands to a file (for savegames)
> - void Write(FileWrite &, Editor_Game_Base &, MapMapObjectSaver &) override;
> - void Read (FileRead &, Editor_Game_Base &, MapMapObjectLoader &) override;
> + void Write(FileWrite &, EditorGameBase &, MapObjectSaver &) override;
> + void Read (FileRead &, EditorGameBase &, MapObjectLoader &) override;
>
> uint8_t id() const override {return QUEUE_CMD_LUASCRIPT;}
>
>
> === modified file 'src/logic/cmd_queue.cc'
> --- src/logic/cmd_queue.cc 2014-07-28 14:17:07 +0000
> +++ src/logic/cmd_queue.cc 2014-09-15 07:27:30 +0000
> @@ -36,13 +36,13 @@
> //
> // class Cmd_Queue
> //
> -Cmd_Queue::Cmd_Queue(Game & game) :
> +CmdQueue::CmdQueue(Game & game) :
> m_game(game),
> nextserial(0),
> m_ncmds(0),
> - m_cmds(CMD_QUEUE_BUCKET_SIZE, std::priority_queue<cmditem>()) {}
> + m_cmds(CMD_QUEUE_BUCKET_SIZE, std::priority_queue<CmdItem>()) {}
>
> -Cmd_Queue::~Cmd_Queue()
> +CmdQueue::~CmdQueue()
> {
> flush();
> }
> @@ -53,10 +53,10 @@
> */
> // TODO(unknown): ...but game loading while in game is not possible!
> // Note: Order of destruction of Items is not guaranteed
> -void Cmd_Queue::flush() {
> +void CmdQueue::flush() {
> uint32_t cbucket = 0;
> while (m_ncmds && cbucket < CMD_QUEUE_BUCKET_SIZE) {
> - std::priority_queue<cmditem> & current_cmds = m_cmds[cbucket];
> + std::priority_queue<CmdItem> & current_cmds = m_cmds[cbucket];
>
> while (!current_cmds.empty()) {
> Command * cmd = current_cmds.top().cmd;
> @@ -74,9 +74,9 @@
> Insert a new command into the queue; it will be executed at the given time
> ===============
> */
> -void Cmd_Queue::enqueue (Command * const cmd)
> +void CmdQueue::enqueue (Command * const cmd)
> {
> - cmditem ci;
> + CmdItem ci;
>
> ci.cmd = cmd;
> if (upcast(PlayerCommand, plcmd, cmd)) {
> @@ -98,12 +98,12 @@
> ++ m_ncmds;
> }
>
> -int32_t Cmd_Queue::run_queue(int32_t const interval, int32_t & game_time_var) {
> +int32_t CmdQueue::run_queue(int32_t const interval, int32_t & game_time_var) {
> int32_t const final = game_time_var + interval;
> int32_t cnt = 0;
>
> while (game_time_var < final) {
> - std::priority_queue<cmditem> & current_cmds = m_cmds[game_time_var % CMD_QUEUE_BUCKET_SIZE];
> + std::priority_queue<CmdItem> & current_cmds = m_cmds[game_time_var % CMD_QUEUE_BUCKET_SIZE];
>
> while (!current_cmds.empty()) {
> Command & c = *current_cmds.top().cmd;
> @@ -149,11 +149,11 @@
> void GameLogicCommand::Write
> (FileWrite & fw,
> #ifndef NDEBUG
> - Editor_Game_Base & egbase,
> + EditorGameBase & egbase,
> #else
> - Editor_Game_Base &,
> + EditorGameBase &,
> #endif
> - MapMapObjectSaver &)
> + MapObjectSaver &)
> {
> // First version
> fw.Unsigned16(BASE_CMD_VERSION);
> @@ -169,7 +169,7 @@
> * \note This function must be called by deriving objects that override it.
> */
> void GameLogicCommand::Read
> - (FileRead & fr, Editor_Game_Base & egbase, MapMapObjectLoader &)
> + (FileRead & fr, EditorGameBase & egbase, MapObjectLoader &)
> {
> try {
> uint16_t const packet_version = fr.Unsigned16();
> @@ -177,13 +177,13 @@
> set_duetime(fr.Unsigned32());
> int32_t const gametime = egbase.get_gametime();
> if (duetime() < gametime)
> - throw game_data_error
> + throw GameDataError
> ("duetime (%i) < gametime (%i)", duetime(), gametime);
> } else
> - throw game_data_error
> + throw GameDataError
> ("unknown/unhandled version %u", packet_version);
> - } catch (const _wexception & e) {
> - throw game_data_error("game logic: %s", e.what());
> + } catch (const WException & e) {
> + throw GameDataError("game logic: %s", e.what());
> }
> }
>
>
> === modified file 'src/logic/cmd_queue.h'
> --- src/logic/cmd_queue.h 2014-07-28 14:17:07 +0000
> +++ src/logic/cmd_queue.h 2014-09-15 07:27:30 +0000
> @@ -34,9 +34,9 @@
>
> namespace Widelands {
>
> -class Editor_Game_Base;
> -struct MapMapObjectSaver;
> -class MapMapObjectLoader;
> +class EditorGameBase;
> +struct MapObjectSaver;
> +class MapObjectLoader;
>
> // Define here all the possible users
> #define SENDER_MAPOBJECT 0
> @@ -111,13 +111,13 @@
>
> // Write these commands to a file (for savegames)
> virtual void Write
> - (FileWrite &, Editor_Game_Base &, MapMapObjectSaver &);
> + (FileWrite &, EditorGameBase &, MapObjectSaver &);
> virtual void Read
> - (FileRead &, Editor_Game_Base &, MapMapObjectLoader &);
> + (FileRead &, EditorGameBase &, MapObjectLoader &);
> };
>
> -class Cmd_Queue {
> - friend struct Game_Cmd_Queue_Data_Packet;
> +class CmdQueue {
> + friend struct GameCmdQueuePacket;
>
> enum {
> cat_nongamelogic = 0,
> @@ -125,7 +125,7 @@
> cat_playercommand
> };
>
> - struct cmditem {
> + struct CmdItem {
> Command * cmd;
>
> /**
> @@ -136,7 +136,7 @@
> int32_t category;
> uint32_t serial;
>
> - bool operator< (const cmditem & c) const
> + bool operator< (const CmdItem & c) const
> {
> if (cmd->duetime() != c.cmd->duetime())
> return cmd->duetime() > c.cmd->duetime();
> @@ -148,8 +148,8 @@
> };
>
> public:
> - Cmd_Queue(Game &);
> - ~Cmd_Queue();
> + CmdQueue(Game &);
> + ~CmdQueue();
>
> /// Add a command to the queue. Takes ownership.
> void enqueue (Command *);
> @@ -166,7 +166,7 @@
> Game & m_game;
> uint32_t nextserial;
> uint32_t m_ncmds;
> - typedef std::vector<std::priority_queue<cmditem> > CommandsContainer;
> + using CommandsContainer = std::vector<std::priority_queue<CmdItem>>;
> CommandsContainer m_cmds;
> };
>
>
> === modified file 'src/logic/constructionsite.cc'
> --- src/logic/constructionsite.cc 2014-08-02 10:14:12 +0000
> +++ src/logic/constructionsite.cc 2014-09-15 07:27:30 +0000
> @@ -45,7 +45,7 @@
> ConstructionSiteDescr::ConstructionSiteDescr
> (char const * const _name, char const * const _descname,
> const std::string & directory, Profile & prof, Section & global_s,
> - const Tribe_Descr & _tribe)
> + const TribeDescr & _tribe)
> :
> BuildingDescr(MapObjectType::CONSTRUCTIONSITE, _name, _descname, directory, prof, global_s, _tribe)
> {
> @@ -75,7 +75,7 @@
>
>
> ConstructionSite::ConstructionSite(const ConstructionSiteDescr & cs_descr) :
> -Partially_Finished_Building (cs_descr),
> +PartiallyFinishedBuilding (cs_descr),
> m_fetchfromflag (0),
> m_builder_idle (false)
> {}
> @@ -93,7 +93,7 @@
> Access to the wares queues by id
> =======
> */
> -WaresQueue & ConstructionSite::waresqueue(Ware_Index const wi) {
> +WaresQueue & ConstructionSite::waresqueue(WareIndex const wi) {
> for (WaresQueue * ware : m_wares) {
> if (ware->get_ware() == wi) {
> return *ware;
> @@ -111,7 +111,7 @@
> ===============
> */
> void ConstructionSite::set_building(const BuildingDescr & building_descr) {
> - Partially_Finished_Building::set_building(building_descr);
> + PartiallyFinishedBuilding::set_building(building_descr);
>
> m_info.becomes = &building_descr;
> }
> @@ -121,14 +121,14 @@
> Initialize the construction site by starting orders
> ===============
> */
> -void ConstructionSite::init(Editor_Game_Base & egbase)
> +void ConstructionSite::init(EditorGameBase & egbase)
> {
> - Partially_Finished_Building::init(egbase);
> + PartiallyFinishedBuilding::init(egbase);
>
> - const std::map<Ware_Index, uint8_t> * buildcost;
> + const std::map<WareIndex, uint8_t> * buildcost;
> if (!m_old_buildings.empty()) {
> // Enhancement
> - Building_Index was_index = m_old_buildings.back();
> + BuildingIndex was_index = m_old_buildings.back();
> const BuildingDescr* was_descr = descr().tribe().get_building_descr(was_index);
> m_info.was = was_descr;
> buildcost = &m_building->enhancement_cost();
> @@ -141,7 +141,7 @@
> // initialize the wares queues
> size_t const buildcost_size = buildcost->size();
> m_wares.resize(buildcost_size);
> - std::map<Ware_Index, uint8_t>::const_iterator it = buildcost->begin();
> + std::map<WareIndex, uint8_t>::const_iterator it = buildcost->begin();
>
> for (size_t i = 0; i < buildcost_size; ++i, ++it) {
> WaresQueue & wq =
> @@ -161,26 +161,26 @@
> If construction was finished successfully, place the building at our position.
> ===============
> */
> -void ConstructionSite::cleanup(Editor_Game_Base & egbase)
> +void ConstructionSite::cleanup(EditorGameBase & egbase)
> {
> - Partially_Finished_Building::cleanup(egbase);
> + PartiallyFinishedBuilding::cleanup(egbase);
>
> if (m_work_steps <= m_work_completed) {
> // Put the real building in place
> - Building_Index becomes_idx = descr().tribe().building_index(m_building->name());
> + BuildingIndex becomes_idx = descr().tribe().building_index(m_building->name());
> m_old_buildings.push_back(becomes_idx);
> Building & b =
> m_building->create(egbase, owner(), m_position, false, false, m_old_buildings);
> if (Worker * const builder = m_builder.get(egbase)) {
> - builder->reset_tasks(ref_cast<Game, Editor_Game_Base>(egbase));
> + builder->reset_tasks(ref_cast<Game, EditorGameBase>(egbase));
> builder->set_location(&b);
> }
> // Open the new building window if needed
> if (m_optionswindow) {
> Point window_position = m_optionswindow->get_pos();
> hide_options();
> - Interactive_GameBase & igbase =
> - ref_cast<Interactive_GameBase, Interactive_Base>(*egbase.get_ibase());
> + InteractiveGameBase & igbase =
> + ref_cast<InteractiveGameBase, InteractiveBase>(*egbase.get_ibase());
> b.show_options(igbase, false, window_position);
> }
> }
> @@ -315,7 +315,7 @@
> ===============
> */
> void ConstructionSite::wares_queue_callback
> - (Game & game, WaresQueue *, Ware_Index, void * const data)
> + (Game & game, WaresQueue *, WareIndex, void * const data)
> {
> ConstructionSite & cs = *static_cast<ConstructionSite *>(data);
>
> @@ -331,7 +331,7 @@
> ===============
> */
> void ConstructionSite::draw
> - (const Editor_Game_Base & game, RenderTarget & dst, const FCoords& coords, const Point& pos)
> + (const EditorGameBase & game, RenderTarget & dst, const FCoords& coords, const Point& pos)
> {
> assert(0 <= game.get_gametime());
> const uint32_t gametime = game.get_gametime();
> @@ -361,10 +361,10 @@
> uint32_t cur_frame;
> try {
> anim_idx = building().get_animation("build");
> - } catch (MapObjectDescr::Animation_Nonexistent&) {
> + } catch (MapObjectDescr::AnimationNonexistent&) {
> try {
> anim_idx = building().get_animation("unoccupied");
> - } catch (MapObjectDescr::Animation_Nonexistent) {
> + } catch (MapObjectDescr::AnimationNonexistent) {
> anim_idx = building().get_animation("idle");
> }
> }
> @@ -387,14 +387,14 @@
> // draw the prev pic from top to where next image will be drawing
> dst.drawanimrect(pos, anim_idx, tanim - FRAME_LENGTH, get_owner(), Rect(Point(0, 0), w, h - lines));
> else if (!m_old_buildings.empty()) {
> - Building_Index prev_idx = m_old_buildings.back();
> + BuildingIndex prev_idx = m_old_buildings.back();
> const BuildingDescr* prev_building = descr().tribe().get_building_descr(prev_idx);
> // Is the first picture but there was another building here before,
> // get its most fitting picture and draw it instead.
> uint32_t prev_building_anim_idx;
> try {
> prev_building_anim_idx = prev_building->get_animation("unoccupied");
> - } catch (MapObjectDescr::Animation_Nonexistent &) {
> + } catch (MapObjectDescr::AnimationNonexistent &) {
> prev_building_anim_idx = prev_building->get_animation("idle");
> }
> const Animation& prev_building_anim = g_gr->animations().get_animation(prev_building_anim_idx);
>
> === modified file 'src/logic/constructionsite.h'
> --- src/logic/constructionsite.h 2014-08-02 10:14:12 +0000
> +++ src/logic/constructionsite.h 2014-09-15 07:27:30 +0000
> @@ -54,7 +54,7 @@
> ConstructionSiteDescr
> (char const * name, char const * descname,
> const std::string & directory, Profile &, Section & global_s,
> - const Tribe_Descr & tribe);
> + const TribeDescr & tribe);
> ~ConstructionSiteDescr() override {}
>
> Building & create_object() const override;
> @@ -63,8 +63,8 @@
> DISALLOW_COPY_AND_ASSIGN(ConstructionSiteDescr);
> };
>
> -class ConstructionSite : public Partially_Finished_Building {
> - friend class Map_Buildingdata_Data_Packet;
> +class ConstructionSite : public PartiallyFinishedBuilding {
> + friend class MapBuildingdataPacket;
>
> static const uint32_t CONSTRUCTIONSITE_STEP_TIME = 30000;
>
> @@ -73,15 +73,15 @@
> public:
> ConstructionSite(const ConstructionSiteDescr & descr);
>
> - const Player::Constructionsite_Information & get_info() {return m_info;}
> + const Player::ConstructionsiteInformation & get_info() {return m_info;}
>
> - WaresQueue & waresqueue(Ware_Index) override;
> + WaresQueue & waresqueue(WareIndex) override;
>
> void set_building(const BuildingDescr &) override;
> const BuildingDescr & building() const {return *m_building;}
>
> - void init (Editor_Game_Base &) override;
> - void cleanup(Editor_Game_Base &) override;
> + void init (EditorGameBase &) override;
> + void cleanup(EditorGameBase &) override;
>
> bool burn_on_destroy() override;
>
> @@ -93,18 +93,18 @@
>
> uint32_t build_step_time() const override {return CONSTRUCTIONSITE_STEP_TIME;}
> virtual void create_options_window
> - (Interactive_GameBase &, UI::Window * & registry) override;
> + (InteractiveGameBase &, UI::Window * & registry) override;
>
> static void wares_queue_callback
> - (Game &, WaresQueue *, Ware_Index, void * data);
> + (Game &, WaresQueue *, WareIndex, void * data);
>
> - void draw(const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&) override;
> + void draw(const EditorGameBase &, RenderTarget &, const FCoords&, const Point&) override;
>
> private:
> int32_t m_fetchfromflag; // # of wares to fetch from flag
>
> bool m_builder_idle; // used to determine whether the builder is idle
> - Player::Constructionsite_Information m_info; // asked for by player point of view for the gameview
> + Player::ConstructionsiteInformation m_info; // asked for by player point of view for the gameview
> };
>
> }
>
> === modified file 'src/logic/cookie_priority_queue.h'
> --- src/logic/cookie_priority_queue.h 2014-07-14 19:24:12 +0000
> +++ src/logic/cookie_priority_queue.h 2014-09-15 07:27:30 +0000
> @@ -28,32 +28,32 @@
> #include "base/macros.h"
>
> template<typename _Type>
> -struct default_cookie_accessor;
> +struct DefaultCookieAccessor;
>
> template<typename _Type>
> -struct cookie_priority_queue_base {
> - typedef _Type type;
> - typedef std::vector<type *> container;
> - typedef typename container::size_type size_type;
> +struct CookiePriorityQueueBase {
> + using CookieType = _Type;
> + using CookieTypeVector = std::vector<CookieType*>;
> + using CookieSizeType = typename CookieTypeVector::size_type;
>
> - struct cookie {
> - cookie() : pos(bad_pos()) {}
> - ~cookie() {}
> + struct Cookie {
> + Cookie() : pos(bad_pos()) {}
> + ~Cookie() {}
>
> /** Returns \c true if the cookie is currently managed by a queue */
> bool is_active() const {return pos != bad_pos();}
>
> private:
> - friend struct cookie_priority_queue_base<_Type>;
> -
> - size_type pos;
> -
> - DISALLOW_COPY_AND_ASSIGN(cookie);
> + friend struct CookiePriorityQueueBase<_Type>;
> +
> + CookieSizeType pos;
> +
> + DISALLOW_COPY_AND_ASSIGN(Cookie);
> };
>
> protected:
> - static size_type & cookie_pos(cookie & cookie) {return cookie.pos;}
> - static size_type bad_pos() {return std::numeric_limits<size_type>::max();}
> + static CookieSizeType & cookie_pos(Cookie & cookie) {return cookie.pos;}
> + static CookieSizeType bad_pos() {return std::numeric_limits<CookieSizeType>::max();}
> };
>
> /**
> @@ -76,94 +76,94 @@
> template
> <typename _Type,
> typename _Compare = std::less<_Type>,
> - typename _CookieAccessor = default_cookie_accessor<_Type> >
> -struct cookie_priority_queue : cookie_priority_queue_base<_Type> {
> - typedef typename cookie_priority_queue_base<_Type>::type type;
> - typedef typename cookie_priority_queue_base<_Type>::container container;
> - typedef typename cookie_priority_queue_base<_Type>::size_type size_type;
> - typedef typename cookie_priority_queue_base<_Type>::cookie cookie;
> -
> - typedef cookie_priority_queue_base<_Type> base_type;
> - typedef _Compare compare;
> - typedef _CookieAccessor cookie_accessor;
> -
> - cookie_priority_queue(const compare & _c = compare(), const cookie_accessor & _a = cookie_accessor());
> - ~cookie_priority_queue();
> -
> - size_type size() const;
> + typename _CookieAccessor = DefaultCookieAccessor<_Type> >
> +struct CookiePriorityQueue : CookiePriorityQueueBase<_Type> {
> + using CookieType = typename CookiePriorityQueueBase<_Type>::CookieType;
> + using CookieTypeVector = typename CookiePriorityQueueBase<_Type>::CookieTypeVector;
> + using CookieSizeType = typename CookiePriorityQueueBase<_Type>::CookieSizeType;
> + using Cookie = typename CookiePriorityQueueBase<_Type>::Cookie;
> +
> + using BaseType = CookiePriorityQueueBase<_Type>;
> + using Compare = _Compare;
> + using CookieAccessor = _CookieAccessor;
> +
> + CookiePriorityQueue(const Compare & _c = Compare(), const CookieAccessor & _a = CookieAccessor());
> + ~CookiePriorityQueue();
> +
> + CookieSizeType size() const;
> bool empty() const;
> - type * top() const;
> + CookieType * top() const;
>
> - void push(type * elt);
> - void pop(type * elt);
> - void decrease_key(type * elt);
> - void increase_key(type * elt);
> + void push(CookieType * elt);
> + void pop(CookieType * elt);
> + void decrease_key(CookieType * elt);
> + void increase_key(CookieType * elt);
>
> private:
> - container d;
> - compare c;
> - cookie_accessor ca;
> + CookieTypeVector d;
> + Compare c;
> + CookieAccessor ca;
>
> - void swap(cookie & a, cookie & b);
> + void swap(Cookie & a, Cookie & b);
> void selftest();
>
> - static size_type & cookie_pos(cookie & c) {return base_type::cookie_pos(c);}
> - static size_type bad_pos() {return base_type::bad_pos();}
> - static size_type parent_pos(size_type pos) {return (pos - 1) / 2;}
> - static size_type left_child_pos(size_type pos) {return (2 * pos) + 1;}
> - static size_type right_child_pos(size_type pos) {return (2 * pos) + 2;}
> + static CookieSizeType & cookie_pos(Cookie & c) {return BaseType::cookie_pos(c);}
> + static CookieSizeType bad_pos() {return BaseType::bad_pos();}
> + static CookieSizeType parent_pos(CookieSizeType pos) {return (pos - 1) / 2;}
> + static CookieSizeType left_child_pos(CookieSizeType pos) {return (2 * pos) + 1;}
> + static CookieSizeType right_child_pos(CookieSizeType pos) {return (2 * pos) + 2;}
> };
>
> template<typename _Type>
> -struct default_cookie_accessor {
> - typedef typename cookie_priority_queue_base<_Type>::cookie cookie;
> +struct DefaultCookieAccessor {
> + using Cookie = typename CookiePriorityQueueBase<_Type>::Cookie;
>
> - cookie & operator()(_Type * t) {
> + Cookie & operator()(_Type * t) {
> return t->cookie();
> }
> };
>
>
> template<typename _T, typename _Cw, typename _CA>
> -cookie_priority_queue<_T, _Cw, _CA>::cookie_priority_queue
> - (const typename cookie_priority_queue<_T, _Cw, _CA>::compare & _c,
> - const typename cookie_priority_queue<_T, _Cw, _CA>::cookie_accessor & _a)
> +CookiePriorityQueue<_T, _Cw, _CA>::CookiePriorityQueue
> + (const typename CookiePriorityQueue<_T, _Cw, _CA>::Compare & _c,
> + const typename CookiePriorityQueue<_T, _Cw, _CA>::CookieAccessor & _a)
> : c(_c), ca(_a)
> {
> }
>
> template<typename _T, typename _Cw, typename _CA>
> -cookie_priority_queue<_T, _Cw, _CA>::~cookie_priority_queue()
> +CookiePriorityQueue<_T, _Cw, _CA>::~CookiePriorityQueue()
> {
> - for (typename container::iterator it = d.begin(); it != d.end(); ++it)
> + for (typename CookieTypeVector::iterator it = d.begin(); it != d.end(); ++it)
> cookie_pos(ca(*it)) = bad_pos();
> }
>
> template<typename _T, typename _Cw, typename _CA>
> -typename cookie_priority_queue<_T, _Cw, _CA>::size_type cookie_priority_queue<_T, _Cw, _CA>::size() const
> +typename CookiePriorityQueue<_T, _Cw, _CA>::CookieSizeType CookiePriorityQueue<_T, _Cw, _CA>::size() const
> {
> return d.size();
> }
>
> template<typename _T, typename _Cw, typename _CA>
> -bool cookie_priority_queue<_T, _Cw, _CA>::empty() const
> +bool CookiePriorityQueue<_T, _Cw, _CA>::empty() const
> {
> return d.empty();
> }
>
> template<typename _T, typename _Cw, typename _CA>
> -typename cookie_priority_queue<_T, _Cw, _CA>::type * cookie_priority_queue<_T, _Cw, _CA>::top() const
> +typename CookiePriorityQueue<_T, _Cw, _CA>::CookieType * CookiePriorityQueue<_T, _Cw, _CA>::top() const
> {
> return *d.begin();
> }
>
> template<typename _T, typename _Cw, typename _CA>
> -void cookie_priority_queue<_T, _Cw, _CA>::push
> - (typename cookie_priority_queue<_T, _Cw, _CA>::type * elt)
> +void CookiePriorityQueue<_T, _Cw, _CA>::push
> + (typename CookiePriorityQueue<_T, _Cw, _CA>::CookieType * elt)
> {
> - cookie & elt_cookie(ca(elt));
> + Cookie & elt_cookie(ca(elt));
>
> - assert(cookie_pos(elt_cookie) == base_type::bad_pos());
> + assert(cookie_pos(elt_cookie) == BaseType::bad_pos());
>
> d.push_back(elt);
> cookie_pos(elt_cookie) = d.size() - 1;
> @@ -172,15 +172,15 @@
> }
>
> template<typename _T, typename _Cw, typename _CA>
> -void cookie_priority_queue<_T, _Cw, _CA>::pop
> - (typename cookie_priority_queue<_T, _Cw, _CA>::type * elt)
> +void CookiePriorityQueue<_T, _Cw, _CA>::pop
> + (typename CookiePriorityQueue<_T, _Cw, _CA>::CookieType * elt)
> {
> - cookie & elt_cookie(ca(elt));
> + Cookie & elt_cookie(ca(elt));
>
> assert(cookie_pos(elt_cookie) < d.size());
>
> while (cookie_pos(elt_cookie) > 0) {
> - cookie & parent_cookie = ca(*(d.begin() + parent_pos(cookie_pos(elt_cookie))));
> + Cookie & parent_cookie = ca(*(d.begin() + parent_pos(cookie_pos(elt_cookie))));
>
> assert(cookie_pos(parent_cookie) == parent_pos(cookie_pos(elt_cookie)));
>
> @@ -189,27 +189,27 @@
>
> swap(elt_cookie, ca(d.back()));
> d.pop_back();
> - cookie_pos(elt_cookie) = base_type::bad_pos();
> + cookie_pos(elt_cookie) = BaseType::bad_pos();
>
> if (!d.empty())
> increase_key(*d.begin());
> }
>
> template<typename _T, typename _Cw, typename _CA>
> -void cookie_priority_queue<_T, _Cw, _CA>::decrease_key
> - (typename cookie_priority_queue<_T, _Cw, _CA>::type * elt)
> +void CookiePriorityQueue<_T, _Cw, _CA>::decrease_key
> + (typename CookiePriorityQueue<_T, _Cw, _CA>::CookieType * elt)
> {
> - cookie & elt_cookie(ca(elt));
> + Cookie & elt_cookie(ca(elt));
>
> assert(cookie_pos(elt_cookie) < d.size());
>
> while (cookie_pos(elt_cookie) != 0) {
> - size_type parent = parent_pos(cookie_pos(elt_cookie));
> + CookieSizeType parent = parent_pos(cookie_pos(elt_cookie));
>
> if (!c(*elt, *d[parent]))
> break;
>
> - cookie & parent_cookie(ca(d[parent]));
> + Cookie & parent_cookie(ca(d[parent]));
>
> assert(cookie_pos(parent_cookie) == parent);
>
> @@ -220,21 +220,21 @@
> }
>
> template<typename _T, typename _Cw, typename _CA>
> -void cookie_priority_queue<_T, _Cw, _CA>::increase_key
> - (typename cookie_priority_queue<_T, _Cw, _CA>::type * elt)
> +void CookiePriorityQueue<_T, _Cw, _CA>::increase_key
> + (typename CookiePriorityQueue<_T, _Cw, _CA>::CookieType * elt)
> {
> - cookie & elt_cookie(ca(elt));
> + Cookie & elt_cookie(ca(elt));
>
> assert(cookie_pos(elt_cookie) < d.size());
>
> for (;;) {
> - size_type left_child = left_child_pos(cookie_pos(elt_cookie));
> - size_type right_child = right_child_pos(cookie_pos(elt_cookie));
> + CookieSizeType left_child = left_child_pos(cookie_pos(elt_cookie));
> + CookieSizeType right_child = right_child_pos(cookie_pos(elt_cookie));
>
> if (left_child >= d.size())
> break;
>
> - cookie & left_cookie(ca(d[left_child]));
> + Cookie & left_cookie(ca(d[left_child]));
>
> assert(cookie_pos(left_cookie) == left_child);
>
> @@ -248,7 +248,7 @@
> if (right_child >= d.size())
> break;
>
> - cookie & right_cookie(ca(d[right_child]));
> + Cookie & right_cookie(ca(d[right_child]));
>
> assert(cookie_pos(right_cookie) == right_child);
>
> @@ -264,9 +264,9 @@
> }
>
> template<typename _T, typename _Cw, typename _CA>
> -void cookie_priority_queue<_T, _Cw, _CA>::swap
> - (typename cookie_priority_queue<_T, _Cw, _CA>::cookie & a,
> - typename cookie_priority_queue<_T, _Cw, _CA>::cookie & b)
> +void CookiePriorityQueue<_T, _Cw, _CA>::swap
> + (typename CookiePriorityQueue<_T, _Cw, _CA>::Cookie & a,
> + typename CookiePriorityQueue<_T, _Cw, _CA>::Cookie & b)
> {
> std::swap(d[cookie_pos(a)], d[cookie_pos(b)]);
> std::swap(cookie_pos(a), cookie_pos(b));
> @@ -274,15 +274,15 @@
>
> // Disable in release builds.
> template<typename _T, typename _Cw, typename _CA>
> -void cookie_priority_queue<_T, _Cw, _CA>::selftest()
> +void CookiePriorityQueue<_T, _Cw, _CA>::selftest()
> {
> - for (size_type pos = 0; pos < d.size(); ++pos) {
> - cookie & elt_cookie(ca(d[pos]));
> + for (CookieSizeType pos = 0; pos < d.size(); ++pos) {
> + Cookie & elt_cookie(ca(d[pos]));
>
> assert(cookie_pos(elt_cookie) == pos);
>
> - size_type left_child = left_child_pos(pos);
> - size_type right_child = right_child_pos(pos);
> + CookieSizeType left_child = left_child_pos(pos);
> + CookieSizeType right_child = right_child_pos(pos);
>
> if (left_child < d.size()) {
> assert(!c(*d[left_child], *d[pos]));
>
> === modified file 'src/logic/critter.cc'
> --- src/logic/critter.cc 2014-07-28 17:12:07 +0000
> +++ src/logic/critter.cc 2014-09-15 07:27:30 +0000
> @@ -136,7 +136,7 @@
> const std::string& directory,
> Profile& prof,
> Section& global_s,
> - Tribe_Descr & _tribe)
> + TribeDescr & _tribe)
> :
> BobDescr(MapObjectType::CRITTER, _name, _descname, &_tribe)
> {
> @@ -399,8 +399,8 @@
> return critter.descr().get_program(name);
> }
>
> -MapObject::Loader* Critter::load(Editor_Game_Base& egbase,
> - MapMapObjectLoader& mol,
> +MapObject::Loader* Critter::load(EditorGameBase& egbase,
> + MapObjectLoader& mol,
> FileRead& fr,
> const OneWorldLegacyLookupTable& lookup_table) {
> std::unique_ptr<Loader> loader(new Loader);
> @@ -421,19 +421,19 @@
> } else {
> egbase.manually_load_tribe(owner);
>
> - if (const Tribe_Descr * tribe = egbase.get_tribe(owner))
> + if (const TribeDescr * tribe = egbase.get_tribe(owner))
> descr = dynamic_cast<const CritterDescr *>
> (tribe->get_bob_descr(critter_name));
> }
>
> if (!descr)
> - throw game_data_error
> + throw GameDataError
> ("undefined critter %s/%s", owner.c_str(), critter_name.c_str());
>
> loader->init(egbase, mol, descr->create_object());
> loader->load(fr);
> } else
> - throw game_data_error("unknown/unhandled version %u", version);
> + throw GameDataError("unknown/unhandled version %u", version);
> } catch (const std::exception & e) {
> throw wexception("loading critter: %s", e.what());
> }
> @@ -442,7 +442,7 @@
> }
>
> void Critter::save
> - (Editor_Game_Base & egbase, MapMapObjectSaver & mos, FileWrite & fw)
> + (EditorGameBase & egbase, MapObjectSaver & mos, FileWrite & fw)
> {
> fw.Unsigned8(HeaderCritter);
> fw.Unsigned8(CRITTER_SAVEGAME_VERSION);
>
> === modified file 'src/logic/critter.h'
> --- src/logic/critter.h 2014-07-28 17:12:07 +0000
> +++ src/logic/critter.h 2014-09-15 07:27:30 +0000
> @@ -42,7 +42,7 @@
> const std::string& directory,
> Profile& prof,
> Section& global_s,
> - Tribe_Descr & _tribe);
> + TribeDescr & _tribe);
> CritterDescr(const LuaTable&);
> ~CritterDescr() override;
>
> @@ -57,13 +57,13 @@
>
> private:
> DirAnimations m_walk_anims;
> - typedef std::map<std::string, CritterProgram *> Programs;
> + using Programs = std::map<std::string, CritterProgram *>;
> Programs m_programs;
> DISALLOW_COPY_AND_ASSIGN(CritterDescr);
> };
>
> class Critter : public Bob {
> - friend struct Map_Bobdata_Data_Packet;
> + friend struct MapBobdataPacket;
> friend struct CritterProgram;
>
> MO_DESCR(CritterDescr)
> @@ -75,10 +75,10 @@
>
> void start_task_program(Game &, const std::string & name);
>
> - void save(Editor_Game_Base &, MapMapObjectSaver &, FileWrite &) override;
> + void save(EditorGameBase &, MapObjectSaver &, FileWrite &) override;
>
> static MapObject::Loader*
> - load(Editor_Game_Base&, MapMapObjectLoader&, FileRead&, const OneWorldLegacyLookupTable& lookup_table);
> + load(EditorGameBase&, MapObjectLoader&, FileRead&, const OneWorldLegacyLookupTable& lookup_table);
>
> protected:
> struct Loader : Bob::Loader {
>
> === modified file 'src/logic/critter_program.h'
> --- src/logic/critter_program.h 2014-07-28 17:12:07 +0000
> +++ src/logic/critter_program.h 2014-09-15 07:27:30 +0000
> @@ -25,8 +25,8 @@
> namespace Widelands {
>
> struct CritterAction {
> - typedef
> - bool (Critter::*execute_t)
> + using CritterExecuteActionFn =
> + bool (Critter::*)
> (Game &, Bob::State &, const CritterAction &);
>
> enum {
> @@ -34,7 +34,7 @@
> walkCoords, // walk to coords
> };
>
> - execute_t function;
> + CritterExecuteActionFn function;
> int32_t iparam1;
> int32_t iparam2;
> std::string sparam1;
>
> === modified file 'src/logic/description_maintainer.h'
> --- src/logic/description_maintainer.h 2014-07-06 08:17:24 +0000
> +++ src/logic/description_maintainer.h 2014-09-15 07:27:30 +0000
> @@ -65,7 +65,7 @@
> }
>
> private:
> - typedef std::map<std::string, int> NameToIndexMap;
> + using NameToIndexMap = std::map<std::string, int>;
> std::vector<std::unique_ptr<T>> items_;
> NameToIndexMap name_to_index_;
> };
>
> === modified file 'src/logic/dismantlesite.cc'
> --- src/logic/dismantlesite.cc 2014-08-02 10:14:12 +0000
> +++ src/logic/dismantlesite.cc 2014-09-15 07:27:30 +0000
> @@ -41,7 +41,7 @@
> DismantleSiteDescr::DismantleSiteDescr
> (char const * const _name, char const * const _descname,
> const std::string & directory, Profile & prof, Section & global_s,
> - const Tribe_Descr & _tribe)
> + const TribeDescr & _tribe)
> :
> BuildingDescr(MapObjectType::DISMANTLESITE, _name, _descname, directory, prof, global_s, _tribe)
> {
> @@ -62,20 +62,20 @@
>
>
> DismantleSite::DismantleSite(const DismantleSiteDescr & gdescr) :
> -Partially_Finished_Building(gdescr)
> +PartiallyFinishedBuilding(gdescr)
> {}
>
> DismantleSite::DismantleSite
> - (const DismantleSiteDescr & gdescr, Editor_Game_Base & egbase, Coords const c,
> + (const DismantleSiteDescr & gdescr, EditorGameBase & egbase, Coords const c,
> Player & plr, bool loading, Building::FormerBuildings & former_buildings)
> :
> -Partially_Finished_Building(gdescr)
> +PartiallyFinishedBuilding(gdescr)
> {
> m_position = c;
> set_owner(&plr);
>
> assert(!former_buildings.empty());
> - for (Building_Index former_idx : former_buildings) {
> + for (BuildingIndex former_idx : former_buildings) {
> m_old_buildings.push_back(former_idx);
> }
> const BuildingDescr* cur_descr = owner().tribe().get_building_descr(m_old_buildings.back());
> @@ -104,14 +104,14 @@
> Initialize the construction site by starting orders
> ===============
> */
> -void DismantleSite::init(Editor_Game_Base & egbase)
> +void DismantleSite::init(EditorGameBase & egbase)
> {
> - Partially_Finished_Building::init(egbase);
> + PartiallyFinishedBuilding::init(egbase);
>
> - std::map<Ware_Index, uint8_t> wares;
> + std::map<WareIndex, uint8_t> wares;
> count_returned_wares(this, wares);
>
> - std::map<Ware_Index, uint8_t>::const_iterator it = wares.begin();
> + std::map<WareIndex, uint8_t>::const_iterator it = wares.begin();
> m_wares.resize(wares.size());
>
> for (size_t i = 0; i < wares.size(); ++i, ++it) {
> @@ -130,10 +130,10 @@
> */
> void DismantleSite::count_returned_wares
> (Building* building,
> - std::map<Ware_Index, uint8_t> & res)
> + std::map<WareIndex, uint8_t> & res)
> {
> - for (Building_Index former_idx : building->get_former_buildings()) {
> - const std::map<Ware_Index, uint8_t> * return_wares;
> + for (BuildingIndex former_idx : building->get_former_buildings()) {
> + const std::map<WareIndex, uint8_t> * return_wares;
> const BuildingDescr* former_descr = building->descr().tribe().get_building_descr(former_idx);
> if (former_idx != building->get_former_buildings().front()) {
> return_wares = & former_descr->returned_wares_enhanced();
> @@ -142,7 +142,7 @@
> }
> assert(return_wares != nullptr);
>
> - std::map<Ware_Index, uint8_t>::const_iterator i;
> + std::map<WareIndex, uint8_t>::const_iterator i;
> for (i = return_wares->begin(); i != return_wares->end(); ++i) {
> res[i->first] += i->second;
> }
> @@ -233,7 +233,7 @@
> ===============
> */
> void DismantleSite::draw
> - (const Editor_Game_Base& game, RenderTarget& dst, const FCoords& coords, const Point& pos)
> + (const EditorGameBase& game, RenderTarget& dst, const FCoords& coords, const Point& pos)
> {
> assert(0 <= game.get_gametime());
> const uint32_t gametime = game.get_gametime();
> @@ -256,7 +256,7 @@
> uint32_t anim_idx;
> try {
> anim_idx = m_building->get_animation("unoccupied");
> - } catch (MapObjectDescr::Animation_Nonexistent &) {
> + } catch (MapObjectDescr::AnimationNonexistent &) {
> anim_idx = m_building->get_animation("idle");
> }
> const Animation& anim = g_gr->animations().get_animation(anim_idx);
>
> === modified file 'src/logic/dismantlesite.h'
> --- src/logic/dismantlesite.h 2014-08-02 10:14:12 +0000
> +++ src/logic/dismantlesite.h 2014-09-15 07:27:30 +0000
> @@ -48,7 +48,7 @@
> const std::string& directory,
> Profile&,
> Section& global_s,
> - const Tribe_Descr& tribe);
> + const TribeDescr& tribe);
> ~DismantleSiteDescr() override {}
>
> Building& create_object() const override;
> @@ -57,8 +57,8 @@
> DISALLOW_COPY_AND_ASSIGN(DismantleSiteDescr);
> };
>
> -class DismantleSite : public Partially_Finished_Building {
> - friend class Map_Buildingdata_Data_Packet;
> +class DismantleSite : public PartiallyFinishedBuilding {
> + friend class MapBuildingdataPacket;
>
> static const uint32_t DISMANTLESITE_STEP_TIME = 45000;
>
> @@ -67,15 +67,15 @@
> public:
> DismantleSite(const DismantleSiteDescr & descr);
> DismantleSite
> - (const DismantleSiteDescr & descr, Editor_Game_Base &,
> + (const DismantleSiteDescr & descr, EditorGameBase &,
> Coords const, Player &, bool, Building::FormerBuildings & former_buildings);
>
> bool burn_on_destroy() override;
> - void init (Editor_Game_Base &) override;
> + void init (EditorGameBase &) override;
>
> bool get_building_work(Game &, Worker &, bool success) override;
>
> - static void count_returned_wares(Building* building, std::map<Ware_Index, uint8_t> & res);
> + static void count_returned_wares(Building* building, std::map<WareIndex, uint8_t> & res);
>
> protected:
> void update_statistics_string(std::string*) override;
> @@ -83,9 +83,9 @@
> uint32_t build_step_time() const override {return DISMANTLESITE_STEP_TIME;}
>
> virtual void create_options_window
> - (Interactive_GameBase &, UI::Window * & registry) override;
> + (InteractiveGameBase &, UI::Window * & registry) override;
>
> - void draw(const Editor_Game_Base &, RenderTarget &, const FCoords&, const Point&) override;
> + void draw(const EditorGameBase &, RenderTarget &, const FCoords&, const Point&) override;
> };
>
> }
>
> === modified file 'src/logic/editor_game_base.cc'
> --- src/logic/editor_game_base.cc 2014-07-28 18:03:51 +0000
> +++ src/logic/editor_game_base.cc 2014-09-15 07:27:30 +0000
> @@ -57,15 +57,15 @@
>
> /*
> ============
> -Editor_Game_Base::Editor_Game_Base()
> +EditorGameBase::EditorGameBase()
>
> initialization
> ============
> */
> -Editor_Game_Base::Editor_Game_Base(LuaInterface * lua_interface) :
> +EditorGameBase::EditorGameBase(LuaInterface * lua_interface) :
> gametime_ (0),
> lua_ (lua_interface),
> -player_manager_ (new Players_Manager(*this)),
> +player_manager_ (new PlayersManager(*this)),
> ibase_ (nullptr),
> map_ (nullptr),
> lasttrackserial_ (0)
> @@ -78,11 +78,11 @@
> }
>
>
> -Editor_Game_Base::~Editor_Game_Base() {
> +EditorGameBase::~EditorGameBase() {
> delete map_;
> delete player_manager_.release();
>
> - for (Tribe_Descr* tribe_descr : tribes_) {
> + for (TribeDescr* tribe_descr : tribes_) {
> delete tribe_descr;
> }
> if (g_gr) { // dedicated does not use the sound_handler
> @@ -91,19 +91,19 @@
> }
> }
>
> -void Editor_Game_Base::think()
> +void EditorGameBase::think()
> {
> //TODO(unknown): Get rid of this; replace by a function that just advances gametime
> // by a given number of milliseconds
> }
>
> -const World& Editor_Game_Base::world() const {
> +const World& EditorGameBase::world() const {
> // Const casts are evil, but this is essentially lazy evaluation and the
> // caller should really not modify this.
> - return *const_cast<Editor_Game_Base*>(this)->mutable_world();
> + return *const_cast<EditorGameBase*>(this)->mutable_world();
> }
>
> -World* Editor_Game_Base::mutable_world() {
> +World* EditorGameBase::mutable_world() {
> if (!world_) {
> // Lazy initialization of World. We need to create the pointer to the
> // world immediately though, because the lua scripts need to have access
> @@ -114,7 +114,7 @@
> try {
> lua_->run_script("world/init.lua");
> }
> - catch (const _wexception& e) {
> + catch (const WException& e) {
> log("Could not read world information: %s", e.what());
> throw;
> }
> @@ -122,19 +122,19 @@
> return world_.get();
> }
>
> -Interactive_GameBase* Editor_Game_Base::get_igbase()
> +InteractiveGameBase* EditorGameBase::get_igbase()
> {
> - return dynamic_cast<Interactive_GameBase *>(get_ibase());
> + return dynamic_cast<InteractiveGameBase *>(get_ibase());
> }
>
> /// @see PlayerManager class
> -void Editor_Game_Base::remove_player(Player_Number plnum) {
> +void EditorGameBase::remove_player(PlayerNumber plnum) {
> player_manager_->remove_player(plnum);
> }
>
> /// @see PlayerManager class
> -Player * Editor_Game_Base::add_player
> - (Player_Number const player_number,
> +Player * EditorGameBase::add_player
> + (PlayerNumber const player_number,
> uint8_t const initialization_index,
> const std::string & tribe,
> const std::string & name,
> @@ -147,16 +147,16 @@
> }
>
> /// Load the given tribe into structure
> -const Tribe_Descr & Editor_Game_Base::manually_load_tribe
> +const TribeDescr & EditorGameBase::manually_load_tribe
> (const std::string & tribe)
> {
> - for (const Tribe_Descr* tribe_descr : tribes_) {
> + for (const TribeDescr* tribe_descr : tribes_) {
> if (tribe_descr->name() == tribe) {
> return *tribe_descr;
> }
> }
>
> - Tribe_Descr & result = *new Tribe_Descr(tribe, *this);
> + TribeDescr & result = *new TribeDescr(tribe, *this);
> //resize the configuration of our wares if they won't fit in the current window (12 = info label size)
> int number = (g_gr->get_yres() - 270) / (WARE_MENU_PIC_HEIGHT + WARE_MENU_PIC_PAD_Y + 12);
> result.resize_ware_orders(number);
> @@ -164,12 +164,12 @@
> return result;
> }
>
> -Player* Editor_Game_Base::get_player(const int32_t n) const
> +Player* EditorGameBase::get_player(const int32_t n) const
> {
> return player_manager_->get_player(n);
> }
>
> -Player& Editor_Game_Base::player(const int32_t n) const
> +Player& EditorGameBase::player(const int32_t n) const
> {
> return player_manager_->player(n);
> }
> @@ -177,9 +177,9 @@
>
>
> /// Returns a tribe description from the internally loaded list
> -const Tribe_Descr * Editor_Game_Base::get_tribe(const std::string& tribename) const
> +const TribeDescr * EditorGameBase::get_tribe(const std::string& tribename) const
> {
> - for (const Tribe_Descr* tribe : tribes_) {
> + for (const TribeDescr* tribe : tribes_) {
> if (tribe->name() == tribename) {
> return tribe;
> }
> @@ -187,8 +187,8 @@
> return nullptr;
> }
>
> -void Editor_Game_Base::inform_players_about_ownership
> - (Map_Index const i, Player_Number const new_owner)
> +void EditorGameBase::inform_players_about_ownership
> + (MapIndex const i, PlayerNumber const new_owner)
> {
> iterate_players_existing_const(plnum, MAX_PLAYERS, *this, p) {
> Player::Field & player_field = p->m_fields[i];
> @@ -197,8 +197,8 @@
> }
> }
> }
> -void Editor_Game_Base::inform_players_about_immovable
> - (Map_Index const i, MapObjectDescr const * const descr)
> +void EditorGameBase::inform_players_about_immovable
> + (MapIndex const i, MapObjectDescr const * const descr)
> {
> if (!Road::IsRoadDescr(descr))
> iterate_players_existing_const(plnum, MAX_PLAYERS, *this, p) {
> @@ -211,9 +211,9 @@
>
> /**
> * Replaces the current map with the given one. Ownership of the map is transferred
> - * to the Editor_Game_Base object.
> + * to the EditorGameBase object.
> */
> -void Editor_Game_Base::set_map(Map * const new_map) {
> +void EditorGameBase::set_map(Map * const new_map) {
> assert(new_map != map_);
> assert(new_map);
>
> @@ -223,7 +223,7 @@
> }
>
>
> -void Editor_Game_Base::allocate_player_maps() {
> +void EditorGameBase::allocate_player_maps() {
> iterate_players_existing(plnum, MAX_PLAYERS, *this, p) {
> p->allocate_map();
> }
> @@ -235,7 +235,7 @@
> * This happens once just after the host has started the game and before the
> * graphics are loaded.
> */
> -void Editor_Game_Base::postload()
> +void EditorGameBase::postload()
> {
> uint32_t id;
> int32_t pid;
> @@ -271,11 +271,11 @@
> * This function needs to be called once at startup when the graphics system is ready.
> * If the graphics system is to be replaced at runtime, the function must be called after that has happened.
> */
> -void Editor_Game_Base::load_graphics(UI::ProgressWindow & loader_ui)
> +void EditorGameBase::load_graphics(UI::ProgressWindow & loader_ui)
> {
> loader_ui.step(_("Loading world data"));
>
> - for (Tribe_Descr* tribe_descr : tribes_) {
> + for (TribeDescr* tribe_descr : tribes_) {
> loader_ui.stepf(_("Loading tribes"));
> tribe_descr->load_graphics();
> }
> @@ -289,12 +289,12 @@
> * \li idx is the building type index.
> * \li former_buildings is the list of former buildings
> */
> -Building & Editor_Game_Base::warp_building
> - (Coords const c, Player_Number const owner, Building_Index const idx,
> +Building & EditorGameBase::warp_building
> + (Coords const c, PlayerNumber const owner, BuildingIndex const idx,
> Building::FormerBuildings former_buildings)
> {
> Player & plr = player(owner);
> - const Tribe_Descr & tribe = plr.tribe();
> + const TribeDescr & tribe = plr.tribe();
> return
> tribe.get_building_descr(idx)->create
> (*this, plr, c, false, true, former_buildings);
> @@ -308,13 +308,13 @@
> * \li former_buildings : the former buildings. If it is not empty, this is
> * an enhancement.
> */
> -Building & Editor_Game_Base::warp_constructionsite
> - (Coords const c, Player_Number const owner,
> - Building_Index idx, bool loading,
> +Building & EditorGameBase::warp_constructionsite
> + (Coords const c, PlayerNumber const owner,
> + BuildingIndex idx, bool loading,
> Building::FormerBuildings former_buildings)
> {
> Player & plr = player(owner);
> - const Tribe_Descr & tribe = plr.tribe();
> + const TribeDescr & tribe = plr.tribe();
> return
> tribe.get_building_descr(idx)->create
> (*this, plr, c, true, loading, former_buildings);
> @@ -325,12 +325,12 @@
> * \li former_buildings : the former buildings list. This should not be empty,
> * except during loading.
> */
> -Building & Editor_Game_Base::warp_dismantlesite
> - (Coords const c, Player_Number const owner,
> +Building & EditorGameBase::warp_dismantlesite
> + (Coords const c, PlayerNumber const owner,
> bool loading, Building::FormerBuildings former_buildings)
> {
> Player & plr = player(owner);
> - const Tribe_Descr & tribe = plr.tribe();
> + const TribeDescr & tribe = plr.tribe();
>
> BuildingDescr const * const descr =
> tribe.get_building_descr
> @@ -349,15 +349,15 @@
> *
> * idx is the bob type.
> */
> -Bob & Editor_Game_Base::create_bob(Coords c, const BobDescr & descr, Player * owner)
> +Bob & EditorGameBase::create_bob(Coords c, const BobDescr & descr, Player * owner)
> {
> return descr.create(*this, owner, c);
> }
>
>
> -Bob & Editor_Game_Base::create_bob
> +Bob & EditorGameBase::create_bob
> (Coords const c,
> - int const idx, Tribe_Descr const * const tribe, Player * owner)
> + int const idx, TribeDescr const * const tribe, Player * owner)
> {
> const BobDescr & descr =
> *
> @@ -369,8 +369,8 @@
> return create_bob(c, descr, owner);
> }
>
> -Bob & Editor_Game_Base::create_bob
> - (Coords c, const std::string & name, const Widelands::Tribe_Descr * const tribe,
> +Bob & EditorGameBase::create_bob
> + (Coords c, const std::string & name, const Widelands::TribeDescr * const tribe,
> Player * owner)
> {
> const BobDescr * descr =
> @@ -395,8 +395,8 @@
> Does not perform any placability checks.
> ===============
> */
> -Immovable & Editor_Game_Base::create_immovable
> - (Coords const c, uint32_t const idx, Tribe_Descr const * const tribe)
> +Immovable & EditorGameBase::create_immovable
> + (Coords const c, uint32_t const idx, TribeDescr const * const tribe)
> {
> const ImmovableDescr & descr =
> *
> @@ -410,8 +410,8 @@
> return descr.create(*this, c);
> }
>
> -Immovable & Editor_Game_Base::create_immovable
> - (Coords const c, const std::string & name, Tribe_Descr const * const tribe)
> +Immovable & EditorGameBase::create_immovable
> + (Coords const c, const std::string & name, TribeDescr const * const tribe)
> {
> const int32_t idx =
> tribe ?
> @@ -420,7 +420,7 @@
> world().get_immovable_index(name.c_str());
> if (idx < 0)
> throw wexception
> - ("Editor_Game_Base::create_immovable(%i, %i): %s is not defined for "
> + ("EditorGameBase::create_immovable(%i, %i): %s is not defined for "
> "%s",
> c.x, c.y, name.c_str(), tribe ? tribe->name().c_str() : "world");
>
> @@ -436,7 +436,7 @@
> zero it means that this player is disabled in the game.
> ================
> */
> -Player * Editor_Game_Base::get_safe_player(Player_Number const n) {
> +Player * EditorGameBase::get_safe_player(PlayerNumber const n) {
> return get_player(n);
> }
>
> @@ -446,7 +446,7 @@
> Returns the serial number that can be used to retrieve or remove the pointer.
> ===============
> */
> -uint32_t Editor_Game_Base::add_trackpointer(void * const ptr)
> +uint32_t EditorGameBase::add_trackpointer(void * const ptr)
> {
> ++lasttrackserial_;
>
> @@ -464,7 +464,7 @@
> Returns 0 if the pointer has been removed.
> ===============
> */
> -void * Editor_Game_Base::get_trackpointer(uint32_t const serial)
> +void * EditorGameBase::get_trackpointer(uint32_t const serial)
> {
> std::map<uint32_t, void *>::iterator it = trackpointers_.find(serial);
>
> @@ -481,7 +481,7 @@
> using this serial number will return 0.
> ===============
> */
> -void Editor_Game_Base::remove_trackpointer(uint32_t serial)
> +void EditorGameBase::remove_trackpointer(uint32_t serial)
> {
> trackpointers_.erase(serial);
> }
> @@ -491,7 +491,7 @@
> *
> * make this object ready to load new data
> */
> -void Editor_Game_Base::cleanup_for_load()
> +void EditorGameBase::cleanup_for_load()
> {
> cleanup_objects(); /// Clean all the stuff up, so we can load.
>
> @@ -502,7 +502,7 @@
> }
>
>
> -void Editor_Game_Base::set_road
> +void EditorGameBase::set_road
> (FCoords const f, uint8_t const direction, uint8_t const roadtype)
> {
> const Map & m = map();
> @@ -545,8 +545,8 @@
> break;
> }
> uint8_t const road = f.field->get_roads() & mask;
> - Map_Index const i = f .field - &first_field;
> - Map_Index const neighbour_i = neighbour.field - &first_field;
> + MapIndex const i = f .field - &first_field;
> + MapIndex const neighbour_i = neighbour.field - &first_field;
> iterate_players_existing_const(plnum, MAX_PLAYERS, *this, p) {
> Player::Field & first_player_field = *p->m_fields;
> Player::Field & player_field = (&first_player_field)[i];
> @@ -563,9 +563,9 @@
>
> /// This unconquers an area. This is only possible, when there is a building
> /// placed on this node.
> -void Editor_Game_Base::unconquer_area
> - (Player_Area<Area<FCoords> > player_area,
> - Player_Number const destroying_player)
> +void EditorGameBase::unconquer_area
> + (PlayerArea<Area<FCoords> > player_area,
> + PlayerNumber const destroying_player)
> {
> assert(0 <= player_area.x);
> assert (player_area.x < map().get_width());
> @@ -602,7 +602,7 @@
>
> /// This conquers a given area because of a new (military) building that is set
> /// there.
> -void Editor_Game_Base::conquer_area(Player_Area<Area<FCoords> > player_area) {
> +void EditorGameBase::conquer_area(PlayerArea<Area<FCoords> > player_area) {
> assert(0 <= player_area.x);
> assert (player_area.x < map().get_width());
> assert(0 <= player_area.y);
> @@ -622,10 +622,10 @@
> cleanup_playerimmovables_area(player_area);
> }
>
> -void Editor_Game_Base::change_field_owner(const FCoords& fc, Player_Number const new_owner) {
> +void EditorGameBase::change_field_owner(const FCoords& fc, PlayerNumber const new_owner) {
> const Field & first_field = map()[0];
>
> - Player_Number const old_owner = fc.field->get_owned_by();
> + PlayerNumber const old_owner = fc.field->get_owned_by();
> if (old_owner == new_owner) {
> return;
> }
> @@ -648,8 +648,8 @@
> }
> }
>
> -void Editor_Game_Base::conquer_area_no_building
> - (Player_Area<Area<FCoords> > player_area)
> +void EditorGameBase::conquer_area_no_building
> + (PlayerArea<Area<FCoords> > player_area)
> {
> assert(0 <= player_area.x);
> assert (player_area.x < map().get_width());
> @@ -678,10 +678,10 @@
> // for example scripts will want to (un)conquer area of non oval shape
> // or give area back to the neutral player (this is very important for the Lua
> // testsuite).
> -void Editor_Game_Base::do_conquer_area
> - (Player_Area<Area<FCoords> > player_area,
> +void EditorGameBase::do_conquer_area
> + (PlayerArea<Area<FCoords> > player_area,
> bool const conquer,
> - Player_Number const preferred_player,
> + PlayerNumber const preferred_player,
> bool const neutral_when_no_influence,
> bool const neutral_when_competing_influence,
> bool const conquer_guarded_location_by_superior_influence)
> @@ -701,15 +701,15 @@
> Player & conquering_player = player(player_area.player_number);
> MapRegion<Area<FCoords> > mr(map(), player_area);
> do {
> - Map_Index const index = mr.location().field - &first_field;
> - Military_Influence const influence =
> + MapIndex const index = mr.location().field - &first_field;
> + MilitaryInfluence const influence =
> map().calc_influence
> (mr.location(), Area<>(player_area, player_area.radius));
>
> - Player_Number const owner = mr.location().field->get_owned_by();
> + PlayerNumber const owner = mr.location().field->get_owned_by();
> if (conquer) {
> // adds the influence
> - Military_Influence new_influence_modified = conquering_player.military_influence(index) +=
> + MilitaryInfluence new_influence_modified = conquering_player.military_influence(index) +=
> influence;
> if (owner && !conquer_guarded_location_by_superior_influence)
> new_influence_modified = 1;
> @@ -721,7 +721,7 @@
> // The player completely lost influence over the location, which he
> // owned. Now we must see if some other player has influence and if
> // so, transfer the ownership to that player.
> - Player_Number best_player;
> + PlayerNumber best_player;
> if
> (preferred_player
> &&
> @@ -730,11 +730,11 @@
> else {
> best_player =
> neutral_when_no_influence ? 0 : player_area.player_number;
> - Military_Influence highest_military_influence = 0;
> - Player_Number const nr_players = map().get_nrplayers();
> + MilitaryInfluence highest_military_influence = 0;
> + PlayerNumber const nr_players = map().get_nrplayers();
> iterate_players_existing_const(p, nr_players, *this, plr) {
> if
> - (Military_Influence const value =
> + (MilitaryInfluence const value =
> plr->military_influence(index))
> {
> if (value > highest_military_influence) {
> @@ -760,8 +760,8 @@
> }
>
> /// Makes sure that buildings cannot exist outside their owner's territory.
> -void Editor_Game_Base::cleanup_playerimmovables_area
> - (Player_Area<Area<FCoords> > const area)
> +void EditorGameBase::cleanup_playerimmovables_area
> + (PlayerArea<Area<FCoords> > const area)
> {
> std::vector<ImmovableFound> immovables;
> std::vector<PlayerImmovable *> burnlist;
>
> === modified file 'src/logic/editor_game_base.h'
> --- src/logic/editor_game_base.h 2014-07-28 16:59:54 +0000
> +++ src/logic/editor_game_base.h 2014-09-15 07:27:30 +0000
> @@ -33,23 +33,23 @@
> #include "notifications/notifications.h"
>
> namespace UI {struct ProgressWindow;}
> -struct Fullscreen_Menu_LaunchGame;
> -class Interactive_Base;
> +struct FullscreenMenuLaunchGame;
> +class InteractiveBase;
> class LuaInterface;
>
> namespace Widelands {
>
> -class Players_Manager;
> +class PlayersManager;
>
> class Battle;
> class Bob;
> struct BuildingDescr;
> class Immovable;
> class Map;
> -struct Object_Manager;
> +struct ObjectManager;
> class Player;
> struct PlayerImmovable;
> -struct Tribe_Descr;
> +struct TribeDescr;
> struct Flag;
> struct AttackController;
>
> @@ -71,14 +71,14 @@
> }
> };
>
> -class Editor_Game_Base {
> +class EditorGameBase {
> public:
> - friend class Interactive_Base;
> - friend struct Fullscreen_Menu_LaunchGame;
> - friend struct Game_Game_Class_Data_Packet;
> + friend class InteractiveBase;
> + friend struct FullscreenMenuLaunchGame;
> + friend struct GameClassPacket;
>
> - Editor_Game_Base(LuaInterface* lua);
> - virtual ~Editor_Game_Base();
> + EditorGameBase(LuaInterface* lua);
> + virtual ~EditorGameBase();
>
> void set_map(Map*);
> // TODO(sirver): this should just be const Map& map() and Map* mutable_map().
> @@ -91,10 +91,10 @@
> Map& get_map() const {
> return *map_;
> }
> - const Object_Manager& objects() const {
> + const ObjectManager& objects() const {
> return objects_;
> }
> - Object_Manager& objects() {
> + ObjectManager& objects() {
> return objects_;
> }
>
> @@ -102,15 +102,15 @@
> virtual void think();
>
> // Player commands
> - void remove_player(Player_Number);
> - Player* add_player(Player_Number,
> + void remove_player(PlayerNumber);
> + Player* add_player(PlayerNumber,
> uint8_t initialization_index,
> const std::string& tribe,
> const std::string& name,
> TeamNumber team = 0);
> Player* get_player(int32_t n) const;
> Player& player(int32_t n) const;
> - virtual Player* get_safe_player(Player_Number);
> + virtual Player* get_safe_player(PlayerNumber);
>
> // loading stuff
> void allocate_player_maps();
> @@ -123,58 +123,58 @@
> // warping stuff. instantly creating map_objects
> Building&
> warp_building(Coords,
> - Player_Number,
> - Building_Index,
> + PlayerNumber,
> + BuildingIndex,
> Building::FormerBuildings former_buildings = Building::FormerBuildings());
> Building&
> warp_constructionsite(Coords,
> - Player_Number,
> - Building_Index,
> + PlayerNumber,
> + BuildingIndex,
> bool loading = false,
> Building::FormerBuildings former_buildings = Building::FormerBuildings());
> Building&
> warp_dismantlesite(Coords,
> - Player_Number,
> + PlayerNumber,
> bool loading = false,
> Building::FormerBuildings former_buildings = Building::FormerBuildings());
> Bob& create_bob(Coords, const BobDescr&, Player* owner = nullptr);
> - Bob& create_bob(Coords, int, Tribe_Descr const* const = nullptr, Player* owner = nullptr);
> + Bob& create_bob(Coords, int, TribeDescr const* const = nullptr, Player* owner = nullptr);
> Bob& create_bob(Coords,
> const std::string& name,
> - Tribe_Descr const* const = nullptr,
> + TribeDescr const* const = nullptr,
> Player* owner = nullptr);
> - Immovable& create_immovable(Coords, uint32_t idx, Tribe_Descr const*);
> - Immovable& create_immovable(Coords, const std::string& name, Tribe_Descr const*);
> + Immovable& create_immovable(Coords, uint32_t idx, TribeDescr const*);
> + Immovable& create_immovable(Coords, const std::string& name, TribeDescr const*);
>
> int32_t get_gametime() const {
> return gametime_;
> }
> - Interactive_Base* get_ibase() const {
> + InteractiveBase* get_ibase() const {
> return ibase_;
> }
>
> // safe system for storing pointers to non-MapObject C++ objects
> - // unlike objects in the Object_Manager, these pointers need not be
> + // unlike objects in the ObjectManager, these pointers need not be
> // synchronized across the network, and they are not saved in savegames
> uint32_t add_trackpointer(void*);
> void* get_trackpointer(uint32_t serial);
> void remove_trackpointer(uint32_t serial);
>
> // Manually load a tribe into memory. Used by the editor
> - const Tribe_Descr& manually_load_tribe(const std::string& tribe);
> - const Tribe_Descr& manually_load_tribe(Player_Number const p) {
> + const TribeDescr& manually_load_tribe(const std::string& tribe);
> + const TribeDescr& manually_load_tribe(PlayerNumber const p) {
> return manually_load_tribe(map().get_scenario_player_tribe(p));
> }
> // Get a tribe from the loaded list, when known or nullptr.
> - Tribe_Descr const* get_tribe(const std::string& name) const;
> + TribeDescr const* get_tribe(const std::string& name) const;
>
> - void inform_players_about_ownership(Map_Index, Player_Number);
> - void inform_players_about_immovable(Map_Index, MapObjectDescr const*);
> + void inform_players_about_ownership(MapIndex, PlayerNumber);
> + void inform_players_about_immovable(MapIndex, MapObjectDescr const*);
> void inform_players_about_road(FCoords, MapObjectDescr const*);
>
> - void unconquer_area(Player_Area<Area<FCoords>>, Player_Number destroying_player = 0);
> - void conquer_area(Player_Area<Area<FCoords>>);
> - void conquer_area_no_building(Player_Area<Area<FCoords>> const);
> + void unconquer_area(PlayerArea<Area<FCoords>>, PlayerNumber destroying_player = 0);
> + void conquer_area(PlayerArea<Area<FCoords>>);
> + void conquer_area_no_building(PlayerArea<Area<FCoords>> const);
>
> void cleanup_objects() {
> objects().cleanup(*this);
> @@ -185,7 +185,7 @@
> int32_t& get_game_time_pointer() {
> return gametime_;
> }
> - void set_ibase(Interactive_Base* const b) {
> + void set_ibase(InteractiveBase* const b) {
> ibase_ = b;
> }
>
> @@ -194,11 +194,11 @@
> return *lua_;
> }
>
> - Players_Manager* player_manager() {
> + PlayersManager* player_manager() {
> return player_manager_.get();
> }
>
> - Interactive_GameBase* get_igbase();
> + InteractiveGameBase* get_igbase();
>
> // Returns the world.
> const World& world() const;
> @@ -207,8 +207,8 @@
> World* mutable_world();
>
> protected:
> - typedef std::vector<Tribe_Descr*> Tribe_Vector;
> - Tribe_Vector tribes_;
> + using TribeVector = std::vector<TribeDescr*>;
> + TribeVector tribes_;
>
> private:
> /// \param preferred_player
> @@ -235,35 +235,35 @@
> /// attacking) conquer a location even if another player already owns and
> /// covers the location with a militarysite, if the conquering player's
> /// influence becomes greater than the owner's influence.
> - virtual void do_conquer_area(Player_Area<Area<FCoords>> player_area,
> + virtual void do_conquer_area(PlayerArea<Area<FCoords>> player_area,
> bool conquer,
> - Player_Number preferred_player = 0,
> + PlayerNumber preferred_player = 0,
> bool neutral_when_no_influence = false,
> bool neutral_when_competing_influence = false,
> bool conquer_guarded_location_by_superior_influence = false);
> - void cleanup_playerimmovables_area(Player_Area<Area<FCoords>>);
> + void cleanup_playerimmovables_area(PlayerArea<Area<FCoords>>);
>
> // Changes the owner of 'fc' from the current player to the new player and
> // sends notifications about this.
> - void change_field_owner(const FCoords& fc, Player_Number new_owner);
> + void change_field_owner(const FCoords& fc, PlayerNumber new_owner);
>
> // TODO(unknown): -- SDL returns time as uint32. Why do I have int32 ? Please comment or change this to
> // uint32.
> int32_t gametime_;
> - Object_Manager objects_;
> + ObjectManager objects_;
>
> std::unique_ptr<LuaInterface> lua_;
> - std::unique_ptr<Players_Manager> player_manager_;
> + std::unique_ptr<PlayersManager> player_manager_;
>
> std::unique_ptr<World> world_;
> - Interactive_Base* ibase_;
> + InteractiveBase* ibase_;
> Map* map_;
>
> uint32_t lasttrackserial_;
> std::map<uint32_t, void*> trackpointers_;
>
>
> - DISALLOW_COPY_AND_ASSIGN(Editor_Game_Base);
> + DISALLOW_COPY_AND_ASSIGN(EditorGameBase);
> };
>
> #define iterate_players_existing(p, nr_players, egbase, player) \
>
> === modified file 'src/logic/expedition_bootstrap.cc'
> --- src/logic/expedition_bootstrap.cc 2014-07-28 14:17:07 +0000
> +++ src/logic/expedition_bootstrap.cc 2014-09-15 07:27:30 +0000
> @@ -26,8 +26,8 @@
> #include "io/filewrite.h"
> #include "logic/player.h"
> #include "logic/warehouse.h"
> -#include "map_io/widelands_map_map_object_loader.h"
> -#include "map_io/widelands_map_map_object_saver.h"
> +#include "map_io/map_object_loader.h"
> +#include "map_io/map_object_saver.h"
> #include "wui/interactive_gamebase.h"
>
> namespace Widelands {
> @@ -67,7 +67,7 @@
> }
>
> // static
> -void ExpeditionBootstrap::ware_callback(Game& game, WaresQueue*, Ware_Index, void* const data)
> +void ExpeditionBootstrap::ware_callback(Game& game, WaresQueue*, WareIndex, void* const data)
> {
> ExpeditionBootstrap* eb = static_cast<ExpeditionBootstrap *>(data);
> eb->is_ready(game);
> @@ -75,7 +75,7 @@
>
> // static
> void ExpeditionBootstrap::worker_callback
> - (Game& game, Request& r, Ware_Index, Worker* worker, PlayerImmovable& pi) {
> + (Game& ga
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1343297_2/+merge/234183
Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1343297_2.
References
