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

Have unit::advance_to() no longer change the unit's current hit points.

Browse source 
This was overridden more often than not anyway, and the code is
overall simpler without hit points being changed by this function.
This commit is contained in:
J. Tyne 2013-01-05 14:11:53 +00:00
parent 391198f281
commit e8796a8279
3 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/actions/attack.cpp
View file

@ -1201,6 +1201,7 @@ unit get_advanced_unit(const unit &u, const std::string& advance_to)
unit new_unit(u);
new_unit.set_experience(new_unit.experience() - new_unit.max_experience());
new_unit.advance_to(new_type);
new_unit.heal_all();
new_unit.set_state(unit::STATE_POISONED, false);
new_unit.set_state(unit::STATE_SLOWED, false);
new_unit.set_state(unit::STATE_PETRIFIED, false);

7
src/scripting/lua.cpp
View file

@ -2613,9 +2613,16 @@ static int intf_transform_unit(lua_State *L)
{
unit *u = luaW_checkunit(L, 1);
char const *m = luaL_checkstring(L, 2);
const bool full_heal = u->type_id() != m;
const unit_type *utp = unit_types.find(m);
if (!utp) return luaL_argerror(L, 2, "unknown unit type");
u->advance_to(utp);
// This is to exactly preserve the old behavior, but perhaps it should
// be removed?
if ( full_heal )
u->heal_all();
return 0;
}

30
src/unit.cpp
View file

@ -823,6 +823,11 @@ std::vector<std::string> unit::get_traits_list() const
return res;
}
/**
* Advances this unit to the specified type.
* Current hit points and experience are left unchanged.
*/
void unit::advance_to(const config &old_cfg, const unit_type *t,
bool use_traits)
{
@ -890,6 +895,7 @@ void unit::advance_to(const config &old_cfg, const unit_type *t,
advances_to_ = t->advances_to();
race_ = t->race();
type_ = t->id();
type_name_ = t->type_name();
cfg_["description"] = t->unit_description();
undead_variation_ = t->undead_variation();
@ -897,7 +903,6 @@ void unit::advance_to(const config &old_cfg, const unit_type *t,
level_ = t->level();
alignment_ = t->alignment();
alpha_ = t->alpha();
hit_points_ = t->hitpoints();
max_hit_points_ = t->hitpoints();
max_movement_ = t->movement();
vision_ = t->vision();
@ -914,13 +919,6 @@ void unit::advance_to(const config &old_cfg, const unit_type *t,
flag_rgb_ = t->flag_rgb();
bool do_heal = false; // Track whether unit should get fully healed.
if(type_id()!=t->id()) {
do_heal = true; // Can't heal until after mods applied.
type_ = t->id();
}
if (cfg_["random_traits"].to_bool(true)) {
generate_traits(!use_traits);
} else {
@ -937,12 +935,6 @@ void unit::advance_to(const config &old_cfg, const unit_type *t,
// that may result in different effects after the advancement.
apply_modifications();
// Not that the unit has all of its modifications applied, it is
// OK to heal it.
if (do_heal) {
heal_all();
}
// In case the unit carries EventWML, apply it now
game_events::add_events(cfg_.child_range("event"), type_);
cfg_.clear_children("event");
@ -1163,13 +1155,8 @@ void unit::expire_modifications(const std::string & duration)
}
if ( rebuild_from_type ) {
// So we can preserve hit points:
int old_hp = hit_points_;
clear_haloes();
advance_to(type());
if ( hit_points_ > old_hp )
hit_points_ = old_hp;
}
}
@ -2866,11 +2853,10 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
const unit_type* type = unit_types.find(type_id);
if(type) {
const bool heal_full = last_effect["heal_full"].to_bool(false);
int hit_points = hit_points_;
advance_to(type);
preferences::encountered_units().insert(type_id);
if(!heal_full) {
hit_points_ = hit_points;
if( heal_full ) {
heal_all();
}
} else {
WRN_UT << "unknown type= in [effect]apply_to=type, ignoring\n";