From a07daae770b64d905206f57cf12b883cba8a1d64 Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Sat, 13 Aug 2022 23:24:15 +0200 Subject: [PATCH] Remove some unused symbols (#17808) --- src/openrct2/common.h | 1 - src/openrct2/drawing/LightFX.cpp | 2 -- src/openrct2/drawing/X8DrawingEngine.h | 1 - src/openrct2/object/Object.cpp | 9 --------- src/openrct2/object/Object.h | 13 ------------- src/openrct2/object/ObjectRepository.cpp | 12 ------------ 6 files changed, 38 deletions(-) diff --git a/src/openrct2/common.h b/src/openrct2/common.h index 26b8616526..ea56c38499 100644 --- a/src/openrct2/common.h +++ b/src/openrct2/common.h @@ -132,7 +132,6 @@ constexpr money16 ToMoney16(money64 value) return value == MONEY64_UNDEFINED ? MONEY16_UNDEFINED : static_cast(value); } -using EMPTY_ARGS_VOID_POINTER = void(); using StringId = uint16_t; #define SafeFree(x) \ diff --git a/src/openrct2/drawing/LightFX.cpp b/src/openrct2/drawing/LightFX.cpp index 390ffbc342..1ae31581c2 100644 --- a/src/openrct2/drawing/LightFX.cpp +++ b/src/openrct2/drawing/LightFX.cpp @@ -187,8 +187,6 @@ void lightfx_update_buffers(rct_drawpixelinfo* info) _pixelInfo = *info; } -extern void viewport_paint_setup(); - void lightfx_prepare_light_list() { for (uint32_t light = 0; light < LightListCurrentCountFront; light++) diff --git a/src/openrct2/drawing/X8DrawingEngine.h b/src/openrct2/drawing/X8DrawingEngine.h index e4787e94c3..aee22dfd59 100644 --- a/src/openrct2/drawing/X8DrawingEngine.h +++ b/src/openrct2/drawing/X8DrawingEngine.h @@ -120,7 +120,6 @@ namespace OpenRCT2 private: void ConfigureDirtyGrid(); - static void ResetWindowVisbilities(); void DrawAllDirtyBlocks(); uint32_t GetNumDirtyRows(const uint32_t x, const uint32_t y, const uint32_t columns); void DrawDirtyBlocks(uint32_t x, uint32_t y, uint32_t columns, uint32_t rows); diff --git a/src/openrct2/object/Object.cpp b/src/openrct2/object/Object.cpp index 936d0b0209..5e93485b89 100644 --- a/src/openrct2/object/Object.cpp +++ b/src/openrct2/object/Object.cpp @@ -114,15 +114,6 @@ void Object::PopulateTablesFromJson(IReadObjectContext* context, json_t& root) _usesFallbackImages = _imageTable.ReadJson(context, root); } -rct_object_entry Object::ParseObjectEntry(const std::string& s) -{ - rct_object_entry entry = {}; - std::fill_n(entry.name, sizeof(entry.name), ' '); - auto copyLen = std::min(8, s.size()); - std::copy_n(s.c_str(), copyLen, entry.name); - return entry; -} - std::string Object::GetOverrideString(uint8_t index) const { auto legacyIdentifier = GetLegacyIdentifier(); diff --git a/src/openrct2/object/Object.h b/src/openrct2/object/Object.h index 5f35eb6c84..7b75749912 100644 --- a/src/openrct2/object/Object.h +++ b/src/openrct2/object/Object.h @@ -159,15 +159,6 @@ struct rct_object_entry }; assert_struct_size(rct_object_entry, 0x10); -struct rct_object_entry_group -{ - void** chunks; - rct_object_entry* entries; -}; -#ifdef PLATFORM_32BIT -assert_struct_size(rct_object_entry_group, 8); -#endif - #pragma pack(pop) struct rct_ride_filters @@ -312,8 +303,6 @@ protected: */ void PopulateTablesFromJson(IReadObjectContext* context, json_t& root); - static rct_object_entry ParseObjectEntry(const std::string& s); - std::string GetOverrideString(uint8_t index) const; std::string GetString(ObjectStringID index) const; std::string GetString(int32_t language, ObjectStringID index) const; @@ -422,8 +411,6 @@ extern int32_t object_entry_group_encoding[]; int32_t object_calculate_checksum(const rct_object_entry* entry, const void* data, size_t dataLength); void object_create_identifier_name(char* string_buffer, size_t size, const rct_object_entry* object); -const rct_object_entry* object_list_find(rct_object_entry* entry); - void object_entry_get_name_fixed(utf8* buffer, size_t bufferSize, const rct_object_entry* entry); void* object_entry_get_chunk(ObjectType objectType, ObjectEntryIndex index); diff --git a/src/openrct2/object/ObjectRepository.cpp b/src/openrct2/object/ObjectRepository.cpp index 12a064290e..971e17466d 100644 --- a/src/openrct2/object/ObjectRepository.cpp +++ b/src/openrct2/object/ObjectRepository.cpp @@ -654,18 +654,6 @@ bool IsObjectCustom(const ObjectRepositoryItem* object) } } -const rct_object_entry* object_list_find(rct_object_entry* entry) -{ - const rct_object_entry* result = nullptr; - auto& objRepo = GetContext()->GetObjectRepository(); - auto item = objRepo.FindObject(entry); - if (item != nullptr) - { - result = &item->ObjectEntry; - } - return result; -} - std::unique_ptr object_repository_load_object(const rct_object_entry* objectEntry) { std::unique_ptr object;