[Scummvm-cvs-logs] SF.net SVN: scummvm:[41250] scummvm/trunk/engines/agi

[sev at users.sourceforge.net]

Revision: 41250
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41250&view=rev
Author:   sev
Date:     2009-06-06 17:43:51 +0000 (Sat, 06 Jun 2009)

Log Message:
-----------
Fix bug #2026605: "SQ2: Have to wait after dying to do anything."

Modified Paths:
--------------
    scummvm/trunk/engines/agi/agi.cpp
    scummvm/trunk/engines/agi/agi.h
    scummvm/trunk/engines/agi/cycle.cpp
    scummvm/trunk/engines/agi/detection.cpp
    scummvm/trunk/engines/agi/menu.cpp
    scummvm/trunk/engines/agi/text.cpp

Modified: scummvm/trunk/engines/agi/agi.cpp
===================================================================
--- scummvm/trunk/engines/agi/agi.cpp	2009-06-06 17:43:26 UTC (rev 41249)
+++ scummvm/trunk/engines/agi/agi.cpp	2009-06-06 17:43:51 UTC (rev 41250)
@@ -674,6 +674,7 @@
 	_intobj = NULL;
 
 	_menu = NULL;
+	_menuSelected = false;
 
 	_lastSentence[0] = 0;
 	memset(&_stringdata, 0, sizeof(struct StringData));

Modified: scummvm/trunk/engines/agi/agi.h
===================================================================
--- scummvm/trunk/engines/agi/agi.h	2009-06-06 17:43:26 UTC (rev 41249)
+++ scummvm/trunk/engines/agi/agi.h	2009-06-06 17:43:51 UTC (rev 41250)
@@ -827,6 +827,7 @@
 	bool _restartGame;
 
 	Menu* _menu;
+	bool _menuSelected;
 
 	char _lastSentence[40];
 

Modified: scummvm/trunk/engines/agi/cycle.cpp
===================================================================
--- scummvm/trunk/engines/agi/cycle.cpp	2009-06-06 17:43:26 UTC (rev 41249)
+++ scummvm/trunk/engines/agi/cycle.cpp	2009-06-06 17:43:51 UTC (rev 41250)
@@ -269,9 +269,8 @@
 			}
 
 			// commented out to close Sarien bug #438872
-			// if (key)
-			//    game.keypress = key;
-			
+			if (key)
+				_game.keypress = key;
 		}
 		break;
 	case INPUT_GETSTRING:

Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp	2009-06-06 17:43:26 UTC (rev 41249)
+++ scummvm/trunk/engines/agi/detection.cpp	2009-06-06 17:43:51 UTC (rev 41250)
@@ -1178,7 +1178,7 @@
 }
 
 bool AgiBase::canLoadGameStateCurrently() {
-	return (!(getGameType() == GType_PreAGI) && getflag(fMenusWork) && !_noSaveLoadAllowed && _game.inputEnabled);
+	return (!(getGameType() == GType_PreAGI) && getflag(fMenusWork) && !_noSaveLoadAllowed);
 }
 
 bool AgiBase::canSaveGameStateCurrently() {

Modified: scummvm/trunk/engines/agi/menu.cpp
===================================================================
--- scummvm/trunk/engines/agi/menu.cpp	2009-06-06 17:43:26 UTC (rev 41249)
+++ scummvm/trunk/engines/agi/menu.cpp	2009-06-06 17:43:51 UTC (rev 41250)
@@ -383,6 +383,9 @@
 						// Fixes bug #1751390 - "LSL: after changing game speed, space key turn unfunctional"
 						if (d->event == 0x20)
 							_vm->_game.evKeyp[d->event].data = d->event + 1;
+
+						_vm->_menuSelected = true;
+
 						goto exit_menu;
 					}
 				}

Modified: scummvm/trunk/engines/agi/text.cpp
===================================================================
--- scummvm/trunk/engines/agi/text.cpp	2009-06-06 17:43:26 UTC (rev 41249)
+++ scummvm/trunk/engines/agi/text.cpp	2009-06-06 17:43:51 UTC (rev 41250)
@@ -475,10 +475,15 @@
 	_game.msgBoxTicks = getvar(vWindowReset) * 10;
 	setvar(vKey, 0);
 
+	_menuSelected = false;
+
 	do {
 		if (getflag(fRestoreJustRan))
 			break;
 
+		if (_menuSelected)
+			break;
+
 		mainCycle();
 		if (_game.keypress == KEY_ENTER) {
 			debugC(4, kDebugLevelText, "KEY_ENTER");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.