[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.47,1.48 sdl-common.h,1.21,1.22 sdl.cpp,1.30,1.31 sdl_gl.cpp,1.28,1.29

Max Horn fingolfin at users.sourceforge.net
Wed May 14 12:49:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1:/tmp/cvs-serv21734

Modified Files:
	sdl-common.cpp sdl-common.h sdl.cpp sdl_gl.cpp 
Log Message:
ouch

Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- sdl-common.cpp	14 May 2003 19:44:41 -0000	1.47
+++ sdl-common.cpp	14 May 2003 19:47:57 -0000	1.48
@@ -52,7 +52,7 @@
 }
 
 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);
 

Index: sdl-common.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- sdl-common.h	14 May 2003 19:44:41 -0000	1.21
+++ sdl-common.h	14 May 2003 19:47:57 -0000	1.22
@@ -130,7 +130,7 @@
 	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 @@
 	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

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- sdl.cpp	14 May 2003 19:44:41 -0000	1.30
+++ sdl.cpp	14 May 2003 19:47:57 -0000	1.31
@@ -48,7 +48,7 @@
 	void hotswap_gfx_mode();
 };
 
-OSystem *OSystem_SDL_Common::create_intern() {
+OSystem_SDL_Common *OSystem_SDL_Common::create_intern() {
 	return new OSystem_SDL();
 }
 

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- sdl_gl.cpp	14 May 2003 19:44:41 -0000	1.28
+++ sdl_gl.cpp	14 May 2003 19:47:57 -0000	1.29
@@ -69,7 +69,7 @@
 	void hotswap_gfx_mode();
 };
 
-OSystem *OSystem_SDL_Common::create_intern() {
+OSystem_SDL_Common *OSystem_SDL_Common::create_intern() {
 	return new OSystem_SDL_OpenGL();
 }
 





More information about the Scummvm-git-logs mailing list