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

invalidate units fcn treats units as const

Browse source 
Since the relevant functions are const from previous commit.
This commit is contained in:
Chris Beck 2014-06-10 09:23:24 -04:00
parent 390babf184
commit 829c66e6bc
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/display.cpp
View file

@ -3034,9 +3034,9 @@ void display::invalidate_animations_location(const map_location& loc) {
}
std::vector<unit*> display::get_unit_list_for_invalidation() {
std::vector<unit*> unit_list;
BOOST_FOREACH(unit &u, *units_) {
std::vector<const unit*> display::get_unit_list_for_invalidation() {
std::vector<const unit*> unit_list;
BOOST_FOREACH(const unit &u, *units_) {
unit_list.push_back(&u);
}
return unit_list;
@ -3056,8 +3056,8 @@ void display::invalidate_animations()
}
}
}
std::vector<unit*> unit_list=get_unit_list_for_invalidation();
BOOST_FOREACH(unit* u, unit_list) {
std::vector<const unit*> unit_list=get_unit_list_for_invalidation();
BOOST_FOREACH(const unit* u, unit_list) {
u->refresh();
}
bool new_inval;

2
src/display.hpp
View file

@ -411,7 +411,7 @@ public:
* helper function for invalidate_animations
* returns a list of units to check for invalidation
*/
virtual std::vector<unit*> get_unit_list_for_invalidation();
virtual std::vector<const unit*> get_unit_list_for_invalidation();
/**
* Per-location invalidation called by invalidate_animations()

6
src/game_display.cpp
View file

@ -620,9 +620,9 @@ void game_display::float_label(const map_location& loc, const std::string& text,
font::add_floating_label(flabel);
}
std::vector<unit*> game_display::get_unit_list_for_invalidation() {
std::vector<unit*> unit_list = display::get_unit_list_for_invalidation();;
BOOST_FOREACH(unit *u, fake_units_) {
std::vector<const unit*> game_display::get_unit_list_for_invalidation() {
std::vector<const unit*> unit_list = display::get_unit_list_for_invalidation();;
BOOST_FOREACH(const unit *u, fake_units_) {
unit_list.push_back(u);
}
return unit_list;;

2
src/game_display.hpp
View file

@ -154,7 +154,7 @@ protected:
/**
* the list of units we need to look at, game_display adds fake units
*/
virtual std::vector<unit*> get_unit_list_for_invalidation();
virtual std::vector<const unit*> get_unit_list_for_invalidation();
public: