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

Fixed some copying of gender attributes to copy attribute instead of token

Browse source
This commit is contained in:
Thonsew 2011-09-24 19:03:09 +00:00
parent fcc6f2e95d
commit 96d5e7a88b
2 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/race.cpp
View file

@ -194,16 +194,16 @@ unit_race::unit_race(const config& cfg) :
}
if (plural_name_.empty()) {
lg::wml_error << "[race] '" << a_name << "' is missing a plural_name field.";
plural_name_ = (a_name.token());
plural_name_ = (a_name.t_str());
}
// use z_name if z_male_name or z_female_name aren't available
name_[MALE] = a_male_name.token();
name_[MALE] = a_male_name;
if(name_[MALE].empty()) {
name_[MALE] = (a_male_name.token());
name_[MALE] = a_male_name;
}
name_[FEMALE] = a_female_name.token();
name_[FEMALE] = a_female_name;
if(name_[FEMALE].empty()) {
name_[FEMALE] = (a_female_name.token());
name_[FEMALE] = a_female_name;
}
if(chain_size_ <= 0)

6
src/unit_types.cpp
View file

@ -986,12 +986,6 @@ const unit_type& unit_type::get_gender_unit_type(config::t_token const & gender)
else if (gender == z_male) return get_gender_unit_type(unit_race::MALE);
else return *this;
}
// const unit_type& unit_type::get_gender_unit_type(std::string gender) const
// {
// if (gender == "female") return get_gender_unit_type(unit_race::FEMALE);
// else if (gender == "male") return get_gender_unit_type(unit_race::MALE);
// else return *this;
// }
const unit_type& unit_type::get_gender_unit_type(unit_race::GENDER gender) const
{