[Scummvm-git-logs] scummvm master -> 1603f7bcb4ad85f1d9543825489ca9906d3a860f

[dwatteau]

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

Summary:
513609fe29 SCUMM: Fix -Wunused-private-field warning when building without cURL
9f27f76a3e SCUMM: Fix -Wunused-const-variable warning when building without HE
b9d524b092 SCUMM: Extend the cyan/pink line in Berlin enhancement to German Indy3
1603f7bcb4 SCUMM: Update my Actor_v3::setupActorScale enhancement comment about Trac#2556


Commit: 513609fe29c97930369ec27ade1d9235d0cdf819
    https://github.com/scummvm/scummvm/commit/513609fe29c97930369ec27ade1d9235d0cdf819
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-07-16T00:20:27+02:00

Commit Message:
SCUMM: Fix -Wunused-private-field warning when building without cURL

Changed paths:
    engines/scumm/dialogs.h


diff --git a/engines/scumm/dialogs.h b/engines/scumm/dialogs.h
index 94c1719d55b..aba64a02222 100644
--- a/engines/scumm/dialogs.h
+++ b/engines/scumm/dialogs.h
@@ -421,7 +421,9 @@ private:
 
 	GUI::EditTextWidget *_lobbyServerAddr;
 
+#ifdef USE_LIBCURL
 	GUI::CheckboxWidget *_enableCompetitiveMods;
+#endif
 
 	GUI::StaticTextWidget *_networkVersion;
 };


Commit: 9f27f76a3e85ab6746907b1afad88ca3b6606d56
    https://github.com/scummvm/scummvm/commit/9f27f76a3e85ab6746907b1afad88ca3b6606d56
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-07-16T00:20:27+02:00

Commit Message:
SCUMM: Fix -Wunused-const-variable warning when building without HE

Changed paths:
    engines/scumm/gfx.cpp


diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 0addb4e3568..0ab2c6f9907 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -62,8 +62,6 @@ struct StripTable {
 	int zrun[120];		// FIXME: Why only 120 here?
 };
 
-static const byte bitMasks[9] = { 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF };
-
 enum {
 	kNoDelay = 0,
 	// This should actually be 3 in all games using it;
@@ -2497,6 +2495,8 @@ void GdiV2::decodeMask(int x, int y, const int width, const int height,
 }
 
 #ifdef ENABLE_HE
+static const byte bitMasks[9] = { 0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F, 0xFF };
+
 /**
  * Draw a bitmap onto a virtual screen. This is main drawing method for room backgrounds
  * used throughout HE71+ versions.


Commit: b9d524b0925e9000798854252321b873e3fb3dce
    https://github.com/scummvm/scummvm/commit/b9d524b0925e9000798854252321b873e3fb3dce
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-07-16T00:20:27+02:00

Commit Message:
SCUMM: Extend the cyan/pink line in Berlin enhancement to German Indy3

This version redrew the background of room 46 for censorship reasons, but
yet the weird cyan/pink lines were left intact, as in the other VGA
releases.  So we what to check for a different smapLen value there.

Checked against my own copy.

Changed paths:
    engines/scumm/gfx.cpp


diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
index 0ab2c6f9907..b54f450af2b 100644
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -2265,8 +2265,13 @@ bool Gdi::drawStrip(byte *dstPtr, VirtScreen *vs, int x, int y, const int width,
 	// palette so that it matches the way these lines have been redrawn in the
 	// FM-TOWNS release.  We take care not to apply this palette change to the
 	// text or inventory, as they still require the original colors.
+	//
+	// The background was redrawn in the German release, for censorhip reasons,
+	// so we have to take care of the different resource size there.
 	if (_vm->_game.id == GID_INDY3 && (_vm->_game.features & GF_OLD256) && _vm->_game.platform != Common::kPlatformFMTowns
-		&& _vm->_roomResource == 46 && smapLen == 43159 && vs->number == kMainVirtScreen && _vm->enhancementEnabled(kEnhMinorBugFixes)) {
+		&& _vm->_roomResource == 46 && vs->number == kMainVirtScreen
+		&& (smapLen == 43159 || (smapLen == 42953 && _vm->_language == Common::DE_DEU))
+		&& _vm->enhancementEnabled(kEnhMinorBugFixes)) {
 		if (_roomPalette[11] == 11 && _roomPalette[86] == 86)
 			_roomPalette[11] = 86;
 		if (_roomPalette[13] == 13 && _roomPalette[80] == 80)


Commit: 1603f7bcb4ad85f1d9543825489ca9906d3a860f
    https://github.com/scummvm/scummvm/commit/1603f7bcb4ad85f1d9543825489ca9906d3a860f
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2024-07-16T00:20:27+02:00

Commit Message:
SCUMM: Update my Actor_v3::setupActorScale enhancement comment about Trac#2556

I now own an original German copy, and I haven't been able to reproduce
the bug that was reported many moons ago.  It's possible that a different
German release with the bug exists, and I haven't checked the script
differences in the German release yet, but I do believe that just comes
from a bad copy of the game.

Anyway, just leaving the enhancement as is for now.

Changed paths:
    engines/scumm/actor.cpp


diff --git a/engines/scumm/actor.cpp b/engines/scumm/actor.cpp
index c176047840c..afffc8d9bb9 100644
--- a/engines/scumm/actor.cpp
+++ b/engines/scumm/actor.cpp
@@ -437,7 +437,10 @@ void Actor_v3::setupActorScale() {
 	// script when Henry escapes from his room). Maybe there's a problem
 	// in the German release (and then it'd probably be better to restore
 	// that safeguard instead, since the game clearly doesn't expect you
-	// to go back inside the castle), but I don't own this version.  -dwa
+	// to go back inside the castle), but so far I haven't been able to
+	// replicate the issue with my German copy. I will dig deeper, but
+	// I think that fingolfin was right when he said that this looks more
+	// like a bug in the game data, back in 2011.  -dwa
 	if (_number == 2 && _costume == 7 && _vm->_game.id == GID_INDY3 && _vm->_currentRoom == 12 && _vm->enhancementEnabled(kEnhMinorBugFixes)) {
 		_scalex = 0x50;
 		_scaley = 0x50;