mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-22 15:23:01 +01:00
Code Issues Releases Wiki Activity

Fix openrct2-cli build

Browse Source 
By using a dummy audio context, we can now make openrct2-cli start a headless instance without any SDL2 calls. SDL2 is still a dependency until we remove out the input code to openrct2-ui.
This commit is contained in:
Ted John
2017-06-03 23:10:20 +01:00
parent acd3b09c80
commit 94e982289e
8 changed files with 134 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/openrct2/Context.cpp
View File

@@ -17,6 +17,7 @@
#include <exception>
#include <memory>
#include <string>
#include "audio/AudioContext.h"
#include "Context.h"
#include "ui/UiContext.h"
#include "core/Console.hpp"
@@ -139,8 +140,7 @@ namespace OpenRCT2
_finished = true;
}
private:
bool Initialise()
bool Initialise() final override
{
#ifndef DISABLE_NETWORK
gHashCTX = EVP_MD_CTX_create();
@@ -233,6 +233,7 @@ namespace OpenRCT2
return true;
}
private:
IPlatformEnvironment * SetupEnvironment()
{
utf8 userPath[MAX_PATH];
@@ -544,11 +545,30 @@ namespace OpenRCT2
}
};
class PlainContext final : public Context
{
std::unique_ptr<IAudioContext> _audioContext;
std::unique_ptr<IUiContext> _uiContext;
public:
PlainContext()
: PlainContext(CreateDummyAudioContext(), CreateDummyUiContext())
{
}
PlainContext(IAudioContext * audioContext, IUiContext * uiContext)
: Context(audioContext, uiContext)
{
_audioContext = std::unique_ptr<IAudioContext>(audioContext);
_uiContext = std::unique_ptr<IUiContext>(uiContext);
}
};
Context * Context::Instance = nullptr;
IContext * CreateContext()
{
return new Context(nullptr, nullptr);
return new PlainContext();
}
IContext * CreateContext(Audio::IAudioContext * audioContext, IUiContext * uiContext)