[Scummvm-git-logs] scummvm master -> ff8e4a4410eb28690d7b220a99ee47f1e672d71a

[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:
ff8e4a4410 TUCKER: Fix walking Royston glitch


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

Commit Message:
TUCKER: Fix walking Royston glitch

Fixes Trac#6640.

Changed paths:
    engines/tucker/tucker.cpp


diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index cb3dd8e..85499b0 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -1941,12 +1941,12 @@ void TuckerEngine::drawSprite(int num) {
 		int srcH = READ_LE_UINT16(p + frameOffset + 2);
 		int srcX = READ_LE_UINT16(p + frameOffset + 8);
 		int srcY = READ_LE_UINT16(p + frameOffset + 10);
+		s->_gfxBackgroundOffset += s->_backgroundOffset;
 		int xPos = s->_gfxBackgroundOffset + srcX;
 		if (xPos < 600 && (_scrollOffset + 320 < xPos || _scrollOffset - srcW > xPos)) {
 			return;
 		}
 		s->_xSource = srcX;
-		s->_gfxBackgroundOffset += s->_backgroundOffset;
 		uint8 *dstPtr = _locationBackgroundGfxBuf + srcY * 640 + xPos;
 		const uint8 *srcPtr = p + frameOffset + 12;
 		switch (s->_colorType) {