aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/sdl/sdl.cpp
diff options
context:
space:
mode:
authorAlejandro Marzini2010-07-11 04:32:24 +0000
committerAlejandro Marzini2010-07-11 04:32:24 +0000
commit4dca7c7e02a111a950124ee26a6d46090a0f755c (patch)
tree0b5a39e1b03a0934392d1e982b4839c08b41daa9 /backends/platform/sdl/sdl.cpp
parent85034dc730148dab3eb85b47be3f3984337e9484 (diff)
downloadscummvm-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/sdl/sdl.cpp')
-rw-r--r--backends/platform/sdl/sdl.cpp9
1 files changed, 2 insertions, 7 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);