[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.45,1.46 sdl.cpp,1.28,1.29 sdl_gl.cpp,1.25,1.26

[Max Horn]

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

Modified Files:
	sdl-common.cpp sdl.cpp sdl_gl.cpp 
Log Message:
Patch #735294: AdvMame3x scaler

Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- sdl-common.cpp	1 May 2003 12:42:46 -0000	1.45
+++ sdl-common.cpp	9 May 2003 22:44:16 -0000	1.46
@@ -544,13 +544,19 @@
 				break;
 			}
 #endif
-			// Ctr-Alt-1 till Ctrl-Alt-9 will change the GFX mode
-			if (b == (KBD_CTRL|KBD_ALT) && 
-				(ev.key.keysym.sym>='1') && (ev.key.keysym.sym<='9')) {
-				Property prop;
-				prop.gfx_mode = ev.key.keysym.sym - '1';
-				property(PROP_SET_GFX_MODE, &prop);
-				break;
+			// Ctr-Alt-<key> will change the GFX mode
+			if (b == (KBD_CTRL|KBD_ALT)) {
+				char keys[] = "1234567890";
+				char *ptr;
+
+				ptr = strchr(keys, ev.key.keysym.sym);
+				if (ptr != NULL) {
+					Property prop;
+
+					prop.gfx_mode = ptr - keys;
+					property(PROP_SET_GFX_MODE, &prop);
+					break;
+				}
 			}
 
 #ifdef QTOPIA

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- sdl.cpp	30 Apr 2003 19:11:33 -0000	1.28
+++ sdl.cpp	9 May 2003 22:44:16 -0000	1.29
@@ -99,6 +99,10 @@
 		_scaleFactor = 2;
 		_scaler_proc = AdvMame2x;
 		break;
+	case GFX_ADVMAME3X:
+		_scaleFactor = 3;
+		_scaler_proc = AdvMame3x;
+		break;
 	case GFX_TV2X:
 		_scaleFactor = 2;
 		_scaler_proc = TV2x;
@@ -360,7 +364,7 @@
 #endif
 		return 1;
 	} else if (param == PROP_SET_GFX_MODE) {
-		if (value->gfx_mode >= 9)
+		if (value->gfx_mode >= 10)
 			return 0;
 
 		_mode = value->gfx_mode;

Index: sdl_gl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl_gl.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- sdl_gl.cpp	25 Apr 2003 20:02:59 -0000	1.25
+++ sdl_gl.cpp	9 May 2003 22:44:16 -0000	1.26
@@ -570,7 +570,7 @@
 				_glScreenStart = 0;
 				break;
 			default: // SDL backend
-				if (value->gfx_mode >= 9)
+				if (value->gfx_mode >= 10)
 				  return 0;
 
 				_mode = value->gfx_mode;