aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Montoir2009-02-15 01:48:18 +0000
committerGregory Montoir2009-02-15 01:48:18 +0000
commit36767120e1d3553217809af262d844474f926c03 (patch)
tree64b928400048f51e33b9bb327fb5482de46a9baf
parentd4ee8455cb29e78c9fd6a9a804304b5f861dc8aa (diff)
downloadscummvm-rg350-36767120e1d3553217809af262d844474f926c03.tar.gz
scummvm-rg350-36767120e1d3553217809af262d844474f926c03.tar.bz2
scummvm-rg350-36767120e1d3553217809af262d844474f926c03.zip
correct sprite state for location 43 (fixes #2600759)
svn-id: r38188
-rw-r--r--engines/tucker/locations.cpp4
-rw-r--r--engines/tucker/tucker.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index eb2559e5c3..2d5d386298 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -2117,7 +2117,7 @@ void TuckerEngine::updateSprite_locationNum43_2(int i) {
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_3(int i) {
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;
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 39355be7a2..abaec547e4 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -2638,9 +2638,9 @@ void TuckerEngine::updateSprite(int i) {
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);