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

Support for variation= in [unit_type].

Browse source
This commit is contained in:
fendrin 2013-09-18 04:40:48 +02:00
parent 3c83420483
commit dbad165891
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/unit.cpp
View file

@ -206,7 +206,7 @@ unit::unit(const config &cfg, bool use_traits, game_state* state, const vconfig*
name_(cfg["name"].t_str()),
underlying_id_(0),
undead_variation_(),
variation_(cfg["variation"]),
variation_(cfg["variation"].empty() ? type_->default_variation() : cfg["variation"]),
hit_points_(1),
max_hit_points_(0),
experience_(0),
@ -527,7 +527,7 @@ unit::unit(const unit_type &u_type, int side, bool real_unit,
name_(),
underlying_id_(real_unit? 0: n_unit::id_manager::instance().next_fake_id()),
undead_variation_(),
variation_(),
variation_(type_->default_variation()),
hit_points_(0),
max_hit_points_(0),
experience_(0),

2
src/unit_types.cpp
View file

@ -364,6 +364,7 @@ unit_type::unit_type(const unit_type& o) :
flag_rgb_(o.flag_rgb_),
num_traits_(o.num_traits_),
variations_(o.variations_),
default_variation_(o.default_variation_),
race_(o.race_),
alpha_(o.alpha_),
abilities_(o.abilities_),
@ -418,6 +419,7 @@ unit_type::unit_type(const config &cfg, const std::string & parent_id) :
num_traits_(0),
gender_types_(),
variations_(),
default_variation_(cfg_["variation"].t_str()),
race_(&unit_race::null_race),
alpha_(ftofxp(1.0)),
abilities_(),

2
src/unit_types.hpp
View file

@ -190,6 +190,7 @@ public:
int jamming() const {return jamming_; }
int max_attacks() const { return max_attacks_; }
int cost() const { return cost_; }
const std::string& default_variation() const { return default_variation_; }
const std::string& usage() const { return usage_; }
const std::string& image() const { return image_; }
const std::string& icon() const { return icon_; }
@ -297,6 +298,7 @@ private:
typedef std::map<std::string,unit_type*> variations_map;
variations_map variations_;
std::string default_variation_;
const unit_race* race_; /// Never NULL, but may point to the null race.