diff options
| author | Alejandro Marzini | 2010-07-11 04:32:24 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-07-11 04:32:24 +0000 |
| commit | 4dca7c7e02a111a950124ee26a6d46090a0f755c (patch) | |
| tree | 0b5a39e1b03a0934392d1e982b4839c08b41daa9 /backends/platform | |
| parent | 85034dc730148dab3eb85b47be3f3984337e9484 (diff) | |
| download | scummvm-rg350-4dca7c7e02a111a950124ee26a6d46090a0f755c.tar.gz scummvm-rg350-4dca7c7e02a111a950124ee26a6d46090a0f755c.tar.bz2 scummvm-rg350-4dca7c7e02a111a950124ee26a6d46090a0f755c.zip | |
Moved getGraphicsManager() from OSystem_SDL to ModularBackend. Moved public SDL graphics manager functions to graphics manager (Allowing OpenGLSdlGraphicsMaanger to be used with other SDL managers easily). Removed BaseSdlGraphicsManager. Implemented in the opengl manager basic screen functions.
svn-id: r50796
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 9 | ||||
| -rw-r--r-- | backends/platform/sdl/sdl.h | 6 |
2 files changed, 2 insertions, 13 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 52a2b335aa..e5ae3bb523 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -86,9 +86,9 @@ void OSystem_SDL::initBackend() { if (_graphicsManager == 0) { // Changed to OpenGL for testing //_graphicsManager = new SdlGraphicsManager(); - _graphicsManager = new OpenGLSDLGraphicsManager(); + _graphicsManager = new OpenGLSdlGraphicsManager(); - ((OpenGLSDLGraphicsManager *)_graphicsManager)->init(); + ((OpenGLSdlGraphicsManager *)_graphicsManager)->init(); } if (_audiocdManager == 0) @@ -241,11 +241,6 @@ void OSystem_SDL::setupIcon() { free(icon); } -BaseSdlGraphicsManager *OSystem_SDL::getGraphicsManager() { - assert(_graphicsManager); - return (BaseSdlGraphicsManager *)_graphicsManager; -} - bool OSystem_SDL::pollEvent(Common::Event &event) { assert(_eventManager); return ((SdlEventManager *)_eventManager)->pollSdlEvent(event); diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 97c91966c1..3bb09683b5 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -33,7 +33,6 @@ #endif #include "backends/modular-backend.h" -#include "backends/graphics/sdl/basesdl-graphics.h" #include "backends/mixer/sdl/sdl-mixer.h" /** @@ -52,11 +51,6 @@ public: virtual void init(); /** - * Get the Graphics Manager instance. Used by other managers. - */ - virtual BaseSdlGraphicsManager *getGraphicsManager(); - - /** * Get the Mixer Manager instance. Not to confuse with getMixer(), * that returns Audio::Mixer. The Mixer Manager is a SDL wrapper class * for the Audio::Mixer. Used by other managers. |