From 46bf0a47d9c51bfe3e903bef62101ca1946db93c Mon Sep 17 00:00:00 2001 From: Ted John Date: Thu, 23 Jun 2016 22:06:48 +0100 Subject: [PATCH] fix loading of footpath chunks --- src/object.c | 4 ++-- src/object_list.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/object.c b/src/object.c index ac0c1d0745..a80313510b 100644 --- a/src/object.c +++ b/src/object.c @@ -1929,11 +1929,11 @@ static uint8* object_type_path_load(void *objectEntry, uint32 entryIndex, int *c rct_footpath_entry *pathEntry = (rct_footpath_entry*)objectEntry; const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + 0x0E); const size_t extendedDataSize = *chunkSize - 0x0E; - *chunkSize = *chunkSize + sizeof(rct_footpath_entry) - 0x0E; + *chunkSize = *chunkSize + 0x0E - 0x0E; assert(*chunkSize > 0); rct_footpath_entry* outPathEntry = malloc(*chunkSize); assert(outPathEntry != NULL); - uint8 *extendedEntryData = (uint8*)((size_t)outPathEntry + sizeof(rct_footpath_entry)); + uint8 *extendedEntryData = (uint8*)((size_t)outPathEntry + 0x0E); memcpy(extendedEntryData, origExtendedEntryData, extendedDataSize); pathEntry->string_idx = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_PATHS, entryIndex, 0); diff --git a/src/object_list.c b/src/object_list.c index 383fee3519..a9abfc667f 100644 --- a/src/object_list.c +++ b/src/object_list.c @@ -30,7 +30,7 @@ #include "world/scenery.h" #include "world/water.h" -#define PLUGIN_VERSION 4 +#define PLUGIN_VERSION 5 #define FILTER_VERSION 1 typedef struct rct_plugin_header {