[Scummvm-cvs-logs] SF.net SVN: scummvm:[38189] scummvm/branches/branch-0-13-0/engines/tucker

cyx at users.sourceforge.net cyx at users.sourceforge.net
Sun Feb 15 02:56:02 CET 2009


Revision: 38189
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38189&view=rev
Author:   cyx
Date:     2009-02-15 01:56:02 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
backport 38188: correct sprite state for location 43 (fixes #2600759)

Modified Paths:
--------------
    scummvm/branches/branch-0-13-0/engines/tucker/locations.cpp
    scummvm/branches/branch-0-13-0/engines/tucker/tucker.cpp

Modified: scummvm/branches/branch-0-13-0/engines/tucker/locations.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/tucker/locations.cpp	2009-02-15 01:48:18 UTC (rev 38188)
+++ scummvm/branches/branch-0-13-0/engines/tucker/locations.cpp	2009-02-15 01:56:02 UTC (rev 38189)
@@ -2117,7 +2117,7 @@
 
 void TuckerEngine::updateSprite_locationNum43_3(int i) {
 	int state;
-	if (_flagsTable[236] > 0) {
+	if (_flagsTable[236] < 4) {
 		state = -1;
 	} else if (_charSpeechSoundCounter > 0 && _actionCharacterNum == i) {
 		state = 7;
@@ -2131,7 +2131,7 @@
 
 void TuckerEngine::updateSprite_locationNum43_4(int i) {
 	int state;
-	if (_flagsTable[236] > 0) {
+	if (_flagsTable[236] < 4) {
 		state = -1;
 	} else if (_charSpeechSoundCounter > 0 && _actionCharacterNum == i) {
 		state = 9;

Modified: scummvm/branches/branch-0-13-0/engines/tucker/tucker.cpp
===================================================================
--- scummvm/branches/branch-0-13-0/engines/tucker/tucker.cpp	2009-02-15 01:48:18 UTC (rev 38188)
+++ scummvm/branches/branch-0-13-0/engines/tucker/tucker.cpp	2009-02-15 01:56:02 UTC (rev 38189)
@@ -2638,9 +2638,9 @@
 			updateSprite_locationNum43_2(i);
 		} else if (i < 2) {
 			if (_flagsTable[236] < 4) {
-				_spritesTable[0].state = i + 1;
+				_spritesTable[i].state = i + 1;
 			} else {
-				_spritesTable[0].state = -1;
+				_spritesTable[i].state = -1;
 			}
 		} else if (i == 3) {
 			updateSprite_locationNum43_3(3);


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