dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

TBTR: Avoid unnecessary iterations of template replacement pool

Browse Source
This commit is contained in:
Jonathan G Rennison
2020-01-16 01:16:08 +00:00
parent 5a3b67c5c3
commit 424813446f
7 changed files with 62 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/tbtr_template_vehicle.cpp
View File

@@ -48,6 +48,7 @@ INSTANTIATE_POOL_METHODS(Template)
TemplateReplacementPool _template_replacement_pool("TemplateReplacementPool");
INSTANTIATE_POOL_METHODS(TemplateReplacement)
btree::btree_map<GroupID, TemplateID> _template_replacement_index;
void TemplateVehicleImageDimensions::SetFromTrain(const Train *t)
{
@@ -127,8 +128,22 @@ int TemplateVehicle::Length() const
return l;
}
TemplateReplacement::~TemplateReplacement()
{
if (CleaningPool()) return;
_template_replacement_index.erase(this->Group());
}
void TemplateReplacement::PreCleanPool()
{
_template_replacement_index.clear();
}
TemplateReplacement* GetTemplateReplacementByGroupID(GroupID gid)
{
if (GetTemplateIDByGroupID(gid) == INVALID_TEMPLATE) return nullptr;
for (TemplateReplacement *tr : TemplateReplacement::Iterate()) {
if (tr->Group() == gid) {
return tr;
@@ -137,6 +152,13 @@ TemplateReplacement* GetTemplateReplacementByGroupID(GroupID gid)
return nullptr;
}
TemplateID GetTemplateIDByGroupID(GroupID gid)
{
auto iter = _template_replacement_index.find(gid);
if (iter == _template_replacement_index.end()) return INVALID_TEMPLATE;
return iter->second;
}
bool IssueTemplateReplacement(GroupID gid, TemplateID tid)
{
TemplateReplacement *tr = GetTemplateReplacementByGroupID(gid);
@@ -144,13 +166,15 @@ bool IssueTemplateReplacement(GroupID gid, TemplateID tid)
if (tr) {
/* Then set the new TemplateVehicle and return */
tr->SetTemplate(tid);
_template_replacement_index[gid] = tid;
return true;
} else if (TemplateReplacement::CanAllocateItem()) {
tr = new TemplateReplacement(gid, tid);
_template_replacement_index[gid] = tid;
return true;
} else {
return false;
}
else return false;
}
short TemplateVehicle::NumGroupsUsingTemplate() const
@@ -166,6 +190,8 @@ short TemplateVehicle::NumGroupsUsingTemplate() const
short DeleteTemplateReplacementsByGroupID(GroupID g_id)
{
if (GetTemplateIDByGroupID(g_id) == INVALID_TEMPLATE) return 0;
short del_amount = 0;
for (const TemplateReplacement *tr : TemplateReplacement::Iterate()) {
if (tr->group == g_id) {
@@ -175,3 +201,11 @@ short DeleteTemplateReplacementsByGroupID(GroupID g_id)
}
return del_amount;
}
void ReindexTemplateReplacements()
{
_template_replacement_index.clear();
for (const TemplateReplacement *tr : TemplateReplacement::Iterate()) {
_template_replacement_index[tr->group] = tr->sel_template;
}
}