[Scummvm-git-logs] scummvm master -> 0ba11ca9337f0e74e8c4adee02bca6eb1f5828b0

[neuromancer]

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

Summary:
49f734dbd4 FREESCAPE: total eclipse fixes
0ba11ca933 COLONY: avoid use using in c++ constructor


Commit: 49f734dbd4afd25f3c8931309458890719963f15
    https://github.com/scummvm/scummvm/commit/49f734dbd4afd25f3c8931309458890719963f15
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-04-03T18:58:17+02:00

Commit Message:
FREESCAPE: total eclipse fixes

Changed paths:
    engines/freescape/detection.cpp
    engines/freescape/games/eclipse/eclipse.cpp


diff --git a/engines/freescape/detection.cpp b/engines/freescape/detection.cpp
index 8192c43fa8d..d69807c680d 100644
--- a/engines/freescape/detection.cpp
+++ b/engines/freescape/detection.cpp
@@ -727,7 +727,7 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("TOTALECLIPSE.C64.DATA", "968fd46b941a00f887741dfc348ac149", 47105),
 		Common::EN_ANY,
 		Common::kPlatformC64,
-		ADGF_UNSTABLE | GF_C64_TAPE,
+		ADGF_TESTING | GF_C64_TAPE,
 		GUIO2(GUIO_NOMIDI, GUIO_RENDERC64)
 	},
 	{
@@ -736,7 +736,7 @@ static const ADGameDescription gameDescriptions[] = {
 		AD_ENTRY1s("TOTALECLIPSE.C64.DATA", "b9d3aa682777ee50840cabfc036693b0", 50356),
 		Common::EN_ANY,
 		Common::kPlatformC64,
-		ADGF_UNSTABLE | GF_C64_DISC,
+		ADGF_TESTING | GF_C64_DISC,
 		GUIO2(GUIO_NOMIDI, GUIO_RENDERC64)
 	},
 	{
@@ -863,7 +863,7 @@ static const ADGameDescription gameDescriptions[] = {
 		},
 		Common::EN_ANY,
 		Common::kPlatformAmiga,
-		ADGF_UNSTABLE | ADGF_DEMO,
+		ADGF_DEMO,
 		GUIO4(GUIO_NOMIDI, GAMEOPTION_TRAVEL_ROCK, GUIO_RENDERAMIGA, GAMEOPTION_WASD_CONTROLS)
 	},
 	{
diff --git a/engines/freescape/games/eclipse/eclipse.cpp b/engines/freescape/games/eclipse/eclipse.cpp
index 9f2056f4c45..a219a81f5ca 100644
--- a/engines/freescape/games/eclipse/eclipse.cpp
+++ b/engines/freescape/games/eclipse/eclipse.cpp
@@ -385,22 +385,6 @@ void EclipseEngine::gotoArea(uint16 areaID, int entranceID) {
 	_currentAreaMessages.clear();
 	_currentAreaMessages.push_back(_currentArea->_name);
 
-	if (isEclipse2() && areaID != _startArea && _messagesList.size() > 15) {
-		// Eclipse 2 displays the sphinx parts count when entering indoor areas
-		Common::String partsMsg = _messagesList[15];
-		Common::String::size_type pos = partsMsg.find("XX");
-		if (pos != Common::String::npos) {
-			int parts = _gameStateVars[kVariableEclipse2SphinxParts];
-			Common::String replacement;
-			if (parts < 10)
-				replacement = Common::String::format("%d ", parts);
-			else
-				replacement = Common::String::format("%d", parts);
-			partsMsg.replace(pos, 2, replacement);
-		}
-		insertTemporaryMessage(partsMsg, _countdown - 2);
-	}
-
 	if (entranceID > 0)
 		traverseEntrance(entranceID);
 	else if (entranceID == -1)
@@ -1084,8 +1068,8 @@ void EclipseEngine::executePrint(FCLInstruction &instruction) {
 	}
 	Common::String message = _messagesList[index];
 	if (isEclipse2()) {
-		// Message 16 (1-based, index 15) contains "XX" placeholder for sphinx parts count.
-		// The original Z80 code at $22FC patches these bytes with the count from variable 0.
+		// Message 16 (1-based, index 15) contains the "NO. OF PARTS XX" placeholder.
+		// The original routine patches those two bytes immediately before drawing the string.
 		Common::String::size_type pos = message.find("XX");
 		if (pos != Common::String::npos) {
 			int parts = _gameStateVars[kVariableEclipse2SphinxParts];


Commit: 0ba11ca9337f0e74e8c4adee02bca6eb1f5828b0
    https://github.com/scummvm/scummvm/commit/0ba11ca9337f0e74e8c4adee02bca6eb1f5828b0
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2026-04-03T19:04:04+02:00

Commit Message:
COLONY: avoid use using in c++ constructor

Changed paths:
    engines/colony/intro.cpp


diff --git a/engines/colony/intro.cpp b/engines/colony/intro.cpp
index 75d60532974..9115bde96c4 100644
--- a/engines/colony/intro.cpp
+++ b/engines/colony/intro.cpp
@@ -49,7 +49,8 @@ namespace Colony {
 
 class ColonyMacDialog : public Graphics::MacDialog {
 public:
-	using Graphics::MacDialog::MacDialog;
+	ColonyMacDialog(Graphics::ManagedSurface *screen, Graphics::MacWindowManager *wm, int width, Graphics::MacText *mactext, int maxTextWidth, Graphics::MacDialogButtonArray *buttons, uint defaultButton)
+		: Graphics::MacDialog(screen, wm, width, mactext, maxTextWidth, buttons, defaultButton) {}
 
 	int runWithRenderer(Renderer *gfx) {
 		if (!_screen || !gfx)