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

Max Horn fingolfin at users.sourceforge.net
Thu Dec 30 06:54:02 CET 2004


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

Modified Files:
	events.cpp 
Log Message:
silly me, shouldn't test a variable which wasn't even set <sigh>

Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/events.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- events.cpp	30 Dec 2004 14:48:21 -0000	1.14
+++ events.cpp	30 Dec 2004 14:53:17 -0000	1.15
@@ -181,8 +181,7 @@
 	while(SDL_PollEvent(&ev)) {
 		switch(ev.type) {
 		case SDL_KEYDOWN:
-			b = SDLModToOSystemKeyFlags(SDL_GetModState());
-			event.kbd.flags = b;
+			b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState());
 
 			// Alt-Return and Alt-Enter toggle full screen mode				
 			if (b == KBD_ALT && (ev.key.keysym.sym == SDLK_RETURN
@@ -398,7 +397,7 @@
 			event.type = EVENT_KEYUP;
 			event.kbd.keycode = ev.key.keysym.sym;
 			event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
-			event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState());
+			b = event.kbd.flags = SDLModToOSystemKeyFlags(SDL_GetModState());
 
 			// Ctrl-Alt-<key> will change the GFX mode
 			if ((b & (KBD_CTRL|KBD_ALT)) == (KBD_CTRL|KBD_ALT)) {





More information about the Scummvm-git-logs mailing list