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

De-virtualise most common calls to Vehicle::Tick

Browse Source
This commit is contained in:
Jonathan G Rennison
2019-01-19 04:29:52 +00:00
parent 08998d95ba
commit 841ea7639f
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/vehicle.cpp
View File

@@ -1145,7 +1145,14 @@ void CallVehicleTicks()
SCOPE_INFO_FMT([&v], "CallVehicleTicks: %s", scope_dumper().VehicleInfo(v)); SCOPE_INFO_FMT([&v], "CallVehicleTicks: %s", scope_dumper().VehicleInfo(v));
FOR_ALL_VEHICLES(v) { FOR_ALL_VEHICLES(v) {
/* Vehicle could be deleted in this tick */ /* Vehicle could be deleted in this tick */
if (!v->Tick()) { auto tick = [](Vehicle *v) -> bool {
/* De-virtualise most common cases */
if (v->type == VEH_TRAIN) return Train::From(v)->Train::Tick();
if (v->type == VEH_ROAD) return RoadVehicle::From(v)->RoadVehicle::Tick();
if (v->type == VEH_AIRCRAFT) return Aircraft::From(v)->Aircraft::Tick();
return v->Tick();
};
if (!tick(v)) {
assert(Vehicle::Get(vehicle_index) == NULL); assert(Vehicle::Get(vehicle_index) == NULL);
continue; continue;
} }