diff options
| author | rubidium <rubidium@openttd.org> | 2009-05-22 18:56:25 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-05-22 18:56:25 +0000 |
| commit | 6d1c974254735f5d4232907718f2cac1869c64c8 (patch) | |
| tree | 040ec7971db0b35dc92880f552a790185bf0cca5 /src/saveload | |
| parent | 2365d27a4d90ec32b0a9db09fe0fe04e4559911a (diff) | |
| download | openttd-6d1c974254735f5d4232907718f2cac1869c64c8.tar.xz | |
(svn r16384) -Codechange: move u.effect to EffectVehicle
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 d692be42b..3a7eebd29 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -1122,8 +1122,8 @@ static const OldChunks vehicle_air_chunk[] = { }; static const OldChunks vehicle_effect_chunk[] = { - OCL_SVAR( OC_UINT16, VehicleEffect, animation_state ), - OCL_SVAR( OC_UINT8, VehicleEffect, animation_substate ), + OCL_SVAR( OC_UINT16, EffectVehicle, animation_state ), + OCL_SVAR( OC_UINT8, EffectVehicle, animation_substate ), OCL_NULL( 7 ), // Junk @@ -1160,7 +1160,7 @@ static bool LoadOldVehicleUnion(LoadgameState *ls, int num) case VEH_ROAD : res = LoadChunk(ls, &v->u.road, vehicle_road_chunk); break; 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->u.effect, vehicle_effect_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; } } diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index c749a27e3..9a4c2503d 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -606,8 +606,8 @@ const SaveLoad *GetVehicleDescription(VehicleType vt) SLE_VAR(Vehicle, progress, SLE_UINT8), SLE_VAR(Vehicle, vehstatus, SLE_UINT8), - SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleEffect, animation_state), SLE_UINT16), - SLE_VARX(cpp_offsetof(Vehicle, u) + cpp_offsetof(VehicleEffect, animation_substate), SLE_UINT8), + SLE_VAR(EffectVehicle, animation_state, SLE_UINT16), + SLE_VAR(EffectVehicle, animation_substate, SLE_UINT8), SLE_CONDVAR(Vehicle, spritenum, SLE_UINT8, 2, SL_MAX_VERSION), |