Added key 'ignore_race_traits' to [unit].
This commit is contained in:
parent
f52f2a12d2
commit
bb4a039df9
1 changed files with 7 additions and 3 deletions
|
@ -667,9 +667,13 @@ unit_type::unit_type(const config& cfg, const movement_type_map& mv_types,
|
|||
if(race_->uses_global_traits() == false) {
|
||||
possibleTraits_.clear();
|
||||
}
|
||||
|
||||
const config::child_list& traits = race_->additional_traits();
|
||||
possibleTraits_.insert(possibleTraits_.end(),traits.begin(),traits.end());
|
||||
|
||||
if(cfg["ignore_race_traits"] == "yes") {
|
||||
possibleTraits_.clear();
|
||||
} else {
|
||||
const config::child_list& traits = race_->additional_traits();
|
||||
possibleTraits_.insert(possibleTraits_.end(),traits.begin(),traits.end());
|
||||
}
|
||||
}
|
||||
} else {
|
||||
static const unit_race dummy_race;
|
||||
|
|
Loading…
Add table
Reference in a new issue