From 1b0a73c1cdf17cdb13c639ea28efd4e506667b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 22:29:22 +0200 Subject: [PATCH 01/17] Revert "fix loading of footpath chunks" This reverts commit 46bf0a47d9c51bfe3e903bef62101ca1946db93c. --- 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 a80313510b..ac0c1d0745 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 + 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); diff --git a/src/object_list.c b/src/object_list.c index a9abfc667f..383fee3519 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 5 +#define PLUGIN_VERSION 4 #define FILTER_VERSION 1 typedef struct rct_plugin_header { 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 02/17] 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); From 1711d52c18b4a8cb6ced532c611c34207f9adc2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 22:30:41 +0200 Subject: [PATCH 03/17] Revert "free initial object chunk" This reverts commit 9b958bfb47b3cb076a36c4faa1664c9d197178cd. --- src/object.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/object.c b/src/object.c index 2aaf278630..3797d388ba 100644 --- a/src/object.c +++ b/src/object.c @@ -132,9 +132,7 @@ int object_load_file(int groupIndex, const rct_object_entry *entry, int* chunkSi } if (RCT2_GLOBAL(0x9ADAFD, uint8) != 0) { - uint8 *oldChunk = chunk; - chunk = object_load(objectType, oldChunk, groupIndex, chunkSize); - free(oldChunk); + chunk = object_load(objectType, chunk, groupIndex, chunkSize); } chunk_list[groupIndex] = chunk; From ac3d0a244dd9a48dc873611842014d79402ed14a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 22:30:57 +0200 Subject: [PATCH 04/17] Revert "fix loading of large scenery objects" This reverts commit 00bc8fadc484fb69362d29117ce6c7f41ad04c81. --- src/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/object.c b/src/object.c index 3797d388ba..c5e24733ae 100644 --- a/src/object.c +++ b/src/object.c @@ -1549,7 +1549,7 @@ static uint8* object_type_large_scenery_load(void *objectEntry, uint32 entryInde } } - extendedEntryData += sizeof(rct_object_entry); + extendedEntryData += sizeof(rct_scenery_entry_32bit); if (sceneryEntry->large_scenery.flags & (1 << 2)) { outSceneryEntry->large_scenery.text = (rct_large_scenery_text*)extendedEntryData; extendedEntryData += 1038; From 0b50ce44f1e50621ca45edc19de59cca8c35d431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 22:31:19 +0200 Subject: [PATCH 05/17] Revert "Merge pull request #3937 from janisozaur/fix-3897" This reverts commit d892f6b683fa26f60154d79d7f9eab988ae0d120, reversing changes made to c487e1278b436dbfc88b659d2f9dd6ac580dab74. --- src/object.c | 10 ++-------- src/world/scenery.h | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/object.c b/src/object.c index c5e24733ae..e07d0e3ad8 100644 --- a/src/object.c +++ b/src/object.c @@ -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; diff --git a/src/world/scenery.h b/src/world/scenery.h index 27b0d9c3d9..5b83792066 100644 --- a/src/world/scenery.h +++ b/src/world/scenery.h @@ -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; From fbd4c8be49b379445f690f962d2739e3a36c8284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 22:32:09 +0200 Subject: [PATCH 06/17] Revert "Merge pull request #3930 from janisozaur/fix-3923" This reverts commit 9f2f7c6b68521b3b5f6d9923d42065e905f51b66, reversing changes made to 27b74dff72445d22b3ab8f9eb7d0eb62f7af2c6e. --- src/config.c | 36 ------------------------------------ 1 file changed, 36 deletions(-) diff --git a/src/config.c b/src/config.c index 4ec41c744c..59b7f49a9c 100644 --- a/src/config.c +++ b/src/config.c @@ -331,8 +331,6 @@ static void config_write_enum(SDL_RWops *file, uint8 type, value_union *value, c static void utf8_skip_whitespace(utf8 **outch); static void utf8_skip_non_whitespace(utf8 **outch); -void config_apply_to_old_addresses(); - static int rwopsreadc(SDL_RWops *file) { int c = 0; @@ -466,7 +464,6 @@ bool config_open_default() config_get_default_path(path); if (config_open(path)) { - config_apply_to_old_addresses(); return true; } @@ -479,7 +476,6 @@ bool config_save_default() config_get_default_path(path); if (config_save(path)) { - config_apply_to_old_addresses(); return true; } @@ -944,38 +940,6 @@ bool config_find_or_browse_install_directory() return true; } -#pragma region Obsolete - -/** - * Any code not implemented in OpenRCT2 will still uses the old configuration option addresses. This function copies all the - * OpenRCT2 configuration options to those addresses until the process is no longer necessary. - */ -void config_apply_to_old_addresses() -{ -#if !defined(NO_RCT2) - RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_EDGE_SCROLLING, sint8) = gConfigGeneral.edge_scrolling; - RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_CURRENCY, sint8) = gConfigGeneral.currency_format; - RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) = gConfigGeneral.measurement_format; - RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_TEMPERATURE, sint8) = gConfigGeneral.temperature_format; - RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_CONSTRUCTION_MARKER, uint8) = gConfigGeneral.construction_marker_colour; - RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = get_height_marker_offset(); - - int configFlags = 0; - if (gConfigGeneral.always_show_gridlines) - configFlags |= CONFIG_FLAG_ALWAYS_SHOW_GRIDLINES; - if (!gConfigGeneral.landscape_smoothing) - configFlags |= CONFIG_FLAG_DISABLE_SMOOTH_LANDSCAPE; - if (gConfigGeneral.show_height_as_units) - configFlags |= CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS; - if (gConfigGeneral.save_plugin_data) - configFlags |= CONFIG_FLAG_SAVE_PLUGIN_DATA; - - RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) = configFlags; -#endif // !defined(NO_RCT2) -} - -#pragma endregion - #pragma region Shortcuts #define SHIFT 0x100 From dfa482b1b5b5b753b0696485d39f0338a97b7025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 22:35:29 +0200 Subject: [PATCH 07/17] Revert "Merge pull request #3897 from janisozaur/rebase-no-rct2" This reverts commit 22c0cc92e64d0c984b80dfe0d56fa40f81cde241, reversing changes made to 7b421c8052143ffa5ddfebb1e835b6c2f697d7ad. --- src/cmdline/RootCommands.cpp | 3 - src/common.h | 2 - src/config.c | 34 + src/drawing/drawing.c | 2 +- src/drawing/drawing.h | 19 +- src/drawing/sprite.c | 52 +- src/game.c | 2 +- src/interface/console.c | 2 +- src/object.c | 1407 ++++++---------------------------- src/object.h | 4 +- src/object_list.c | 14 +- src/openrct2.c | 6 +- src/rct1.c | 15 +- src/rct1.h | 1 - src/rct2.c | 60 +- src/rct2.h | 7 - src/ride/ride.c | 13 +- src/ride/ride.h | 4 +- src/ride/vehicle.h | 4 +- src/scenario.c | 23 +- src/scenario.h | 22 +- src/windows/loadsave.c | 2 +- src/world/scenery.h | 11 +- 23 files changed, 374 insertions(+), 1335 deletions(-) diff --git a/src/cmdline/RootCommands.cpp b/src/cmdline/RootCommands.cpp index 89f0a29571..32c1e2045e 100644 --- a/src/cmdline/RootCommands.cpp +++ b/src/cmdline/RootCommands.cpp @@ -411,9 +411,6 @@ static void PrintVersion() openrct2_write_full_version_info(buffer, sizeof(buffer)); Console::WriteLine(buffer); Console::WriteFormat("%s (%s)", OPENRCT2_PLATFORM, OPENRCT2_ARCHITECTURE); -#if NO_RCT2 - Console::Write(" (NO_RCT2)"); -#endif Console::WriteLine(); } diff --git a/src/common.h b/src/common.h index 9e6435a3df..cd2a13869c 100644 --- a/src/common.h +++ b/src/common.h @@ -32,8 +32,6 @@ #if defined(__i386__) || defined(_M_IX86) #define PLATFORM_X86 -#else -#define NO_RCT2 1 #endif #if defined(__LP64__) || defined(_WIN64) diff --git a/src/config.c b/src/config.c index 59b7f49a9c..07fb167ba4 100644 --- a/src/config.c +++ b/src/config.c @@ -331,6 +331,8 @@ static void config_write_enum(SDL_RWops *file, uint8 type, value_union *value, c static void utf8_skip_whitespace(utf8 **outch); static void utf8_skip_non_whitespace(utf8 **outch); +void config_apply_to_old_addresses(); + static int rwopsreadc(SDL_RWops *file) { int c = 0; @@ -464,6 +466,7 @@ bool config_open_default() config_get_default_path(path); if (config_open(path)) { + config_apply_to_old_addresses(); return true; } @@ -476,6 +479,7 @@ bool config_save_default() config_get_default_path(path); if (config_save(path)) { + config_apply_to_old_addresses(); return true; } @@ -940,6 +944,36 @@ bool config_find_or_browse_install_directory() return true; } +#pragma region Obsolete + +/** + * Any code not implemented in OpenRCT2 will still uses the old configuration option addresses. This function copies all the + * OpenRCT2 configuration options to those addresses until the process is no longer necessary. + */ +void config_apply_to_old_addresses() +{ + RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_EDGE_SCROLLING, sint8) = gConfigGeneral.edge_scrolling; + RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_CURRENCY, sint8) = gConfigGeneral.currency_format; + RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) = gConfigGeneral.measurement_format; + RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_TEMPERATURE, sint8) = gConfigGeneral.temperature_format; + RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_CONSTRUCTION_MARKER, uint8) = gConfigGeneral.construction_marker_colour; + RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_HEIGHT_MARKERS, sint16) = get_height_marker_offset(); + + int configFlags = 0; + if (gConfigGeneral.always_show_gridlines) + configFlags |= CONFIG_FLAG_ALWAYS_SHOW_GRIDLINES; + if (!gConfigGeneral.landscape_smoothing) + configFlags |= CONFIG_FLAG_DISABLE_SMOOTH_LANDSCAPE; + if (gConfigGeneral.show_height_as_units) + configFlags |= CONFIG_FLAG_SHOW_HEIGHT_AS_UNITS; + if (gConfigGeneral.save_plugin_data) + configFlags |= CONFIG_FLAG_SAVE_PLUGIN_DATA; + + RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) = configFlags; +} + +#pragma endregion + #pragma region Shortcuts #define SHIFT 0x100 diff --git a/src/drawing/drawing.c b/src/drawing/drawing.c index e4ddeb5759..55eb628397 100644 --- a/src/drawing/drawing.c +++ b/src/drawing/drawing.c @@ -144,7 +144,7 @@ void load_palette(){ uint32 palette = 0x5FC; - if ((uintptr_t)water_type != (uint32)-1){ + if ((sint32)water_type != -1){ palette = water_type->image_id; } diff --git a/src/drawing/drawing.h b/src/drawing/drawing.h index d06b5df4e6..8321c688ef 100644 --- a/src/drawing/drawing.h +++ b/src/drawing/drawing.h @@ -24,9 +24,8 @@ #ifndef NO_RCT2 #pragma pack(push, 1) #endif - -// Size: 0x10 or more -typedef struct { +// Size: 0x10 +typedef struct rct_g1_element { uint8* offset; // 0x00 sint16 width; // 0x04 sint16 height; // 0x06 @@ -58,19 +57,7 @@ typedef struct rct_drawpixelinfo { assert_struct_size(rct_drawpixelinfo, 0x10); #endif -// Size: 0x10 -typedef struct rct_g1_element_32bit { - uint32 offset; // 0x00 note: uint32 always! - sint16 width; // 0x04 - sint16 height; // 0x06 - sint16 x_offset; // 0x08 - sint16 y_offset; // 0x0A - uint16 flags; // 0x0C - uint16 zoomed_offset; // 0x0E -} rct_g1_element_32bit; -assert_struct_size(rct_g1_element_32bit, 0x10); - -enum{ +enum { G1_FLAG_BMP = (1 << 0), //No invisible sections G1_FLAG_RLE_COMPRESSION = (1<<2), }; diff --git a/src/drawing/sprite.c b/src/drawing/sprite.c index cf4dc11582..4787ed7684 100644 --- a/src/drawing/sprite.c +++ b/src/drawing/sprite.c @@ -31,25 +31,6 @@ rct_gx g2; rct_g1_element *g1Elements = (rct_g1_element*)RCT2_ADDRESS_G1_ELEMENTS; #endif -static void read_and_convert_gxdat(SDL_RWops *file, size_t count, rct_g1_element *elements) -{ - rct_g1_element_32bit *g1Elements32 = calloc(count, sizeof(rct_g1_element_32bit)); - SDL_RWread(file, g1Elements32, count * sizeof(rct_g1_element_32bit), 1); - for (size_t i = 0; i < count; i++) { - /* Double cast to silence compiler warning about casting to - * pointer from integer of mismatched length. - */ - elements[i].offset = (uint8*)(uintptr_t)g1Elements32[i].offset; - elements[i].width = g1Elements32[i].width; - elements[i].height = g1Elements32[i].height; - elements[i].x_offset = g1Elements32[i].x_offset; - elements[i].y_offset = g1Elements32[i].y_offset; - elements[i].flags = g1Elements32[i].flags; - elements[i].zoomed_offset = g1Elements32[i].zoomed_offset; - } - free(g1Elements32); -} - /** * * rct2: 0x00678998 @@ -71,6 +52,20 @@ int gfx_load_g1() * pointers to however long our machine wants them. */ + #pragma pack(push, 1) + // Size: 0x10 + typedef struct { + uint32 offset; // 0x00 note: uint32 always! + sint16 width; // 0x04 + sint16 height; // 0x06 + sint16 x_offset; // 0x08 + sint16 y_offset; // 0x0A + uint16 flags; // 0x0C + uint16 zoomed_offset; // 0x0E + } rct_g1_element_32bit; + assert_struct_size(rct_g1_element_32bit, 0x10); + #pragma pack(pop) + /* number of elements is stored in g1.dat, but because the entry * headers are static, this can't be variable until made into a * dynamic array. @@ -82,7 +77,18 @@ int gfx_load_g1() g1Elements = calloc(324206, sizeof(rct_g1_element)); #endif - read_and_convert_gxdat(file, header.num_entries, g1Elements); + rct_g1_element_32bit *g1Elements32 = calloc(324206, sizeof(rct_g1_element_32bit)); + SDL_RWread(file, g1Elements32, header.num_entries * sizeof(rct_g1_element_32bit), 1); + for (uint32 i = 0; i < header.num_entries; i++) { + g1Elements[i].offset = (uint8*)g1Elements32[i].offset; + g1Elements[i].width = g1Elements32[i].width; + g1Elements[i].height = g1Elements32[i].height; + g1Elements[i].x_offset = g1Elements32[i].x_offset; + g1Elements[i].y_offset = g1Elements32[i].y_offset; + g1Elements[i].flags = g1Elements32[i].flags; + g1Elements[i].zoomed_offset = g1Elements32[i].zoomed_offset; + } + free(g1Elements32); // Read element data _g1Buffer = malloc(header.total_size); @@ -91,9 +97,8 @@ int gfx_load_g1() SDL_RWclose(file); // Fix entry data offsets - for (i = 0; i < header.num_entries; i++) { + for (i = 0; i < header.num_entries; i++) g1Elements[i].offset += (uintptr_t)_g1Buffer; - } // Successful return 1; @@ -136,8 +141,7 @@ int gfx_load_g2() if (SDL_RWread(file, &g2.header, 8, 1) == 1) { // Read element headers g2.elements = malloc(g2.header.num_entries * sizeof(rct_g1_element)); - - read_and_convert_gxdat(file, g2.header.num_entries, g2.elements); + SDL_RWread(file, g2.elements, g2.header.num_entries * sizeof(rct_g1_element), 1); // Read element data g2.data = malloc(g2.header.total_size); diff --git a/src/game.c b/src/game.c index 9cdff4b448..d58214672c 100644 --- a/src/game.c +++ b/src/game.c @@ -783,7 +783,7 @@ bool game_load_save(const utf8 *path) log_verbose("loading saved game, %s", path); safe_strcpy((char*)0x0141EF68, path, MAX_PATH); - safe_strcpy((char*)gRCT2AddressSavedGamesPath2, path, MAX_PATH); + safe_strcpy((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2, path, MAX_PATH); safe_strcpy(gScenarioSavePath, path, MAX_PATH); diff --git a/src/interface/console.c b/src/interface/console.c index 998aa73a15..6bfde3df3b 100644 --- a/src/interface/console.c +++ b/src/interface/console.c @@ -893,7 +893,7 @@ static int cc_load_object(const utf8 **argv, int argc) { if (argc > 0) { utf8 path[MAX_PATH]; - substitute_path(path, gRCT2AddressObjectDataPath, argv[0]); + substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), argv[0]); strcat(path, ".DAT\0"); rct_object_entry entry; diff --git a/src/object.c b/src/object.c index e07d0e3ad8..4cadf489cc 100644 --- a/src/object.c +++ b/src/object.c @@ -31,7 +31,6 @@ #include "world/water.h" char gTempObjectLoadName[9] = { 0 }; -uint32 gTotalNoImages = 0; int object_load_entry(const utf8 *path, rct_object_entry *outEntry) { @@ -57,7 +56,7 @@ int object_load_file(int groupIndex, const rct_object_entry *entry, int* chunkSi char path[MAX_PATH]; SDL_RWops* rw; - substitute_path(path, gRCT2AddressObjectDataPath, (char*)installedObject + 16); + substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), (char*)installedObject + 16); log_verbose("loading object, %s", path); @@ -114,7 +113,7 @@ int object_load_file(int groupIndex, const rct_object_entry *entry, int* chunkSi return 0; } - if (gTotalNoImages >= 0x4726E){ + if (RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) >= 0x4726E){ log_error("Object Load failed due to too many images loaded."); free(chunk); return 0; @@ -130,11 +129,6 @@ int object_load_file(int groupIndex, const rct_object_entry *entry, int* chunkSi } } } - - if (RCT2_GLOBAL(0x9ADAFD, uint8) != 0) { - chunk = object_load(objectType, chunk, groupIndex, chunkSize); - } - chunk_list[groupIndex] = chunk; rct_object_entry_extended* extended_entry = &object_entry_groups[objectType].entries[groupIndex]; @@ -144,6 +138,9 @@ int object_load_file(int groupIndex, const rct_object_entry *entry, int* chunkSi gLastLoadedObjectChunkData = chunk; + if (RCT2_GLOBAL(0x9ADAFD, uint8) != 0) { + object_load(objectType, chunk, groupIndex); + } return 1; } @@ -295,7 +292,7 @@ int object_load_packed(SDL_RWops* rw) return 0; } - if (gTotalNoImages >= 0x4726E){ + if (RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) >= 0x4726E){ log_error("Packed object has too many images."); free(chunk); return 0; @@ -346,7 +343,7 @@ int object_load_packed(SDL_RWops* rw) objectPath[i] = '\0'; } - substitute_path(path, gRCT2AddressObjectDataPath, objectPath); + substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), objectPath); // Require pointer to start of filename char* last_char = path + strlen(path); strcat(path, ".DAT"); @@ -356,7 +353,7 @@ int object_load_packed(SDL_RWops* rw) for (; platform_file_exists(path);){ for (char* curr_char = last_char - 1;; --curr_char){ if (*curr_char == '\\'){ - substitute_path(path, gRCT2AddressObjectDataPath, "00000000.DAT"); + substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), "00000000.DAT"); break; } if (*curr_char < '0') *curr_char = '0'; @@ -449,7 +446,7 @@ int object_calculate_checksum(const rct_object_entry *entry, const uint8 *data, */ int object_chunk_load_image_directory(uint8_t** chunk) { - int image_start_no = gTotalNoImages; + int image_start_no = RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32_t); // First dword of chunk is no_images int no_images = *((uint32_t*)(*chunk)); @@ -458,28 +455,22 @@ int object_chunk_load_image_directory(uint8_t** chunk) int length_of_data = *((uint32_t*)(*chunk)); *chunk += 4; - gTotalNoImages = no_images + image_start_no; + RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32_t) = no_images + image_start_no; rct_g1_element* g1_dest = &g1Elements[image_start_no]; // After length of data is the start of all g1 element structs - rct_g1_element_32bit* g1_source = (rct_g1_element_32bit*)(*chunk); + rct_g1_element* g1_source = (rct_g1_element*)(*chunk); // After the g1 element structs is the actual images. - uintptr_t image_offset = no_images * sizeof(rct_g1_element_32bit) + (uintptr_t)g1_source; + uint8* image_offset = no_images * sizeof(rct_g1_element) + (uint8*)g1_source; - for (int i = 0; i < no_images; ++i) { - g1_dest->offset = (uint8*)(g1_source->offset + image_offset); - g1_dest->width = g1_source->width; - g1_dest->height = g1_source->height; - g1_dest->x_offset = g1_source->x_offset; - g1_dest->y_offset = g1_source->y_offset; - g1_dest->flags = g1_source->flags; - g1_dest->zoomed_offset = g1_source->zoomed_offset; + for (int i = 0; i < no_images; ++i){ + *g1_dest = *g1_source++; + g1_dest->offset += (uint32)image_offset; g1_dest++; drawing_engine_invalidate_image(image_start_no + i); - g1_source++; } *chunk = ((uint8*)g1_source) + length_of_data; @@ -487,570 +478,28 @@ int object_chunk_load_image_directory(uint8_t** chunk) return image_start_no; } -/** - * object_load_func will receive the struct as it is stored in a file, this - * means 32bit pointers. On non-32bit platforms it's supposed to upconvert - * structure to native pointer types and return pointer to newly allocated - * space. It should not be the same pointer as input. - * - * object_unload_func will receive a pointer to the structure created with - * object_load_func, i.e. with native pointer types - * - * object_test_func will receive a pointer to the struct as it is stored in a - * file. - * - * object_paint_func and object_paint_func will receive structs with native - * pointer types. - */ -typedef uint8* (*object_load_func)(void *objectEntry, uint32 entryIndex, int *chunkSize); -typedef void (*object_unload_func)(void *objectEntry); -typedef bool (*object_test_func)(void *objectEntry); -typedef void (*object_paint_func)(void *objectEntry, rct_drawpixelinfo *dpi, sint32 x, sint32 y); +typedef bool (*object_load_func)(void *objectEntry, uint32 entryIndex); +typedef void (*object_unload_func)(void *objectEntry); +typedef bool (*object_test_func)(void *objectEntry); +typedef void (*object_paint_func)(void *objectEntry, rct_drawpixelinfo *dpi, sint32 x, sint32 y); typedef rct_string_id (*object_desc_func)(void *objectEntry); -typedef void (*object_reset_func)(void *objectEntry, uint32 entryIndex); /** * Represents addresses for virtual object functions. */ typedef struct object_type_vtable { - object_load_func load; + object_load_func load; object_unload_func unload; - object_test_func test; - object_paint_func paint; - object_desc_func desc; - object_reset_func reset; + object_test_func test; + object_paint_func paint; + object_desc_func desc; } object_type_vtable; /////////////////////////////////////////////////////////////////////////////// // Ride (rct2: 0x006E6E2A) /////////////////////////////////////////////////////////////////////////////// -#pragma pack(push, 1) -/** - * Ride type vehicle structure. - * size: 0x65 - */ -typedef struct rct_ride_entry_vehicle_32bit { - uint16 rotation_frame_mask; // 0x00 , 0x1A - uint8 var_02; // 0x02 , 0x1C - uint8 var_03; // 0x03 , 0x1D - uint32 spacing; // 0x04 , 0x1E - uint16 car_friction; // 0x08 , 0x22 - sint8 tab_height; // 0x0A , 0x24 - uint8 num_seats; // 0x0B , 0x25 - uint16 sprite_flags; // 0x0C , 0x26 - uint8 sprite_width; // 0x0E , 0x28 - uint8 sprite_height_negative; // 0x0F , 0x29 - uint8 sprite_height_positive; // 0x10 , 0x2A - uint8 var_11; // 0x11 , 0x2B - uint16 flags_a; // 0x12 , 0x2C - uint16 flags_b; // 0x14 , 0x2E - uint16 var_16; // 0x16 , 0x30 - uint32 base_image_id; // 0x18 , 0x32 - uint32 var_1C; // 0x1C , 0x36 - uint32 var_20; // 0x20 , 0x3A - uint32 var_24; // 0x24 , 0x3E - uint32 var_28; // 0x28 , 0x42 - uint32 var_2C; // 0x2C , 0x46 - uint32 var_30; // 0x30 , 0x4A - uint32 var_34; // 0x34 , 0x4E - uint32 var_38; // 0x38 , 0x52 - uint32 var_3C; // 0x3C , 0x56 - uint32 var_40; // 0x40 , 0x5A - uint32 var_44; // 0x44 , 0x5E - uint32 var_48; // 0x48 , 0x62 - uint32 var_4C; // 0x4C , 0x66 - uint32 no_vehicle_images; // 0x50 , 0x6A - uint8 no_seating_rows; // 0x54 , 0x6E - uint8 spinning_inertia; // 0x55 , 0x6F - uint8 spinning_friction; // 0x56 , 0x70 - uint8 friction_sound_id; // 0x57 , 0x71 - uint8 var_58; // 0x58 , 0x72 - uint8 sound_range; // 0x59 , 0x73 - uint8 var_5A; // 0x5A , 0x74 - uint8 powered_acceleration; // 0x5B , 0x75 - uint8 powered_max_speed; // 0x5C , 0x76 - uint8 car_visual; // 0x5D , 0x77 - uint8 effect_visual; - uint8 draw_order; - uint8 special_frames; // 0x60 , 0x7A - uint32 peep_loading_positions; // 0x61 , 0x7B note: uint32 -} rct_ride_entry_vehicle_32bit; -assert_struct_size(rct_ride_entry_vehicle_32bit, 0x65); - -/** - * Ride type structure. - * size: unknown - */ -typedef struct rct_ride_entry_32bit { - rct_string_id name; // 0x000 - rct_string_id description; // 0x002 - uint32 images_offset; // 0x004 - uint32 flags; // 0x008 - uint8 ride_type[3]; // 0x00C - uint8 min_cars_in_train; // 0x00F - uint8 max_cars_in_train; // 0x010 - uint8 cars_per_flat_ride; // 0x011 - // Number of cars that can't hold passengers - uint8 zero_cars; // 0x012 - // The index to the vehicle type displayed in - // the vehicle tab. - uint8 tab_vehicle; // 0x013 - uint8 default_vehicle; // 0x014 - // Convert from first - fourth vehicle to - // vehicle structure - uint8 front_vehicle; // 0x015 - uint8 second_vehicle; // 0x016 - uint8 rear_vehicle; // 0x017 - uint8 third_vehicle; // 0x018 - uint8 pad_019; - rct_ride_entry_vehicle_32bit vehicles[4]; // 0x1A note: 32bit! - uint32 vehicle_preset_list; // 0x1AE note: uint32! - sint8 excitement_multipler; // 0x1B2 - sint8 intensity_multipler; // 0x1B3 - sint8 nausea_multipler; // 0x1B4 - uint8 max_height; // 0x1B5 - union { - uint64 enabledTrackPieces; // 0x1B6 - struct { - uint32 enabledTrackPiecesA; // 0x1B6 - uint32 enabledTrackPiecesB; // 0x1BA - }; - }; - uint8 category[2]; // 0x1BE - uint8 shop_item; // 0x1C0 - uint8 shop_item_secondary; // 0x1C1 -} rct_ride_entry_32bit; -assert_struct_size(rct_ride_entry_32bit, 0x1c2); -#pragma pack(pop) - -static uint8* object_type_ride_load(void *objectEntry, uint32 entryIndex, int *chunkSize) -{ - rct_ride_entry_32bit *rideEntry = (rct_ride_entry_32bit*)objectEntry; - const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_ride_entry_32bit)); - const size_t extendedDataSize = *chunkSize - sizeof(rct_ride_entry_32bit); - *chunkSize = *chunkSize + sizeof(rct_ride_entry) - sizeof(rct_ride_entry_32bit); - assert(*chunkSize > 0); - rct_ride_entry* outRideEntry = malloc(*chunkSize); - assert(outRideEntry != NULL); - uint8 *extendedEntryData = (uint8*)((size_t)outRideEntry + sizeof(rct_ride_entry)); - memcpy(extendedEntryData, origExtendedEntryData, extendedDataSize); - - // After rideEntry is 3 string tables - rideEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_RIDE, entryIndex, 0); - rideEntry->description = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_RIDE, entryIndex, 1); - - //TODO: Move to its own function when ride construction window is merged. - if (gConfigInterface.select_by_track_type) { - rideEntry->enabledTrackPieces = 0xFFFFFFFFFFFFFFFF; - } - - object_get_localised_text(&extendedEntryData, OBJECT_TYPE_RIDE, entryIndex, 2); - outRideEntry->vehicle_preset_list = (vehicle_colour_preset_list*)extendedEntryData; - - // If Unknown struct size is 0xFF then there are 32 3 byte structures - uint8 unknown_size = *extendedEntryData++; - if (unknown_size != 0xFF) { - extendedEntryData += unknown_size * 3; - } else { - extendedEntryData += 0x60; - } - - sint8 *peep_loading_positions = (sint8*)extendedEntryData; - // Peep loading positions variable size - // 4 different vehicle subtypes are available - for (int i = 0; i < 4; i++){ - uint16 no_peep_positions = *extendedEntryData++; - // If no_peep_positions is 0xFF then no_peep_positions is a word - if (no_peep_positions == 0xFF) { - no_peep_positions = *((uint16*)extendedEntryData); - extendedEntryData += 2; - } - extendedEntryData += no_peep_positions; - } - - int images_offset = object_chunk_load_image_directory(&extendedEntryData); - outRideEntry->images_offset = images_offset; - - int cur_vehicle_images_offset = images_offset + 3; - - for (int i = 0; i < 4; i++) { - rct_ride_entry_vehicle_32bit* vehicleEntry = &rideEntry->vehicles[i]; - rct_ride_entry_vehicle* outVehicleEntry = &outRideEntry->vehicles[i]; - - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT) { - int al = 1; - if (vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_SWINGING) { - al = 13; - if ((vehicleEntry->flags_b & (VEHICLE_ENTRY_FLAG_B_5 | VEHICLE_ENTRY_FLAG_B_11)) != (VEHICLE_ENTRY_FLAG_B_5 | VEHICLE_ENTRY_FLAG_B_11)) { - al = 7; - if (!(vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_5)) { - if (!(vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_11)) { - al = 5; - if (vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_9) { - al = 3; - } - } - } - } - } - vehicleEntry->var_03 = al; - // 0x6DE90B - - al = 0x20; - if (!(vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_14)) { - al = 1; - if (vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_7) { - if (vehicleEntry->var_11 != 6) { - al = 2; - if (!(vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_7)) { - al = 4; - } - } - } - } - if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_12) { - al = vehicleEntry->special_frames; - } - vehicleEntry->var_02 = al; - // 0x6DE946 - - vehicleEntry->var_16 = vehicleEntry->var_02 * vehicleEntry->var_03; - vehicleEntry->base_image_id = cur_vehicle_images_offset; - int image_index = vehicleEntry->base_image_id; - - if (vehicleEntry->car_visual != VEHICLE_VISUAL_RIVER_RAPIDS) { - int b = vehicleEntry->var_16 * 32; - - if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_11) b /= 2; - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_15) b /= 8; - - image_index += b; - - // Incline 25 - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPES) { - vehicleEntry->var_20 = image_index; - b = vehicleEntry->var_16 * 72; - if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_14) - b = vehicleEntry->var_16 * 16; - - image_index += b; - } - - // Incline 60 - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_STEEP_SLOPES) { - vehicleEntry->var_24 = image_index; - b = vehicleEntry->var_16 * 80; - image_index += b; - } - - // Verticle - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_VERTICAL_SLOPES) { - vehicleEntry->var_28 = image_index; - b = vehicleEntry->var_16 * 116; - image_index += b; - } - - // Unknown - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_SLOPES) { - vehicleEntry->var_2C = image_index; - b = vehicleEntry->var_16 * 24; - image_index += b; - } - - // Bank - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_BANKED) { - vehicleEntry->var_30 = image_index; - b = vehicleEntry->var_16 * 80; - image_index += b; - } - - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_INLINE_TWISTS) { - vehicleEntry->var_34 = image_index; - b = vehicleEntry->var_16 * 40; - image_index += b; - } - - // Track half? Up/Down - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_BANKED_TRANSITIONS) { - vehicleEntry->var_38 = image_index; - b = vehicleEntry->var_16 * 128; - image_index += b; - } - - // Unknown - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_DIAGONAL_GENTLE_SLOPE_BANKED_TRANSITIONS) { - vehicleEntry->var_3C = image_index; - b = vehicleEntry->var_16 * 16; - image_index += b; - } - - // Unknown - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TRANSITIONS) { - vehicleEntry->var_40 = image_index; - b = vehicleEntry->var_16 * 16; - image_index += b; - } - - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_GENTLE_SLOPE_BANKED_TURNS) { - vehicleEntry->var_44 = image_index; - b = vehicleEntry->var_16 * 128; - image_index += b; - } - - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_FLAT_TO_GENTLE_SLOPE_WHILE_BANKED_TRANSITIONS) { - vehicleEntry->var_48 = image_index; - b = vehicleEntry->var_16 * 16; - image_index += b; - } - - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_CORKSCREWS) { - vehicleEntry->var_4C = image_index; - b = vehicleEntry->var_16 * 80; - image_index += b; - } - - // Unknown - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_RESTRAINT_ANIMATION) { - vehicleEntry->var_1C = image_index; - b = vehicleEntry->var_16 * 12; - image_index += b; - } - - if (vehicleEntry->sprite_flags & VEHICLE_SPRITE_FLAG_14) { - // Same offset as above??? - vehicleEntry->var_4C = image_index; - b = vehicleEntry->var_16 * 32; - image_index += b; - } - } else { - image_index += vehicleEntry->var_16 * 36; - } - // No vehicle images - vehicleEntry->no_vehicle_images = image_index - cur_vehicle_images_offset; - - // Move the offset over this vehicles images. Including peeps - cur_vehicle_images_offset = image_index + vehicleEntry->no_seating_rows * vehicleEntry->no_vehicle_images; - // 0x6DEB0D - - // Copy the vehicle entry over to new one - outVehicleEntry->rotation_frame_mask = vehicleEntry->rotation_frame_mask; - outVehicleEntry->var_02 = vehicleEntry->var_02; - outVehicleEntry->var_03 = vehicleEntry->var_03; - outVehicleEntry->spacing = vehicleEntry->spacing; - outVehicleEntry->car_friction = vehicleEntry->car_friction; - outVehicleEntry->tab_height = vehicleEntry->tab_height; - outVehicleEntry->num_seats = vehicleEntry->num_seats; - outVehicleEntry->sprite_flags = vehicleEntry->sprite_flags; - outVehicleEntry->sprite_width = vehicleEntry->sprite_width; - outVehicleEntry->sprite_height_negative = vehicleEntry->sprite_height_negative; - outVehicleEntry->sprite_height_positive = vehicleEntry->sprite_height_positive; - outVehicleEntry->var_11 = vehicleEntry->var_11; - outVehicleEntry->flags_a = vehicleEntry->flags_a; - outVehicleEntry->flags_b = vehicleEntry->flags_b; - outVehicleEntry->var_16 = vehicleEntry->var_16; - outVehicleEntry->base_image_id = vehicleEntry->base_image_id; - outVehicleEntry->var_1C = vehicleEntry->var_1C; - outVehicleEntry->var_20 = vehicleEntry->var_20; - outVehicleEntry->var_24 = vehicleEntry->var_24; - outVehicleEntry->var_28 = vehicleEntry->var_28; - outVehicleEntry->var_2C = vehicleEntry->var_2C; - outVehicleEntry->var_30 = vehicleEntry->var_30; - outVehicleEntry->var_34 = vehicleEntry->var_34; - outVehicleEntry->var_38 = vehicleEntry->var_38; - outVehicleEntry->var_3C = vehicleEntry->var_3C; - outVehicleEntry->var_40 = vehicleEntry->var_40; - outVehicleEntry->var_44 = vehicleEntry->var_44; - outVehicleEntry->var_48 = vehicleEntry->var_48; - outVehicleEntry->var_4C = vehicleEntry->var_4C; - outVehicleEntry->no_vehicle_images = vehicleEntry->no_vehicle_images; - outVehicleEntry->no_seating_rows = vehicleEntry->no_seating_rows; - outVehicleEntry->spinning_inertia = vehicleEntry->spinning_inertia; - outVehicleEntry->spinning_friction = vehicleEntry->spinning_friction; - outVehicleEntry->friction_sound_id = vehicleEntry->friction_sound_id; - outVehicleEntry->var_58 = vehicleEntry->var_58; - outVehicleEntry->sound_range = vehicleEntry->sound_range; - outVehicleEntry->var_5A = vehicleEntry->var_5A; - outVehicleEntry->powered_acceleration = vehicleEntry->powered_acceleration; - outVehicleEntry->powered_max_speed = vehicleEntry->powered_max_speed; - outVehicleEntry->car_visual = vehicleEntry->car_visual; - outVehicleEntry->effect_visual = vehicleEntry->effect_visual; - outVehicleEntry->draw_order = vehicleEntry->draw_order; - outVehicleEntry->special_frames = vehicleEntry->special_frames; - - if (!(vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_10)) { - int num_images = cur_vehicle_images_offset - vehicleEntry->base_image_id; - if (vehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_13) { - num_images *= 2; - } - - set_vehicle_type_image_max_sizes(outVehicleEntry, num_images); - } - - sint8 no_positions = *peep_loading_positions++; - if (no_positions == -1) { - // The no_positions is 16 bit skip over - peep_loading_positions += 2; - } - // not set for original entry - outVehicleEntry->peep_loading_positions = peep_loading_positions; - } - } - - // 0x6DEB71 - if (RCT2_GLOBAL(0x9ADAFD, uint8) == 0) { - for (int i = 0; i < 3; i++) { - int dl = rideEntry->ride_type[i]; - if (dl == 0xFF) { - continue; - } - - uint8 *typeToRideEntryIndexMap = gTypeToRideEntryIndexMap; - while (dl >= 0) { - if (*typeToRideEntryIndexMap++ == 0xFF) { - dl--; - } - } - - typeToRideEntryIndexMap--; - uint8 previous_entry = entryIndex; - while (typeToRideEntryIndexMap < gTypeToRideEntryIndexMap + countof(gTypeToRideEntryIndexMap)){ - uint8 backup_entry = *typeToRideEntryIndexMap; - *typeToRideEntryIndexMap++ = previous_entry; - previous_entry = backup_entry; - } - } - } - - // 0x6DEBAA - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; - } - - int di = rideEntry->ride_type[0] | (rideEntry->ride_type[1] << 8) | (rideEntry->ride_type[2] << 16); - - outRideEntry->name = rideEntry->name; - outRideEntry->description = rideEntry->description; - outRideEntry->images_offset = rideEntry->images_offset; - outRideEntry->flags = rideEntry->flags; - outRideEntry->ride_type[0] = rideEntry->ride_type[0]; - outRideEntry->ride_type[1] = rideEntry->ride_type[1]; - outRideEntry->ride_type[2] = rideEntry->ride_type[2]; - outRideEntry->min_cars_in_train = rideEntry->min_cars_in_train; - outRideEntry->max_cars_in_train = rideEntry->max_cars_in_train; - outRideEntry->cars_per_flat_ride = rideEntry->cars_per_flat_ride; - outRideEntry->zero_cars = rideEntry->zero_cars; - outRideEntry->tab_vehicle = rideEntry->tab_vehicle; - outRideEntry->default_vehicle = rideEntry->default_vehicle; - outRideEntry->front_vehicle = rideEntry->front_vehicle; - outRideEntry->second_vehicle = rideEntry->second_vehicle; - outRideEntry->rear_vehicle = rideEntry->rear_vehicle; - outRideEntry->third_vehicle = rideEntry->third_vehicle; - outRideEntry->pad_019 = rideEntry->pad_019; - // 0x1a vehicles already set - // 0a1ae vehicle_preset_list already set - outRideEntry->excitement_multipler = rideEntry->excitement_multipler; - outRideEntry->intensity_multipler = rideEntry->intensity_multipler; - outRideEntry->nausea_multipler = rideEntry->nausea_multipler; - outRideEntry->max_height = rideEntry->max_height; - outRideEntry->enabledTrackPieces = rideEntry->enabledTrackPieces; - outRideEntry->category[0] = rideEntry->category[0]; - outRideEntry->category[1] = rideEntry->category[1]; - outRideEntry->shop_item = rideEntry->shop_item; - outRideEntry->shop_item_secondary = rideEntry->shop_item_secondary; - - if ((rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) && !rideTypeShouldLoseSeparateFlag(outRideEntry)) { - di |= 0x1000000; - } - - RCT2_GLOBAL(0xF433DD, uint32) = di; - - return (uint8*)outRideEntry; -} - -static void object_type_ride_unload(void *objectEntry) -{ - rct_ride_entry *rideEntry = (rct_ride_entry*)objectEntry; - rideEntry->name = 0; - rideEntry->description = 0; - rideEntry->images_offset = 0; - - for (int i = 0; i < 4; i++) { - rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[i]; - - rideVehicleEntry->base_image_id = 0; - rideVehicleEntry->var_1C = 0; - rideVehicleEntry->var_20 = 0; - rideVehicleEntry->var_24 = 0; - rideVehicleEntry->var_28 = 0; - rideVehicleEntry->var_2C = 0; - rideVehicleEntry->var_30 = 0; - rideVehicleEntry->var_34 = 0; - rideVehicleEntry->var_38 = 0; - rideVehicleEntry->var_3C = 0; - rideVehicleEntry->var_40 = 0; - rideVehicleEntry->var_44 = 0; - rideVehicleEntry->var_48 = 0; - rideVehicleEntry->var_4C = 0; - rideVehicleEntry->no_vehicle_images = 0; - rideVehicleEntry->var_16 = 0; - - if (!(rideVehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_10)) { - rideVehicleEntry->sprite_width = 0; - rideVehicleEntry->sprite_height_negative = 0; - rideVehicleEntry->sprite_height_positive = 0; - } - rideVehicleEntry->var_02 = 0; - rideVehicleEntry->var_03 = 0; - rideVehicleEntry->peep_loading_positions = 0; - } - - rideEntry->vehicle_preset_list = NULL; -} - -static bool object_type_ride_test(void *objectEntry) -{ - rct_ride_entry_32bit* rideEntry = (rct_ride_entry_32bit*)objectEntry; - if (rideEntry->excitement_multipler > 75) return false; - if (rideEntry->intensity_multipler > 75) return false; - if (rideEntry->nausea_multipler > 75) return false; - return true; -} - -static void object_type_ride_paint(void *objectEntry, rct_drawpixelinfo *dpi, sint32 x, sint32 y) -{ - rct_ride_entry_32bit *rideEntry = (rct_ride_entry_32bit*)objectEntry; - int imageId = rideEntry->images_offset; - if (rideEntry->ride_type[0] == 0xFF) { - imageId++; - if (rideEntry->ride_type[1] == 0xFF) { - imageId++; - } - } - gfx_draw_sprite(dpi, imageId, x - 56, y - 56, 0); -} - -static rct_string_id object_type_ride_desc(void *objectEntry) -{ - rct_ride_entry_32bit *rideEntry = (rct_ride_entry_32bit*)objectEntry; - - // Get description - rct_string_id stringId = rideEntry->description; - if (!(rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) || rideTypeShouldLoseSeparateFlagByRideType(rideEntry->ride_type)) { - uint8 rideType = rideEntry->ride_type[0]; - if (rideType == 0xFF) { - rideType = rideEntry->ride_type[1]; - if (rideType == 0xFF) { - rideType = rideEntry->ride_type[2]; - } - } - stringId = 512 + rideType; - } - return stringId; -} - -static void object_type_ride_reset(void *objectEntry, uint32 entryIndex) +static bool object_type_ride_load(void *objectEntry, uint32 entryIndex) { rct_ride_entry *rideEntry = (rct_ride_entry*)objectEntry; @@ -1277,7 +726,7 @@ static void object_type_ride_reset(void *objectEntry, uint32 entryIndex) continue; } - uint8 *typeToRideEntryIndexMap = gTypeToRideEntryIndexMap; + uint8 *typeToRideEntryIndexMap = RCT2_ADDRESS(0x009E32F8, uint8); while (dl >= 0) { if (*typeToRideEntryIndexMap++ == 0xFF) { dl--; @@ -1294,9 +743,9 @@ static void object_type_ride_reset(void *objectEntry, uint32 entryIndex) } } - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; + // 0x6DEBAA + if (RCT2_GLOBAL(0x9ADAF4, sint32) != 0xFFFFFFFF) { + *RCT2_GLOBAL(0x9ADAF4, uint16*) = 0; } int di = rideEntry->ride_type[0] | (rideEntry->ride_type[1] << 8) | (rideEntry->ride_type[2] << 16); @@ -1306,6 +755,88 @@ static void object_type_ride_reset(void *objectEntry, uint32 entryIndex) } RCT2_GLOBAL(0xF433DD, uint32) = di; + return true; +} + +static void object_type_ride_unload(void *objectEntry) +{ + rct_ride_entry *rideEntry = (rct_ride_entry*)objectEntry; + rideEntry->name = 0; + rideEntry->description = 0; + rideEntry->images_offset = 0; + + for (int i = 0; i < 4; i++) { + rct_ride_entry_vehicle* rideVehicleEntry = &rideEntry->vehicles[i]; + + rideVehicleEntry->base_image_id = 0; + rideVehicleEntry->var_1C = 0; + rideVehicleEntry->var_20 = 0; + rideVehicleEntry->var_24 = 0; + rideVehicleEntry->var_28 = 0; + rideVehicleEntry->var_2C = 0; + rideVehicleEntry->var_30 = 0; + rideVehicleEntry->var_34 = 0; + rideVehicleEntry->var_38 = 0; + rideVehicleEntry->var_3C = 0; + rideVehicleEntry->var_40 = 0; + rideVehicleEntry->var_44 = 0; + rideVehicleEntry->var_48 = 0; + rideVehicleEntry->var_4C = 0; + rideVehicleEntry->no_vehicle_images = 0; + rideVehicleEntry->var_16 = 0; + + if (!(rideVehicleEntry->flags_a & VEHICLE_ENTRY_FLAG_A_10)) { + rideVehicleEntry->sprite_width = 0; + rideVehicleEntry->sprite_height_negative = 0; + rideVehicleEntry->sprite_height_positive = 0; + } + rideVehicleEntry->var_02 = 0; + rideVehicleEntry->var_03 = 0; + rideVehicleEntry->peep_loading_positions = 0; + } + + rideEntry->vehicle_preset_list = NULL; +} + +static bool object_type_ride_test(void *objectEntry) +{ + rct_ride_entry* rideEntry = (rct_ride_entry*)objectEntry; + if (rideEntry->excitement_multipler > 75) return false; + if (rideEntry->intensity_multipler > 75) return false; + if (rideEntry->nausea_multipler > 75) return false; + return true; +} + +static void object_type_ride_paint(void *objectEntry, rct_drawpixelinfo *dpi, sint32 x, sint32 y) +{ + rct_ride_entry *rideEntry = (rct_ride_entry*)objectEntry; + int imageId = rideEntry->images_offset; + if (rideEntry->ride_type[0] == 0xFF) { + imageId++; + if (rideEntry->ride_type[1] == 0xFF) { + imageId++; + } + } + gfx_draw_sprite(dpi, imageId, x - 56, y - 56, 0); +} + +static rct_string_id object_type_ride_desc(void *objectEntry) +{ + rct_ride_entry *rideEntry = (rct_ride_entry*)objectEntry; + + // Get description + rct_string_id stringId = rideEntry->description; + if (!(rideEntry->flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) || rideTypeShouldLoseSeparateFlag(rideEntry)) { + uint8 rideType = rideEntry->ride_type[0]; + if (rideType == 0xFF) { + rideType = rideEntry->ride_type[1]; + if (rideType == 0xFF) { + rideType = rideEntry->ride_type[2]; + } + } + stringId = 512 + rideType; + } + return stringId; } static const object_type_vtable object_type_ride_vtable[] = { @@ -1313,65 +844,17 @@ static const object_type_vtable object_type_ride_vtable[] = { object_type_ride_unload, object_type_ride_test, object_type_ride_paint, - object_type_ride_desc, - object_type_ride_reset, + object_type_ride_desc }; /////////////////////////////////////////////////////////////////////////////// // Small Scenery (rct2: 0x006E3466) /////////////////////////////////////////////////////////////////////////////// -#pragma pack(push, 1) -typedef struct rct_large_scenery_entry_32bit { - uint8 tool_id; // 0x06 - uint8 flags; // 0x07 - sint16 price; // 0x08 - sint16 removal_price; // 0x0A - uint32 tiles; // 0x0C note: 32bit! - uint8 scenery_tab_id; // 0x10 - uint8 var_11; - uint32 text; - uint32 text_image; -} rct_large_scenery_entry_32bit; -assert_struct_size(rct_large_scenery_entry_32bit, 20); - -typedef struct rct_small_scenery_entry_32bit { - uint32 flags; // 0x06 - uint8 height; // 0x0A - uint8 tool_id; // 0x0B - sint16 price; // 0x0C - sint16 removal_price; // 0x0E - uint32 var_10; // note: uint32! - uint8 pad_14[0x06]; - uint8 scenery_tab_id; // 0x1A -} rct_small_scenery_entry_32bit; -assert_struct_size(rct_small_scenery_entry_32bit, 21); - -typedef struct rct_scenery_entry_32bit { - rct_string_id name; // 0x00 - uint32 image; // 0x02 - union { - rct_small_scenery_entry_32bit small_scenery; - rct_large_scenery_entry_32bit large_scenery; - rct_wall_scenery_entry wall; - rct_path_bit_scenery_entry path_bit; - rct_banner_scenery_entry banner; - }; -} rct_scenery_entry_32bit; -assert_struct_size(rct_scenery_entry_32bit, 6 + 21); -#pragma pack(pop) - -static uint8* object_type_small_scenery_load(void *objectEntry, uint32 entryIndex, int *chunkSize) +static bool object_type_small_scenery_load(void *objectEntry, uint32 entryIndex) { - rct_scenery_entry_32bit* sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; - const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + 0x1C); - const size_t extendedDataSize = *chunkSize - 0x1C; - *chunkSize = *chunkSize + sizeof(rct_scenery_entry) - 0x1C; - assert(*chunkSize > 0); - rct_scenery_entry* outSceneryEntry = malloc(*chunkSize); - assert(outSceneryEntry != NULL); - uint8 *extendedEntryData = (uint8*)((size_t)outSceneryEntry + sizeof(rct_scenery_entry)); - memcpy(extendedEntryData, origExtendedEntryData, extendedDataSize); + rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; + uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + (size_t)0x1C); sceneryEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_SMALL_SCENERY, entryIndex, 0); sceneryEntry->small_scenery.scenery_tab_id = 0xFF; @@ -1384,36 +867,22 @@ static uint8* object_type_small_scenery_load(void *objectEntry, uint32 entryInde extendedEntryData += sizeof(rct_object_entry); if (sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG16){ - outSceneryEntry->small_scenery.var_10 = (uintptr_t)extendedEntryData; + sceneryEntry->small_scenery.var_10 = (uint32)extendedEntryData; while (*++extendedEntryData != 0xFF); extendedEntryData++; - } else { - outSceneryEntry->small_scenery.var_10 = sceneryEntry->small_scenery.var_10; } sceneryEntry->image = object_chunk_load_image_directory(&extendedEntryData); - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; + if (RCT2_GLOBAL(0x9ADAF4, uint32) != 0xFFFFFFFF) { + *RCT2_GLOBAL(0x9ADAF4, uint16*) = 0; } - outSceneryEntry->name = sceneryEntry->name; - outSceneryEntry->image = sceneryEntry->image; - outSceneryEntry->small_scenery.flags = sceneryEntry->small_scenery.flags; - outSceneryEntry->small_scenery.height = sceneryEntry->small_scenery.height; - outSceneryEntry->small_scenery.tool_id = sceneryEntry->small_scenery.tool_id; - outSceneryEntry->small_scenery.price = sceneryEntry->small_scenery.price; - outSceneryEntry->small_scenery.removal_price = sceneryEntry->small_scenery.removal_price; - // var10 already set - // pad_14 not needed set - outSceneryEntry->small_scenery.scenery_tab_id = sceneryEntry->small_scenery.scenery_tab_id; - - return (uint8*)outSceneryEntry; + return true; } static void object_type_small_scenery_unload(void *objectEntry) { - rct_scenery_entry_32bit *sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; + rct_scenery_entry *sceneryEntry = (rct_scenery_entry*)objectEntry; sceneryEntry->name = 0; sceneryEntry->image = 0; sceneryEntry->small_scenery.var_10 = 0; @@ -1422,7 +891,7 @@ static void object_type_small_scenery_unload(void *objectEntry) static bool object_type_small_scenery_test(void *objectEntry) { - rct_scenery_entry_32bit *sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; + rct_scenery_entry *sceneryEntry = (rct_scenery_entry*)objectEntry; if (sceneryEntry->small_scenery.price <= 0) return false; if (sceneryEntry->small_scenery.removal_price > 0) return true; @@ -1435,7 +904,7 @@ static bool object_type_small_scenery_test(void *objectEntry) static void object_type_small_scenery_paint(void *objectEntry, rct_drawpixelinfo *dpi, sint32 x, sint32 y) { - rct_scenery_entry_32bit* sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; + rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; rct_drawpixelinfo clipDPI; if (!clip_drawpixelinfo(&clipDPI, dpi, x - 56, y - 56, 112, 112)) { return; @@ -1482,155 +951,22 @@ static rct_string_id object_type_small_scenery_desc(void *objectEntry) return STR_NONE; } -static void object_type_small_scenery_reset(void *objectEntry, uint32 entryIndex) -{ - rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; - uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_scenery_entry)); - - sceneryEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_SMALL_SCENERY, entryIndex, 0); - sceneryEntry->small_scenery.scenery_tab_id = 0xFF; - if (*extendedEntryData != 0xFF) { - uint8 entry_type, entry_index; - if (find_object_in_entry_group((rct_object_entry*)extendedEntryData, &entry_type, &entry_index)) { - sceneryEntry->small_scenery.scenery_tab_id = entry_index; - } - } - - extendedEntryData += sizeof(rct_object_entry); - if (sceneryEntry->small_scenery.flags & SMALL_SCENERY_FLAG16){ - sceneryEntry->small_scenery.var_10 = (uintptr_t)extendedEntryData; - while (*++extendedEntryData != 0xFF); - extendedEntryData++; - } - - sceneryEntry->image = object_chunk_load_image_directory(&extendedEntryData); - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; - } -} - static const object_type_vtable object_type_small_scenery_vtable[] = { object_type_small_scenery_load, object_type_small_scenery_unload, object_type_small_scenery_test, object_type_small_scenery_paint, - object_type_small_scenery_desc, - object_type_small_scenery_reset, + object_type_small_scenery_desc }; - /////////////////////////////////////////////////////////////////////////////// // Large Scenery (rct2: 0x006B92A7) /////////////////////////////////////////////////////////////////////////////// -static uint8* object_type_large_scenery_load(void *objectEntry, uint32 entryIndex, int *chunkSize) -{ - rct_scenery_entry_32bit* sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; - const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + 0x1A); - const size_t extendedDataSize = *chunkSize - 0x1A; - *chunkSize = *chunkSize + sizeof(rct_scenery_entry) - 0x1A; - assert(*chunkSize > 0); - rct_scenery_entry* outSceneryEntry = malloc(*chunkSize); - assert(outSceneryEntry != NULL); - uint8 *extendedEntryData = (uint8*)((size_t)outSceneryEntry + sizeof(rct_scenery_entry)); - memcpy(extendedEntryData, origExtendedEntryData, extendedDataSize); - - sceneryEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_LARGE_SCENERY, entryIndex, 0); - sceneryEntry->large_scenery.scenery_tab_id = 0xFF; - if (*extendedEntryData != 0xFF) { - uint8 entry_type, entry_index; - if (find_object_in_entry_group((rct_object_entry*)extendedEntryData, &entry_type, &entry_index)) { - sceneryEntry->large_scenery.scenery_tab_id = entry_index; - } - } - - extendedEntryData += sizeof(rct_scenery_entry_32bit); - if (sceneryEntry->large_scenery.flags & (1 << 2)) { - outSceneryEntry->large_scenery.text = (rct_large_scenery_text*)extendedEntryData; - extendedEntryData += 1038; - } - - outSceneryEntry->large_scenery.tiles = (rct_large_scenery_tile*)extendedEntryData; - - // skip over large scenery tiles - while (*((uint16*)extendedEntryData) != 0xFFFF){ - extendedEntryData += sizeof(rct_large_scenery_tile); - } - - extendedEntryData += 2; - - int imageId = object_chunk_load_image_directory(&extendedEntryData); - if (sceneryEntry->large_scenery.flags & (1 << 2)){ - sceneryEntry->large_scenery.text_image = imageId; - - uint8* edx = (uint8*)outSceneryEntry->large_scenery.text; - if (!(edx[0xC] & 1)) { - imageId += edx[0xD] * 4; - } else{ - imageId += edx[0xD] * 2; - } - } - sceneryEntry->image = imageId; - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; - } - - 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; - outSceneryEntry->large_scenery.removal_price = sceneryEntry->large_scenery.removal_price; - // 0x0a tiles is a pointer, already set - outSceneryEntry->large_scenery.scenery_tab_id = sceneryEntry->large_scenery.scenery_tab_id; - outSceneryEntry->large_scenery.var_11 = sceneryEntry->large_scenery.var_11; - // var_12 is a pointer, already set - outSceneryEntry->large_scenery.text_image = sceneryEntry->large_scenery.text_image; - - return (uint8*)outSceneryEntry; -} - -static void object_type_large_scenery_unload(void *objectEntry) -{ - rct_scenery_entry *sceneryEntry = (rct_scenery_entry*)objectEntry; - sceneryEntry->name = 0; - sceneryEntry->image = 0; - sceneryEntry->large_scenery.tiles = 0; - sceneryEntry->large_scenery.scenery_tab_id = 0; - sceneryEntry->large_scenery.text = 0; - sceneryEntry->large_scenery.text_image = 0; -} - -static bool object_type_large_scenery_test(void *objectEntry) -{ - rct_scenery_entry_32bit *sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; - - if (sceneryEntry->large_scenery.price <= 0) return false; - if (sceneryEntry->large_scenery.removal_price > 0) return true; - - // Make sure you don't make a profit when placing then removing. - if (-sceneryEntry->large_scenery.removal_price > sceneryEntry->large_scenery.price) return false; - - return true; -} - -static void object_type_large_scenery_paint(void *objectEntry, rct_drawpixelinfo *dpi, sint32 x, sint32 y) +static bool object_type_large_scenery_load(void *objectEntry, uint32 entryIndex) { rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; - - int imageId = sceneryEntry->image | 0xB2D00000; - gfx_draw_sprite(dpi, imageId, x, y - 39, 0); -} - -static rct_string_id object_type_large_scenery_desc(void *objectEntry) -{ - return STR_NONE; -} - -static void object_type_large_scenery_reset(void *objectEntry, uint32 entryIndex) -{ - rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; - uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_scenery_entry)); + uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + (size_t)0x1A); sceneryEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_LARGE_SCENERY, entryIndex, 0); sceneryEntry->large_scenery.scenery_tab_id = 0xFF; @@ -1643,7 +979,7 @@ static void object_type_large_scenery_reset(void *objectEntry, uint32 entryIndex extendedEntryData += sizeof(rct_object_entry); if (sceneryEntry->large_scenery.flags & (1 << 2)) { - sceneryEntry->large_scenery.text = (rct_large_scenery_text *)extendedEntryData; + sceneryEntry->large_scenery.text = (rct_large_scenery_text*)extendedEntryData; extendedEntryData += 1038; } @@ -1668,10 +1004,48 @@ static void object_type_large_scenery_reset(void *objectEntry, uint32 entryIndex } } sceneryEntry->image = imageId; - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; + if (RCT2_GLOBAL(0x9ADAF4, uint32) != 0xFFFFFFFF) { + *RCT2_GLOBAL(0x9ADAF4, uint16*) = 0; } + + return true; +} + +static void object_type_large_scenery_unload(void *objectEntry) +{ + rct_scenery_entry *sceneryEntry = (rct_scenery_entry*)objectEntry; + sceneryEntry->name = 0; + sceneryEntry->image = 0; + sceneryEntry->large_scenery.tiles = 0; + sceneryEntry->large_scenery.scenery_tab_id = 0; + sceneryEntry->large_scenery.text = 0; + sceneryEntry->large_scenery.text_image = 0; +} + +static bool object_type_large_scenery_test(void *objectEntry) +{ + rct_scenery_entry *sceneryEntry = (rct_scenery_entry*)objectEntry; + + if (sceneryEntry->large_scenery.price <= 0) return false; + if (sceneryEntry->large_scenery.removal_price > 0) return true; + + // Make sure you don't make a profit when placing then removing. + if (-sceneryEntry->large_scenery.removal_price > sceneryEntry->large_scenery.price) return false; + + return true; +} + +static void object_type_large_scenery_paint(void *objectEntry, rct_drawpixelinfo *dpi, sint32 x, sint32 y) +{ + rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; + + int imageId = sceneryEntry->image | 0xB2D00000; + gfx_draw_sprite(dpi, imageId, x, y - 39, 0); +} + +static rct_string_id object_type_large_scenery_desc(void *objectEntry) +{ + return STR_NONE; } static const object_type_vtable object_type_large_scenery_vtable[] = { @@ -1679,25 +1053,17 @@ static const object_type_vtable object_type_large_scenery_vtable[] = { object_type_large_scenery_unload, object_type_large_scenery_test, object_type_large_scenery_paint, - object_type_large_scenery_desc, - object_type_large_scenery_reset, + object_type_large_scenery_desc }; /////////////////////////////////////////////////////////////////////////////// // Wall (rct2: 0x006E5A25) /////////////////////////////////////////////////////////////////////////////// -static uint8* object_type_wall_load(void *objectEntry, uint32 entryIndex, int *chunkSize) +static bool object_type_wall_load(void *objectEntry, uint32 entryIndex) { - rct_scenery_entry_32bit* sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; - const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + 0x0E); - const size_t extendedDataSize = *chunkSize - 0x0E; - *chunkSize = *chunkSize + sizeof(rct_scenery_entry) - 0x0E; - assert(*chunkSize > 0); - rct_scenery_entry* outSceneryEntry = malloc(*chunkSize); - assert(outSceneryEntry != NULL); - uint8 *extendedEntryData = (uint8*)((size_t)outSceneryEntry + sizeof(rct_scenery_entry)); - memcpy(extendedEntryData, origExtendedEntryData, extendedDataSize); + rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; + uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + (size_t)0x0E); sceneryEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_WALLS, entryIndex, 0); sceneryEntry->wall.scenery_tab_id = 0xFF; @@ -1711,22 +1077,11 @@ static uint8* object_type_wall_load(void *objectEntry, uint32 entryIndex, int *c extendedEntryData += sizeof(rct_object_entry); sceneryEntry->image = object_chunk_load_image_directory(&extendedEntryData); - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; + if (RCT2_GLOBAL(0x9ADAF4, uint32) != 0xFFFFFFFF) { + *RCT2_GLOBAL(0x9ADAF4, uint16*) = 0; } - outSceneryEntry->name = sceneryEntry->name; - outSceneryEntry->image = sceneryEntry->image; - outSceneryEntry->wall.tool_id = sceneryEntry->wall.tool_id; - outSceneryEntry->wall.flags = sceneryEntry->wall.flags; - outSceneryEntry->wall.height = sceneryEntry->wall.height; - outSceneryEntry->wall.flags2 = sceneryEntry->wall.flags2; - outSceneryEntry->wall.price = sceneryEntry->wall.price; - outSceneryEntry->wall.scenery_tab_id = sceneryEntry->wall.scenery_tab_id; - outSceneryEntry->wall.var_0D = sceneryEntry->wall.var_0D; - - return (uint8*)outSceneryEntry; + return true; } @@ -1740,7 +1095,7 @@ static void object_type_wall_unload(void *objectEntry) static bool object_type_wall_test(void *objectEntry) { - rct_scenery_entry_32bit *sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; + rct_scenery_entry *sceneryEntry = (rct_scenery_entry*)objectEntry; if (sceneryEntry->wall.price <= 0) return false; return true; } @@ -1777,53 +1132,22 @@ static rct_string_id object_type_wall_desc(void *objectEntry) return STR_NONE; } -static void object_type_wall_reset(void *objectEntry, uint32 entryIndex) -{ - rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; - uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_scenery_entry)); - - sceneryEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_WALLS, entryIndex, 0); - sceneryEntry->wall.scenery_tab_id = 0xFF; - if (*extendedEntryData != 0xFF){ - uint8 entry_type, entry_index; - if (find_object_in_entry_group((rct_object_entry*)extendedEntryData, &entry_type, &entry_index)) { - sceneryEntry->wall.scenery_tab_id = entry_index; - } - } - - extendedEntryData += sizeof(rct_object_entry); - sceneryEntry->image = object_chunk_load_image_directory(&extendedEntryData); - - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; - } -} - static const object_type_vtable object_type_wall_vtable[] = { object_type_wall_load, object_type_wall_unload, object_type_wall_test, object_type_wall_paint, - object_type_wall_desc, - object_type_wall_reset, + object_type_wall_desc }; /////////////////////////////////////////////////////////////////////////////// // Banner (rct2: 0x006BA84E) /////////////////////////////////////////////////////////////////////////////// -static uint8* object_type_banner_load(void *objectEntry, uint32 entryIndex, int *chunkSize) +static bool object_type_banner_load(void *objectEntry, uint32 entryIndex) { - rct_scenery_entry_32bit* sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; - const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + 0x0C); - const size_t extendedDataSize = *chunkSize - 0x0C; - *chunkSize = *chunkSize + sizeof(rct_scenery_entry) - 0x0C; - assert(*chunkSize > 0); - rct_scenery_entry* outSceneryEntry = malloc(*chunkSize); - assert(outSceneryEntry != NULL); - uint8 *extendedEntryData = (uint8*)((size_t)outSceneryEntry + sizeof(rct_scenery_entry)); - memcpy(extendedEntryData, origExtendedEntryData, extendedDataSize); + rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; + uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + (size_t)0x0C); sceneryEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_BANNERS, entryIndex, 0); sceneryEntry->banner.scenery_tab_id = 0xFF; @@ -1837,18 +1161,11 @@ static uint8* object_type_banner_load(void *objectEntry, uint32 entryIndex, int extendedEntryData += sizeof(rct_object_entry); sceneryEntry->image = object_chunk_load_image_directory(&extendedEntryData); - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; + if (RCT2_GLOBAL(0x9ADAF4, uint32) != 0xFFFFFFFF) { + *RCT2_GLOBAL(0x9ADAF4, uint16*) = 0; } - outSceneryEntry->name = sceneryEntry->name; - outSceneryEntry->image = sceneryEntry->image; - outSceneryEntry->banner.scrolling_mode = sceneryEntry->banner.scrolling_mode; - outSceneryEntry->banner.flags = sceneryEntry->banner.flags; - outSceneryEntry->banner.price = sceneryEntry->banner.price; - outSceneryEntry->banner.scenery_tab_id = sceneryEntry->banner.scenery_tab_id; - return (uint8*)outSceneryEntry; + return true; } static void object_type_banner_unload(void *objectEntry) @@ -1861,7 +1178,7 @@ static void object_type_banner_unload(void *objectEntry) static bool object_type_banner_test(void *objectEntry) { - rct_scenery_entry_32bit *sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; + rct_scenery_entry *sceneryEntry = (rct_scenery_entry*)objectEntry; if (sceneryEntry->banner.price <= 0) return false; return true; } @@ -1880,53 +1197,22 @@ static rct_string_id object_type_banner_desc(void *objectEntry) return STR_NONE; } -static void object_type_banner_reset(void *objectEntry, uint32 entryIndex) -{ - rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; - uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_scenery_entry)); - - sceneryEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_BANNERS, entryIndex, 0); - sceneryEntry->banner.scenery_tab_id = 0xFF; - if (*extendedEntryData != 0xFF){ - uint8 entry_type, entry_index; - if (find_object_in_entry_group((rct_object_entry*)extendedEntryData, &entry_type, &entry_index)){ - sceneryEntry->banner.scenery_tab_id = entry_index; - } - } - - extendedEntryData += sizeof(rct_object_entry); - sceneryEntry->image = object_chunk_load_image_directory(&extendedEntryData); - - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; - } -} - static const object_type_vtable object_type_banner_vtable[] = { object_type_banner_load, object_type_banner_unload, object_type_banner_test, object_type_banner_paint, - object_type_banner_desc, - object_type_banner_reset, + object_type_banner_desc }; /////////////////////////////////////////////////////////////////////////////// // Path (rct2: 0x006A8621) /////////////////////////////////////////////////////////////////////////////// -static uint8* object_type_path_load(void *objectEntry, uint32 entryIndex, int *chunkSize) +static bool object_type_path_load(void *objectEntry, uint32 entryIndex) { 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; - assert(*chunkSize > 0); - rct_footpath_entry* outPathEntry = malloc(*chunkSize); - assert(outPathEntry != NULL); - uint8 *extendedEntryData = (uint8*)((size_t)outPathEntry + sizeof(rct_footpath_entry)); - memcpy(extendedEntryData, origExtendedEntryData, extendedDataSize); + uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + (size_t)0x0E); pathEntry->string_idx = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_PATHS, entryIndex, 0); @@ -1934,15 +1220,11 @@ static uint8* object_type_path_load(void *objectEntry, uint32 entryIndex, int *c pathEntry->image = imageId; pathEntry->bridge_image = imageId + 109; - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; + if (RCT2_GLOBAL(0x9ADAF4, uint32) != 0xFFFFFFFF) { + *RCT2_GLOBAL(0x9ADAF4, uint16*) = 0; } - // rct_path_Type has no pointer, its size does not change, safe to memcpy - memcpy(outPathEntry, pathEntry, sizeof(rct_footpath_entry)); - - return (uint8*)outPathEntry; + return true; } static void object_type_path_unload(void *objectEntry) @@ -1972,61 +1254,22 @@ static rct_string_id object_type_path_desc(void *objectEntry) return STR_NONE; } -static void object_type_path_reset(void *objectEntry, uint32 entryIndex) -{ - rct_footpath_entry *pathEntry = (rct_footpath_entry*)objectEntry; - uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_footpath_entry)); - - pathEntry->string_idx = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_PATHS, entryIndex, 0); - - int imageId = object_chunk_load_image_directory(&extendedEntryData); - pathEntry->image = imageId; - pathEntry->bridge_image = imageId + 109; - - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; - } - - gFootpathSelectedId = 0; - // Set the default path for when opening footpath window - for (int i = 0; i < object_entry_group_counts[OBJECT_TYPE_PATHS]; i++) { - rct_footpath_entry *pathEntry2 = (rct_footpath_entry*)object_entry_groups[OBJECT_TYPE_PATHS].chunks[i]; - if (pathEntry2 == (rct_footpath_entry*)-1) { - continue; - } - if (!(pathEntry2->flags & 4)) { - gFootpathSelectedId = i; - break; - } - gFootpathSelectedId = i; - } -} - static const object_type_vtable object_type_path_vtable[] = { object_type_path_load, object_type_path_unload, object_type_path_test, object_type_path_paint, - object_type_path_desc, - object_type_path_reset, + object_type_path_desc }; /////////////////////////////////////////////////////////////////////////////// // Path Item (rct2: 0x006A86E2) /////////////////////////////////////////////////////////////////////////////// -static uint8* object_type_path_bit_load(void *objectEntry, uint32 entryIndex, int *chunkSize) +static bool object_type_path_bit_load(void *objectEntry, uint32 entryIndex) { - rct_scenery_entry_32bit* sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; - const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + 0x0E); - const size_t extendedDataSize = *chunkSize - 0x0E; - *chunkSize = *chunkSize + sizeof(rct_scenery_entry) - 0x0E; - assert(*chunkSize > 0); - rct_scenery_entry* outSceneryEntry = malloc(*chunkSize); - assert(outSceneryEntry != NULL); - uint8 *extendedEntryData = (uint8*)((size_t)outSceneryEntry + sizeof(rct_scenery_entry)); - memcpy(extendedEntryData, origExtendedEntryData, extendedDataSize); + rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; + uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + (size_t)0x0E); sceneryEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_PATH_BITS, entryIndex, 0); sceneryEntry->path_bit.scenery_tab_id = 0xFF; @@ -2040,20 +1283,11 @@ static uint8* object_type_path_bit_load(void *objectEntry, uint32 entryIndex, in extendedEntryData += sizeof(rct_object_entry); sceneryEntry->image = object_chunk_load_image_directory(&extendedEntryData); - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; + if (RCT2_GLOBAL(0x9ADAF4, uint32) != 0xFFFFFFFF) { + *RCT2_GLOBAL(0x9ADAF4, uint16*) = 0; } - outSceneryEntry->name = sceneryEntry->name; - outSceneryEntry->image = sceneryEntry->image; - outSceneryEntry->path_bit.flags = sceneryEntry->path_bit.flags; - outSceneryEntry->path_bit.draw_type = sceneryEntry->path_bit.draw_type; - outSceneryEntry->path_bit.tool_id = sceneryEntry->path_bit.tool_id; - outSceneryEntry->path_bit.price = sceneryEntry->path_bit.price; - outSceneryEntry->path_bit.scenery_tab_id = sceneryEntry->path_bit.scenery_tab_id; - - return (uint8*)outSceneryEntry; + return true; } static void object_type_path_bit_unload(void *objectEntry) @@ -2066,7 +1300,7 @@ static void object_type_path_bit_unload(void *objectEntry) static bool object_type_path_bit_test(void *objectEntry) { - rct_scenery_entry_32bit *sceneryEntry = (rct_scenery_entry_32bit*)objectEntry; + rct_scenery_entry *sceneryEntry = (rct_scenery_entry*)objectEntry; if (sceneryEntry->path_bit.price <= 0) return false; return true; } @@ -2082,62 +1316,32 @@ static rct_string_id object_type_path_bit_desc(void *objectEntry) return STR_NONE; } -static void object_type_path_bit_reset(void *objectEntry, uint32 entryIndex) -{ - rct_scenery_entry* sceneryEntry = (rct_scenery_entry*)objectEntry; - uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_scenery_entry)); - - sceneryEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_PATH_BITS, entryIndex, 0); - sceneryEntry->path_bit.scenery_tab_id = 0xFF; - if (*extendedEntryData != 0xFF) { - uint8 entry_type, entry_index; - if (find_object_in_entry_group((rct_object_entry*)extendedEntryData, &entry_type, &entry_index)){ - sceneryEntry->path_bit.scenery_tab_id = entry_index; - } - } - - extendedEntryData += sizeof(rct_object_entry); - sceneryEntry->image = object_chunk_load_image_directory(&extendedEntryData); - - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; - } -} - static const object_type_vtable object_type_path_bit_vtable[] = { object_type_path_bit_load, object_type_path_bit_unload, object_type_path_bit_test, object_type_path_bit_paint, - object_type_path_bit_desc, - object_type_path_bit_reset, + object_type_path_bit_desc }; /////////////////////////////////////////////////////////////////////////////// // Scenery Set (rct2: 0x006B93AA) /////////////////////////////////////////////////////////////////////////////// -static uint8* object_type_scenery_set_load(void *objectEntry, uint32 entryIndex, int *chunkSize) +static bool object_type_scenery_set_load(void *objectEntry, uint32 entryIndex) { rct_scenery_set_entry *scenerySetEntry = (rct_scenery_set_entry*)objectEntry; - const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_scenery_set_entry)); - const size_t extendedDataSize = *chunkSize - sizeof(rct_scenery_set_entry); - *chunkSize = *chunkSize + sizeof(rct_scenery_set_entry) - sizeof(rct_scenery_set_entry); - assert(*chunkSize > 0); - rct_scenery_set_entry* outSceneryEntry = malloc(*chunkSize); - assert(outSceneryEntry != NULL); - uint8 *extendedEntryData = (uint8*)((size_t)outSceneryEntry + sizeof(rct_scenery_set_entry)); - memcpy(extendedEntryData, origExtendedEntryData, extendedDataSize); + uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_scenery_set_entry)); scenerySetEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_SCENERY_SETS, entryIndex, 0); rct_object_entry *entryObjects = NULL; - uintptr_t eax = RCT2_GLOBAL(0x9ADAF4, uint32); - if (eax != (uintptr_t)0xFFFFFFFF){ + uint8 *eax = RCT2_GLOBAL(0x9ADAF4, uint8*); + if ((uint32)eax != 0xFFFFFFFF){ *((uint16*)eax) = 0; entryObjects = (rct_object_entry*)(eax + 2); } + scenerySetEntry->entry_count = 0; scenerySetEntry->var_107 = 0; @@ -2147,7 +1351,7 @@ static uint8* object_type_scenery_set_load(void *objectEntry, uint32 entryIndex, if (entryObjects != NULL){ memcpy(entryObjects, extendedEntryData, sizeof(rct_object_entry)); entryObjects++; - (*((uint8*)(eax + 1)))++; + (*(eax + 1))++; } uint8 entry_type; uint8 entry_index = 0; @@ -2179,9 +1383,7 @@ static uint8* object_type_scenery_set_load(void *objectEntry, uint32 entryIndex, extendedEntryData++; scenerySetEntry->image = object_chunk_load_image_directory(&extendedEntryData); - memcpy(outSceneryEntry, scenerySetEntry, sizeof(rct_scenery_set_entry)); - - return (uint8*)outSceneryEntry; + return true; } static void object_type_scenery_set_unload(void *objectEntry) @@ -2211,98 +1413,31 @@ static rct_string_id object_type_scenery_set_desc(void *objectEntry) return STR_NONE; } -static void object_type_scenery_set_reset(void *objectEntry, uint32 entryIndex) -{ - rct_scenery_set_entry *scenerySetEntry = (rct_scenery_set_entry*)objectEntry; - uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_scenery_set_entry)); - - scenerySetEntry->name = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_SCENERY_SETS, entryIndex, 0); - - rct_object_entry *entryObjects = NULL; - uintptr_t eax = RCT2_GLOBAL(0x9ADAF4, uint32); - if (eax != (uintptr_t)0xFFFFFFFF){ - *((uint16*)eax) = 0; - entryObjects = (rct_object_entry*)(eax + 2); - } - - scenerySetEntry->entry_count = 0; - scenerySetEntry->var_107 = 0; - - for (; *extendedEntryData != 0xFF; extendedEntryData += sizeof(rct_object_entry)) { - scenerySetEntry->var_107++; - - if (entryObjects != NULL){ - memcpy(entryObjects, extendedEntryData, sizeof(rct_object_entry)); - entryObjects++; - (*((uint16*)(eax + 1)))++; - } - uint8 entry_type; - uint8 entry_index = 0; - if (!find_object_in_entry_group((rct_object_entry*)extendedEntryData, &entry_type, &entry_index)) - continue; - - uint16 scenery_entry = entry_index; - - switch (entry_type){ - case OBJECT_TYPE_SMALL_SCENERY: - break; - case OBJECT_TYPE_LARGE_SCENERY: - scenery_entry |= 0x300; - break; - case OBJECT_TYPE_WALLS: - scenery_entry |= 0x200; - break; - case OBJECT_TYPE_PATH_BITS: - scenery_entry |= 0x100; - break; - default: - scenery_entry |= 0x400; - break; - } - - scenerySetEntry->scenery_entries[scenerySetEntry->entry_count++] = scenery_entry; - } - - extendedEntryData++; - scenerySetEntry->image = object_chunk_load_image_directory(&extendedEntryData); -} - static const object_type_vtable object_type_scenery_set_vtable[] = { object_type_scenery_set_load, object_type_scenery_set_unload, object_type_scenery_set_test, object_type_scenery_set_paint, - object_type_scenery_set_desc, - object_type_scenery_set_reset, + object_type_scenery_set_desc }; /////////////////////////////////////////////////////////////////////////////// // Park Entrance (rct2: 0x00666E42) /////////////////////////////////////////////////////////////////////////////// -static uint8* object_type_park_entrance_load(void *objectEntry, uint32 entryIndex, int *chunkSize) +bool object_type_park_entrance_load(void *objectEntry, uint32 entryIndex) { rct_entrance_type *entranceType = (rct_entrance_type*)objectEntry; - const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_entrance_type)); - const size_t extendedDataSize = *chunkSize - sizeof(rct_entrance_type); - *chunkSize = *chunkSize + sizeof(rct_entrance_type) - sizeof(rct_entrance_type); - assert(*chunkSize > 0); - rct_entrance_type* outEntranceType = malloc(*chunkSize); - assert(outEntranceType != NULL); - uint8 *extendedEntryData = (uint8*)((size_t)outEntranceType + sizeof(rct_entrance_type)); - memcpy(extendedEntryData, origExtendedEntryData, extendedDataSize); + uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_entrance_type)); entranceType->string_idx = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_PARK_ENTRANCE, entryIndex, 0); entranceType->image_id = object_chunk_load_image_directory(&extendedEntryData); - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; + if (RCT2_GLOBAL(0x9ADAF4, uint32) != 0xFFFFFFFF) { + *RCT2_GLOBAL(0x9ADAF4, uint16*) = 0; } - memcpy(outEntranceType, entranceType, sizeof(rct_entrance_type)); - - return (uint8*)outEntranceType; + return true; } static void object_type_park_entrance_unload(void *objectEntry) @@ -2337,45 +1472,23 @@ static rct_string_id object_type_park_entrance_desc(void *objectEntry) return STR_NONE; } -static void object_type_park_entrance_reset(void *objectEntry, uint32 entryIndex) -{ - rct_entrance_type *entranceType = (rct_entrance_type*)objectEntry; - uint8 *extendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_entrance_type)); - - entranceType->string_idx = object_get_localised_text(&extendedEntryData, OBJECT_TYPE_PARK_ENTRANCE, entryIndex, 0); - entranceType->image_id = object_chunk_load_image_directory(&extendedEntryData); - - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; - } -} - static const object_type_vtable object_type_park_entrance_vtable[] = { object_type_park_entrance_load, object_type_park_entrance_unload, object_type_park_entrance_test, object_type_park_entrance_paint, - object_type_park_entrance_desc, - object_type_park_entrance_reset, + object_type_park_entrance_desc }; /////////////////////////////////////////////////////////////////////////////// // Water (rct2: 0x006E6E2A) /////////////////////////////////////////////////////////////////////////////// -static uint8* object_type_water_load(void *objectEntry, uint32 entryIndex, int *chunkSize) +static bool object_type_water_load(void *objectEntry, uint32 entryIndex) { rct_water_type *waterEntry = (rct_water_type*)objectEntry; - const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + sizeof(rct_water_type)); - const size_t extendedDataSize = *chunkSize - sizeof(rct_water_type); - *chunkSize = *chunkSize + sizeof(rct_water_type) - sizeof(rct_water_type); - assert(*chunkSize > 0); - rct_water_type* outWaterEntry = malloc(*chunkSize); - assert(outWaterEntry != NULL); - uint8 *pStringTable = (uint8*)((size_t)outWaterEntry + sizeof(rct_water_type)); - memcpy(pStringTable, origExtendedEntryData, extendedDataSize); + uint8 *pStringTable = (uint8*)((size_t)objectEntry + sizeof(rct_water_type)); waterEntry->string_idx = object_get_localised_text(&pStringTable, OBJECT_TYPE_WATER, entryIndex, 0); int imageId = object_chunk_load_image_directory(&pStringTable); @@ -2383,9 +1496,8 @@ static uint8* object_type_water_load(void *objectEntry, uint32 entryIndex, int * waterEntry->var_06 = imageId + 1; waterEntry->var_0A = imageId + 4; - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; + if (RCT2_GLOBAL(0x009ADAF4, uint32) != 0xFFFFFFFF) { + *RCT2_GLOBAL(0x009ADAF4, uint16*) = 0; } if (RCT2_GLOBAL(0x009ADAFD, uint8) == 0) { @@ -2393,9 +1505,7 @@ static uint8* object_type_water_load(void *objectEntry, uint32 entryIndex, int * gfx_invalidate_screen(); } - memcpy(outWaterEntry, waterEntry, sizeof(rct_water_type)); - - return (uint8*)outWaterEntry; + return true; } static void object_type_water_unload(void *objectEntry) @@ -2423,66 +1533,32 @@ static rct_string_id object_type_water_desc(void *objectEntry) return STR_NONE; } -static void object_type_water_reset(void *objectEntry, uint32 entryIndex) -{ - rct_water_type *waterEntry = (rct_water_type*)objectEntry; - - uint8 *pStringTable = (uint8*)((size_t)objectEntry + sizeof(rct_water_type)); - waterEntry->string_idx = object_get_localised_text(&pStringTable, OBJECT_TYPE_WATER, entryIndex, 0); - - int imageId = object_chunk_load_image_directory(&pStringTable); - waterEntry->image_id = imageId; - waterEntry->var_06 = imageId + 1; - waterEntry->var_0A = imageId + 4; - - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; - } - - if (RCT2_GLOBAL(0x009ADAFD, uint8) == 0) { - load_palette(); - gfx_invalidate_screen(); - } -} - static const object_type_vtable object_type_water_vtable[] = { object_type_water_load, object_type_water_unload, object_type_water_test, object_type_water_paint, - object_type_water_desc, - object_type_water_reset, + object_type_water_desc }; /////////////////////////////////////////////////////////////////////////////// // Stex (rct2: 0x0066B355) /////////////////////////////////////////////////////////////////////////////// -static uint8* object_type_stex_load(void *objectEntry, uint32 entryIndex, int *chunkSize) +static bool object_type_stex_load(void *objectEntry, uint32 entryIndex) { rct_stex_entry *stexEntry = (rct_stex_entry*)objectEntry; - const uint8 *origExtendedEntryData = (uint8*)((size_t)objectEntry + 0x08); - const size_t extendedDataSize = *chunkSize - 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 + sizeof(rct_stex_entry)); - memcpy(stringTable, origExtendedEntryData, extendedDataSize); + uint8 *stringTable = (uint8*)((size_t)objectEntry + (size_t)0x08); stexEntry->scenario_name = object_get_localised_text(&stringTable, OBJECT_TYPE_SCENARIO_TEXT, entryIndex, 0); stexEntry->park_name = object_get_localised_text(&stringTable, OBJECT_TYPE_SCENARIO_TEXT, entryIndex, 1); stexEntry->details = object_get_localised_text(&stringTable, OBJECT_TYPE_SCENARIO_TEXT, entryIndex, 2); - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; + if (RCT2_GLOBAL(0x9ADAF4, int) != -1) { + RCT2_GLOBAL(0x9ADAF4, uint16*)[0] = 0; } - memcpy(outStexEntry, stexEntry, sizeof(rct_stex_entry)); - - return (uint8*)outStexEntry; + return true; } static void object_type_stex_unload(void *objectEntry) @@ -2510,28 +1586,12 @@ static rct_string_id object_type_stex_desc(void *objectEntry) return stexEntry->details; } -static void object_type_stex_reset(void *objectEntry, uint32 entryIndex) -{ - rct_stex_entry *stexEntry = (rct_stex_entry*)objectEntry; - uint8 *stringTable = (uint8*)((size_t)objectEntry + (size_t)0x08); - - stexEntry->scenario_name = object_get_localised_text(&stringTable, OBJECT_TYPE_SCENARIO_TEXT, entryIndex, 0); - stexEntry->park_name = object_get_localised_text(&stringTable, OBJECT_TYPE_SCENARIO_TEXT, entryIndex, 1); - stexEntry->details = object_get_localised_text(&stringTable, OBJECT_TYPE_SCENARIO_TEXT, entryIndex, 2); - - uintptr_t some_pointer = RCT2_GLOBAL(0x9ADAF4, uint32); - if (some_pointer != (uintptr_t)0xFFFFFFFF){ - *((uint16*)some_pointer) = 0; - } -} - static const object_type_vtable object_type_stex_vtable[] = { object_type_stex_load, object_type_stex_unload, object_type_stex_test, object_type_stex_paint, - object_type_stex_desc, - object_type_stex_reset, + object_type_stex_desc }; /////////////////////////////////////////////////////////////////////////////// @@ -2550,11 +1610,11 @@ static const object_type_vtable * const object_type_vtables[] = { object_type_stex_vtable }; -uint8* object_load(int type, void *objectEntry, uint32 entryIndex, int *chunkSize) +bool object_load(int type, void *objectEntry, uint32 entryIndex) { assert(type >= OBJECT_TYPE_RIDE && type <= OBJECT_TYPE_SCENARIO_TEXT); const object_type_vtable *vtable = object_type_vtables[type]; - return vtable->load(objectEntry, entryIndex, chunkSize); + return vtable->load(objectEntry, entryIndex) ? 0 : 1; } void object_unload(int type, void *objectEntry) @@ -2585,13 +1645,6 @@ rct_string_id object_desc(int type, void *objectEntry) return vtable->desc(objectEntry); } -void object_reset(int type, void *objectEntry, uint32 entryIndex) -{ - assert(type >= OBJECT_TYPE_RIDE && type <= OBJECT_TYPE_SCENARIO_TEXT); - const object_type_vtable *vtable = object_type_vtables[type]; - vtable->reset(objectEntry, entryIndex); -} - /** * * rct2: 0x006A9428 @@ -2609,7 +1662,7 @@ int object_get_scenario_text(rct_object_entry *entry) char path[MAX_PATH]; char *objectPath = (char*)installedObject + 16; - substitute_path(path, gRCT2AddressObjectDataPath, objectPath); + substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), objectPath); rct_object_entry openedEntry; SDL_RWops* rw = SDL_RWFromFile(path, "rb"); @@ -2652,12 +1705,11 @@ int object_get_scenario_text(rct_object_entry *entry) } // Save the real total images. - int total_no_images = gTotalNoImages; + int total_no_images = RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32); // This is being changed to force the images to be loaded into a different // image id. - chunk = object_load(openedEntry.flags & 0x0F, chunk, 0, &chunkSize); - gTotalNoImages = 0x726E; + RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) = 0x726E; gStexTempChunk = (rct_stex_entry*)chunk; // Not used anywhere. RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_TEXT_TEMP_OBJECT, rct_object_entry) = openedEntry; @@ -2667,11 +1719,12 @@ int object_get_scenario_text(rct_object_entry *entry) memcpy(gTempObjectLoadName, openedEntry.name, 8); // Not used?? RCT2_GLOBAL(0x009ADAFD, uint8) = 1; + object_load(openedEntry.flags & 0x0F, chunk, 0); // Tell text to be loaded into normal address RCT2_GLOBAL(0x009ADAFC, uint8) = 0; // Not used?? RCT2_GLOBAL(0x009ADAFD, uint8) = 0; - gTotalNoImages = total_no_images; + RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) = total_no_images; return 1; } log_error("Opened object didn't match."); diff --git a/src/object.h b/src/object.h index 2cd15feb30..c991489913 100644 --- a/src/object.h +++ b/src/object.h @@ -106,7 +106,6 @@ extern uint32 gInstalledObjectsCount; extern rct_object_entry *gInstalledObjects; extern uint32 gNumInstalledRCT2Objects; extern uint32 gNumInstalledCustomObjects; -extern uint32 gTotalNoImages; extern void *gLastLoadedObjectChunkData; @@ -140,11 +139,10 @@ char *object_get_name(rct_object_entry *entry); rct_object_filters *get_object_filter(int index); -uint8* object_load(int type, void *objectEntry, uint32 entryIndex, int *chunkSize); +bool object_load(int type, void *objectEntry, uint32 entryIndex); void object_unload(int type, void *objectEntry); bool object_test(int type, void *objectEntry); void object_paint(int type, void *objectEntry, rct_drawpixelinfo *dpi, sint32 x, sint32 y); rct_string_id object_desc(int type, void *objectEntry); -void object_reset(int type, void *objectEntry, uint32 entryIndex); #endif diff --git a/src/object_list.c b/src/object_list.c index 383fee3519..b39b7aec39 100644 --- a/src/object_list.c +++ b/src/object_list.c @@ -230,13 +230,13 @@ void reset_loaded_objects() { reset_type_to_ride_entry_index_map(); - gTotalNoImages = 0xF26E; + RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) = 0xF26E; for (int type = 0; type < 11; ++type){ for (int j = 0; j < object_entry_group_counts[type]; j++){ uint8* chunk = object_entry_groups[type].chunks[j]; if (chunk != (uint8*)-1) - object_reset(type, chunk, j); + object_load(type, chunk, j); } } } @@ -252,7 +252,7 @@ static int object_list_query_directory(int *outTotalFiles, uint64 *outTotalFileS fileDateModifiedChecksum = 0; // Enumerate through each object in the directory - enumFileHandle = platform_enumerate_files_begin(gRCT2AddressObjectDataPath); + enumFileHandle = platform_enumerate_files_begin(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char)); if (enumFileHandle == INVALID_HANDLE) return 0; @@ -320,7 +320,7 @@ void object_list_load() _installedObjectFilters = NULL; } - enumFileHandle = platform_enumerate_files_begin(gRCT2AddressObjectDataPath); + enumFileHandle = platform_enumerate_files_begin(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char)); if (enumFileHandle != INVALID_HANDLE) { size_t installedObjectsCapacity = 4096; while (platform_enumerate_files_next(enumFileHandle, &enumFileInfo)) { @@ -337,7 +337,7 @@ void object_list_load() } char path[MAX_PATH]; - substitute_path(path, gRCT2AddressObjectDataPath, enumFileInfo.path); + substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), enumFileInfo.path); rct_object_entry entry; if (object_load_entry(path, &entry)) { @@ -786,7 +786,7 @@ static uint32 install_object_entry(rct_object_entry* entry, rct_object_entry* in *((uint16*)(installed_entry_pointer + 9)) = 0; *((uint32*)(installed_entry_pointer + 11)) = 0; - gTotalNoImages = 0xF26E; + RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) = 0xF26E; gInstalledObjectsCount++; @@ -839,7 +839,7 @@ static uint32 install_object_entry(rct_object_entry* entry, rct_object_entry* in // This is deceptive. Due to setting the total no images earlier to 0xF26E // this is actually the no_images in this entry. - *((uint32*)installed_entry_pointer) = gTotalNoImages - 0xF26E; + *((uint32*)installed_entry_pointer) = RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) - 0xF26E; installed_entry_pointer += 4; uint8* esi = RCT2_ADDRESS(0x00F42BDB, uint8); diff --git a/src/openrct2.c b/src/openrct2.c index 0e4ebf4cbd..91fa50fe9e 100644 --- a/src/openrct2.c +++ b/src/openrct2.c @@ -166,10 +166,10 @@ static void openrct2_copy_original_user_files_over() utf8 path[MAX_PATH]; platform_get_user_directory(path, "save"); - openrct2_copy_files_over((utf8*)gRCT2AddressSavedGamesPath, path, ".sv6"); + openrct2_copy_files_over((utf8*)RCT2_ADDRESS_SAVED_GAMES_PATH, path, ".sv6"); platform_get_user_directory(path, "landscape"); - openrct2_copy_files_over((utf8*)gRCT2AddressLandscapesPath, path, ".sc6"); + openrct2_copy_files_over((utf8*)RCT2_ADDRESS_LANDSCAPES_PATH, path, ".sc6"); } bool openrct2_initialise() @@ -571,7 +571,6 @@ bool openrct2_setup_rct2_segment() } #endif // defined(__unix__) -#if !defined(NO_RCT2) && !defined(__WINDOWS__) // Check that the expected data is at various addresses. // Start at 0x9a6000, which is start of .data, to skip the region containing addresses to DLL // calls, which can be changed by windows/wine loader. @@ -584,7 +583,6 @@ bool openrct2_setup_rct2_segment() log_warning("c2 = %u, expected %u, match %d", c2, exp_c2, c2 == exp_c2); return false; } -#endif return true; } diff --git a/src/rct1.c b/src/rct1.c index 8864ae7591..04c2356359 100644 --- a/src/rct1.c +++ b/src/rct1.c @@ -78,11 +78,7 @@ bool rct1_read_sv4(const char *path, rct1_s4 *s4) return success; } -/** - * Only to be used when loading 32 bit items from files, otherwise use - * rideTypeShouldLoseSeparateFlag. - */ -bool rideTypeShouldLoseSeparateFlagByRideType(uint8 ride_type[3]) +bool rideTypeShouldLoseSeparateFlag(rct_ride_entry *rideEntry) { if (!gConfigInterface.select_by_track_type) { return false; @@ -90,21 +86,16 @@ bool rideTypeShouldLoseSeparateFlagByRideType(uint8 ride_type[3]) bool remove_flag = true; for (int j = 0; j < 3; j++) { - if (ride_type_has_flag(ride_type[j], RIDE_TYPE_FLAG_FLAT_RIDE)) { + if (ride_type_has_flag(rideEntry->ride_type[j], RIDE_TYPE_FLAG_FLAT_RIDE)) { remove_flag = false; } - if (ride_type[j] == RIDE_TYPE_MAZE || ride_type[j] == RIDE_TYPE_MINI_GOLF) { + if (rideEntry->ride_type[j] == RIDE_TYPE_MAZE || rideEntry->ride_type[j] == RIDE_TYPE_MINI_GOLF) { remove_flag = false; } } return remove_flag; } -bool rideTypeShouldLoseSeparateFlag(rct_ride_entry *rideEntry) -{ - return rideTypeShouldLoseSeparateFlagByRideType(rideEntry->ride_type); -} - const uint8 gRideCategories[] = { 2, // Spiral Roller coaster 2, // Stand Up Coaster diff --git a/src/rct1.h b/src/rct1.h index 4ac779c294..4ae06a295e 100644 --- a/src/rct1.h +++ b/src/rct1.h @@ -746,7 +746,6 @@ void rct1_import_s4(rct1_s4 *s4); void rct1_fix_landscape(); int vehicle_preference_compare(uint8 rideType, const char * a, const char * b); bool rideTypeShouldLoseSeparateFlag(rct_ride_entry *rideEntry); -bool rideTypeShouldLoseSeparateFlagByRideType(uint8 ride_type[3]); bool rct1_load_saved_game(const char *path); bool rct1_load_scenario(const char *path); diff --git a/src/rct2.c b/src/rct2.c index b081a7db5b..b61f92046b 100644 --- a/src/rct2.c +++ b/src/rct2.c @@ -114,13 +114,6 @@ uint8 gSavePromptMode; sint32 gScreenWidth; sint32 gScreenHeight; -char gRCT2AddressSavedGamesPath[MAX_PATH]; -char gRCT2AddressSavedGamesPath2[MAX_PATH]; -char gRCT2AddressScenariosPath[MAX_PATH]; -char gRCT2AddressLandscapesPath[MAX_PATH]; -char gRCT2AddressObjectDataPath[MAX_PATH]; -char gRCT2AddressTracksPath[MAX_PATH]; - typedef struct tm tm_t; void print_launch_information(); @@ -220,36 +213,41 @@ int rct2_init_directories() char separator[] = {platform_get_path_separator(), 0}; - char gRCT2AddressAppPath[MAX_PATH] = { 0 }; + strcpy(RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char), gConfigGeneral.game_path); - strcpy(gRCT2AddressAppPath, gConfigGeneral.game_path); - strcat(gRCT2AddressAppPath, separator); + strcpy(RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH_SLASH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH_SLASH, char), separator); - strcpy(gRCT2AddressSavedGamesPath, gRCT2AddressAppPath); - strcat(gRCT2AddressSavedGamesPath, "Saved Games"); - strcat(gRCT2AddressSavedGamesPath, separator); + strcpy(RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH, char), separator); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH, char), "Saved Games"); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH, char), separator); - strcpy(gRCT2AddressScenariosPath, gRCT2AddressAppPath); - strcat(gRCT2AddressScenariosPath, "Scenarios"); - strcat(gRCT2AddressScenariosPath, separator); - strcat(gRCT2AddressScenariosPath, "*.SC6"); + strcpy(RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), separator); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), "Scenarios"); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), separator); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), "*.SC6"); - strcpy(gRCT2AddressLandscapesPath, gRCT2AddressAppPath); - strcat(gRCT2AddressLandscapesPath, "Landscapes"); - strcat(gRCT2AddressLandscapesPath, separator); - strcat(gRCT2AddressLandscapesPath, "*.SC6"); + strcpy(RCT2_ADDRESS(RCT2_ADDRESS_LANDSCAPES_PATH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_LANDSCAPES_PATH, char), separator); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_LANDSCAPES_PATH, char), "Landscapes"); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_LANDSCAPES_PATH, char), separator); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_LANDSCAPES_PATH, char), "*.SC6"); - strcpy(gRCT2AddressObjectDataPath, gRCT2AddressAppPath); - strcat(gRCT2AddressObjectDataPath, "ObjData"); - strcat(gRCT2AddressObjectDataPath, separator); - strcat(gRCT2AddressObjectDataPath, "*.DAT"); + strcpy(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), separator); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), "ObjData"); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), separator); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), "*.DAT"); - strcpy(gRCT2AddressTracksPath, gRCT2AddressAppPath); - strcat(gRCT2AddressTracksPath, "Tracks"); - strcat(gRCT2AddressTracksPath, separator); - strcat(gRCT2AddressTracksPath, "*.TD?"); + strcpy(RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), separator); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), "Tracks"); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), separator); + strcat(RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), "*.TD?"); - strcpy(gRCT2AddressSavedGamesPath2, gRCT2AddressSavedGamesPath); + strcpy(RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH_2, char), RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH, char)); return 1; } @@ -353,7 +351,7 @@ bool rct2_open_file(const char *path) extension++; if (_stricmp(extension, "sv6") == 0) { - strcpy((char*)gRCT2AddressSavedGamesPath2, path); + strcpy((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2, path); game_load_save(path); gFirstTimeSave = 0; return true; diff --git a/src/rct2.h b/src/rct2.h index 1d12df5cd1..923ab22f65 100644 --- a/src/rct2.h +++ b/src/rct2.h @@ -279,13 +279,6 @@ extern uint8 gSavePromptMode; extern sint32 gScreenWidth; extern sint32 gScreenHeight; -extern char gRCT2AddressSavedGamesPath[]; -extern char gRCT2AddressSavedGamesPath2[]; -extern char gRCT2AddressScenariosPath[]; -extern char gRCT2AddressLandscapesPath[]; -extern char gRCT2AddressObjectDataPath[]; -extern char gRCT2AddressTracksPath[]; - int rct2_init(); void rct2_dispose(); void rct2_update(); diff --git a/src/ride/ride.c b/src/ride/ride.c index 8d9148dc61..b905609a28 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -31,7 +31,6 @@ #include "../management/news_item.h" #include "../network/network.h" #include "../object_list.h" -#include "../openrct2.h" #include "../peep/peep.h" #include "../peep/staff.h" #include "../rct1.h" @@ -252,12 +251,14 @@ rct_ride_entry *get_ride_entry_by_ride(rct_ride *ride) * rct2: 0x006DED68 */ void reset_type_to_ride_entry_index_map(){ - memset(gTypeToRideEntryIndexMap, 0xFF, 91); + uint8* typeToRideEntryIndexMap = RCT2_ADDRESS(0x009E32F8, uint8); + memset(typeToRideEntryIndexMap, 0xFF, 91); } uint8 *get_ride_entry_indices_for_ride_type(uint8 rideType) { - uint8 *entryIndexList = gTypeToRideEntryIndexMap; + uint8 *typeToRideEntryIndexMap = (uint8*)0x009E32F8; + uint8 *entryIndexList = typeToRideEntryIndexMap; while (rideType > 0) { do { entryIndexList++; @@ -6923,10 +6924,8 @@ void set_vehicle_type_image_max_sizes(rct_ride_entry_vehicle* vehicle_type, int .zoom_level = 0 }; - if (!gOpenRCT2Headless) { - for (int i = 0; i < num_images; ++i){ - gfx_draw_sprite_software(&dpi, vehicle_type->base_image_id + i, 0, 0, 0); - } + for (int i = 0; i < num_images; ++i){ + gfx_draw_sprite_software(&dpi, vehicle_type->base_image_id + i, 0, 0, 0); } int al = -1; for (int i = 99; i != 0; --i){ diff --git a/src/ride/ride.h b/src/ride/ride.h index 9497d34aba..a8facce1fc 100644 --- a/src/ride/ride.h +++ b/src/ride/ride.h @@ -122,7 +122,9 @@ typedef struct rct_ride_entry { uint8 shop_item; // 0x1C0 uint8 shop_item_secondary; // 0x1C1 } rct_ride_entry; -// FIXME: unpack +#ifdef PLATFORM_32BIT +assert_struct_size(rct_ride_entry, 0x1c2); +#endif /** * Ride structure. diff --git a/src/ride/vehicle.h b/src/ride/vehicle.h index df7eca6e86..424fd2e21f 100644 --- a/src/ride/vehicle.h +++ b/src/ride/vehicle.h @@ -77,7 +77,9 @@ typedef struct rct_ride_entry_vehicle { uint8 special_frames; // 0x60 , 0x7A sint8* peep_loading_positions; // 0x61 , 0x7B } rct_ride_entry_vehicle; -// FIXME: unpack +#ifdef PLATFORM_32BIT +assert_struct_size(rct_ride_entry_vehicle, 0x65); +#endif typedef struct rct_vehicle { uint8 sprite_identifier; // 0x00 diff --git a/src/scenario.c b/src/scenario.c index d576cfc5c4..7f22310439 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -66,21 +66,6 @@ char gScenarioSavePath[MAX_PATH]; int gFirstTimeSave = 1; uint32 gLastAutoSaveTick = 0; -#if defined(NO_RCT2) -uint32 gScenarioTicks; -#endif -uint32 gScenarioSrand0; -uint32 gScenarioSrand1; - -uint8 gScenarioObjectiveType; -uint8 gScenarioObjectiveYear; -uint16 gScenarioObjectiveNumGuests; -money32 gScenarioObjectiveCurrency; - -uint16 gScenarioParkRatingWarningDays; -money32 gScenarioCompletedCompanyValue; -money32 gScenarioCompanyValueRecord; - static int scenario_create_ducks(); static void scenario_objective_check(); @@ -244,9 +229,9 @@ void scenario_begin() strncat(gScenarioSavePath, parkName, sizeof(gScenarioSavePath) - strlen(gScenarioSavePath) - 1); strncat(gScenarioSavePath, ".sv6", sizeof(gScenarioSavePath) - strlen(gScenarioSavePath) - 1); - strcpy(gRCT2AddressSavedGamesPath2, gRCT2AddressSavedGamesPath); - strcpy(gRCT2AddressSavedGamesPath2 + strlen(gRCT2AddressSavedGamesPath2), gScenarioSavePath); - strcat(gRCT2AddressSavedGamesPath2, ".SV6"); + strcpy((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2, (char*)RCT2_ADDRESS_SAVED_GAMES_PATH); + strcpy((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2 + strlen((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2), gScenarioSavePath); + strcat((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2, ".SV6"); memset((void*)0x001357848, 0, 56); gCurrentExpenditure = 0; @@ -299,7 +284,7 @@ void scenario_end() void scenario_set_filename(const char *value) { - substitute_path(_scenarioPath, gRCT2AddressScenariosPath, value); + substitute_path(_scenarioPath, RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), value); _scenarioFileName = path_get_filename(_scenarioPath); } diff --git a/src/scenario.h b/src/scenario.h index dd35641e2a..b9fa0a576d 100644 --- a/src/scenario.h +++ b/src/scenario.h @@ -427,22 +427,18 @@ typedef struct source_desc { extern const rct_string_id ScenarioCategoryStringIds[SCENARIO_CATEGORY_COUNT]; -#if defined(NO_RCT2) -extern uint32 gScenarioTicks; -#else #define gScenarioTicks RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_TICKS, uint32) -#endif -extern uint32 gScenarioSrand0; -extern uint32 gScenarioSrand1; +#define gScenarioSrand0 RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_SRAND_0, uint32) +#define gScenarioSrand1 RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_SRAND_1, uint32) -extern uint8 gScenarioObjectiveType; -extern uint8 gScenarioObjectiveYear; -extern uint16 gScenarioObjectiveNumGuests; -extern money32 gScenarioObjectiveCurrency; +#define gScenarioObjectiveType RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_TYPE, uint8) +#define gScenarioObjectiveYear RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_YEAR, uint8) +#define gScenarioObjectiveNumGuests RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_NUM_GUESTS, uint16) +#define gScenarioObjectiveCurrency RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_CURRENCY, money32) -extern uint16 gScenarioParkRatingWarningDays; -extern money32 gScenarioCompletedCompanyValue; -extern money32 gScenarioCompanyValueRecord; +#define gScenarioParkRatingWarningDays RCT2_GLOBAL(RCT2_ADDRESS_PARK_RATING_WARNING_DAYS, uint16) +#define gScenarioCompletedCompanyValue RCT2_GLOBAL(RCT2_ADDRESS_COMPLETED_COMPANY_VALUE, money32) +#define gScenarioCompanyValueRecord RCT2_GLOBAL(RCT2_ADDRESS_COMPANY_VALUE_RECORD, money32) // Scenario list extern int gScenarioListCount; diff --git a/src/windows/loadsave.c b/src/windows/loadsave.c index c77eedc847..c068229904 100644 --- a/src/windows/loadsave.c +++ b/src/windows/loadsave.c @@ -237,7 +237,7 @@ rct_window *window_loadsave_open(int type, char *defaultName) } */ - safe_strcpy(path, gRCT2AddressTracksPath, MAX_PATH); + safe_strcpy(path, RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), MAX_PATH); ch = strchr(path, '*'); if (ch != NULL) *ch = 0; diff --git a/src/world/scenery.h b/src/world/scenery.h index 5b83792066..0f46018a55 100644 --- a/src/world/scenery.h +++ b/src/world/scenery.h @@ -21,6 +21,7 @@ #include "../object.h" #include "../world/map.h" +#pragma pack(push, 1) typedef struct rct_small_scenery_entry { uint32 flags; // 0x06 uint8 height; // 0x0A @@ -33,6 +34,7 @@ typedef struct rct_small_scenery_entry { uint16 var_18; uint8 scenery_tab_id; // 0x1A } rct_small_scenery_entry; +assert_struct_size(rct_small_scenery_entry, 21); typedef enum { SMALL_SCENERY_FLAG_FULL_TILE = (1 << 0), // 0x1 @@ -65,7 +67,6 @@ typedef enum { SMALL_SCENERY_FLAG27 = (1 << 27), // 0x8000000 } SMALL_SCENERY_FLAGS; -#pragma pack(push, 1) typedef struct rct_large_scenery_tile { sint16 x_offset; sint16 y_offset; @@ -103,7 +104,9 @@ typedef struct rct_large_scenery_entry { rct_large_scenery_text* text; // 0x12 uint32 text_image; // 0x16 } rct_large_scenery_entry; -// FIXME: unpack +#ifdef PLATFORM_32BIT +assert_struct_size(rct_large_scenery_entry, 20); +#endif typedef struct rct_wall_scenery_entry { uint8 tool_id; // 0x06 @@ -159,7 +162,9 @@ typedef struct rct_scenery_entry { rct_banner_scenery_entry banner; }; } rct_scenery_entry; -// FIXME: unpack? +#ifdef PLATFORM_32BIT +assert_struct_size(rct_scenery_entry, 6 + 21); +#endif typedef struct rct_scenery_set_entry { rct_string_id name; // 0x00 From 5e307339937c8a0a4dfa5dec16eac7ac908695b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 22:39:55 +0200 Subject: [PATCH 08/17] revert fixes --- src/object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/object.c b/src/object.c index 4cadf489cc..e7cbfb01fa 100644 --- a/src/object.c +++ b/src/object.c @@ -735,7 +735,7 @@ static bool object_type_ride_load(void *objectEntry, uint32 entryIndex) typeToRideEntryIndexMap--; uint8 previous_entry = entryIndex; - while (typeToRideEntryIndexMap < gTypeToRideEntryIndexMap + countof(gTypeToRideEntryIndexMap)){ + while (typeToRideEntryIndexMap < RCT2_ADDRESS(0x9E34E4, uint8)){ uint8 backup_entry = *typeToRideEntryIndexMap; *typeToRideEntryIndexMap++ = previous_entry; previous_entry = backup_entry; From 1d0a9f212ded622a5617d9e85b94b053d6a4bdad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Mon, 20 Jun 2016 14:11:10 +0200 Subject: [PATCH 09/17] Make config_apply_to_old_addresses empty for NO_RCT2 --- src/config.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/config.c b/src/config.c index 07fb167ba4..4ec41c744c 100644 --- a/src/config.c +++ b/src/config.c @@ -952,6 +952,7 @@ bool config_find_or_browse_install_directory() */ void config_apply_to_old_addresses() { +#if !defined(NO_RCT2) RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_EDGE_SCROLLING, sint8) = gConfigGeneral.edge_scrolling; RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_CURRENCY, sint8) = gConfigGeneral.currency_format; RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_METRIC, sint8) = gConfigGeneral.measurement_format; @@ -970,6 +971,7 @@ void config_apply_to_old_addresses() configFlags |= CONFIG_FLAG_SAVE_PLUGIN_DATA; RCT2_GLOBAL(RCT2_ADDRESS_CONFIG_FLAGS, uint8) = configFlags; +#endif // !defined(NO_RCT2) } #pragma endregion From 683eee827e25e271bac7e711988026f11035d3f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 22:52:28 +0200 Subject: [PATCH 10/17] Refactor gX.dat loading, make sure g2.dat loads too --- src/drawing/drawing.h | 13 +++++++++++++ src/drawing/sprite.c | 35 ++++++++++++++++++++++------------- src/object.c | 16 +++++++++++----- 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/src/drawing/drawing.h b/src/drawing/drawing.h index 8321c688ef..04367bc40e 100644 --- a/src/drawing/drawing.h +++ b/src/drawing/drawing.h @@ -57,6 +57,19 @@ typedef struct rct_drawpixelinfo { assert_struct_size(rct_drawpixelinfo, 0x10); #endif +// Size: 0x10 +typedef struct rct_g1_element_32bit { + uint32 offset; // 0x00 note: uint32 always! + sint16 width; // 0x04 + sint16 height; // 0x06 + sint16 x_offset; // 0x08 + sint16 y_offset; // 0x0A + uint16 flags; // 0x0C + uint16 zoomed_offset; // 0x0E +} rct_g1_element_32bit; +assert_struct_size(rct_g1_element_32bit, 0x10); + + enum { G1_FLAG_BMP = (1 << 0), //No invisible sections G1_FLAG_RLE_COMPRESSION = (1<<2), diff --git a/src/drawing/sprite.c b/src/drawing/sprite.c index 4787ed7684..26458bb1ab 100644 --- a/src/drawing/sprite.c +++ b/src/drawing/sprite.c @@ -31,6 +31,25 @@ rct_gx g2; rct_g1_element *g1Elements = (rct_g1_element*)RCT2_ADDRESS_G1_ELEMENTS; #endif +static void read_and_convert_gxdat(SDL_RWops *file, size_t count, rct_g1_element *elements) +{ + rct_g1_element_32bit *g1Elements32 = calloc(count, sizeof(rct_g1_element_32bit)); + SDL_RWread(file, g1Elements32, count * sizeof(rct_g1_element_32bit), 1); + for (size_t i = 0; i < count; i++) { + /* Double cast to silence compiler warning about casting to + * pointer from integer of mismatched length. + */ + elements[i].offset = (uint8*)(uintptr_t)g1Elements32[i].offset; + elements[i].width = g1Elements32[i].width; + elements[i].height = g1Elements32[i].height; + elements[i].x_offset = g1Elements32[i].x_offset; + elements[i].y_offset = g1Elements32[i].y_offset; + elements[i].flags = g1Elements32[i].flags; + elements[i].zoomed_offset = g1Elements32[i].zoomed_offset; + } + free(g1Elements32); +} + /** * * rct2: 0x00678998 @@ -77,18 +96,7 @@ int gfx_load_g1() g1Elements = calloc(324206, sizeof(rct_g1_element)); #endif - rct_g1_element_32bit *g1Elements32 = calloc(324206, sizeof(rct_g1_element_32bit)); - SDL_RWread(file, g1Elements32, header.num_entries * sizeof(rct_g1_element_32bit), 1); - for (uint32 i = 0; i < header.num_entries; i++) { - g1Elements[i].offset = (uint8*)g1Elements32[i].offset; - g1Elements[i].width = g1Elements32[i].width; - g1Elements[i].height = g1Elements32[i].height; - g1Elements[i].x_offset = g1Elements32[i].x_offset; - g1Elements[i].y_offset = g1Elements32[i].y_offset; - g1Elements[i].flags = g1Elements32[i].flags; - g1Elements[i].zoomed_offset = g1Elements32[i].zoomed_offset; - } - free(g1Elements32); + read_and_convert_gxdat(file, header.num_entries, g1Elements); // Read element data _g1Buffer = malloc(header.total_size); @@ -141,7 +149,8 @@ int gfx_load_g2() if (SDL_RWread(file, &g2.header, 8, 1) == 1) { // Read element headers g2.elements = malloc(g2.header.num_entries * sizeof(rct_g1_element)); - SDL_RWread(file, g2.elements, g2.header.num_entries * sizeof(rct_g1_element), 1); + + read_and_convert_gxdat(file, g2.header.num_entries, g2.elements); // Read element data g2.data = malloc(g2.header.total_size); diff --git a/src/object.c b/src/object.c index e7cbfb01fa..ad3928100a 100644 --- a/src/object.c +++ b/src/object.c @@ -460,17 +460,23 @@ int object_chunk_load_image_directory(uint8_t** chunk) rct_g1_element* g1_dest = &g1Elements[image_start_no]; // After length of data is the start of all g1 element structs - rct_g1_element* g1_source = (rct_g1_element*)(*chunk); + rct_g1_element_32bit* g1_source = (rct_g1_element_32bit*)(*chunk); // After the g1 element structs is the actual images. - uint8* image_offset = no_images * sizeof(rct_g1_element) + (uint8*)g1_source; + uintptr_t image_offset = no_images * sizeof(rct_g1_element_32bit) + (uintptr_t)g1_source; - for (int i = 0; i < no_images; ++i){ - *g1_dest = *g1_source++; - g1_dest->offset += (uint32)image_offset; + for (int i = 0; i < no_images; ++i) { + g1_dest->offset = (uint8*)(g1_source->offset + image_offset); + g1_dest->width = g1_source->width; + g1_dest->height = g1_source->height; + g1_dest->x_offset = g1_source->x_offset; + g1_dest->y_offset = g1_source->y_offset; + g1_dest->flags = g1_source->flags; + g1_dest->zoomed_offset = g1_source->zoomed_offset; g1_dest++; drawing_engine_invalidate_image(image_start_no + i); + g1_source++; } *chunk = ((uint8*)g1_source) + length_of_data; From d9bcf2d94698b3709d3a6d67e2f46ee4c739bc87 Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 4 May 2016 00:03:17 +0100 Subject: [PATCH 11/17] remove RCT2 memory checksum for Win32 NO_RCT2 --- src/openrct2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/openrct2.c b/src/openrct2.c index 91fa50fe9e..8dcb8e0f0d 100644 --- a/src/openrct2.c +++ b/src/openrct2.c @@ -571,6 +571,7 @@ bool openrct2_setup_rct2_segment() } #endif // defined(__unix__) +#if !defined(NO_RCT2) || !defined(__WINDOWS__) // Check that the expected data is at various addresses. // Start at 0x9a6000, which is start of .data, to skip the region containing addresses to DLL // calls, which can be changed by windows/wine loader. @@ -583,6 +584,7 @@ bool openrct2_setup_rct2_segment() log_warning("c2 = %u, expected %u, match %d", c2, exp_c2, c2 == exp_c2); return false; } +#endif return true; } From b1eb071b64534ec61e0ad6e999d69501f0202a5c Mon Sep 17 00:00:00 2001 From: Ted John Date: Wed, 4 May 2016 21:25:49 +0100 Subject: [PATCH 12/17] print NO_RCT2 flag in version info for binary confidence --- src/cmdline/RootCommands.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/cmdline/RootCommands.cpp b/src/cmdline/RootCommands.cpp index 32c1e2045e..89f0a29571 100644 --- a/src/cmdline/RootCommands.cpp +++ b/src/cmdline/RootCommands.cpp @@ -411,6 +411,9 @@ static void PrintVersion() openrct2_write_full_version_info(buffer, sizeof(buffer)); Console::WriteLine(buffer); Console::WriteFormat("%s (%s)", OPENRCT2_PLATFORM, OPENRCT2_ARCHITECTURE); +#if NO_RCT2 + Console::Write(" (NO_RCT2)"); +#endif Console::WriteLine(); } From 6c28df82503d6e6535038139a984e30486b35417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 22:57:40 +0200 Subject: [PATCH 13/17] Integrate gTypeToRideEntryIndexMap --- src/object.c | 4 ++-- src/ride/ride.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/object.c b/src/object.c index ad3928100a..2cb315bfdf 100644 --- a/src/object.c +++ b/src/object.c @@ -732,7 +732,7 @@ static bool object_type_ride_load(void *objectEntry, uint32 entryIndex) continue; } - uint8 *typeToRideEntryIndexMap = RCT2_ADDRESS(0x009E32F8, uint8); + uint8 *typeToRideEntryIndexMap = gTypeToRideEntryIndexMap; while (dl >= 0) { if (*typeToRideEntryIndexMap++ == 0xFF) { dl--; @@ -741,7 +741,7 @@ static bool object_type_ride_load(void *objectEntry, uint32 entryIndex) typeToRideEntryIndexMap--; uint8 previous_entry = entryIndex; - while (typeToRideEntryIndexMap < RCT2_ADDRESS(0x9E34E4, uint8)){ + while (typeToRideEntryIndexMap < gTypeToRideEntryIndexMap + countof(gTypeToRideEntryIndexMap)){ uint8 backup_entry = *typeToRideEntryIndexMap; *typeToRideEntryIndexMap++ = previous_entry; previous_entry = backup_entry; diff --git a/src/ride/ride.c b/src/ride/ride.c index b905609a28..f77c559b06 100644 --- a/src/ride/ride.c +++ b/src/ride/ride.c @@ -251,14 +251,12 @@ rct_ride_entry *get_ride_entry_by_ride(rct_ride *ride) * rct2: 0x006DED68 */ void reset_type_to_ride_entry_index_map(){ - uint8* typeToRideEntryIndexMap = RCT2_ADDRESS(0x009E32F8, uint8); - memset(typeToRideEntryIndexMap, 0xFF, 91); + memset(gTypeToRideEntryIndexMap, 0xFF, 91); } uint8 *get_ride_entry_indices_for_ride_type(uint8 rideType) { - uint8 *typeToRideEntryIndexMap = (uint8*)0x009E32F8; - uint8 *entryIndexList = typeToRideEntryIndexMap; + uint8 *entryIndexList = gTypeToRideEntryIndexMap; while (rideType > 0) { do { entryIndexList++; From 761fdfb7c048bbdc7cdcc0842b63fa5f40152727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 19 Jun 2016 23:03:05 +0200 Subject: [PATCH 14/17] Integrate gTotalNoImages --- src/object.c | 15 ++++++++------- src/object.h | 1 + src/object_list.c | 6 +++--- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/object.c b/src/object.c index 2cb315bfdf..80594f71fc 100644 --- a/src/object.c +++ b/src/object.c @@ -31,6 +31,7 @@ #include "world/water.h" char gTempObjectLoadName[9] = { 0 }; +uint32 gTotalNoImages = 0; int object_load_entry(const utf8 *path, rct_object_entry *outEntry) { @@ -113,7 +114,7 @@ int object_load_file(int groupIndex, const rct_object_entry *entry, int* chunkSi return 0; } - if (RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) >= 0x4726E){ + if (gTotalNoImages >= 0x4726E){ log_error("Object Load failed due to too many images loaded."); free(chunk); return 0; @@ -292,7 +293,7 @@ int object_load_packed(SDL_RWops* rw) return 0; } - if (RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) >= 0x4726E){ + if (gTotalNoImages >= 0x4726E){ log_error("Packed object has too many images."); free(chunk); return 0; @@ -446,7 +447,7 @@ int object_calculate_checksum(const rct_object_entry *entry, const uint8 *data, */ int object_chunk_load_image_directory(uint8_t** chunk) { - int image_start_no = RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32_t); + int image_start_no = gTotalNoImages; // First dword of chunk is no_images int no_images = *((uint32_t*)(*chunk)); @@ -455,7 +456,7 @@ int object_chunk_load_image_directory(uint8_t** chunk) int length_of_data = *((uint32_t*)(*chunk)); *chunk += 4; - RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32_t) = no_images + image_start_no; + gTotalNoImages = no_images + image_start_no; rct_g1_element* g1_dest = &g1Elements[image_start_no]; @@ -1711,11 +1712,11 @@ int object_get_scenario_text(rct_object_entry *entry) } // Save the real total images. - int total_no_images = RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32); + int total_no_images = gTotalNoImages; // This is being changed to force the images to be loaded into a different // image id. - RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) = 0x726E; + gTotalNoImages = 0x726E; gStexTempChunk = (rct_stex_entry*)chunk; // Not used anywhere. RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_TEXT_TEMP_OBJECT, rct_object_entry) = openedEntry; @@ -1730,7 +1731,7 @@ int object_get_scenario_text(rct_object_entry *entry) RCT2_GLOBAL(0x009ADAFC, uint8) = 0; // Not used?? RCT2_GLOBAL(0x009ADAFD, uint8) = 0; - RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) = total_no_images; + gTotalNoImages = total_no_images; return 1; } log_error("Opened object didn't match."); diff --git a/src/object.h b/src/object.h index c991489913..3c9b1a3ea2 100644 --- a/src/object.h +++ b/src/object.h @@ -106,6 +106,7 @@ extern uint32 gInstalledObjectsCount; extern rct_object_entry *gInstalledObjects; extern uint32 gNumInstalledRCT2Objects; extern uint32 gNumInstalledCustomObjects; +extern uint32 gTotalNoImages; extern void *gLastLoadedObjectChunkData; diff --git a/src/object_list.c b/src/object_list.c index b39b7aec39..99dced7f34 100644 --- a/src/object_list.c +++ b/src/object_list.c @@ -230,7 +230,7 @@ void reset_loaded_objects() { reset_type_to_ride_entry_index_map(); - RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) = 0xF26E; + gTotalNoImages = 0xF26E; for (int type = 0; type < 11; ++type){ for (int j = 0; j < object_entry_group_counts[type]; j++){ @@ -786,7 +786,7 @@ static uint32 install_object_entry(rct_object_entry* entry, rct_object_entry* in *((uint16*)(installed_entry_pointer + 9)) = 0; *((uint32*)(installed_entry_pointer + 11)) = 0; - RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) = 0xF26E; + gTotalNoImages = 0xF26E; gInstalledObjectsCount++; @@ -839,7 +839,7 @@ static uint32 install_object_entry(rct_object_entry* entry, rct_object_entry* in // This is deceptive. Due to setting the total no images earlier to 0xF26E // this is actually the no_images in this entry. - *((uint32*)installed_entry_pointer) = RCT2_GLOBAL(RCT2_ADDRESS_TOTAL_NO_IMAGES, uint32) - 0xF26E; + *((uint32*)installed_entry_pointer) = gTotalNoImages - 0xF26E; installed_entry_pointer += 4; uint8* esi = RCT2_ADDRESS(0x00F42BDB, uint8); From 199d0f03d8d3338cb668973a703f044c032452fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 19 Jun 2016 23:19:38 +0200 Subject: [PATCH 15/17] Integrate some scenario variables gScenarioTicks is still being used in some of native code --- src/scenario.c | 15 +++++++++++++++ src/scenario.h | 22 +++++++++++++--------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/scenario.c b/src/scenario.c index 7f22310439..018bbea720 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -66,6 +66,21 @@ char gScenarioSavePath[MAX_PATH]; int gFirstTimeSave = 1; uint32 gLastAutoSaveTick = 0; +#if defined(NO_RCT2) +uint32 gScenarioTicks; +#endif +uint32 gScenarioSrand0; +uint32 gScenarioSrand1; + +uint8 gScenarioObjectiveType; +uint8 gScenarioObjectiveYear; +uint16 gScenarioObjectiveNumGuests; +money32 gScenarioObjectiveCurrency; + +uint16 gScenarioParkRatingWarningDays; +money32 gScenarioCompletedCompanyValue; +money32 gScenarioCompanyValueRecord; + static int scenario_create_ducks(); static void scenario_objective_check(); diff --git a/src/scenario.h b/src/scenario.h index b9fa0a576d..dd35641e2a 100644 --- a/src/scenario.h +++ b/src/scenario.h @@ -427,18 +427,22 @@ typedef struct source_desc { extern const rct_string_id ScenarioCategoryStringIds[SCENARIO_CATEGORY_COUNT]; +#if defined(NO_RCT2) +extern uint32 gScenarioTicks; +#else #define gScenarioTicks RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_TICKS, uint32) -#define gScenarioSrand0 RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_SRAND_0, uint32) -#define gScenarioSrand1 RCT2_GLOBAL(RCT2_ADDRESS_SCENARIO_SRAND_1, uint32) +#endif +extern uint32 gScenarioSrand0; +extern uint32 gScenarioSrand1; -#define gScenarioObjectiveType RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_TYPE, uint8) -#define gScenarioObjectiveYear RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_YEAR, uint8) -#define gScenarioObjectiveNumGuests RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_NUM_GUESTS, uint16) -#define gScenarioObjectiveCurrency RCT2_GLOBAL(RCT2_ADDRESS_OBJECTIVE_CURRENCY, money32) +extern uint8 gScenarioObjectiveType; +extern uint8 gScenarioObjectiveYear; +extern uint16 gScenarioObjectiveNumGuests; +extern money32 gScenarioObjectiveCurrency; -#define gScenarioParkRatingWarningDays RCT2_GLOBAL(RCT2_ADDRESS_PARK_RATING_WARNING_DAYS, uint16) -#define gScenarioCompletedCompanyValue RCT2_GLOBAL(RCT2_ADDRESS_COMPLETED_COMPANY_VALUE, money32) -#define gScenarioCompanyValueRecord RCT2_GLOBAL(RCT2_ADDRESS_COMPANY_VALUE_RECORD, money32) +extern uint16 gScenarioParkRatingWarningDays; +extern money32 gScenarioCompletedCompanyValue; +extern money32 gScenarioCompanyValueRecord; // Scenario list extern int gScenarioListCount; From 35676d31f74d04b6795b91d3e6a2651487a92181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sun, 19 Jun 2016 23:47:06 +0200 Subject: [PATCH 16/17] Integrate path variables used by game --- src/game.c | 2 +- src/interface/console.c | 2 +- src/object.c | 8 +++--- src/object_list.c | 6 ++--- src/openrct2.c | 4 +-- src/rct2.c | 60 +++++++++++++++++++++-------------------- src/rct2.h | 7 +++++ src/scenario.c | 8 +++--- src/windows/loadsave.c | 2 +- 9 files changed, 54 insertions(+), 45 deletions(-) diff --git a/src/game.c b/src/game.c index d58214672c..9cdff4b448 100644 --- a/src/game.c +++ b/src/game.c @@ -783,7 +783,7 @@ bool game_load_save(const utf8 *path) log_verbose("loading saved game, %s", path); safe_strcpy((char*)0x0141EF68, path, MAX_PATH); - safe_strcpy((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2, path, MAX_PATH); + safe_strcpy((char*)gRCT2AddressSavedGamesPath2, path, MAX_PATH); safe_strcpy(gScenarioSavePath, path, MAX_PATH); diff --git a/src/interface/console.c b/src/interface/console.c index 6bfde3df3b..998aa73a15 100644 --- a/src/interface/console.c +++ b/src/interface/console.c @@ -893,7 +893,7 @@ static int cc_load_object(const utf8 **argv, int argc) { if (argc > 0) { utf8 path[MAX_PATH]; - substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), argv[0]); + substitute_path(path, gRCT2AddressObjectDataPath, argv[0]); strcat(path, ".DAT\0"); rct_object_entry entry; diff --git a/src/object.c b/src/object.c index 80594f71fc..ce0d7c86e3 100644 --- a/src/object.c +++ b/src/object.c @@ -57,7 +57,7 @@ int object_load_file(int groupIndex, const rct_object_entry *entry, int* chunkSi char path[MAX_PATH]; SDL_RWops* rw; - substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), (char*)installedObject + 16); + substitute_path(path, gRCT2AddressObjectDataPath, (char*)installedObject + 16); log_verbose("loading object, %s", path); @@ -344,7 +344,7 @@ int object_load_packed(SDL_RWops* rw) objectPath[i] = '\0'; } - substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), objectPath); + substitute_path(path, gRCT2AddressObjectDataPath, objectPath); // Require pointer to start of filename char* last_char = path + strlen(path); strcat(path, ".DAT"); @@ -354,7 +354,7 @@ int object_load_packed(SDL_RWops* rw) for (; platform_file_exists(path);){ for (char* curr_char = last_char - 1;; --curr_char){ if (*curr_char == '\\'){ - substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), "00000000.DAT"); + substitute_path(path, gRCT2AddressObjectDataPath, "00000000.DAT"); break; } if (*curr_char < '0') *curr_char = '0'; @@ -1669,7 +1669,7 @@ int object_get_scenario_text(rct_object_entry *entry) char path[MAX_PATH]; char *objectPath = (char*)installedObject + 16; - substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), objectPath); + substitute_path(path, gRCT2AddressObjectDataPath, objectPath); rct_object_entry openedEntry; SDL_RWops* rw = SDL_RWFromFile(path, "rb"); diff --git a/src/object_list.c b/src/object_list.c index 99dced7f34..19cbc4f301 100644 --- a/src/object_list.c +++ b/src/object_list.c @@ -252,7 +252,7 @@ static int object_list_query_directory(int *outTotalFiles, uint64 *outTotalFileS fileDateModifiedChecksum = 0; // Enumerate through each object in the directory - enumFileHandle = platform_enumerate_files_begin(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char)); + enumFileHandle = platform_enumerate_files_begin(gRCT2AddressObjectDataPath); if (enumFileHandle == INVALID_HANDLE) return 0; @@ -320,7 +320,7 @@ void object_list_load() _installedObjectFilters = NULL; } - enumFileHandle = platform_enumerate_files_begin(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char)); + enumFileHandle = platform_enumerate_files_begin(gRCT2AddressObjectDataPath); if (enumFileHandle != INVALID_HANDLE) { size_t installedObjectsCapacity = 4096; while (platform_enumerate_files_next(enumFileHandle, &enumFileInfo)) { @@ -337,7 +337,7 @@ void object_list_load() } char path[MAX_PATH]; - substitute_path(path, RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), enumFileInfo.path); + substitute_path(path, gRCT2AddressObjectDataPath, enumFileInfo.path); rct_object_entry entry; if (object_load_entry(path, &entry)) { diff --git a/src/openrct2.c b/src/openrct2.c index 8dcb8e0f0d..fcfe3fee32 100644 --- a/src/openrct2.c +++ b/src/openrct2.c @@ -166,10 +166,10 @@ static void openrct2_copy_original_user_files_over() utf8 path[MAX_PATH]; platform_get_user_directory(path, "save"); - openrct2_copy_files_over((utf8*)RCT2_ADDRESS_SAVED_GAMES_PATH, path, ".sv6"); + openrct2_copy_files_over((utf8*)gRCT2AddressSavedGamesPath, path, ".sv6"); platform_get_user_directory(path, "landscape"); - openrct2_copy_files_over((utf8*)RCT2_ADDRESS_LANDSCAPES_PATH, path, ".sc6"); + openrct2_copy_files_over((utf8*)gRCT2AddressLandscapesPath, path, ".sc6"); } bool openrct2_initialise() diff --git a/src/rct2.c b/src/rct2.c index b61f92046b..b081a7db5b 100644 --- a/src/rct2.c +++ b/src/rct2.c @@ -114,6 +114,13 @@ uint8 gSavePromptMode; sint32 gScreenWidth; sint32 gScreenHeight; +char gRCT2AddressSavedGamesPath[MAX_PATH]; +char gRCT2AddressSavedGamesPath2[MAX_PATH]; +char gRCT2AddressScenariosPath[MAX_PATH]; +char gRCT2AddressLandscapesPath[MAX_PATH]; +char gRCT2AddressObjectDataPath[MAX_PATH]; +char gRCT2AddressTracksPath[MAX_PATH]; + typedef struct tm tm_t; void print_launch_information(); @@ -213,41 +220,36 @@ int rct2_init_directories() char separator[] = {platform_get_path_separator(), 0}; - strcpy(RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char), gConfigGeneral.game_path); + char gRCT2AddressAppPath[MAX_PATH] = { 0 }; - strcpy(RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH_SLASH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH_SLASH, char), separator); + strcpy(gRCT2AddressAppPath, gConfigGeneral.game_path); + strcat(gRCT2AddressAppPath, separator); - strcpy(RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH, char), separator); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH, char), "Saved Games"); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH, char), separator); + strcpy(gRCT2AddressSavedGamesPath, gRCT2AddressAppPath); + strcat(gRCT2AddressSavedGamesPath, "Saved Games"); + strcat(gRCT2AddressSavedGamesPath, separator); - strcpy(RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), separator); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), "Scenarios"); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), separator); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), "*.SC6"); + strcpy(gRCT2AddressScenariosPath, gRCT2AddressAppPath); + strcat(gRCT2AddressScenariosPath, "Scenarios"); + strcat(gRCT2AddressScenariosPath, separator); + strcat(gRCT2AddressScenariosPath, "*.SC6"); - strcpy(RCT2_ADDRESS(RCT2_ADDRESS_LANDSCAPES_PATH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_LANDSCAPES_PATH, char), separator); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_LANDSCAPES_PATH, char), "Landscapes"); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_LANDSCAPES_PATH, char), separator); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_LANDSCAPES_PATH, char), "*.SC6"); + strcpy(gRCT2AddressLandscapesPath, gRCT2AddressAppPath); + strcat(gRCT2AddressLandscapesPath, "Landscapes"); + strcat(gRCT2AddressLandscapesPath, separator); + strcat(gRCT2AddressLandscapesPath, "*.SC6"); - strcpy(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), separator); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), "ObjData"); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), separator); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_OBJECT_DATA_PATH, char), "*.DAT"); + strcpy(gRCT2AddressObjectDataPath, gRCT2AddressAppPath); + strcat(gRCT2AddressObjectDataPath, "ObjData"); + strcat(gRCT2AddressObjectDataPath, separator); + strcat(gRCT2AddressObjectDataPath, "*.DAT"); - strcpy(RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), RCT2_ADDRESS(RCT2_ADDRESS_APP_PATH, char)); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), separator); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), "Tracks"); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), separator); - strcat(RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), "*.TD?"); + strcpy(gRCT2AddressTracksPath, gRCT2AddressAppPath); + strcat(gRCT2AddressTracksPath, "Tracks"); + strcat(gRCT2AddressTracksPath, separator); + strcat(gRCT2AddressTracksPath, "*.TD?"); - strcpy(RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH_2, char), RCT2_ADDRESS(RCT2_ADDRESS_SAVED_GAMES_PATH, char)); + strcpy(gRCT2AddressSavedGamesPath2, gRCT2AddressSavedGamesPath); return 1; } @@ -351,7 +353,7 @@ bool rct2_open_file(const char *path) extension++; if (_stricmp(extension, "sv6") == 0) { - strcpy((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2, path); + strcpy((char*)gRCT2AddressSavedGamesPath2, path); game_load_save(path); gFirstTimeSave = 0; return true; diff --git a/src/rct2.h b/src/rct2.h index 923ab22f65..1d12df5cd1 100644 --- a/src/rct2.h +++ b/src/rct2.h @@ -279,6 +279,13 @@ extern uint8 gSavePromptMode; extern sint32 gScreenWidth; extern sint32 gScreenHeight; +extern char gRCT2AddressSavedGamesPath[]; +extern char gRCT2AddressSavedGamesPath2[]; +extern char gRCT2AddressScenariosPath[]; +extern char gRCT2AddressLandscapesPath[]; +extern char gRCT2AddressObjectDataPath[]; +extern char gRCT2AddressTracksPath[]; + int rct2_init(); void rct2_dispose(); void rct2_update(); diff --git a/src/scenario.c b/src/scenario.c index 018bbea720..d576cfc5c4 100644 --- a/src/scenario.c +++ b/src/scenario.c @@ -244,9 +244,9 @@ void scenario_begin() strncat(gScenarioSavePath, parkName, sizeof(gScenarioSavePath) - strlen(gScenarioSavePath) - 1); strncat(gScenarioSavePath, ".sv6", sizeof(gScenarioSavePath) - strlen(gScenarioSavePath) - 1); - strcpy((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2, (char*)RCT2_ADDRESS_SAVED_GAMES_PATH); - strcpy((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2 + strlen((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2), gScenarioSavePath); - strcat((char*)RCT2_ADDRESS_SAVED_GAMES_PATH_2, ".SV6"); + strcpy(gRCT2AddressSavedGamesPath2, gRCT2AddressSavedGamesPath); + strcpy(gRCT2AddressSavedGamesPath2 + strlen(gRCT2AddressSavedGamesPath2), gScenarioSavePath); + strcat(gRCT2AddressSavedGamesPath2, ".SV6"); memset((void*)0x001357848, 0, 56); gCurrentExpenditure = 0; @@ -299,7 +299,7 @@ void scenario_end() void scenario_set_filename(const char *value) { - substitute_path(_scenarioPath, RCT2_ADDRESS(RCT2_ADDRESS_SCENARIOS_PATH, char), value); + substitute_path(_scenarioPath, gRCT2AddressScenariosPath, value); _scenarioFileName = path_get_filename(_scenarioPath); } diff --git a/src/windows/loadsave.c b/src/windows/loadsave.c index c068229904..c77eedc847 100644 --- a/src/windows/loadsave.c +++ b/src/windows/loadsave.c @@ -237,7 +237,7 @@ rct_window *window_loadsave_open(int type, char *defaultName) } */ - safe_strcpy(path, RCT2_ADDRESS(RCT2_ADDRESS_TRACKS_PATH, char), MAX_PATH); + safe_strcpy(path, gRCT2AddressTracksPath, MAX_PATH); ch = strchr(path, '*'); if (ch != NULL) *ch = 0; From 42d6c8de4f5cbef8d3cd0c666026b6b90013e3eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Fri, 24 Jun 2016 23:13:40 +0200 Subject: [PATCH 17/17] Define NO_RCT2 for non-x86 platforms --- src/common.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common.h b/src/common.h index cd2a13869c..9e6435a3df 100644 --- a/src/common.h +++ b/src/common.h @@ -32,6 +32,8 @@ #if defined(__i386__) || defined(_M_IX86) #define PLATFORM_X86 +#else +#define NO_RCT2 1 #endif #if defined(__LP64__) || defined(_WIN64)