From 85ccec488546c55be535fb71059383ee74d7666c Mon Sep 17 00:00:00 2001 From: Duncan Date: Mon, 29 Sep 2014 12:46:26 +0100 Subject: [PATCH] Switched to main version of chunk read. --- src/object.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/object.c b/src/object.c index 9d2e01dbb5..bed506afdf 100644 --- a/src/object.c +++ b/src/object.c @@ -68,12 +68,12 @@ int object_load(int groupIndex, rct_object_entry *entry) if (chunkSize == 0xFFFFFFFF) { chunk = rct2_malloc(0x600000); - chunkSize = sawyercoding_read_chunk_variable(file, &chunk); + chunkSize = sawyercoding_read_chunk(file, chunk); chunk = rct2_realloc(chunk, chunkSize); } else { chunk = rct2_malloc(chunkSize); - chunkSize = sawyercoding_read_chunk_variable(file, &chunk); + chunkSize = sawyercoding_read_chunk(file, chunk); } fclose(file); @@ -124,9 +124,9 @@ int object_load(int groupIndex, rct_object_entry *entry) installedObject = object_get_next(installedObject); } //6a991f - object_load(groupIndex, entry); - - return !(RCT2_CALLPROC_X(0x006A985D, 0, 0, groupIndex, 0, 0, 0, (int)entry) & 0x400); + // Installed Object can not be found. + return 0; + //return !(RCT2_CALLPROC_X(0x006A985D, 0, 0, groupIndex, 0, 0, 0, (int)entry) & 0x400); } /** @@ -340,4 +340,4 @@ rct_object_entry *object_get_next(rct_object_entry *entry) pos += 4; return (rct_object_entry*)pos; -} \ No newline at end of file +}