diff options
author | Max Horn | 2011-06-06 23:25:37 +0200 |
---|---|---|
committer | Max Horn | 2011-06-07 14:57:56 +0200 |
commit | 04afdf7c7d2c70e4c31b65741d22545a8979367e (patch) | |
tree | ca9e2b2f9b669808bb2121251a5f7a1ec5e50608 /backends/modular-backend.cpp | |
parent | b7be24b83515eb3266d1f1d20601dd7cf43d0755 (diff) | |
download | scummvm-rg350-04afdf7c7d2c70e4c31b65741d22545a8979367e.tar.gz scummvm-rg350-04afdf7c7d2c70e4c31b65741d22545a8979367e.tar.bz2 scummvm-rg350-04afdf7c7d2c70e4c31b65741d22545a8979367e.zip |
BACKENDS: Move more 'manager slots' from ModularBackend to OSystem
Diffstat (limited to 'backends/modular-backend.cpp')
-rw-r--r-- | backends/modular-backend.cpp | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp index bbf6a6c1ed..e36348abd5 100644 --- a/backends/modular-backend.cpp +++ b/backends/modular-backend.cpp @@ -30,14 +30,13 @@ #include "audio/mixer.h" #include "common/events.h" +#include "common/timer.h" +#include "common/savefile.h" #include "gui/message.h" #include "graphics/pixelformat.h" ModularBackend::ModularBackend() : - _fsFactory(0), - _savefileManager(0), - _timerManager(0), _mutexManager(0), _graphicsManager(0), _mixer(0) { @@ -45,16 +44,10 @@ ModularBackend::ModularBackend() } ModularBackend::~ModularBackend() { - delete _fsFactory; - _fsFactory = 0; delete _graphicsManager; _graphicsManager = 0; delete _mixer; _mixer = 0; - delete _savefileManager; - _savefileManager = 0; - delete _timerManager; - _timerManager = 0; delete _mutexManager; _mutexManager = 0; } @@ -215,11 +208,6 @@ void ModularBackend::setCursorPalette(const byte *colors, uint start, uint num) _graphicsManager->setCursorPalette(colors, start, num); } -Common::TimerManager *ModularBackend::getTimerManager() { - assert(_timerManager); - return _timerManager; -} - OSystem::MutexRef ModularBackend::createMutex() { assert(_mutexManager); return _mutexManager->createMutex(); @@ -249,16 +237,6 @@ void ModularBackend::displayMessageOnOSD(const char *msg) { _graphicsManager->displayMessageOnOSD(msg); } -Common::SaveFileManager *ModularBackend::getSavefileManager() { - assert(_savefileManager); - return _savefileManager; -} - -FilesystemFactory *ModularBackend::getFilesystemFactory() { - assert(_fsFactory); - return _fsFactory; -} - void ModularBackend::quit() { exit(0); } |