[Scummvm-git-logs] scummvm master -> 855c2e439229254448abfa3ceeddf92011024a24

[sev-]

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

Summary:
487167a7bf DEVTOOLS: Made encode-macbinary.sh work with European encodings
855c2e4392 SLUDGE: Fix zbuffer loading. Regression from 7c5acdaa4b390198df20afc0c88ff22a87203342


Commit: 487167a7bfefd34804c3bcfe28fb6fea05a026c1
    https://github.com/scummvm/scummvm/commit/487167a7bfefd34804c3bcfe28fb6fea05a026c1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-03T15:46:08+02:00

Commit Message:
DEVTOOLS: Made encode-macbinary.sh work with European encodings

Changed paths:
    devtools/encode-macbinary.sh


diff --git a/devtools/encode-macbinary.sh b/devtools/encode-macbinary.sh
index d8f18b109c..cd836e8a33 100755
--- a/devtools/encode-macbinary.sh
+++ b/devtools/encode-macbinary.sh
@@ -49,17 +49,10 @@ macbinarydump() {
 hfsdump() {
 	mypath=`realpath $0`
 
-	if [[ jap == "jap" ]] ; then
-		flist=`hls -F1a|recode SJIS..utf-8`
-	else
-		flist=`hls -F1a`
-	fi
-
-	echo "$flist" | while read i ; do
-		if [[ jap == "jap" ]] ; then
-			macname=`echo "$i"|recode utf-8..SJIS`
-		else
-			macname="$i"
+	hls -F1a | while read i ; do
+		macname=$i
+		if  [ -n $jap ] ; then
+			i=`echo -n $i|recode $jap..utf-8`
 		fi
 
 		# Guard empty directories
@@ -132,14 +125,22 @@ if  [ "$#" -lt 1 ] ; then
 	exit 1
 fi
 
-if [[ $1 == "jap" ]] ; then
+case $1 in
+	jap|SJIS)
+		jap=SJIS
+		shift
+		;;
+	es|macintosh)
+		jap=macintosh
+		shift
+		;;
+esac
+
+if [ -n $jap ] ; then
 	if ! `command -v recode >/dev/null 2>/dev/null` ; then
 		echo "recode not found. Exiting"
 		exit 1
 	fi
-
-	jap=jap
-	shift
 fi
 
 if [[ $1 == "hfsutils-phase2" ]] ; then


Commit: 855c2e439229254448abfa3ceeddf92011024a24
    https://github.com/scummvm/scummvm/commit/855c2e439229254448abfa3ceeddf92011024a24
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-05-03T15:46:08+02:00

Commit Message:
SLUDGE: Fix zbuffer loading. Regression from 7c5acdaa4b390198df20afc0c88ff22a87203342

Changed paths:
    engines/sludge/zbuffer.cpp


diff --git a/engines/sludge/zbuffer.cpp b/engines/sludge/zbuffer.cpp
index 4d2ae01f10..10b98ed31d 100644
--- a/engines/sludge/zbuffer.cpp
+++ b/engines/sludge/zbuffer.cpp
@@ -135,9 +135,10 @@ bool GraphicsManager::setZBuffer(int num) {
 		_zBuffer->sprites[i].create(picWidth, picHeight, *g_sludge->getScreenPixelFormat());
 	}
 
+	int n = 0;
+
 	for (uint y = 0; y < _sceneHeight; y++) {
 		for (uint x = 0; x < _sceneWidth; x++) {
-			int n = 0;
 			if (stillToGo == 0) {
 				n = readStream->readByte();
 				stillToGo = n >> 4;
@@ -147,6 +148,9 @@ bool GraphicsManager::setZBuffer(int num) {
 					stillToGo++;
 				n &= 15;
 			}
+
+			byte *target = (byte *)_zBuffer->sprites[i].getBasePtr(x, y);
+			*target = n;
 			for (int i = 0; i < _zBuffer->numPanels; ++i) {
 				byte *target = (byte *)_zBuffer->sprites[i].getBasePtr(x, y);
 				if (n && (sorted[i] == n || i == 0)) {
@@ -165,6 +169,7 @@ bool GraphicsManager::setZBuffer(int num) {
 			stillToGo--;
 		}
 	}
+
 	g_sludge->_resMan->finishAccess();
 	setResourceForFatal(-1);
 	return true;