[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.511,2.512

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31168/scumm

Modified Files:
	scummvm.cpp 
Log Message:

Fix restart key in fm towns games


Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.511
retrieving revision 2.512
diff -u -d -r2.511 -r2.512
--- scummvm.cpp	16 Dec 2003 08:03:14 -0000	2.511
+++ scummvm.cpp	17 Dec 2003 02:23:30 -0000	2.512
@@ -1715,7 +1715,7 @@
 
 	_lastKeyHit = _keyPressed;
 	_keyPressed = 0;
-	if (_version <= 2 && 315 <= _lastKeyHit && _lastKeyHit < 315+12) {
+	if (((_version <= 2) || (_features & GF_FMTOWNS)) && 315 <= _lastKeyHit && _lastKeyHit < 315+12) {
 		// Convert F-Keys for V1/V2 games (they start at 1 instead of at 315)
 		_lastKeyHit -= 314;
 	}
@@ -1843,7 +1843,7 @@
 #endif
 
 	if (VAR_RESTART_KEY != 0xFF && _lastKeyHit == VAR(VAR_RESTART_KEY) ||
-	   (_version <= 2 && _lastKeyHit == 8)) {
+	   (((_version <= 2) || (_features & GF_FMTOWNS)) && _lastKeyHit == 8)) {
 		confirmrestartDialog();
 		return;
 	}