mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r9763) -Codechange/Fix (r9760): don't read the variables that are calculated automatically either.

This commit is contained in:
rubidium 2007-05-01 18:17:52 +00:00
parent 9b7a615887
commit 1bea3b55a6
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/oldloader.cpp
View File

@ -1116,11 +1116,9 @@ static const OldChunks vehicle_chunk[] = {
OCL_SVAR( OC_FILE_U16 | OC_VAR_I32, Vehicle, y_pos ),
OCL_SVAR( OC_UINT8, Vehicle, z_pos ),
OCL_SVAR( OC_UINT8, Vehicle, direction ),
OCL_SVAR( OC_INT8, Vehicle, x_offs ),
OCL_SVAR( OC_INT8, Vehicle, y_offs ),
OCL_SVAR( OC_UINT8, Vehicle, sprite_width ),
OCL_SVAR( OC_UINT8, Vehicle, sprite_height ),
OCL_SVAR( OC_UINT8, Vehicle, z_height ),
OCL_NULL( 2 ), ///< x_offs and y_offs, calculated automatically
OCL_NULL( 2 ), ///< sprite_width and sprite_height, calculated automatically
OCL_NULL( 1 ), ///< z_height, calculated automatically
OCL_SVAR( OC_UINT8, Vehicle, owner ),
OCL_SVAR( OC_TILE, Vehicle, tile ),

20
src/vehicle.cpp
View File

@ -2645,13 +2645,9 @@ extern const SaveLoad _common_veh_desc[] = {
SLE_VAR(Vehicle, z_pos, SLE_UINT8),
SLE_VAR(Vehicle, direction, SLE_UINT8),
SLE_CONDVAR(Vehicle, cur_image, SLE_UINT16, 0, 57),
SLE_CONDNULL(2, 0, 57),
SLE_VAR(Vehicle, spritenum, SLE_UINT8),
SLE_CONDVAR(Vehicle, sprite_width, SLE_UINT8, 0, 57),
SLE_CONDVAR(Vehicle, sprite_height, SLE_UINT8, 0, 57),
SLE_CONDVAR(Vehicle, z_height, SLE_UINT8, 0, 57),
SLE_CONDVAR(Vehicle, x_offs, SLE_INT8, 0, 57),
SLE_CONDVAR(Vehicle, y_offs, SLE_INT8, 0, 57),
SLE_CONDNULL(5, 0, 57),
SLE_VAR(Vehicle, engine_type, SLE_UINT16),
SLE_VAR(Vehicle, max_speed, SLE_UINT16),
@ -2819,11 +2815,7 @@ static const SaveLoad _special_desc[] = {
SLE_VAR(Vehicle, z_pos, SLE_UINT8),
SLE_VAR(Vehicle, cur_image, SLE_UINT16),
SLE_CONDVAR(Vehicle, sprite_width, SLE_UINT8, 0, 57),
SLE_CONDVAR(Vehicle, sprite_height, SLE_UINT8, 0, 57),
SLE_CONDVAR(Vehicle, z_height, SLE_UINT8, 0, 57),
SLE_CONDVAR(Vehicle, x_offs, SLE_INT8, 0, 57),
SLE_CONDVAR(Vehicle, y_offs, SLE_INT8, 0, 57),
SLE_CONDNULL(5, 0, 57),
SLE_VAR(Vehicle, progress, SLE_UINT8),
SLE_VAR(Vehicle, vehstatus, SLE_UINT8),
@ -2854,11 +2846,7 @@ static const SaveLoad _disaster_desc[] = {
SLE_VAR(Vehicle, z_pos, SLE_UINT8),
SLE_VAR(Vehicle, direction, SLE_UINT8),
SLE_CONDVAR(Vehicle, x_offs, SLE_INT8, 0, 57),
SLE_CONDVAR(Vehicle, y_offs, SLE_INT8, 0, 57),
SLE_CONDVAR(Vehicle, sprite_width, SLE_UINT8, 0, 57),
SLE_CONDVAR(Vehicle, sprite_height, SLE_UINT8, 0, 57),
SLE_CONDVAR(Vehicle, z_height, SLE_UINT8, 0, 57),
SLE_CONDNULL(5, 0, 57),
SLE_VAR(Vehicle, owner, SLE_UINT8),
SLE_VAR(Vehicle, vehstatus, SLE_UINT8),
SLE_CONDVARX(cpp_offsetof(Vehicle, current_order) + cpp_offsetof(Order, dest), SLE_FILE_U8 | SLE_VAR_U16, 0, 4),