aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorGregory Montoir2011-12-02 21:13:16 +0100
committerGregory Montoir2011-12-02 21:13:16 +0100
commit65608952c271352ff0e8bda793fdcba8273b83a5 (patch)
tree9f27ab6da98549beb2f7f223d54489851be5c648 /engines
parenta3b8eb30cb6556f8a6a29ebc4f19e09702c6f230 (diff)
downloadscummvm-rg350-65608952c271352ff0e8bda793fdcba8273b83a5.tar.gz
scummvm-rg350-65608952c271352ff0e8bda793fdcba8273b83a5.tar.bz2
scummvm-rg350-65608952c271352ff0e8bda793fdcba8273b83a5.zip
TUCKER: remove duplicated logic branches in locations 48 and 66 (checked against the original)
Diffstat (limited to 'engines')
-rw-r--r--engines/tucker/locations.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index 49340e96ac..f6d34c295b 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -2184,11 +2184,6 @@ void TuckerEngine::updateSprite_locationNum48(int i) {
} else if (_charSpeechSoundCounter > 0 && _actionCharacterNum == i) {
_spritesTable[i].needUpdate = 1;
state = 2;
- } else if (getRandomNumber() < 30000) {
- // FIXME: This case is similar to the case below.
- _spritesTable[i].needUpdate = 0;
- state = 2;
- _spritesTable[i].updateDelay = 5;
} else {
_spritesTable[i].needUpdate = 0;
state = 2;
@@ -2858,10 +2853,6 @@ void TuckerEngine::updateSprite_locationNum66_1(int i) {
if (_charSpeechSoundCounter > 0 && _actionCharacterNum == i) {
_spritesTable[i].needUpdate = 1;
state = 8;
- } else if (getRandomNumber() > 30000) {
- // FIXME: This case is the same as the one below
- state = 10;
- _spritesTable[i].needUpdate = 0;
} else {
state = 10;
_spritesTable[i].needUpdate = 0;
@@ -2919,13 +2910,13 @@ void TuckerEngine::execData3PostUpdate_locationNum66() {
if (_spritesTable[2].flipX == 1) {
--_updateLocationXPosTable2[0];
if (_updateLocationXPosTable2[0] < -50) {
- _updateLocationXPosTable2[0] = 0;
+ _spritesTable[2].flipX = 0;
_updateLocationXPosTable2[0] = -50;
}
} else {
++_updateLocationXPosTable2[0];
if (_updateLocationXPosTable2[0] > 500) {
- _updateLocationXPosTable2[0] = 1;
+ _spritesTable[2].flipX = 1;
_updateLocationXPosTable2[0] = 500;
}
}