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

Optimize a little registering of specific profile's unit.

Browse source
This commit is contained in:
Ali El Gariani 2009-12-03 02:26:58 +00:00
parent 5cd75ad594
commit 0a76731c0b
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/unit.cpp
View file

@ -765,17 +765,18 @@ void unit::advance_to(const unit_type* t, bool use_traits, game_state* state)
cfg_.merge_with(t->movement_type().get_parent()->get_cfg());
}
// If unit has specific profile, remember it and keep it after advancing
std::string specific_profile;
if (type() != NULL) {
const std::string profile = cfg_["profile"];
if (!profile.empty() && profile != type()->cfg_["profile"]){
specific_profile = profile;
bool specific_profile = false;
const std::string profile = cfg_["profile"];
if (!profile.empty()) {
const unit_type* u_type = type();
if (u_type != NULL && profile != u_type->cfg_["profile"]){
specific_profile = true;
}
}
cfg_.merge_with(t->cfg_);
if (!specific_profile.empty()) {
cfg_["profile"] = specific_profile;
if (specific_profile) {
cfg_["profile"] = profile;
}
cfg_.clear_children("male");
cfg_.clear_children("female");