From 8d168fb2ce314ba9a658ab877bddc22e18c5504e Mon Sep 17 00:00:00 2001 From: Ted John Date: Sat, 2 Jul 2016 20:42:10 +0100 Subject: [PATCH] remove more old object code --- src/addresses.h | 5 +- src/object.h | 6 -- src/object_list.c | 104 -------------------------- src/object_list.h | 2 - src/windows/editor_object_selection.c | 2 - src/windows/options.c | 5 +- 6 files changed, 3 insertions(+), 121 deletions(-) diff --git a/src/addresses.h b/src/addresses.h index 7885109865..b62873a7e4 100644 --- a/src/addresses.h +++ b/src/addresses.h @@ -98,9 +98,6 @@ #define RCT2_ADDRESS_WATER_ENTRIES 0x009ADAE0 #define RCT2_ADDRESS_SCENARIO_TEXT_ENTRIES 0x009ADAE4 -#define RCT2_ADDRESS_INSTALLED_OBJECT_LIST 0x009ADAE8 -#define RCT2_ADDRESS_TOTAL_NO_IMAGES 0x009ADAF0 - #define RCT2_ADDRESS_CURRENT_SOUND_DEVICE 0x009AF280 #define RCT2_ADDRESS_VEHICLE_SOUND_LIST 0x009AF288 @@ -478,7 +475,9 @@ #define RCT2_ADDRESS_RUN_INTRO_TICK_PART 0x009AC319 #define RCT2_ADDRESS_WINDOW_MAP_FLASHING_FLAGS 0x009AC861 +#define RCT2_ADDRESS_INSTALLED_OBJECT_LIST 0x009ADAE8 #define RCT2_ADDRESS_EDITOR_OBJECT_FLAGS_LIST 0x009ADAEC +#define RCT2_ADDRESS_TOTAL_NO_IMAGES 0x009ADAF0 #define RCT2_ADDRESS_TOOL_WINDOWNUMBER 0x009DE542 #define RCT2_ADDRESS_TOOL_WINDOWCLASS 0x009DE544 diff --git a/src/object.h b/src/object.h index 4defcbf9b0..be5ee43f44 100644 --- a/src/object.h +++ b/src/object.h @@ -107,14 +107,8 @@ assert_struct_size(rct_object_filters, 3); extern const rct_object_entry_group object_entry_groups[]; extern char gTempObjectLoadName[9]; -extern uint32 gInstalledObjectsCount; -extern rct_object_entry *gInstalledObjects; -extern uint32 gNumInstalledRCT2Objects; -extern uint32 gNumInstalledCustomObjects; extern uint32 gTotalNoImages; -extern void *gLastLoadedObjectChunkData; - int object_load_entry(const utf8 *path, rct_object_entry *outEntry); void object_list_load(); void set_load_objects_fail_reason(); diff --git a/src/object_list.c b/src/object_list.c index a58a5bdcd4..28ac2f5bf1 100644 --- a/src/object_list.c +++ b/src/object_list.c @@ -91,45 +91,6 @@ const rct_object_entry_group object_entry_groups[] = { (void**)(gStexEntries ), (rct_object_entry_extended*)(0x00F3F03C + (720 * 20)) // scenario text 0x009ADAE4, 0xF4287C }; -static void load_object_filter(rct_object_entry* entry, uint8* chunk, rct_object_filters* filter); - -static rct_object_filters *_installedObjectFilters = NULL; - -rct_stex_entry *gStexTempChunk; - -uint32 gInstalledObjectsCount; -rct_object_entry *gInstalledObjects; -uint32 gNumInstalledRCT2Objects; -uint32 gNumInstalledCustomObjects; - -void *gLastLoadedObjectChunkData; - -static uint32 object_list_count_custom_objects() -{ - size_t numObjects = object_repository_get_items_count(); - const ObjectRepositoryItem * items = object_repository_get_items(); - - uint32 numCustomObjects = 0; - for (size_t i = 0; i < numObjects; i++) { - if ((items[i].ObjectEntry.flags & 0xF0) == 0) { - numCustomObjects++; - } - } - - gNumInstalledCustomObjects = numCustomObjects; - return numCustomObjects; -} - -/** - * - * rct2: 0x006A93CD - */ -static void object_list_examine() -{ - object_list_count_custom_objects(); - // object_list_sort(); -} - int check_object_entry(rct_object_entry *entry) { uint32 *dwords = (uint32*)entry; @@ -289,71 +250,6 @@ int find_object_in_entry_group(const rct_object_entry* entry, uint8* entry_type, return 1; } -rct_string_id object_get_name_string_id(rct_object_entry *entry, const void *chunk) -{ - int objectType = entry->flags & 0x0F; - switch (objectType) { - case OBJECT_TYPE_RIDE: - return ((rct_ride_entry*)chunk)->name; - case OBJECT_TYPE_SMALL_SCENERY: - case OBJECT_TYPE_LARGE_SCENERY: - case OBJECT_TYPE_WALLS: - case OBJECT_TYPE_BANNERS: - case OBJECT_TYPE_PATH_BITS: - return ((rct_scenery_entry*)chunk)->name; - case OBJECT_TYPE_PATHS: - return ((rct_footpath_entry*)chunk)->string_idx; - case OBJECT_TYPE_SCENERY_SETS: - return ((rct_scenery_set_entry*)chunk)->name; - case OBJECT_TYPE_PARK_ENTRANCE: - return ((rct_entrance_type*)chunk)->string_idx; - case OBJECT_TYPE_WATER: - return ((rct_water_type*)chunk)->string_idx; - case OBJECT_TYPE_SCENARIO_TEXT: - return ((rct_stex_entry*)chunk)->scenario_name; - default: - return STR_NONE; - } -} - -static void load_object_filter(rct_object_entry* entry, uint8* chunk, rct_object_filters* filter) -{ - rct_ride_entry *rideType; - rct_ride_filters *rideFilter; - - switch (entry->flags & 0xF) { - case OBJECT_TYPE_RIDE: - rideType = ((rct_ride_entry*)chunk); - rideFilter = &(filter->ride); - - rideFilter->category[0] = rideType->category[0]; - rideFilter->category[1] = rideType->category[1]; - - for (int i = 0; i < 3; i++) { - rideFilter->ride_type = rideType->ride_type[i]; - if (rideFilter->ride_type != 255) - break; - } - break; - case OBJECT_TYPE_SMALL_SCENERY: - case OBJECT_TYPE_LARGE_SCENERY: - case OBJECT_TYPE_WALLS: - case OBJECT_TYPE_BANNERS: - case OBJECT_TYPE_PATHS: - case OBJECT_TYPE_PATH_BITS: - case OBJECT_TYPE_SCENERY_SETS: - case OBJECT_TYPE_PARK_ENTRANCE: - case OBJECT_TYPE_WATER: - case OBJECT_TYPE_SCENARIO_TEXT: - break; - } -} - -rct_object_filters *get_object_filter(int index) -{ - return &_installedObjectFilters[index]; -} - void object_list_init() { for (uint8 objectType = 0; objectType < OBJECT_ENTRY_GROUP_COUNT; objectType++) { diff --git a/src/object_list.h b/src/object_list.h index 34b360b88e..6e1e6a3463 100644 --- a/src/object_list.h +++ b/src/object_list.h @@ -33,7 +33,5 @@ #define gStexEntries RCT2_ADDRESS(RCT2_ADDRESS_SCENARIO_TEXT_ENTRIES, rct_stex_entry*) #endif -extern rct_stex_entry *gStexTempChunk; - void object_list_init(); void *get_loaded_object_entry(size_t index); diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c index e592f3eb52..d92021219d 100644 --- a/src/windows/editor_object_selection.c +++ b/src/windows/editor_object_selection.c @@ -1294,8 +1294,6 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf gfx_draw_string_left(dpi, 3164, gCommonFormatArgs, 0, x, y); } - rct_stex_entry* stex_entry = gStexTempChunk; - // Draw sort button text widget = &w->widgets[WIDX_LIST_SORT_TYPE]; if (widget->type != WWT_EMPTY) { diff --git a/src/windows/options.c b/src/windows/options.c index 12b4e2e718..6371f05282 100644 --- a/src/windows/options.c +++ b/src/windows/options.c @@ -1536,10 +1536,7 @@ static void window_options_invalidate(rct_window *w) w->disabled_widgets |= (1ULL << WIDX_REAL_NAME_CHECKBOX); // save plugin data checkbox: visible or not - if (gNumInstalledCustomObjects == 0) - window_options_misc_widgets[WIDX_SAVE_PLUGIN_DATA_CHECKBOX].type = WWT_EMPTY; - else - window_options_misc_widgets[WIDX_SAVE_PLUGIN_DATA_CHECKBOX].type = WWT_CHECKBOX; + window_options_misc_widgets[WIDX_SAVE_PLUGIN_DATA_CHECKBOX].type = WWT_CHECKBOX; widget_set_checkbox_value(w, WIDX_REAL_NAME_CHECKBOX, gParkFlags & PARK_FLAGS_SHOW_REAL_GUEST_NAMES); widget_set_checkbox_value(w, WIDX_SAVE_PLUGIN_DATA_CHECKBOX, gConfigGeneral.save_plugin_data);