upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-07 20:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix unit builds

Browse Source
This commit is contained in:
Bär Halberkamp 2016-08-01 12:18:56 -04:00
parent 864d84c2b5
commit a2639431bf
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/units/types.cpp
View File

@ -192,18 +192,6 @@ void unit_type::build_full(const movement_type_map &mv_types,
if ( race_ != &unit_race::null_race )
{
if (!race_->uses_global_traits()) {
possible_traits_.clear();
}
if ( cfg_["ignore_race_traits"].to_bool() ) {
possible_traits_.clear();
} else {
for (const config &t : race_->additional_traits())
{
if (alignment_ != unit_type::ALIGNMENT::NEUTRAL || t["id"] != "fearless")
possible_traits_.add_child("trait", t);
}
}
if (undead_variation_.empty()) {
undead_variation_ = race_->undead_variation();
}
@ -334,12 +322,30 @@ void unit_type::build_help_index(const movement_type_map &mv_types,
{
possible_traits_.add_child("trait", t);
}
if ( race_ != &unit_race::null_race )
{
if (!race_->uses_global_traits()) {
possible_traits_.clear();
}
if ( cfg_["ignore_race_traits"].to_bool() ) {
possible_traits_.clear();
} else {
for (const config &t : race_->additional_traits())
{
if (alignment_ != unit_type::ALIGNMENT::NEUTRAL || t["id"] != "fearless")
possible_traits_.add_child("trait", t);
}
}
if (undead_variation_.empty()) {
undead_variation_ = race_->undead_variation();
}
}
// Insert any traits that are just for this unit type
for (const config &trait : cfg_.child_range("trait"))
{
possible_traits_.add_child("trait", trait);
}
for (const config &var_cfg : cfg_.child_range("variation"))
{
const std::string& var_id = var_cfg["variation_id"].empty() ?