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

Have [unit_type] variations (including [male]/[female])...

Browse source 
...inherit their parent's ID, even if inherit=no.

If a variation is really supposed to have a blank ID, that can still
be accomplished by explicitly setting id="".
This commit is contained in:
J. Tyne 2013-01-19 17:01:48 +00:00
parent 0713c12a3f
commit d971271d15
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/unit_types.cpp
View file

@ -649,9 +649,9 @@ unit_type::unit_type(const unit_type& o) :
}
unit_type::unit_type(const config &cfg) :
unit_type::unit_type(const config &cfg, const std::string & parent_id) :
cfg_(cfg),
id_(cfg_["id"]),
id_(cfg_.has_attribute("id") ? cfg_["id"].str() : parent_id),
type_name_(cfg_["name"].t_str()),
description_(),
hitpoints_(0),
@ -881,7 +881,7 @@ void unit_type::build_help_index(const movement_type_map &mv_types,
}
BOOST_FOREACH(const config &var_cfg, cfg_.child_range("variation"))
{
unit_type *ut = new unit_type(var_cfg);
unit_type *ut = new unit_type(var_cfg, id_);
ut->build_help_index(mv_types, races, traits);
variations_.insert(std::make_pair(var_cfg["variation_name"], ut));
}
@ -903,10 +903,10 @@ void unit_type::build_created(const movement_type_map &mv_types,
gender_types_[1] = NULL;
if ( const config &male_cfg = cfg_.child("male") )
gender_types_[0] = new unit_type(male_cfg);
gender_types_[0] = new unit_type(male_cfg, id_);
if ( const config &female_cfg = cfg_.child("female") )
gender_types_[1] = new unit_type(female_cfg);
gender_types_[1] = new unit_type(female_cfg, id_);
for (int i = 0; i < 2; ++i) {
if (gender_types_[i])
@ -1090,15 +1090,14 @@ bool unit_type::hide_help() const {
void unit_type::add_advancement(const unit_type &to_unit,int xp)
{
const std::string &to_id = to_unit.cfg_["id"];
const std::string &from_id = cfg_["id"];
const std::string &to_id = to_unit.id_;
// Add extra advancement path to this unit type
LOG_CONFIG << "adding advancement from " << from_id << " to " << to_id << "\n";
LOG_CONFIG << "adding advancement from " << id_ << " to " << to_id << "\n";
if(std::find(advances_to_.begin(), advances_to_.end(), to_id) == advances_to_.end()) {
advances_to_.push_back(to_id);
} else {
LOG_CONFIG << "advancement from " << from_id
LOG_CONFIG << "advancement from " << id_
<< " to " << to_id << " already known, ignoring.\n";
return;
}

2
src/unit_types.hpp
View file

@ -189,7 +189,7 @@ public:
* @note @a cfg is not copied, so it has to point to some permanent
* storage, that is, a child of unit_type_data::unit_cfg.
*/
explicit unit_type(const config &cfg);
explicit unit_type(const config &cfg, const std::string & parent_id="");
unit_type(const unit_type& o);
~unit_type();