0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Display Context: added write-access units() overload (pure virtual)"

Browse source 
This reverts commit 0f8e25f970. For some damn reason
this was causing invalid access crashes for me on VS 2017 release builds, but no one
else could repro. Since I can implement a non-const accessor in the map_context class
anyway, I'm reverting.
This commit is contained in:
Charles Dang 2018-01-27 00:43:34 +11:00
parent 88b31f2609
commit ab4580c6ea
4 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/display_context.hpp
View file

@ -53,7 +53,6 @@ public:
virtual const std::vector<team> & teams() const = 0;
virtual const gamemap & map() const = 0;
virtual const unit_map & units() const = 0;
virtual unit_map& units() = 0;
virtual const std::vector<std::string> & hidden_label_categories() const = 0;
std::vector<std::string> & hidden_label_categories_ref();
const team& get_team(int side) const;

3
src/editor/map/map_context.hpp
View file

@ -134,9 +134,6 @@ public:
virtual const unit_map & units() const {
return units_;
}
virtual unit_map& units() {
return units_;
}
virtual const std::vector<team>& teams() const {
return teams_;
}

3
src/pathfind/teleport.cpp
View file

@ -72,13 +72,12 @@ public:
um_ = &empty_unit_map;
}
const unit_map & units() const { return *um_; }
unit_map& units() { return *um_; }
const gamemap & map() const { return *gm_; }
const std::vector<team> & teams() const { return *tm_; }
const std::vector<std::string> & hidden_label_categories() const { return *lbls_; }
private:
unit_map * um_;
const unit_map * um_;
const gamemap * gm_;
const std::vector<team> * tm_;
const std::vector<std::string> * lbls_;

1
src/tests/gui/test_gui2.cpp
View file

@ -372,7 +372,6 @@ public:
virtual const gamemap & map() const { return m; }
virtual const unit_map & units() const { return u; }
virtual unit_map& units() { return u; }
virtual const std::vector<team> & teams() const { return t; }
virtual const std::vector<std::string> & hidden_label_categories() const { return lbls; }