diff options
| author | Paul Gilbert | 2013-07-04 08:44:49 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2013-07-04 08:44:49 -0400 |
| commit | fa737fd5af3763a152e92c4b74c114876b3a8573 (patch) | |
| tree | 3e698f9c095ba692c6e305b35785a8f45f5e061b /common/system.cpp | |
| parent | a49a7d5ad4f4435ed8cee0934c94155586f2dd99 (diff) | |
| parent | baafae672f3489b0eaf77c22be0c65ba31e6b73d (diff) | |
| download | scummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.tar.gz scummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.tar.bz2 scummvm-rg350-fa737fd5af3763a152e92c4b74c114876b3a8573.zip | |
Merge branch 'master' into tsage_r2r
Diffstat (limited to 'common/system.cpp')
| -rw-r--r-- | common/system.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/common/system.cpp b/common/system.cpp index 59210544ab..b40072afad 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -30,6 +30,7 @@ #include "common/taskbar.h" #include "common/updates.h" #include "common/textconsole.h" +#include "gui/EventRecorder.h" #include "backends/audiocd/default/default-audiocd.h" #include "backends/fs/fs-factory.h" @@ -84,7 +85,7 @@ void OSystem::initBackend() { error("Backend failed to instantiate audio CD manager"); if (!_eventManager) error("Backend failed to instantiate event manager"); - if (!_timerManager) + if (!getTimerManager()) error("Backend failed to instantiate timer manager"); // TODO: We currently don't check _savefileManager, because at least @@ -152,3 +153,11 @@ Common::String OSystem::getDefaultConfigFileName() { Common::String OSystem::getSystemLanguage() const { return "en_US"; } + +Common::TimerManager *OSystem::getTimerManager() { + return _timerManager; +} + +Common::SaveFileManager *OSystem::getSavefileManager() { + return g_eventRec.getSaveManager(_savefileManager); +} |