diff options
| -rw-r--r-- | oldloader.c | 2 | ||||
| -rw-r--r-- | roadveh_cmd.c | 6 | ||||
| -rw-r--r-- | vehicle.c | 2 | ||||
| -rw-r--r-- | vehicle.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/oldloader.c b/oldloader.c index 57b9f5ec5..b3cfa27e2 100644 --- a/oldloader.c +++ b/oldloader.c @@ -1083,7 +1083,7 @@ static const OldChunks vehicle_train_chunk[] = { static const OldChunks vehicle_road_chunk[] = { OCL_SVAR( OC_UINT8, VehicleRoad, state ), OCL_SVAR( OC_UINT8, VehicleRoad, frame ), - OCL_SVAR( OC_UINT16, VehicleRoad, unk2 ), + OCL_SVAR( OC_UINT16, VehicleRoad, blocked_ctr ), OCL_SVAR( OC_UINT8, VehicleRoad, overtaking ), OCL_SVAR( OC_UINT8, VehicleRoad, overtaking_ctr ), OCL_SVAR( OC_UINT16, VehicleRoad, crashed_ctr ), diff --git a/roadveh_cmd.c b/roadveh_cmd.c index e381acddd..0964aaf39 100644 --- a/roadveh_cmd.c +++ b/roadveh_cmd.c @@ -741,11 +741,11 @@ static Vehicle *RoadVehFindCloseTo(Vehicle *v, int x, int y, byte dir) // drive just through it. The ultimate backup-code of TTD. // It can be disabled. if (u == NULL) { - v->u.road.unk2 = 0; + v->u.road.blocked_ctr = 0; return NULL; } - if (++v->u.road.unk2 > 1480) + if (++v->u.road.blocked_ctr > 1480) return NULL; return u; @@ -1570,7 +1570,7 @@ void OnNewDay_RoadVeh(Vehicle *v) if ((++v->day_counter & 7) == 0) DecreaseVehicleValue(v); - if (v->u.road.unk2 == 0) + if (v->u.road.blocked_ctr == 0) CheckVehicleBreakdown(v); AgeVehicle(v); @@ -2161,7 +2161,7 @@ static const SaveLoad _roadveh_desc[] = { SLE_INCLUDEX(0, INC_VEHICLE_COMMON), SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,state), SLE_UINT8), SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,frame), SLE_UINT8), - SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,unk2), SLE_UINT16), + SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,blocked_ctr), SLE_UINT16), SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,overtaking), SLE_UINT8), SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,overtaking_ctr),SLE_UINT8), SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,crashed_ctr), SLE_UINT16), @@ -100,7 +100,7 @@ typedef struct VehicleAir { typedef struct VehicleRoad { byte state; byte frame; - uint16 unk2; + uint16 blocked_ctr; byte overtaking; byte overtaking_ctr; uint16 crashed_ctr; |