mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Fix compilation errors with GCC

Browse Source
This commit is contained in:
Michał Janiszewski
2016-11-12 21:35:35 +01:00
committed by Ted John
parent e62629c6e3
commit 80bab643f8
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Collections.hpp
View File

@@ -110,7 +110,7 @@ namespace Collections
return nullptr;
}
auto * items = Memory::AllocateArray<TCollection::value_type>(count);
auto * items = Memory::AllocateArray<typename TCollection::value_type>(count);
size_t i = 0;
for (const auto &item : collection)
{

2
src/title.c
View File

@@ -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;

4
src/title/TitleSequenceManager.cpp
View File

@@ -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];

5
src/title/TitleSequenceManager.h
View File

@@ -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