Skip to content

Commit

Permalink
remove unused attributes from carryover sides
Browse files Browse the repository at this point in the history
  • Loading branch information
gfgtdf committed Oct 30, 2014
1 parent d4f7ebc commit 97fc1ad
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
8 changes: 0 additions & 8 deletions src/carryover.cpp
Expand Up @@ -25,10 +25,8 @@

carryover::carryover(const config& side)
: add_(side["add"].to_bool())
, color_(side["color"])
, current_player_(side["current_player"])
, gold_(side["gold"].to_int())
, name_(side["name"])
// if we load it from a snapshot we need to read the recruits from "recruits" and not from "previous_recruits".
, previous_recruits_(side.has_attribute("recruit") ? utils::set_split(side["recruit"]) :utils::set_split(side["previous_recruits"]))
, recall_list_()
Expand All @@ -47,10 +45,8 @@ carryover::carryover(const config& side)

carryover::carryover(const team& t, const int gold, const bool add)
: add_ (add)
, color_(t.color())
, current_player_(t.current_player())
, gold_(gold)
, name_(t.name())
, previous_recruits_(t.recruits())
, recall_list_()
, save_id_(t.save_id())
Expand Down Expand Up @@ -108,9 +104,7 @@ std::string carryover::get_recruits(bool erase){
void carryover::update_carryover(const team& t, const int gold, const bool add){
gold_ += gold;
add_ = add;
color_ = t.color();
current_player_ = t.current_player();
name_ = t.name();
previous_recruits_.insert(t.recruits().begin(), t.recruits().end());
BOOST_FOREACH(const unit_const_ptr & u, t.recall_list()) {
recall_list_.push_back(config());
Expand Down Expand Up @@ -141,9 +135,7 @@ void carryover::to_config(config& cfg){
side["save_id"] = save_id_;
side["gold"] = gold_;
side["add"] = add_;
side["color"] = color_;
side["current_player"] = current_player_;
side["name"] = name_;
side["previous_recruits"] = get_recruits(false);
BOOST_FOREACH(const config & u_cfg, recall_list_)
side.add_child("unit", u_cfg);
Expand Down
4 changes: 0 additions & 4 deletions src/carryover.hpp
Expand Up @@ -18,10 +18,8 @@ class carryover{
public:
carryover()
: add_ ()
, color_()
, current_player_()
, gold_()
, name_()
, previous_recruits_()
, recall_list_()
, save_id_()
Expand All @@ -44,10 +42,8 @@ class carryover{
void set_gold(int gold, bool add);
private:
bool add_;
std::string color_;
std::string current_player_;
int gold_;
std::string name_;
std::set<std::string> previous_recruits_;
// NOTE: we store configs instead of units because units often assume or
// assert that various resources:: are available, which is not the
Expand Down

0 comments on commit 97fc1ad

Please sign in to comment.