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

De-virtualise calls to Vehicle::OnNewDay

Browse Source
This commit is contained in:
Jonathan G Rennison
2021-11-27 15:17:41 +00:00
parent 0794825187
commit 1ff03f8ee9
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/vehicle.cpp
View File

@@ -1241,6 +1241,12 @@ void VehicleEnteredDepotThisTick(Vehicle *v)
v->vehstatus |= VS_STOPPED; v->vehstatus |= VS_STOPPED;
} }
template <typename T>
void CallVehicleOnNewDay(Vehicle *v)
{
T::From(v)->T::OnNewDay();
}
/** /**
* Increases the day counter for all vehicles and calls 1-day and 32-day handlers. * Increases the day counter for all vehicles and calls 1-day and 32-day handlers.
* Each tick, it processes vehicles with "index % DAY_TICKS == _date_fract", * Each tick, it processes vehicles with "index % DAY_TICKS == _date_fract",
@@ -1274,7 +1280,22 @@ static void RunVehicleDayProc()
} }
/* This is called once per day for each vehicle, but not in the first tick of the day */ /* This is called once per day for each vehicle, but not in the first tick of the day */
v->OnNewDay(); switch (v->type) {
case VEH_TRAIN:
CallVehicleOnNewDay<Train>(v);
break;
case VEH_ROAD:
CallVehicleOnNewDay<RoadVehicle>(v);
break;
case VEH_SHIP:
CallVehicleOnNewDay<Ship>(v);
break;
case VEH_AIRCRAFT:
CallVehicleOnNewDay<Aircraft>(v);
break;
default:
break;
}
} }
} }