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

Avoided rebuilding all the units again and again when the AI recruits units.

Browse source 
(Idea by Saphy.)

Simplified the code along the way.
This commit is contained in:
Guillaume Melquiond 2010-03-22 10:38:43 +00:00
parent 2823813747
commit a326d16696
2 changed files with 34 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
src/unit_types.cpp
View file

@ -1132,7 +1132,8 @@ unit_type_data::unit_type_data() :
hide_help_all_(false),
hide_help_type_(),
hide_help_race_(),
unit_cfg_(NULL)
unit_cfg_(NULL),
build_status_(unit_type::NOT_BUILT)
{
}
@ -1251,59 +1252,50 @@ void unit_type_data::clear()
types_.clear();
movement_types_.clear();
races_.clear();
build_status_ = unit_type::NOT_BUILT;
hide_help_all_ = false;
hide_help_race_.clear();
hide_help_type_.clear();
}
void unit_type_data::build_all(unit_type::BUILD_STATUS status) const
void unit_type_data::build_all(unit_type::BUILD_STATUS status)
{
assert(unit_cfg_ != NULL);
if (int(status) <= int(build_status_)) return;
assert(unit_cfg_ != NULL);
for (unit_type_map::iterator u = types_.begin(); u != types_.end(); ++u){
build_unit_type(u, status);
}
for (unit_type_map::iterator u = types_.begin(); u != types_.end(); ++u){
add_advancement(u->second);
}
for (unit_type_map::iterator u = types_.begin(), u_end = types_.end(); u != u_end; ++u) {
build_unit_type(u, status);
}
for (unit_type_map::iterator u = types_.begin(), u_end = types_.end(); u != u_end; ++u) {
add_advancement(u->second);
}
build_status_ = status;
}
unit_type &unit_type_data::build_unit_type(const unit_type_map::iterator &ut, unit_type::BUILD_STATUS status) const
{
DBG_UT << "Building unit type " << ut->first << ", level " << status << "\n";
DBG_UT << "Building unit type " << ut->first << ", level " << status << '\n';
switch (status){
case unit_type::CREATED: {
const config& unit_cfg = find_config(ut->first);
ut->second.set_config(unit_cfg);
ut->second.build_created(unit_cfg, movement_types_, races_, unit_cfg_->child_range("trait"));
break;
}
case unit_type::HELP_INDEX: {
//build the stuff that is needed to feed the help index
if ( (ut->second.build_status() == unit_type::NOT_BUILT) || (ut->second.build_status() == unit_type::CREATED) ) {
const config& unit_cfg = find_config(ut->first);
ut->second.build_help_index(unit_cfg, movement_types_, races_, unit_cfg_->child_range("trait"));
}
break;
}
case unit_type::WITHOUT_ANIMATIONS:
case unit_type::FULL: {
if ( (ut->second.build_status() == unit_type::NOT_BUILT) ||
(ut->second.build_status() == unit_type::CREATED) ||
(ut->second.build_status() == unit_type::HELP_INDEX) )
{
const config& unit_cfg = find_config(ut->first);
ut->second.build_full(unit_cfg, movement_types_, races_, unit_cfg_->child_range("trait"));
}
break;
}
default:
break;
}
const config &unit_cfg = find_config(ut->first);
if (int(status) <= int(ut->second.build_status()))
return ut->second;
return ut->second;
switch (status) {
case unit_type::CREATED:
ut->second.set_config(unit_cfg);
ut->second.build_created(unit_cfg, movement_types_, races_, unit_cfg_->child_range("trait"));
break;
case unit_type::HELP_INDEX:
// Build the data needed to feed the help index.
ut->second.build_help_index(unit_cfg, movement_types_, races_, unit_cfg_->child_range("trait"));
break;
default:
ut->second.build_full(unit_cfg, movement_types_, races_, unit_cfg_->child_range("trait"));
}
return ut->second;
}
void unit_type_data::read_hide_help(const config& cfg)

3
src/unit_types.hpp
View file

@ -346,7 +346,7 @@ public:
const unit_type *find(const std::string &key, unit_type::BUILD_STATUS status = unit_type::FULL) const;
const unit_race *find_race(const std::string &) const;
void build_all(unit_type::BUILD_STATUS status) const;
void build_all(unit_type::BUILD_STATUS status);
/** Checks if the [hide_help] tag contains these IDs. */
bool hide_help(const std::string &type_id, const std::string &race_id) const;
@ -378,6 +378,7 @@ private:
std::vector< std::set<std::string> > hide_help_race_;
const config *unit_cfg_;
unit_type::BUILD_STATUS build_status_;
};
extern unit_type_data unit_types;