diff options
| author | Paul Gilbert | 2016-08-27 13:59:08 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-27 13:59:08 -0400 |
| commit | f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7 (patch) | |
| tree | 771a8d2b3fddf96c17a1d81d42cb08dfba09d110 /common/system.cpp | |
| parent | 873d555add9aaf5eb0d021518f5134142e2c2ff6 (diff) | |
| parent | 5ea32efbb0ecb3e6b8336ad3c2edd3905ea5b89a (diff) | |
| download | scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.tar.gz scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.tar.bz2 scummvm-rg350-f5ab3d1cd9eb3a884b0ab5d0b154a4f9cccc74b7.zip | |
Merge branch 'master' into xeen
Diffstat (limited to 'common/system.cpp')
| -rw-r--r-- | common/system.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/common/system.cpp b/common/system.cpp index 53f28cafa1..131a7d2580 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -30,9 +30,6 @@ #include "common/taskbar.h" #include "common/updates.h" #include "common/textconsole.h" -#ifdef ENABLE_EVENTRECORDER -#include "gui/EventRecorder.h" -#endif #include "backends/audiocd/default/default-audiocd.h" #include "backends/fs/fs-factory.h" @@ -161,9 +158,5 @@ Common::TimerManager *OSystem::getTimerManager() { } Common::SaveFileManager *OSystem::getSavefileManager() { -#ifdef ENABLE_EVENTRECORDER - return g_eventRec.getSaveManager(_savefileManager); -#else return _savefileManager; -#endif } |