diff --git a/src/unit_abilities.cpp b/src/unit_abilities.cpp index 309430fe926..cbd6bf45f1e 100644 --- a/src/unit_abilities.cpp +++ b/src/unit_abilities.cpp @@ -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; diff --git a/src/unit_types.cpp b/src/unit_types.cpp index f1c282f6e0e..3da95b61841 100644 --- a/src/unit_types.cpp +++ b/src/unit_types.cpp @@ -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), diff --git a/src/unit_types.hpp b/src/unit_types.hpp index 16773931d53..cd2637b37da 100644 --- a/src/unit_types.hpp +++ b/src/unit_types.hpp @@ -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* teams_; mutable const attack_type* other_attack_;