diff options
| author | Eugene Sandulenko | 2013-07-04 04:58:54 -0700 |
|---|---|---|
| committer | Eugene Sandulenko | 2013-07-04 04:58:54 -0700 |
| commit | 49210a803a53b84bcabe42fd339a1b205236c34d (patch) | |
| tree | d5916067b55404324fb70a3d3ee0a8f672f92679 /common/system.cpp | |
| parent | 2b980e86e3db2ebc2279761ba29c0be4f24e03dc (diff) | |
| parent | b286a6d033287dce11dfa4216ad11728b892667d (diff) | |
| download | scummvm-rg350-49210a803a53b84bcabe42fd339a1b205236c34d.tar.gz scummvm-rg350-49210a803a53b84bcabe42fd339a1b205236c34d.tar.bz2 scummvm-rg350-49210a803a53b84bcabe42fd339a1b205236c34d.zip | |
Merge pull request #331 from sev-/gsoc2012-eventsrecorder
GSoC2012: Event Recorder (reworked)
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); +} |