From d0d5cc51790a46b05cd0930e6187d033817e740f Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 16 Sep 2020 19:29:43 +0300 Subject: [PATCH] Remove unused declarations --- src/openrct2-ui/input/KeyboardShortcuts.h | 1 - src/openrct2/Context.h | 1 - src/openrct2/management/NewsItem.h | 3 --- src/openrct2/peep/Peep.h | 3 --- src/openrct2/ride/Ride.h | 2 -- src/openrct2/scenario/Scenario.h | 8 -------- src/openrct2/world/Footpath.h | 2 -- src/openrct2/world/MapGen.h | 1 - src/openrct2/world/Sprite.h | 3 --- 9 files changed, 24 deletions(-) diff --git a/src/openrct2-ui/input/KeyboardShortcuts.h b/src/openrct2-ui/input/KeyboardShortcuts.h index b4a46cf66b..386bce0eef 100644 --- a/src/openrct2-ui/input/KeyboardShortcuts.h +++ b/src/openrct2-ui/input/KeyboardShortcuts.h @@ -167,6 +167,5 @@ void keyboard_shortcuts_format_string(char* buffer, size_t bufferSize, int32_t s void keyboard_shortcut_handle(int32_t key); void keyboard_shortcut_handle_command(OpenRCT2::Input::Shortcut shortcut); -void keyboard_shortcut_format_string(char* buffer, size_t size, uint16_t shortcutKey); ScreenCoordsXY get_keyboard_map_scroll(const uint8_t* keysState); diff --git a/src/openrct2/Context.h b/src/openrct2/Context.h index d575ef4b12..60730a8906 100644 --- a/src/openrct2/Context.h +++ b/src/openrct2/Context.h @@ -259,7 +259,6 @@ void context_force_close_window_by_class(rct_windowclass wc); void context_update_map_tooltip(); void context_handle_input(); void context_input_handle_keyboard(bool isTitle); -bool context_read_bmp(void** outPixels, uint32_t* outWidth, uint32_t* outHeight, const utf8* path); void context_quit(); const utf8* context_get_path_legacy(int32_t pathId); bool context_load_park_from_file(const utf8* path); diff --git a/src/openrct2/management/NewsItem.h b/src/openrct2/management/NewsItem.h index ed034a5fbe..7fadc0e162 100644 --- a/src/openrct2/management/NewsItem.h +++ b/src/openrct2/management/NewsItem.h @@ -246,8 +246,6 @@ namespace News uint16_t IncrementTicks(); News::Item& Current(); const News::Item& Current() const; - News::Item& Oldest(); - const News::Item& Oldest() const; bool CurrentShouldBeArchived() const; void ArchiveCurrent(); News::Item* FirstOpenOrNewSlot(); @@ -278,7 +276,6 @@ namespace News private: int32_t RemoveTime() const; - void AppendToArchive(News::Item& item); News::ItemQueue Recent; News::ItemQueue Archived; diff --git a/src/openrct2/peep/Peep.h b/src/openrct2/peep/Peep.h index 64f1cb6ea9..de6aa673b3 100644 --- a/src/openrct2/peep/Peep.h +++ b/src/openrct2/peep/Peep.h @@ -1046,8 +1046,6 @@ void peep_applause(); void peep_thought_set_format_args(const rct_peep_thought* thought, Formatter& ft); int32_t get_peep_face_sprite_small(Peep* peep); int32_t get_peep_face_sprite_large(Peep* peep); -void game_command_pickup_guest( - int32_t* eax, int32_t* ebx, int32_t* ecx, int32_t* edx, int32_t* esi, int32_t* edi, int32_t* ebp); void peep_sprite_remove(Peep* peep); void peep_window_state_update(Peep* peep); @@ -1056,7 +1054,6 @@ void peep_decrement_num_riders(Peep* peep); void peep_set_map_tooltip(Peep* peep); int32_t peep_compare(const uint16_t sprite_index_a, const uint16_t sprite_index_b); -void SwitchToSpecialSprite(Peep* peep, uint8_t special_sprite_id); void peep_update_names(bool realNames); void guest_set_name(uint16_t spriteIndex, const char* name); diff --git a/src/openrct2/ride/Ride.h b/src/openrct2/ride/Ride.h index 8b2e09f663..1ea8be85df 100644 --- a/src/openrct2/ride/Ride.h +++ b/src/openrct2/ride/Ride.h @@ -1036,7 +1036,6 @@ ride_id_t GetNextFreeRideId(); Ride* GetOrAllocateRide(ride_id_t index); rct_ride_entry* get_ride_entry(ObjectEntryIndex index); std::string_view get_ride_entry_name(ObjectEntryIndex index); -RideMeasurement* get_ride_measurement(int32_t index); extern money16 gTotalRideValueForMoney; @@ -1083,7 +1082,6 @@ extern bool gGotoStartPlacementMode; extern uint8_t gLastEntranceStyle; -ride_id_t ride_get_empty_slot(); int32_t ride_get_count(); void ride_init_all(); void reset_all_ride_build_dates(); diff --git a/src/openrct2/scenario/Scenario.h b/src/openrct2/scenario/Scenario.h index ca214a8b4c..3c0890c21d 100644 --- a/src/openrct2/scenario/Scenario.h +++ b/src/openrct2/scenario/Scenario.h @@ -452,15 +452,7 @@ bool scenario_create_ducks(); const random_engine_t::state_type& scenario_rand_state(); void scenario_rand_seed(random_engine_t::result_type s0, random_engine_t::result_type s1); -#ifdef DEBUG_DESYNC -uint32_t dbg_scenario_rand(const char* file, const char* function, const uint32_t line, const void* data); -# define scenario_rand() dbg_scenario_rand(__FILE__, __FUNCTION__, __LINE__, NULL) -# define scenario_rand_data(data) dbg_scenario_rand(__FILE__, __FUNCTION__, __LINE__, data) -void dbg_report_desync(uint32_t tick, uint32_t srand0, uint32_t server_srand0, const char* clientHash, const char* serverHash); -#else random_engine_t::result_type scenario_rand(); -#endif - uint32_t scenario_rand_max(uint32_t max); bool scenario_prepare_for_save(); diff --git a/src/openrct2/world/Footpath.h b/src/openrct2/world/Footpath.h index 9d041503e1..6a033139cb 100644 --- a/src/openrct2/world/Footpath.h +++ b/src/openrct2/world/Footpath.h @@ -178,8 +178,6 @@ extern const CoordsXY BinUseOffsets[NumOrthogonalDirections]; extern const CoordsXY BenchUseOffsets[NumOrthogonalDirections * 2]; TileElement* map_get_footpath_element(const CoordsXYZ& coords); -struct PathElement; -PathElement* map_get_footpath_element_slope(const CoordsXYZ& footpathPos, int32_t slope); void footpath_interrupt_peeps(const CoordsXYZ& footpathPos); money32 footpath_remove(const CoordsXYZ& footpathLoc, int32_t flags); money32 footpath_provisional_set(int32_t type, const CoordsXYZ& footpathLoc, int32_t slope); diff --git a/src/openrct2/world/MapGen.h b/src/openrct2/world/MapGen.h index b0929ee74b..ed4d3a932f 100644 --- a/src/openrct2/world/MapGen.h +++ b/src/openrct2/world/MapGen.h @@ -38,7 +38,6 @@ struct mapgen_settings void mapgen_generate_blank(mapgen_settings* settings); void mapgen_generate(mapgen_settings* settings); -void mapgen_generate_custom_simplex(mapgen_settings* settings); bool mapgen_load_heightmap(const utf8* path); void mapgen_unload_heightmap(); void mapgen_generate_from_heightmap(mapgen_settings* settings); diff --git a/src/openrct2/world/Sprite.h b/src/openrct2/world/Sprite.h index 9240cc0a9b..416fdbf667 100644 --- a/src/openrct2/world/Sprite.h +++ b/src/openrct2/world/Sprite.h @@ -255,7 +255,6 @@ void balloon_update(Balloon* balloon); // Duck /////////////////////////////////////////////////////////////// void create_duck(const CoordsXY& pos); -void duck_update(Duck* duck); void duck_press(Duck* duck); void duck_remove_all(); @@ -263,9 +262,7 @@ void duck_remove_all(); // Crash particles /////////////////////////////////////////////////////////////// void crashed_vehicle_particle_create(rct_vehicle_colour colours, const CoordsXYZ& vehiclePos); -void crashed_vehicle_particle_update(VehicleCrashParticle* particle); void crash_splash_create(const CoordsXYZ& splashPos); -void crash_splash_update(CrashSplashParticle* splash); rct_sprite_checksum sprite_checksum();