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

Speed up access to the "canrecruit" unit flag.

Browse source
This commit is contained in:
Guillaume Melquiond 2010-02-09 19:46:03 +00:00
parent 92753783d3
commit aa1cc3c869
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/unit.cpp
View file

@ -139,6 +139,7 @@ unit::unit(const unit& o):
experience_(o.experience_),
max_experience_(o.max_experience_),
level_(o.level_),
canrecruit_(o.canrecruit_),
alignment_(o.alignment_),
flag_rgb_(o.flag_rgb_),
image_mods_(o.image_mods_),
@ -224,6 +225,7 @@ unit::unit(unit_map* unitmap, const config& cfg,
experience_(0),
max_experience_(0),
level_(0),
canrecruit_(utils::string_bool(cfg["canrecruit"])),
alignment_(),
flag_rgb_(),
image_mods_(),
@ -519,6 +521,7 @@ unit::unit(unit_map* unitmap, const config& cfg,
"max_hitpoints", "max_moves", "max_experience",
"advances_to", "hitpoints", "goto_x", "goto_y", "moves",
"experience", "resting", "unrenamable", "alignment",
"canrecruit",
// Useless attributes created when saving units to WML:
"flag_rgb", "language_name" };
foreach (const char *attr, internalized_attrs) {
@ -527,7 +530,7 @@ unit::unit(unit_map* unitmap, const config& cfg,
}
static char const *raw_attrs[] = { "description", "halo",
"profile", "upkeep", "canrecruit", "usage", "ellipse",
"profile", "upkeep", "usage", "ellipse",
"image", "random_traits", "generate_name" };
foreach (const char *attr, raw_attrs) {
input_cfg.remove_attribute(attr);
@ -566,6 +569,7 @@ unit::unit(unit_map *unitmap, const unit_type *t, int side,
experience_(0),
max_experience_(0),
level_(0),
canrecruit_(false),
alignment_(),
flag_rgb_(),
image_mods_(),
@ -803,7 +807,7 @@ void unit::advance_to(const unit_type* t, bool use_traits, game_state* state)
config old_cfg;
old_cfg.swap(cfg_);
static char const *persistent_attrs[] = { "canrecruit", "upkeep", "ellipse",
static char const *persistent_attrs[] = { "upkeep", "ellipse",
"image", "usage", "random_traits", "generate_name" };
foreach (const char *attr, persistent_attrs) {
if (!old_cfg.has_attribute(attr)) continue;

3
src/unit.hpp
View file

@ -131,7 +131,7 @@ public:
void set_side(unsigned int new_side) { side_ = new_side; }
fixed_t alpha() const { return alpha_; }
bool can_recruit() const { return utils::string_bool(cfg_["canrecruit"]); }
bool can_recruit() const { return canrecruit_; }
bool incapacitated() const { return get_state(STATE_PETRIFIED); }
int total_movement() const { return max_movement_; }
int movement_left() const { return (movement_ == 0 || incapacitated()) ? 0 : movement_; }
@ -371,6 +371,7 @@ private:
int experience_;
int max_experience_;
int level_;
bool canrecruit_;
unit_type::ALIGNMENT alignment_;
std::string flag_rgb_;
std::string image_mods_;