mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Change: Groups cache vehicle lists 

Use std::vector<const Vehicle *> VehicleList for these lists.
pull/10548/head
SamuXarick 2023-03-06 19:58:58 +00:00
parent aef49e9933
commit ac1e2ef077
3 changed files with 98 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/group.h
View File

@ -16,6 +16,7 @@
#include "vehicle_type.h" #include "vehicle_type.h"
#include "engine_type.h" #include "engine_type.h"
#include "livery.h" #include "livery.h"
#include "vehiclelist.h"
typedef Pool<Group, GroupID, 16, 64000> GroupPool; typedef Pool<Group, GroupID, 16, 64000> GroupPool;
extern GroupPool _group_pool; ///< Pool of groups. extern GroupPool _group_pool; ///< Pool of groups.
@ -29,6 +30,7 @@ struct GroupStatistics {
uint16_t num_vehicle_min_age; ///< Number of vehicles considered for profit statistics; uint16_t num_vehicle_min_age; ///< Number of vehicles considered for profit statistics;
bool autoreplace_defined; ///< Are any autoreplace rules set? bool autoreplace_defined; ///< Are any autoreplace rules set?
bool autoreplace_finished; ///< Have all autoreplacement finished? bool autoreplace_finished; ///< Have all autoreplacement finished?
VehicleList vehicle_list; ///< List of vehicles
GroupStatistics(); GroupStatistics();
~GroupStatistics(); ~GroupStatistics();

12
src/group_cmd.cpp
View File

@ -50,6 +50,8 @@ void GroupStatistics::Clear()
/* This is also called when NewGRF change. So the number of engines might have changed. Reallocate. */ /* This is also called when NewGRF change. So the number of engines might have changed. Reallocate. */
free(this->num_engines); free(this->num_engines);
this->num_engines = CallocT<uint16_t>(Engine::GetPoolSize()); this->num_engines = CallocT<uint16_t>(Engine::GetPoolSize());
this->vehicle_list.clear();
} }
/** /**
@ -147,6 +149,16 @@ void GroupStatistics::Clear()
stats.num_vehicle_min_age += delta; stats.num_vehicle_min_age += delta;
stats.profit_last_year_min_age += v->GetDisplayProfitLastYear() * delta; stats.profit_last_year_min_age += v->GetDisplayProfitLastYear() * delta;
} }
auto it_all = std::find(stats_all.vehicle_list.begin(), stats_all.vehicle_list.end(), v);
auto it = std::find(stats.vehicle_list.begin(), stats.vehicle_list.end(), v);
if (delta == 1) {
if (it_all == stats_all.vehicle_list.end()) stats_all.vehicle_list.push_back(v);
if (it == stats.vehicle_list.end()) stats.vehicle_list.push_back(v);
} else {
if (it_all != stats_all.vehicle_list.end()) stats_all.vehicle_list.erase(it_all);
if (it != stats.vehicle_list.end()) stats.vehicle_list.erase(it);
}
} }
/** /**

84
src/openttd.cpp
View File

@ -1363,6 +1363,90 @@ static void CheckCaches()
} }
i++; i++;
} }
/* Check group vehicle_list */
for (const Company *c : Company::Iterate()) {
for (VehicleType type = VEH_BEGIN; type < VEH_COMPANY_END; type++) {
for (const Vehicle *v : Vehicle::Iterate()) {
if (v->type == type && v->owner == c->index && v->IsPrimaryVehicle()) {
if (std::find(c->group_all[type].vehicle_list.begin(), c->group_all[type].vehicle_list.end(), v) == c->group_all[type].vehicle_list.end()) {
Debug(desync, 2, "group_all vehicle list mismatch, vehicle_id {} missing in group_all of company {} of type {}", v->index, c->index, type);
}
if (v->group_id == DEFAULT_GROUP) {
if (std::find(c->group_default[type].vehicle_list.begin(), c->group_default[type].vehicle_list.end(), v) == c->group_default[type].vehicle_list.end()) {
Debug(desync, 2, "group_default vehicle list mismatch, vehicle_id {} missing in group_default of company {} of type {}", v->index, c->index, type);
}
} else if (std::find(Group::Get(v->group_id)->statistics.vehicle_list.begin(), Group::Get(v->group_id)->statistics.vehicle_list.end(), v) == Group::Get(v->group_id)->statistics.vehicle_list.end()) {
Debug(desync, 2, "group vehicle list mismatch: vehicle_id {} missing in group {}", v->index, v->group_id);
}
}
}
for (const Vehicle *v : c->group_all[type].vehicle_list) {
if (v == nullptr) {
Debug(desync, 2, "vehicle in group_all vehicle list mismatch: group_all of company {} of type {} has vehicle_id {} which does not exist", c->index, type, v->index);
continue;
}
for (const Company *c2 : Company::Iterate()) {
for (VehicleType type2 = VEH_BEGIN; type2 < VEH_COMPANY_END; type2++) {
if (c2->index == c->index && type2 == type) continue;
if (std::find(c2->group_all[type2].vehicle_list.begin(), c2->group_all[type2].vehicle_list.end(), v) != c2->group_all[type2].vehicle_list.end()) {
Debug(desync, 2, "vehicle in group_all vehicle list mismatch: group_all of company {} of type {} has vehicle_id {}, but vehicle is also in group_all of company {} of type {}", c->index, type, v->index, c2->index, type2);
}
}
}
}
for (const Vehicle *v : c->group_default[type].vehicle_list) {
if (v == nullptr) {
Debug(desync, 2, "vehicle in group_default vehicle list mismatch: group_default of type {} has vehicle_id {} which does not exist", type, v->index);
continue;
}
for (const Company *c2 : Company::Iterate()) {
for (VehicleType type2 = VEH_BEGIN; type2 < VEH_COMPANY_END; type2++) {
if (c2->index == c->index && type2 == type) continue;
if (std::find(c2->group_default[type2].vehicle_list.begin(), c2->group_default[type2].vehicle_list.end(), v) != c2->group_default[type2].vehicle_list.end()) {
Debug(desync, 2, "vehicle in group_default vehicle list mismatch: group_default of company {} of type {} has vehicle_id {}, but vehicle is also in group_default of company {} of type {}", c->index, type, v->index, c2->index, type2);
}
}
}
for (const Group *g : Group::Iterate()) {
if (std::find(g->statistics.vehicle_list.begin(), g->statistics.vehicle_list.end(), v) != g->statistics.vehicle_list.end()) {
Debug(desync, 2, "vehicle in group_default vehicle list mismatch: group_default of company {} of type {} has vehicle_id {}, but vehicle is also in group {}", c->index, type, v->index, g->index);
}
}
}
}
}
for (const Group *g : Group::Iterate()) {
for (const Vehicle *v : g->statistics.vehicle_list) {
if (v == nullptr) {
Debug(desync, 2, "vehicle in group vehicle list mismatch: group {} has vehicle_id {} which does not exist", g->index, v->index);
continue;
}
if (v->group_id != g->index) {
Debug(desync, 2, "vehicle in group vehicle list mismatch: group {} has vehicle_id {}, but vehicle has group {}", g->index, v->index, v->group_id);
}
for (const Group *g2 : Group::Iterate()) {
if (g2->index == g->index) continue;
if (std::find(g2->statistics.vehicle_list.begin(), g2->statistics.vehicle_list.end(), v) != g2->statistics.vehicle_list.end()) {
Debug(desync, 2, "vehicle in group vehicle list mismatch: group {} has vehicle_id {}, but vehicle is also in group {}", g->index, v->index, g2->index);
}
}
for (const Company *c : Company::Iterate()) {
for (VehicleType type = VEH_BEGIN; type < VEH_COMPANY_END; type++) {
if (std::find(c->group_all[type].vehicle_list.begin(), c->group_all[type].vehicle_list.end(), v) != c->group_all[type].vehicle_list.end()) {
if (v->type != type || v->owner != c->index) {
Debug(desync, 2, "vehicle in group vehicle list mismatch: group {} has vehicle_id {} of company {} of type {}, but vehicle is also in group_all of company {} of type {}", g->index, v->index, v->owner, v->type, c->index, type);
}
} else if (v->type == type && v->owner == c->index) {
Debug(desync, 2, "vehicle in group vehicle list mismatch: group {} has vehicle_id {} of company {} of type {}, but vehicle is missing in group_all of company {} of type {}", g->index, v->index, v->owner, v->type, c->index, type);
}
if (std::find(c->group_default[type].vehicle_list.begin(), c->group_default[type].vehicle_list.end(), v) != c->group_default[type].vehicle_list.end()) {
Debug(desync, 2, "vehicle in group vehicle list mismatch: group {} has vehicle_id {} of company {} of type {}, but vehicle is also in group_default of company {} of type {}", g->index, v->index, v->owner, v->type, c->index, type);
}
}
}
}
}
} }
/** /**