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

Fixed [event] tags from units being merged with the ones from unit

Browse source 
types.

Cleared events after usage.  Cleared everything from the old config
when advancing a unit except for a few attributes. (This needs testing
in order to ensure no important attribute was missed.)
This commit is contained in:
Guillaume Melquiond 2010-01-05 21:33:11 +00:00
parent 3f1fd92c11
commit 317354f343
2 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/unit.cpp
View file

@ -471,7 +471,7 @@ unit::unit(unit_map* unitmap, const config& cfg,
generate_name(state ? &(state->rng()) : 0);
game_events::add_events(cfg_.child_range("event"), type_);
game_events::add_events(cfg.child_range("event"), type_);
// Make the default upkeep "full"
if(cfg_["upkeep"].empty()) {
cfg_["upkeep"] = "full";
@ -659,6 +659,7 @@ void unit::set_game_context(unit_map *unitmap)
// In case the unit carries EventWML, apply it now
game_events::add_events(cfg_.child_range("event"), type_);
cfg_.clear_children("event");
}
void unit::generate_name(rand_rng::simple_rng* rng)
@ -773,35 +774,33 @@ void unit::advance_to(const unit_type* t, bool use_traits, game_state* state)
movement_costs_.clear();
defense_mods_.clear();
// Clear modified configs
const std::string mod_childs[] = {"advancement","attacks","movement_costs","defense","resistance","abilities"};
foreach(const std::string& tag, mod_childs) {
cfg_.clear_children(tag);
}
// Clear the stored config and replace it with the one from the unit type,
// except for a few attributes.
config old_cfg;
old_cfg.swap(cfg_);
// Remove old type's halo, animations, abilities, attacks and advancement options (AMLA)
cfg_["halo"] = "";
foreach(const std::string& tag_name, unit_animation::all_tag_names()) {
cfg_.clear_children(tag_name);
static char const *persistent_attrs[] = { "canrecruit", "upkeep", "ellipse",
"image", "usage", "random_traits", "generate_name" };
foreach (const char *attr, persistent_attrs) {
if (!old_cfg.has_attribute(attr)) continue;
cfg_[attr] = old_cfg[attr];
}
if(t->movement_type().get_parent()) {
cfg_.merge_with(t->movement_type().get_parent()->get_cfg());
}
cfg_.merge_with(t->cfg_);
// If unit has specific profile, remember it and keep it after advancing
bool specific_profile = false;
const std::string profile = cfg_["profile"];
const std::string &profile = old_cfg["profile"];
if (!profile.empty()) {
const unit_type* u_type = type();
if (u_type != NULL && profile != u_type->cfg_["profile"]){
specific_profile = true;
cfg_["profile"] = profile;
}
}
cfg_.merge_with(t->cfg_);
if (specific_profile) {
cfg_["profile"] = profile;
}
cfg_.clear_children("male");
cfg_.clear_children("female");
@ -860,6 +859,7 @@ void unit::advance_to(const unit_type* t, bool use_traits, game_state* state)
}
game_events::add_events(cfg_.child_range("event"), type_);
cfg_.clear_children("event");
set_state(STATE_POISONED,false);
set_state(STATE_SLOWED,false);
@ -2107,10 +2107,6 @@ std::vector<std::pair<std::string,std::string> > unit::amla_icons() const
return(temp);
}
void unit::reset_modifications()
{
}
std::vector<config> unit::get_modification_advances() const
{
std::vector<config> res;

1
src/unit.hpp
View file

@ -306,7 +306,6 @@ public:
const std::string& get_loop_formula() const { return unit_loop_formula_; }
const std::string& get_priority_formula() const { return unit_priority_formula_; }
void reset_modifications();
void backup_state();
void apply_modifications();
void remove_temporary_modifications();