upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-03 16:50:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed gamestatus member from class attack_type

Browse Source
This commit is contained in:
Eugen Jiresch 2009-06-22 07:20:53 +00:00
parent 34b24b48a6
commit 58d9fed35b
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/unit_abilities.cpp
View File

@ -681,7 +681,7 @@ bool attack_type::special_active(const config& cfg, bool self) const
}
}
assert(map_ && game_status_ && teams_ && tod_manager_);
assert(map_ && teams_ && tod_manager_);
foreach (const config &i, cfg.child_range("filter_adjacent_location"))
{
foreach (const std::string &j, utils::split(i["adjacent"]))
@ -749,7 +749,6 @@ void attack_type::set_specials_context(const map_location& aloc,const map_locati
dloc_ = dloc;
unitmap_ = unitmap;
map_ = map;
game_status_ = game_status;
tod_manager_ = tod_mng;
teams_ = teams;
attacker_ = attacker;
@ -762,7 +761,6 @@ void attack_type::set_specials_context(const map_location& loc, const map_locati
dloc_ = dloc;
unitmap_ = un.units_;
map_ = un.map_;
game_status_ = un.gamestatus_;
tod_manager_ = un.tod_manager_;
teams_ = un.teams_;
attacker_ = attacker;

1
src/unit_types.cpp
View File

@ -45,7 +45,6 @@ attack_type::attack_type(const config& cfg) :
attacker_(false),
unitmap_(NULL),
map_(NULL),
game_status_(NULL),
tod_manager_(NULL),
teams_(NULL),
other_attack_(NULL),

1
src/unit_types.hpp
View File

@ -79,7 +79,6 @@ public:
mutable bool attacker_;
mutable const unit_map* unitmap_;
mutable const gamemap* map_;
mutable const gamestatus* game_status_;
mutable const tod_manager* tod_manager_;
mutable const std::vector<team>* teams_;
mutable const attack_type* other_attack_;