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

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

Browse source
This commit is contained in:
Charles Dang 2018-01-26 13:40:54 +11:00
parent f9238c015b
commit 0f8e25f970
4 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/display_context.hpp
View file

@ -53,6 +53,7 @@ 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;

1
src/editor/editor_display.cpp
View file

@ -43,6 +43,7 @@ public:
virtual const gamemap & map() const { return em; }
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; }
};

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

@ -143,6 +143,9 @@ 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,12 +72,13 @@ 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:
const unit_map * um_;
unit_map * um_;
const gamemap * gm_;
const std::vector<team> * tm_;
const std::vector<std::string> * lbls_;