diff options
| author | Eugene Sandulenko | 2016-07-28 23:05:30 +0300 |
|---|---|---|
| committer | GitHub | 2016-07-28 23:05:30 +0300 |
| commit | d8e7d3cc355827a0a7dc3de4e77fade1ec13a10c (patch) | |
| tree | 7d1bf6d6a59d6eec7809796a174afaae8304cb6a /common | |
| parent | 823c2f899b480a1fa494b08e1471142129293779 (diff) | |
| parent | f980ef5524897eac047f0d794af3971c7c71a6a3 (diff) | |
| download | scummvm-rg350-d8e7d3cc355827a0a7dc3de4e77fade1ec13a10c.tar.gz scummvm-rg350-d8e7d3cc355827a0a7dc3de4e77fade1ec13a10c.tar.bz2 scummvm-rg350-d8e7d3cc355827a0a7dc3de4e77fade1ec13a10c.zip | |
Merge pull request #794 from bgK/fix-tests-event-recorder
COMMON: Fix tests when building with the event recorder
Diffstat (limited to 'common')
| -rw-r--r-- | common/recorderfile.cpp | 4 | ||||
| -rw-r--r-- | common/scummsys.h | 4 | ||||
| -rw-r--r-- | common/system.cpp | 7 | ||||
| -rw-r--r-- | common/system.h | 2 |
4 files changed, 1 insertions, 16 deletions
diff --git a/common/recorderfile.cpp b/common/recorderfile.cpp index 04802aa0c8..71f8272b44 100644 --- a/common/recorderfile.cpp +++ b/common/recorderfile.cpp @@ -30,8 +30,6 @@ #include "graphics/surface.h" #include "graphics/scaler.h" -#ifdef ENABLE_EVENTRECORDER - #define RECORD_VERSION 1 namespace Common { @@ -716,5 +714,3 @@ void PlaybackFile::checkRecordedMD5() { } - -#endif // ENABLE_EVENTRECORDER diff --git a/common/scummsys.h b/common/scummsys.h index 3513ee2d7d..5e1069fb46 100644 --- a/common/scummsys.h +++ b/common/scummsys.h @@ -215,10 +215,6 @@ #include "config.h" #endif -// Now we need to adjust some settings when running tests -#ifdef COMPILING_TESTS -#undef ENABLE_EVENTRECORDER -#endif // In the following we configure various targets, in particular those // which can't use our "configure" tool and hence don't use config.h. 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 } diff --git a/common/system.h b/common/system.h index 8896554f76..6d185d3075 100644 --- a/common/system.h +++ b/common/system.h @@ -1090,7 +1090,7 @@ public: * and other modifiable persistent game data. For more information, * refer to the SaveFileManager documentation. */ - Common::SaveFileManager *getSavefileManager(); + virtual Common::SaveFileManager *getSavefileManager(); #if defined(USE_TASKBAR) /** |