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

Codechange: Move VehicleEnteredDepotThisTick call to a more suitable position. (#14065)

pull/14004/head
frosch 2025-04-21 17:52:03 +02:00 committed by GitHub
parent 7d03cee512
commit 98445088b1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/newgrf_engine.cpp
View File

@ -1311,11 +1311,6 @@ static void DoTriggerVehicle(Vehicle *v, VehicleTrigger trigger, uint16_t base_r
void TriggerVehicle(Vehicle *v, VehicleTrigger trigger) void TriggerVehicle(Vehicle *v, VehicleTrigger trigger)
{ {
if (trigger == VEHICLE_TRIGGER_DEPOT) {
/* store that the vehicle entered a depot this tick */
VehicleEnteredDepotThisTick(v);
}
v->InvalidateNewGRFCacheOfChain(); v->InvalidateNewGRFCacheOfChain();
DoTriggerVehicle(v, trigger, 0, true); DoTriggerVehicle(v, trigger, 0, true);
v->InvalidateNewGRFCacheOfChain(); v->InvalidateNewGRFCacheOfChain();

5
src/vehicle.cpp
View File

@ -925,7 +925,7 @@ Vehicle::~Vehicle()
* Adds a vehicle to the list of vehicles that visited a depot this tick * Adds a vehicle to the list of vehicles that visited a depot this tick
* @param *v vehicle to add * @param *v vehicle to add
*/ */
void VehicleEnteredDepotThisTick(Vehicle *v) static void VehicleEnteredDepotThisTick(Vehicle *v)
{ {
/* Vehicle should stop in the depot if it was in 'stopping' state */ /* Vehicle should stop in the depot if it was in 'stopping' state */
_vehicles_to_autoreplace[v->index] = !v->vehstatus.Test(VehState::Stopped); _vehicles_to_autoreplace[v->index] = !v->vehstatus.Test(VehState::Stopped);
@ -1610,6 +1610,9 @@ void VehicleEnterDepot(Vehicle *v)
VehicleServiceInDepot(v); VehicleServiceInDepot(v);
/* Store that the vehicle entered a depot this tick */
VehicleEnteredDepotThisTick(v);
/* After a vehicle trigger, the graphics and properties of the vehicle could change. */ /* After a vehicle trigger, the graphics and properties of the vehicle could change. */
TriggerVehicle(v, VEHICLE_TRIGGER_DEPOT); TriggerVehicle(v, VEHICLE_TRIGGER_DEPOT);
v->MarkDirty(); v->MarkDirty();

1
src/vehicle_func.h
View File

@ -74,7 +74,6 @@ void CheckVehicleBreakdown(Vehicle *v);
void EconomyAgeVehicle(Vehicle *v); void EconomyAgeVehicle(Vehicle *v);
void AgeVehicle(Vehicle *v); void AgeVehicle(Vehicle *v);
void RunVehicleCalendarDayProc(); void RunVehicleCalendarDayProc();
void VehicleEnteredDepotThisTick(Vehicle *v);
UnitID GetFreeUnitNumber(VehicleType type); UnitID GetFreeUnitNumber(VehicleType type);