[Scummvm-cvs-logs] scummvm master -> 65608952c271352ff0e8bda793fdcba8273b83a5

[cyxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
65608952c2 TUCKER: remove duplicated logic branches in locations 48 and 66 (checked against the original)


Commit: 65608952c271352ff0e8bda793fdcba8273b83a5
    https://github.com/scummvm/scummvm/commit/65608952c271352ff0e8bda793fdcba8273b83a5
Author: Gregory Montoir (cyx at scummvm.org)
Date: 2011-12-02T12:13:16-08:00

Commit Message:
TUCKER: remove duplicated logic branches in locations 48 and 66 (checked against the original)

Changed paths:
    engines/tucker/locations.cpp



diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index 49340e9..f6d34c2 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;
 		}
 	}