[Scummvm-cvs-logs] CVS: scummvm/backends/sdl events.cpp,1.2,1.3

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31524

Modified Files:
	events.cpp 
Log Message:
Allow changing the scaler via keypad, too (FR #821415)

Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/events.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- events.cpp	12 Mar 2004 18:23:15 -0000	1.2
+++ events.cpp	13 Mar 2004 14:59:43 -0000	1.3
@@ -265,16 +265,19 @@
 
 				// Increase/decrease the scale factor
 				// TODO: Shall we 'wrap around' here?
-				if (ev.key.keysym.sym == '=' || ev.key.keysym.sym == '+' || ev.key.keysym.sym == '-') {
-					factor += (ev.key.keysym.sym == '-' ? -1 : +1);
+				if (ev.key.keysym.sym == SDLK_EQUALS || ev.key.keysym.sym == SDLK_PLUS || ev.key.keysym.sym == SDLK_MINUS ||
+					ev.key.keysym.sym == SDLK_KP_PLUS || ev.key.keysym.sym == SDLK_KP_MINUS) {
+					factor += (ev.key.keysym.sym == SDLK_MINUS || ev.key.keysym.sym == SDLK_KP_MINUS) ? -1 : +1;
 					if (0 <= factor && factor < 4 && s_gfxModeSwitchTable[_scalerType][factor] >= 0) {
 						setGraphicsMode(s_gfxModeSwitchTable[_scalerType][factor]);
 					}
 					break;
 				}
 				
-				if ('1' <= ev.key.keysym.sym && ev.key.keysym.sym <= '9') {
-					_scalerType = ev.key.keysym.sym - '1';
+				const bool isNormalNumber = (SDLK_1 <= ev.key.keysym.sym && ev.key.keysym.sym <= SDLK_9);
+				const bool isKeypadNumber = (SDLK_KP1 <= ev.key.keysym.sym && ev.key.keysym.sym <= SDLK_KP9);
+				if (isNormalNumber || isKeypadNumber) {
+					_scalerType = ev.key.keysym.sym - (isNormalNumber ? SDLK_1 : SDLK_KP1);
 					if (_scalerType >= ARRAYSIZE(s_gfxModeSwitchTable))
 						break;