diff --git a/src/openrct2-ui/scripting/ScTitleSequence.hpp b/src/openrct2-ui/scripting/ScTitleSequence.hpp index c2e61a04bf..04aa9a83fa 100644 --- a/src/openrct2-ui/scripting/ScTitleSequence.hpp +++ b/src/openrct2-ui/scripting/ScTitleSequence.hpp @@ -360,7 +360,7 @@ namespace OpenRCT2::Scripting const auto* item = GetItem(); if (item != nullptr) { - return item->PredefinedIndex != std::numeric_limits::max(); + return item->PredefinedIndex != PREDEFINED_INDEX_CUSTOM; } return {}; } diff --git a/src/openrct2/title/TitleSequenceManager.cpp b/src/openrct2/title/TitleSequenceManager.cpp index e819c640e3..da61dd419f 100644 --- a/src/openrct2/title/TitleSequenceManager.cpp +++ b/src/openrct2/title/TitleSequenceManager.cpp @@ -182,13 +182,9 @@ namespace TitleSequenceManager // Sort sequences by predefined index and then name std::sort( _items.begin(), _items.end(), [](const TitleSequenceManagerItem& a, const TitleSequenceManagerItem& b) -> bool { - if (a.PredefinedIndex < b.PredefinedIndex) + if (a.PredefinedIndex != b.PredefinedIndex) { - return true; - } - if (a.PredefinedIndex > b.PredefinedIndex) - { - return false; + return a.PredefinedIndex < b.PredefinedIndex; } return _strcmpi(a.Name.c_str(), b.Name.c_str()) < 0; }); @@ -366,11 +362,6 @@ size_t title_sequence_manager_get_index_for_name(const utf8* name) return SIZE_MAX; } -bool title_sequence_manager_is_name_reserved(const utf8* name) -{ - return TitleSequenceManager::IsNameReserved(name); -} - void title_sequence_manager_scan() { TitleSequenceManager::Scan(); diff --git a/src/openrct2/title/TitleSequenceManager.h b/src/openrct2/title/TitleSequenceManager.h index 17ff5b7932..c4fb3a236a 100644 --- a/src/openrct2/title/TitleSequenceManager.h +++ b/src/openrct2/title/TitleSequenceManager.h @@ -11,6 +11,7 @@ #include "../common.h" #include "../core/String.hpp" +#include #include struct TitleSequenceManagerItem @@ -32,7 +33,7 @@ namespace TitleSequenceManager void Scan(); } // namespace TitleSequenceManager -constexpr const size_t PREDEFINED_INDEX_CUSTOM = SIZE_MAX; +constexpr const size_t PREDEFINED_INDEX_CUSTOM = std::numeric_limits::max(); size_t title_sequence_manager_get_count(); const utf8* title_sequence_manager_get_name(size_t index); @@ -41,7 +42,6 @@ const utf8* title_sequence_manager_get_config_id(size_t index); size_t title_sequence_manager_get_predefined_index(size_t index); size_t title_sequence_manager_get_index_for_config_id(const utf8* configId); size_t title_sequence_manager_get_index_for_name(const utf8* name); -bool title_sequence_manager_is_name_reserved(const utf8* name); void title_sequence_manager_scan(); void title_sequence_manager_delete(size_t i); size_t title_sequence_manager_rename(size_t i, const utf8* name);