diff --git a/src/core/Collections.hpp b/src/core/Collections.hpp index c937bfed26..2dbde38388 100644 --- a/src/core/Collections.hpp +++ b/src/core/Collections.hpp @@ -110,7 +110,7 @@ namespace Collections return nullptr; } - auto * items = Memory::AllocateArray(count); + auto * items = Memory::AllocateArray(count); size_t i = 0; for (const auto &item : collection) { diff --git a/src/title.c b/src/title.c index 98270ad260..97772b5473 100644 --- a/src/title.c +++ b/src/title.c @@ -47,7 +47,6 @@ #include "world/sprite.h" #include "windows/error.h" -static const int gRandomShowcase = 0; bool gTitleHideVersionInfo = false; @@ -445,7 +444,6 @@ bool title_refresh_sequence() _loadedTitleSequenceId = gCurrentPreviewTitleSequence; } - TitleSequence *title = _loadedTitleSequence; _scriptWaitCounter = 0; gTitleScriptCommand = 0; diff --git a/src/title/TitleSequenceManager.cpp b/src/title/TitleSequenceManager.cpp index 471c390a39..0cc6304992 100644 --- a/src/title/TitleSequenceManager.cpp +++ b/src/title/TitleSequenceManager.cpp @@ -64,7 +64,7 @@ namespace TitleSequenceManager return &_items[i]; } - const uint16 GetPredefinedIndex(const utf8 * path) + static const uint16 GetPredefinedIndex(const utf8 * path) { const utf8 * filename = Path::GetFileName(path); for (uint16 i = 0; i < Util::CountOf(PredefinedSequences); i++) @@ -77,7 +77,7 @@ namespace TitleSequenceManager return PREDEFINED_INDEX_CUSTOM; } - void Scan() + static void Scan() { utf8 path[MAX_PATH]; diff --git a/src/title/TitleSequenceManager.h b/src/title/TitleSequenceManager.h index ef8227285a..005c016a56 100644 --- a/src/title/TitleSequenceManager.h +++ b/src/title/TitleSequenceManager.h @@ -37,7 +37,8 @@ namespace TitleSequenceManager constexpr uint16 PREDEFINED_INDEX_CUSTOM = UINT16_MAX; -#else +extern "C" { +#endif size_t title_sequence_manager_get_count(); const utf8 * title_sequence_manager_get_name(size_t index); @@ -46,4 +47,6 @@ constexpr uint16 PREDEFINED_INDEX_CUSTOM = UINT16_MAX; size_t title_sequence_manager_get_index_for_config_id(const utf8 * configId); void title_sequence_manager_scan(); +#ifdef __cplusplus +} #endif