From 0b50ce44f1e50621ca45edc19de59cca8c35d431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 22:31:19 +0200 Subject: [PATCH] Revert "Merge pull request #3937 from janisozaur/fix-3897" This reverts commit d892f6b683fa26f60154d79d7f9eab988ae0d120, reversing changes made to c487e1278b436dbfc88b659d2f9dd6ac580dab74. --- src/object.c | 10 ++-------- src/world/scenery.h | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/object.c b/src/object.c index c5e24733ae..e07d0e3ad8 100644 --- a/src/object.c +++ b/src/object.c @@ -1342,9 +1342,7 @@ typedef struct rct_small_scenery_entry_32bit { sint16 price; // 0x0C sint16 removal_price; // 0x0E uint32 var_10; // note: uint32! - uint16 var_14; - uint16 var_16; - uint16 var_18; + uint8 pad_14[0x06]; uint8 scenery_tab_id; // 0x1A } rct_small_scenery_entry_32bit; assert_struct_size(rct_small_scenery_entry_32bit, 21); @@ -1407,9 +1405,7 @@ static uint8* object_type_small_scenery_load(void *objectEntry, uint32 entryInde outSceneryEntry->small_scenery.price = sceneryEntry->small_scenery.price; outSceneryEntry->small_scenery.removal_price = sceneryEntry->small_scenery.removal_price; // var10 already set - outSceneryEntry->small_scenery.var_14 = sceneryEntry->small_scenery.var_14; - outSceneryEntry->small_scenery.var_16 = sceneryEntry->small_scenery.var_16; - outSceneryEntry->small_scenery.var_18 = sceneryEntry->small_scenery.var_18; + // pad_14 not needed set outSceneryEntry->small_scenery.scenery_tab_id = sceneryEntry->small_scenery.scenery_tab_id; return (uint8*)outSceneryEntry; @@ -1581,8 +1577,6 @@ static uint8* object_type_large_scenery_load(void *objectEntry, uint32 entryInde *((uint16*)some_pointer) = 0; } - outSceneryEntry->name = sceneryEntry->name; - outSceneryEntry->image = sceneryEntry->image; outSceneryEntry->large_scenery.tool_id = sceneryEntry->large_scenery.tool_id; outSceneryEntry->large_scenery.flags = sceneryEntry->large_scenery.flags; outSceneryEntry->large_scenery.price = sceneryEntry->large_scenery.price; diff --git a/src/world/scenery.h b/src/world/scenery.h index 27b0d9c3d9..5b83792066 100644 --- a/src/world/scenery.h +++ b/src/world/scenery.h @@ -27,7 +27,7 @@ typedef struct rct_small_scenery_entry { uint8 tool_id; // 0x0B sint16 price; // 0x0C sint16 removal_price; // 0x0E - uintptr_t var_10; + uint32 var_10; uint16 var_14; uint16 var_16; uint16 var_18;