From 6e35eac6f82318630c9e06ff197fd4632233fa15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Tue, 21 Jun 2016 23:39:04 +0200 Subject: [PATCH] Update fields in rct_small_scenery_entry_32bit --- src/object.c | 8 ++++++-- src/world/scenery.h | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/object.c b/src/object.c index ca81853f33..5de9d30937 100644 --- a/src/object.c +++ b/src/object.c @@ -1341,7 +1341,9 @@ typedef struct rct_small_scenery_entry_32bit { sint16 price; // 0x0C sint16 removal_price; // 0x0E uint32 var_10; // note: uint32! - uint8 pad_14[0x06]; + uint16 var_14; + uint16 var_16; + uint16 var_18; uint8 scenery_tab_id; // 0x1A } rct_small_scenery_entry_32bit; assert_struct_size(rct_small_scenery_entry_32bit, 21); @@ -1404,7 +1406,9 @@ 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 - // pad_14 not needed 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; outSceneryEntry->small_scenery.scenery_tab_id = sceneryEntry->small_scenery.scenery_tab_id; return (uint8*)outSceneryEntry; diff --git a/src/world/scenery.h b/src/world/scenery.h index 5b83792066..27b0d9c3d9 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 - uint32 var_10; + uintptr_t var_10; uint16 var_14; uint16 var_16; uint16 var_18;