[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.177,1.178

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv3967

Modified Files:
	scummvm.cpp 
Log Message:
fixed my fix - mouse cursor now moves again in new GUI

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- scummvm.cpp	15 Jul 2002 01:38:52 -0000	1.177
+++ scummvm.cpp	15 Jul 2002 12:47:12 -0000	1.178
@@ -1263,10 +1263,8 @@
 
 			// if newgui is running, copy event to EventList, and let the GUI handle it itself
 			// we might consider this approach for ScummLoop as well, and clean up the current mess
-			if (_newgui->isActive()) {
+			if (_newgui->isActive())
 				_newgui->handleEvent(event);
-				continue;
-			}
 
 			switch(event.event_code) {
 			case OSystem::EVENT_KEYDOWN:
@@ -1286,7 +1284,7 @@
 						g_debugger.attach(this);
 					else if (event.kbd.keycode=='s')
 						resourceStats();
-				} else
+				} else if (!_newgui->isActive())
 					_keyPressed = event.kbd.ascii;	// Normal key press, pass on to the game.
 				break;