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

Applied InvPhi's patch (#3760) to cache unit alignment computations.

Browse source 
Presumably speeds up the AI, at a small memory expense.
This commit is contained in:
Guillaume Melquiond 2005-02-22 00:03:53 +00:00
parent a547fd2521
commit 79fe908437
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/unit_types.cpp
View file

@ -528,7 +528,7 @@ unit_type::unit_type(const unit_type& o)
leadership_(o.leadership_), illuminates_(o.illuminates_),
skirmish_(o.skirmish_), teleport_(o.teleport_),
nightvision_(o.nightvision_), steadfast_(o.steadfast_),
can_advance_(o.can_advance_),
can_advance_(o.can_advance_), alignment_(o.alignment_),
movementType_(o.movementType_), possibleTraits_(o.possibleTraits_),
genders_(o.genders_), defensive_animations_(o.defensive_animations_),
teleport_animations_(o.teleport_animations_)
@ -610,6 +610,18 @@ unit_type::unit_type(const config& cfg, const movement_type_map& mv_types,
teleport_ = has_ability("teleport");
nightvision_ = has_ability("night vision");
steadfast_ = has_ability("steadfast");
const std::string& align = cfg_["alignment"];
if(align == "lawful")
alignment_ = LAWFUL;
else if(align == "chaotic")
alignment_ = CHAOTIC;
else if(align == "neutral")
alignment_ = NEUTRAL;
else {
lg::err(lg::config) << "Invalid alignment found for " << name() << ": '" << align << "'\n";
alignment_ = NEUTRAL;
}
const std::string& alpha_blend = cfg_["alpha"];
if(alpha_blend.empty() == false) {
@ -882,17 +894,7 @@ int unit_type::movement() const
unit_type::ALIGNMENT unit_type::alignment() const
{
const std::string& align = cfg_["alignment"];
if(align == "lawful")
return LAWFUL;
else if(align == "chaotic")
return CHAOTIC;
else if(align == "neutral")
return NEUTRAL;
else {
lg::err(lg::config) << "Invalid alignment found for " << name() << ": '" << align << "'\n";
return NEUTRAL;
}
return alignment_;
}
const char* unit_type::alignment_description(unit_type::ALIGNMENT align)

1
src/unit_types.hpp
View file

@ -273,6 +273,7 @@ private:
bool nightvision_;
bool steadfast_;
bool can_advance_;
ALIGNMENT alignment_;
unit_movement_type movementType_;