mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Merge pull request #3937 from janisozaur/fix-3897" 

This reverts commit d892f6b683, reversing
changes made to c487e1278b.
This commit is contained in:
Michał Janiszewski 2016-06-24 22:31:19 +02:00
parent ac3d0a244d
commit 0b50ce44f1
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/object.c
View File

@ -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;

2
src/world/scenery.h
View File

@ -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;