diff options
author | Max Horn | 2003-05-14 19:47:57 +0000 |
---|---|---|
committer | Max Horn | 2003-05-14 19:47:57 +0000 |
commit | af8cb44727c4cc7a00a0c652c661386c9c715775 (patch) | |
tree | b1d2c3051445e16c84f8291d646c1d5a9c4f1f06 /backends | |
parent | fae5ab677c1c3d3042c48f73a34f66ce3f2fdba4 (diff) | |
download | scummvm-rg350-af8cb44727c4cc7a00a0c652c661386c9c715775.tar.gz scummvm-rg350-af8cb44727c4cc7a00a0c652c661386c9c715775.tar.bz2 scummvm-rg350-af8cb44727c4cc7a00a0c652c661386c9c715775.zip |
ouch
svn-id: r7511
Diffstat (limited to 'backends')
-rw-r--r-- | backends/sdl/sdl-common.cpp | 2 | ||||
-rw-r--r-- | backends/sdl/sdl-common.h | 4 | ||||
-rw-r--r-- | backends/sdl/sdl.cpp | 2 | ||||
-rw-r--r-- | backends/sdl/sdl_gl.cpp | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/backends/sdl/sdl-common.cpp b/backends/sdl/sdl-common.cpp index 34c3ee2c35..0761da84b5 100644 --- a/backends/sdl/sdl-common.cpp +++ b/backends/sdl/sdl-common.cpp @@ -52,7 +52,7 @@ OSystem *OSystem_SDL_create(int gfx_mode, bool full_screen) { } OSystem *OSystem_SDL_Common::create(int gfx_mode, bool full_screen) { - OSystem_SDL_Common *syst = OSystem_SDL_Common::create(); + OSystem_SDL_Common *syst = OSystem_SDL_Common::create_intern(); syst->init_intern(gfx_mode, full_screen); diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h index 409d4183fb..08202869d1 100644 --- a/backends/sdl/sdl-common.h +++ b/backends/sdl/sdl-common.h @@ -130,7 +130,7 @@ protected: OSystem_SDL_Common(); virtual ~OSystem_SDL_Common(); - static OSystem *create_intern(); + static OSystem_SDL_Common *create_intern(); void init_intern(int gfx_mode, bool full_screen); @@ -226,8 +226,6 @@ protected: void setup_icon(); void kbd_mouse(); void init_joystick() { _joystick = SDL_JoystickOpen(0); } - - static OSystem_SDL_Common *create(); }; // Auxillary class to (un)lock a mutex on the stack diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp index b2134be962..cd06a6c039 100644 --- a/backends/sdl/sdl.cpp +++ b/backends/sdl/sdl.cpp @@ -48,7 +48,7 @@ protected: void hotswap_gfx_mode(); }; -OSystem *OSystem_SDL_Common::create_intern() { +OSystem_SDL_Common *OSystem_SDL_Common::create_intern() { return new OSystem_SDL(); } diff --git a/backends/sdl/sdl_gl.cpp b/backends/sdl/sdl_gl.cpp index 35d88d2e4b..ad3a2d9f5a 100644 --- a/backends/sdl/sdl_gl.cpp +++ b/backends/sdl/sdl_gl.cpp @@ -69,7 +69,7 @@ protected: void hotswap_gfx_mode(); }; -OSystem *OSystem_SDL_Common::create_intern() { +OSystem_SDL_Common *OSystem_SDL_Common::create_intern() { return new OSystem_SDL_OpenGL(); } |