[Scummvm-git-logs] scummvm master -> 3c37c42bd08b8c220b17de75a3f3370e7e3474c4

[sev-]

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:
3c37c42bd0 TUCKER: Cure Bud's and Billy's seasickness


Commit: 3c37c42bd08b8c220b17de75a3f3370e7e3474c4
    https://github.com/scummvm/scummvm/commit/3c37c42bd08b8c220b17de75a3f3370e7e3474c4
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-01-31T19:02:29+01:00

Commit Message:
TUCKER: Cure Bud's and Billy's seasickness

This ensures that the calculated offsets for Bud and Billy are [0,2] px
and follow the sequence 0px -> 1px -> 2px -> 1px -> 0px as opposed to
the earlier 0px -> 1px -> 2px -> 3px -> 0px which resulted in them
teleporting back to their original location and on top of that being
out of sync with the boat.

Fixes Trac#6643.

Changed paths:
    engines/tucker/tucker.cpp


diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index 85499b0..acb0805 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -496,12 +496,9 @@ void TuckerEngine::mainLoop() {
 			}
 			_currentGfxBackground = _quadBackgroundGfxBuf + (_currentGfxBackgroundCounter / 10) * 44800;
 			if (_fadePaletteCounter < 34 && _locationNum == 22) {
-				_spritesTable[0]._gfxBackgroundOffset = (_currentGfxBackgroundCounter / 10) * 640;
-				_mainSpritesBaseOffset = _currentGfxBackgroundCounter / 10;
-				if (_locationNum == 22 && _currentGfxBackgroundCounter <= 29) {
-					_spritesTable[0]._gfxBackgroundOffset = 640;
-					_mainSpritesBaseOffset = 1;
-				}
+				int offset = (_currentGfxBackgroundCounter > 29 ? 1 : (_currentGfxBackgroundCounter / 10));
+				_spritesTable[0]._gfxBackgroundOffset = offset * 640;
+				_mainSpritesBaseOffset = offset;
 			}
 			_fullRedraw = true;
 		} else {