[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.148,1.149

James Brown ender at users.sourceforge.net
Sat May 11 14:10:03 CEST 2002


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

Modified Files:
	scummvm.cpp 
Log Message:
FIXME to re-enable F5 under zak256 until we support the ingame save/load dialog


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -d -r1.148 -r1.149
--- scummvm.cpp	10 May 2002 21:22:13 -0000	1.148
+++ scummvm.cpp	11 May 2002 21:09:30 -0000	1.149
@@ -803,17 +803,21 @@
 
 void Scumm::processKbd()
 {
+	int saveloadkey;
 	getKeyInput(0);
 
+	if (_features & GF_OLD256) /* FIXME: Support ingame screen */
+		saveloadkey = 319;
+	else
+		saveloadkey = _vars[VAR_SAVELOADDIALOG_KEY];
+
 	_virtual_mouse_x = mouse.x + virtscr[0].xstart;
 
 
 
 	if(_features & GF_AFTER_V7)
 		_virtual_mouse_y = mouse.y + camera._cur.y-100;
-
 	else
-
 		_virtual_mouse_y = mouse.y;
 
 	if (!(_features & GF_OLD256))
@@ -823,6 +827,7 @@
 
 	if (_virtual_mouse_y < 0)
 		_virtual_mouse_y = -1;
+
 	if (_features & GF_OLD256) {
 		if (_virtual_mouse_y >= virtscr[0].height + virtscr[0].topline)
 			_virtual_mouse_y = -1;
@@ -856,7 +861,7 @@
 			videoFinished = 1;
 		} else
 			exitCutscene();
-	} else if (_lastKeyHit == _vars[VAR_SAVELOADDIALOG_KEY]
+	} else if (_lastKeyHit == saveloadkey
 						 && _currentRoom != 0) {
 		if (_features & GF_AFTER_V7)
 			runScript(_vars[VAR_UNK_SCRIPT], 0, 0, 0);





More information about the Scummvm-git-logs mailing list