diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-22 18:57:11 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-22 18:57:11 +0000 |
| commit | 74ea34ca669b5027003a6c760c59903b69ddbee8 (patch) | |
| tree | d159e298d06e91885853ff9e818c5d9e7c92cecb /src/saveload | |
| parent | 6d1c974254735f5d4232907718f2cac1869c64c8 (diff) | |
| download | openttd-74ea34ca669b5027003a6c760c59903b69ddbee8.tar.xz | |
(svn r16385) -Codechange: move u.disaster to DisasterVehicle.
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/oldloader_sl.cpp | 6 | ||||
| -rw-r--r-- | src/saveload/vehicle_sl.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index 3a7eebd29..eaa488fa1 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -1131,8 +1131,8 @@ static const OldChunks vehicle_effect_chunk[] = { }; static const OldChunks vehicle_disaster_chunk[] = { - OCL_SVAR( OC_UINT16, VehicleDisaster, image_override ), - OCL_SVAR( OC_UINT16, VehicleDisaster, big_ufo_destroyer_target ), + OCL_SVAR( OC_UINT16, DisasterVehicle, image_override ), + OCL_SVAR( OC_UINT16, DisasterVehicle, big_ufo_destroyer_target ), OCL_NULL( 6 ), ///< Junk @@ -1161,7 +1161,7 @@ static bool LoadOldVehicleUnion(LoadgameState *ls, int num) case VEH_SHIP : res = LoadChunk(ls, v, vehicle_ship_chunk); break; case VEH_AIRCRAFT: res = LoadChunk(ls, &v->u.air, vehicle_air_chunk); break; case VEH_EFFECT : res = LoadChunk(ls, v, vehicle_effect_chunk); break; - case VEH_DISASTER: res = LoadChunk(ls, &v->u.disaster, vehicle_disaster_chunk); break; + case VEH_DISASTER: res = LoadChunk(ls, v, vehicle_disaster_chunk); break; } } diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index 9a4c2503d..6673081e0 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -646,8 +646,8 @@ const SaveLoad *GetVehicleDescription(VehicleType vt) SLE_CONDVAR(Vehicle, age, SLE_INT32, 31, SL_MAX_VERSION), SLE_VAR(Vehicle, tick_counter, SLE_UINT8), - SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleDisaster, image_override), SLE_UINT16), - SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleDisaster, big_ufo_destroyer_target), SLE_UINT16), + SLE_VAR(DisasterVehicle, image_override, SLE_UINT16), + SLE_VAR(DisasterVehicle, big_ufo_destroyer_target, SLE_UINT16), /* reserve extra space in savegame here. (currently 16 bytes) */ SLE_CONDNULL(16, 2, SL_MAX_VERSION), |