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

Revert "fix loading of footpath chunks" 

This reverts commit 46bf0a47d9.
This commit is contained in:
Michał Janiszewski 2016-06-24 22:29:22 +02:00
parent 080f470ef1
commit 1b0a73c1cd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/object.c
View File

@ -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 + 0x0E - 0x0E;
*chunkSize = *chunkSize + sizeof(rct_footpath_entry) - 0x0E;
assert(*chunkSize > 0);
rct_footpath_entry* outPathEntry = malloc(*chunkSize);
assert(outPathEntry != NULL);
uint8 *extendedEntryData = (uint8*)((size_t)outPathEntry + 0x0E);
uint8 *extendedEntryData = (uint8*)((size_t)outPathEntry + sizeof(rct_footpath_entry));
memcpy(extendedEntryData, origExtendedEntryData, extendedDataSize);
pathEntry->string_idx = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_PATHS, entryIndex, 0);

2
src/object_list.c
View File

@ -30,7 +30,7 @@
#include "world/scenery.h"
#include "world/water.h"
#define PLUGIN_VERSION 5
#define PLUGIN_VERSION 4
#define FILTER_VERSION 1
typedef struct rct_plugin_header {