diff options
Diffstat (limited to 'src/vehicle.cpp')
| -rw-r--r-- | src/vehicle.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index daae5c0c9..66d0ac6a0 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -2714,7 +2714,6 @@ extern const SaveLoad _common_veh_desc[] = { static const SaveLoad _train_desc[] = { - SLE_WRITEBYTE(Vehicle, type, VEH_TRAIN, 0), // Train type. VEH_TRAIN in mem, 0 in file. SLE_INCLUDEX(0, INC_VEHICLE_COMMON), SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRail, crash_anim_pos), SLE_UINT16), SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRail, force_proceed), SLE_UINT8), @@ -2732,7 +2731,6 @@ static const SaveLoad _train_desc[] = { }; static const SaveLoad _roadveh_desc[] = { - SLE_WRITEBYTE(Vehicle, type, VEH_ROAD, 1), // Road type. VEH_ROAD in mem, 1 in file. SLE_INCLUDEX(0, INC_VEHICLE_COMMON), SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRoad, state), SLE_UINT8), SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleRoad, frame), SLE_UINT8), @@ -2752,7 +2750,6 @@ static const SaveLoad _roadveh_desc[] = { }; static const SaveLoad _ship_desc[] = { - SLE_WRITEBYTE(Vehicle, type, VEH_SHIP, 2), // Ship type. VEH_SHIP in mem, 2 in file. SLE_INCLUDEX(0, INC_VEHICLE_COMMON), SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleShip, state), SLE_UINT8), @@ -2763,7 +2760,6 @@ static const SaveLoad _ship_desc[] = { }; static const SaveLoad _aircraft_desc[] = { - SLE_WRITEBYTE(Vehicle, type, VEH_AIRCRAFT, 3), // Aircraft type. VEH_AIRCRAFT in mem, 3 in file. SLE_INCLUDEX(0, INC_VEHICLE_COMMON), SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleAir, crashed_counter), SLE_UINT16), SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleAir, pos), SLE_UINT8), @@ -2782,8 +2778,6 @@ static const SaveLoad _aircraft_desc[] = { }; static const SaveLoad _special_desc[] = { - SLE_WRITEBYTE(Vehicle,type,VEH_SPECIAL, 4), - SLE_VAR(Vehicle, subtype, SLE_UINT8), SLE_CONDVAR(Vehicle, tile, SLE_FILE_U16 | SLE_VAR_U32, 0, 5), @@ -2810,8 +2804,6 @@ static const SaveLoad _special_desc[] = { }; static const SaveLoad _disaster_desc[] = { - SLE_WRITEBYTE(Vehicle, type, VEH_DISASTER, 5), - SLE_REF(Vehicle, next, REF_VEHICLE_OLD), SLE_VAR(Vehicle, subtype, SLE_UINT8), @@ -2864,6 +2856,7 @@ static void Save_VEHS() /* Write the vehicles */ FOR_ALL_VEHICLES(v) { SlSetArrayIndex(v->index); + SlWriteByte(v->type); SlObject(v, (SaveLoad*)_veh_descs[v->type]); } } @@ -2881,7 +2874,8 @@ static void Load_VEHS() error("Vehicles: failed loading savegame: too many vehicles"); v = GetVehicle(index); - SlObject(v, (SaveLoad*)_veh_descs[SlReadByte()]); + v->type = (VehicleType)SlReadByte(); + SlObject(v, (SaveLoad*)_veh_descs[v->type]); switch (v->type) { case VEH_TRAIN: v = new (v) Train(); break; |