diff options
author | rubidium <rubidium@openttd.org> | 2007-05-01 18:17:52 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-05-01 18:17:52 +0000 |
commit | dfe7c5cd667ce406866c84f46fa841c15d1d83ec (patch) | |
tree | 650ad89010f7408fa15e5de389b3761b869d356f /src/vehicle.cpp | |
parent | 7de20df3791e86c0692b05f94a68b96f45bc7a33 (diff) | |
download | openttd-dfe7c5cd667ce406866c84f46fa841c15d1d83ec.tar.xz |
(svn r9763) -Codechange/Fix (r9760): don't read the variables that are calculated automatically either.
Diffstat (limited to 'src/vehicle.cpp')
-rw-r--r-- | src/vehicle.cpp | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 4cbb4887f..143f1fc36 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -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), |