From 032c0d67aaca1c6f969c9732b81282f5787eccbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 22:29:56 +0200 Subject: [PATCH] Revert "fix loading of STEX object chunks" This reverts commit 3275c44bbbc7e1bf1e4435c017c9b76317aa7fff. --- src/object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/object.c b/src/object.c index ac0c1d0745..2aaf278630 100644 --- a/src/object.c +++ b/src/object.c @@ -2472,11 +2472,11 @@ static uint8* object_type_stex_load(void *objectEntry, uint32 entryIndex, int *c rct_stex_entry *stexEntry = (rct_stex_entry*)objectEntry; const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + 0x08); const size_t extendedDataSize = *chunkSize - 0x08; - *chunkSize = *chunkSize + 0x08 - 0x08; + *chunkSize = *chunkSize + sizeof(rct_stex_entry) - 0x08; assert(*chunkSize > 0); rct_stex_entry* outStexEntry = malloc(*chunkSize); assert(outStexEntry != NULL); - uint8 *stringTable = (uint8*)((size_t)outStexEntry + 0x08); + uint8 *stringTable = (uint8*)((size_t)outStexEntry + sizeof(rct_stex_entry)); memcpy(stringTable, origExtendedEntryData, extendedDataSize); stexEntry->scenario_name = object_get_localised_text(&stringTable, OBJECT_TYPE_SCENARIO_TEXT, entryIndex, 0);