[Scummvm-cvs-logs] SF.net SVN: scummvm:[42896] scummvm/branches/branch-1-0-0/engines/kyra/ sequences_mr.cpp

[lordhoto at users.sourceforge.net]

Revision: 42896
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42896&view=rev
Author:   lordhoto
Date:     2009-07-29 16:26:08 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Backport of r42895: Fix a little bug in KyraEngine_MR::showBadConscience, which prevented Gunther's mouse shapes from showing up.

Modified Paths:
--------------
    scummvm/branches/branch-1-0-0/engines/kyra/sequences_mr.cpp

Modified: scummvm/branches/branch-1-0-0/engines/kyra/sequences_mr.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/engines/kyra/sequences_mr.cpp	2009-07-29 16:24:07 UTC (rev 42895)
+++ scummvm/branches/branch-1-0-0/engines/kyra/sequences_mr.cpp	2009-07-29 16:26:08 UTC (rev 42896)
@@ -42,7 +42,8 @@
 		_badConscienceAnim = 6;
 	else if (_currentChapter == 5 && _rnd.getRandomNumberRng(1, 100) <= 25)
 		_badConscienceAnim = 7;
-	else if (_characterShapeFile == 9)
+
+	if (_characterShapeFile == 9)
 		_badConscienceAnim = 4;
 
 	_badConsciencePosition = (_mainCharacter.x1 <= 160);


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