[Scummvm-cvs-logs] SF.net SVN: scummvm: [31286] scummvm/trunk/engines/kyra/timer_v2.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Fri Mar 28 02:44:49 CET 2008


Revision: 31286
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31286&view=rev
Author:   lordhoto
Date:     2008-03-27 18:44:49 -0700 (Thu, 27 Mar 2008)

Log Message:
-----------
Fixed showing of cauldron animations processing while the inventory is not shown.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/timer_v2.cpp

Modified: scummvm/trunk/engines/kyra/timer_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/timer_v2.cpp	2008-03-28 01:28:02 UTC (rev 31285)
+++ scummvm/trunk/engines/kyra/timer_v2.cpp	2008-03-28 01:44:49 UTC (rev 31286)
@@ -51,6 +51,11 @@
 	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v2::timerCauldronAnimation(%d)", arg);
 	int animation = -1;
 
+	// HACK: We don't allow inventory animations while the inventory is backed off, which means not shown usually.
+	// This prevents for example that the cauldron animation is shown in the meanwhile scene with Marco and the Hand in Chapter 2.
+	if (_inventorySaved)
+		return;
+
 	if (queryGameFlag(2) && _mainCharacter.sceneId != 34 && _mainCharacter.sceneId != 73 && !_invWsa.wsa && !_invWsa.running) {
 		if (animation == -1)
 			animation = _rnd.getRandomNumberRng(1, 6);


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




More information about the Scummvm-git-logs mailing list