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

(svn r3589) - Rename u.road.unk2 to u.road.blocked_ctr

release/0.5
peter1138 2006-02-11 10:45:20 +00:00
parent 6f5f3101b6
commit efe76c22e6
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oldloader.c
View File

@ -1083,7 +1083,7 @@ static const OldChunks vehicle_train_chunk[] = {
static const OldChunks vehicle_road_chunk[] = { static const OldChunks vehicle_road_chunk[] = {
OCL_SVAR( OC_UINT8, VehicleRoad, state ), OCL_SVAR( OC_UINT8, VehicleRoad, state ),
OCL_SVAR( OC_UINT8, VehicleRoad, frame ), 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 ),
OCL_SVAR( OC_UINT8, VehicleRoad, overtaking_ctr ), OCL_SVAR( OC_UINT8, VehicleRoad, overtaking_ctr ),
OCL_SVAR( OC_UINT16, VehicleRoad, crashed_ctr ), OCL_SVAR( OC_UINT16, VehicleRoad, crashed_ctr ),

6
roadveh_cmd.c
View File

@ -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. // drive just through it. The ultimate backup-code of TTD.
// It can be disabled. // It can be disabled.
if (u == NULL) { if (u == NULL) {
v->u.road.unk2 = 0; v->u.road.blocked_ctr = 0;
return NULL; return NULL;
} }
if (++v->u.road.unk2 > 1480) if (++v->u.road.blocked_ctr > 1480)
return NULL; return NULL;
return u; return u;
@ -1570,7 +1570,7 @@ void OnNewDay_RoadVeh(Vehicle *v)
if ((++v->day_counter & 7) == 0) if ((++v->day_counter & 7) == 0)
DecreaseVehicleValue(v); DecreaseVehicleValue(v);
if (v->u.road.unk2 == 0) if (v->u.road.blocked_ctr == 0)
CheckVehicleBreakdown(v); CheckVehicleBreakdown(v);
AgeVehicle(v); AgeVehicle(v);

2
vehicle.c
View File

@ -2161,7 +2161,7 @@ static const SaveLoad _roadveh_desc[] = {
SLE_INCLUDEX(0, INC_VEHICLE_COMMON), SLE_INCLUDEX(0, INC_VEHICLE_COMMON),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,state), SLE_UINT8), 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,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), SLE_UINT8),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,overtaking_ctr),SLE_UINT8), SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,overtaking_ctr),SLE_UINT8),
SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,crashed_ctr), SLE_UINT16), SLE_VARX(offsetof(Vehicle,u)+offsetof(VehicleRoad,crashed_ctr), SLE_UINT16),

2
vehicle.h
View File

@ -100,7 +100,7 @@ typedef struct VehicleAir {
typedef struct VehicleRoad { typedef struct VehicleRoad {
byte state; byte state;
byte frame; byte frame;
uint16 unk2; uint16 blocked_ctr;
byte overtaking; byte overtaking;
byte overtaking_ctr; byte overtaking_ctr;
uint16 crashed_ctr; uint16 crashed_ctr;