diff options
| author | peter1138 <peter1138@openttd.org> | 2011-01-04 12:04:09 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2011-01-04 12:04:09 +0000 |
| commit | 3408814169a85c31f683e17c3c6ebb74189fcdf4 (patch) | |
| tree | 2b56d048f4eedf7d842de8fc2705ee1782fd7fda | |
| parent | d9305ef99d0159415b5217c3966ff678ff89c893 (diff) | |
| download | openttd-3408814169a85c31f683e17c3c6ebb74189fcdf4.tar.xz | |
(svn r21709) -Fix (r8128): Vehicle sprite was cached into a 16 bit variable, causing incorrect sprites to be displayed.
| -rw-r--r-- | src/saveload/vehicle_sl.cpp | 4 | ||||
| -rw-r--r-- | src/vehicle_base.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp index f6e40e792..4d65a12b1 100644 --- a/src/saveload/vehicle_sl.cpp +++ b/src/saveload/vehicle_sl.cpp @@ -630,7 +630,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt) SLE_CONDVAR(Vehicle, y_pos, SLE_INT32, 6, SL_MAX_VERSION), SLE_VAR(Vehicle, z_pos, SLE_UINT8), - SLE_VAR(Vehicle, cur_image, SLE_UINT16), + SLE_VAR(Vehicle, cur_image, SLE_FILE_U16 | SLE_VAR_U32), SLE_CONDNULL(5, 0, 57), SLE_VAR(Vehicle, progress, SLE_UINT8), SLE_VAR(Vehicle, vehstatus, SLE_UINT8), @@ -669,7 +669,7 @@ const SaveLoad *GetVehicleDescription(VehicleType vt) SLE_CONDVAR(Vehicle, current_order.dest, SLE_FILE_U8 | SLE_VAR_U16, 0, 4), SLE_CONDVAR(Vehicle, current_order.dest, SLE_UINT16, 5, SL_MAX_VERSION), - SLE_VAR(Vehicle, cur_image, SLE_UINT16), + SLE_VAR(Vehicle, cur_image, SLE_FILE_U16 | SLE_VAR_U32), SLE_CONDVAR(Vehicle, age, SLE_FILE_U16 | SLE_VAR_I32, 0, 30), SLE_CONDVAR(Vehicle, age, SLE_INT32, 31, SL_MAX_VERSION), SLE_VAR(Vehicle, tick_counter, SLE_UINT8), diff --git a/src/vehicle_base.h b/src/vehicle_base.h index 3d956b12b..1e2ae6cf8 100644 --- a/src/vehicle_base.h +++ b/src/vehicle_base.h @@ -174,7 +174,7 @@ public: byte spritenum; ///< currently displayed sprite index ///< 0xfd == custom sprite, 0xfe == custom second head sprite ///< 0xff == reserved for another custom sprite - uint16 cur_image; ///< sprite number for this vehicle + SpriteID cur_image; ///< sprite number for this vehicle byte x_extent; ///< x-extent of vehicle bounding box byte y_extent; ///< y-extent of vehicle bounding box byte z_extent; ///< z-extent of vehicle bounding box |