dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16385) -Codechange: move u.disaster to DisasterVehicle.

Browse Source
This commit is contained in:
rubidium
2009-05-22 18:57:11 +00:00
parent 6d1c974254
commit 74ea34ca66
4 changed files with 52 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/saveload/oldloader_sl.cpp
View File

@@ -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;
}
}

4
src/saveload/vehicle_sl.cpp
View File

@@ -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),