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

TBTR: Re-index recursive replacements on group topology changes

Browse Source
This commit is contained in:
Jonathan G Rennison
2023-03-24 21:47:14 +00:00
parent 9f9cc99fc1
commit 1ad77f8697
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/group_cmd.cpp
View File

@@ -385,6 +385,7 @@ CommandCost CmdCreateGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
g->livery.colour1 = pg->livery.colour1; g->livery.colour1 = pg->livery.colour1;
g->livery.colour2 = pg->livery.colour2; g->livery.colour2 = pg->livery.colour2;
g->flags = pg->flags; g->flags = pg->flags;
if (vt == VEH_TRAIN) ReindexTemplateReplacementsRecursive();
} }
_new_group_id = g->index; _new_group_id = g->index;
@@ -440,7 +441,7 @@ CommandCost CmdDeleteGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
VehicleType vt = g->vehicle_type; VehicleType vt = g->vehicle_type;
/* Delete all template replacements using the just deleted group */ /* Delete all template replacements using the just deleted group */
DeleteTemplateReplacementsByGroupID(g->index); DeleteTemplateReplacementsByGroupID(g);
/* notify tracerestrict that group is about to be deleted */ /* notify tracerestrict that group is about to be deleted */
TraceRestrictRemoveGroupID(g->index); TraceRestrictRemoveGroupID(g->index);
@@ -506,6 +507,7 @@ CommandCost CmdAlterGroup(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
if (flags & DC_EXEC) { if (flags & DC_EXEC) {
g->parent = (pg == nullptr) ? INVALID_GROUP : pg->index; g->parent = (pg == nullptr) ? INVALID_GROUP : pg->index;
GroupStatistics::UpdateAutoreplace(g->owner); GroupStatistics::UpdateAutoreplace(g->owner);
if (g->vehicle_type == VEH_TRAIN) ReindexTemplateReplacementsRecursive();
if (g->livery.in_use == 0) { if (g->livery.in_use == 0) {
const Livery *livery = GetParentLivery(g); const Livery *livery = GetParentLivery(g);
@@ -1050,7 +1052,7 @@ void RemoveAllGroupsForCompany(const CompanyID company)
{ {
for (Group *g : Group::Iterate()) { for (Group *g : Group::Iterate()) {
if (company == g->owner) { if (company == g->owner) {
DeleteTemplateReplacementsByGroupID(g->index); DeleteTemplateReplacementsByGroupID(g);
delete g; delete g;
} }
} }

16
src/tbtr_template_vehicle.cpp
View File

@@ -54,7 +54,6 @@ INSTANTIATE_POOL_METHODS(TemplateReplacement)
robin_hood::unordered_flat_map<GroupID, TemplateID> _template_replacement_index; robin_hood::unordered_flat_map<GroupID, TemplateID> _template_replacement_index;
robin_hood::unordered_flat_map<GroupID, TemplateID> _template_replacement_index_recursive; robin_hood::unordered_flat_map<GroupID, TemplateID> _template_replacement_index_recursive;
static void ReindexTemplateReplacementsRecursive();
static void MarkTrainsInGroupAsPendingTemplateReplacement(GroupID gid, const TemplateVehicle *tv); static void MarkTrainsInGroupAsPendingTemplateReplacement(GroupID gid, const TemplateVehicle *tv);
void TemplateVehicleImageDimensions::SetFromTrain(const Train *t) void TemplateVehicleImageDimensions::SetFromTrain(const Train *t)
@@ -291,13 +290,20 @@ uint TemplateVehicle::NumGroupsUsingTemplate() const
return amount; return amount;
} }
uint DeleteTemplateReplacementsByGroupID(GroupID g_id) uint DeleteTemplateReplacementsByGroupID(const Group *g)
{ {
if (GetTemplateIDByGroupID(g_id) == INVALID_TEMPLATE) return 0; if (g->vehicle_type != VEH_TRAIN) return 0;
if (g->parent != INVALID_GROUP) {
/* Erase any inherited replacement */
_template_replacement_index_recursive.erase(g->index);
}
if (GetTemplateIDByGroupID(g->index) == INVALID_TEMPLATE) return 0;
uint del_amount = 0; uint del_amount = 0;
for (const TemplateReplacement *tr : TemplateReplacement::Iterate()) { for (const TemplateReplacement *tr : TemplateReplacement::Iterate()) {
if (tr->group == g_id) { if (tr->group == g->index) {
delete tr; delete tr;
del_amount++; del_amount++;
} }
@@ -314,7 +320,7 @@ void ReindexTemplateReplacements()
ReindexTemplateReplacementsRecursive(); ReindexTemplateReplacementsRecursive();
} }
static void ReindexTemplateReplacementsRecursive() void ReindexTemplateReplacementsRecursive()
{ {
_template_replacement_index_recursive.clear(); _template_replacement_index_recursive.clear();
for (const Group *group : Group::Iterate()) { for (const Group *group : Group::Iterate()) {

3
src/tbtr_template_vehicle.h
View File

@@ -227,9 +227,10 @@ bool IssueTemplateReplacement(GroupID gid, TemplateID tid);
bool ShouldServiceTrainForTemplateReplacement(const Train *t, const TemplateVehicle *tv); bool ShouldServiceTrainForTemplateReplacement(const Train *t, const TemplateVehicle *tv);
void MarkTrainsUsingTemplateAsPendingTemplateReplacement(const TemplateVehicle *tv); void MarkTrainsUsingTemplateAsPendingTemplateReplacement(const TemplateVehicle *tv);
uint DeleteTemplateReplacementsByGroupID(GroupID g_id); uint DeleteTemplateReplacementsByGroupID(const Group *g);
void ReindexTemplateReplacements(); void ReindexTemplateReplacements();
void ReindexTemplateReplacementsRecursive();
int GetTemplateVehicleEstimatedMaxAchievableSpeed(const TemplateVehicle *tv, int mass, const int speed_cap); int GetTemplateVehicleEstimatedMaxAchievableSpeed(const TemplateVehicle *tv, int mass, const int speed_cap);