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

[elasota]

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:
ccef585e1a MTROPOLIS: Discard 127 vertical skip code since it doesn't appear to do anything, and it breaks several graphics


Commit: ccef585e1ae0c43504701df522de44b0163696e7
    https://github.com/scummvm/scummvm/commit/ccef585e1ae0c43504701df522de44b0163696e7
Author: elasota (ejlasota at gmail.com)
Date: 2023-06-10T20:43:13-04:00

Commit Message:
MTROPOLIS: Discard 127 vertical skip code since it doesn't appear to do anything, and it breaks several graphics

Changed paths:
    engines/mtropolis/assets.cpp


diff --git a/engines/mtropolis/assets.cpp b/engines/mtropolis/assets.cpp
index 02b5b61e941..0284cf58bf6 100644
--- a/engines/mtropolis/assets.cpp
+++ b/engines/mtropolis/assets.cpp
@@ -247,16 +247,19 @@ bool CachedMToon::decompressMToonRLE(const RleFrame &frame, const Common::Array<
 				// Vertical skip
 				uint32 skipAmount = transparentCountCode - TTransparentRowSkipMask;
 
-				if ((hackFlags & MToonHackFlags::kMTIHispaniolaMPZHack) && (transparentCountCode - TTransparentRowSkipMask) == (TTransparentRowSkipMask - 2))
-					skipAmount = 0;
-
-				y += skipAmount;
-				x = 0;
-				if (y < h) {
-					rowData = static_cast<TNumber *>(surface.getBasePtr(0, isBottomUp ? (h - 1 - y) : y));
-					continue;
-				} else {
-					break;
+				// Not sure why this special code exists, but several mToons in MTI use it, such as the pants and shoe pull-outs
+				// in the treasure chest in the first area, and the Hispaniola TV in the MPZ-1000.
+				//
+				// The pants graphic depends on avoiding the x=0 here.
+				if (skipAmount != (TTransparentRowSkipMask - 2)) {
+					y += skipAmount;
+					x = 0;
+					if (y < h) {
+						rowData = static_cast<TNumber *>(surface.getBasePtr(0, isBottomUp ? (h - 1 - y) : y));
+						continue;
+					} else {
+						break;
+					}
 				}
 			} else {
 				// Horizontal skip