From e1ea8201113e170f5f891e73d817d4c30716ad1a Mon Sep 17 00:00:00 2001 From: duncanspumpkin Date: Thu, 2 Feb 2017 18:20:16 +0000 Subject: [PATCH] Remove unnecessery read. Add offsets --- src/openrct2/object/WaterObject.cpp | 4 +--- src/openrct2/world/water.h | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/openrct2/object/WaterObject.cpp b/src/openrct2/object/WaterObject.cpp index 11a29e01f5..62a213500a 100644 --- a/src/openrct2/object/WaterObject.cpp +++ b/src/openrct2/object/WaterObject.cpp @@ -24,9 +24,7 @@ extern "C" void WaterObject::ReadLegacy(IReadObjectContext * context, IStream * stream) { - stream->Seek(6, STREAM_SEEK_CURRENT); - _legacyType.palette_index_1 = stream->ReadValue(); - _legacyType.palette_index_2 = stream->ReadValue(); + stream->Seek(14, STREAM_SEEK_CURRENT); _legacyType.flags = stream->ReadValue(); GetStringTable()->Read(context, stream, OBJ_STRING_ID_NAME); diff --git a/src/openrct2/world/water.h b/src/openrct2/world/water.h index 6d57ca4a83..d5d191bd8d 100644 --- a/src/openrct2/world/water.h +++ b/src/openrct2/world/water.h @@ -27,9 +27,9 @@ enum { typedef struct rct_water_type { rct_string_id string_idx; // 0x00 uint32 image_id; // 0x02 - uint32 palette_index_1; - uint32 palette_index_2; - uint16 flags; + uint32 palette_index_1; // 0x06 + uint32 palette_index_2; // 0x0A + uint16 flags; // 0x0E } rct_water_type; assert_struct_size(rct_water_type, 16); #pragma pack(pop)