[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl_gl.cpp,1.64,1.65

Travis Howell kirben at users.sourceforge.net
Fri Oct 10 03:44:26 CEST 2003


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

Modified Files:
	sdl_gl.cpp 
Log Message:

Add old change from SDL backends, give error if video mode isn't support.


Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- sdl_gl.cpp	5 Oct 2003 00:50:21 -0000	1.64
+++ sdl_gl.cpp	10 Oct 2003 10:03:02 -0000	1.65
@@ -203,8 +203,10 @@
 		_hwscreen = SDL_SetVideoMode(_screenWidth * _scaleFactor, (_adjustAspectRatio ? 240 : _screenHeight) * _scaleFactor, 16, 
 		_full_screen ? (SDL_FULLSCREEN|SDL_SWSURFACE) : SDL_SWSURFACE
 		);
-		if (_hwscreen == NULL)
-			error("_hwscreen failed");
+		if (_hwscreen == NULL) {
+			warning("SDL_SetVideoMode says we can't switch to that mode");
+			quit();
+		}
 
 		// Distinguish 555 and 565 mode
 		if (_hwscreen->format->Rmask == 0x7C00)





More information about the Scummvm-git-logs mailing list