[Scummvm-git-logs] scummvm master -> 9f06410bda6105ed29420b5c4a9febca29c5d7a2

[neuromancer]

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

Summary:
71ce9ce8fc FREESCAPE: redraw ui during the info menu
cc14d277f6 FREESCAPE: add link with instructions on how to unpack a Driller demo
9f06410bda FREESCAPE: fix for eclipse 2 initial area


Commit: 71ce9ce8fc56ccb1ae9c33c55e27fb5ab845093e
    https://github.com/scummvm/scummvm/commit/71ce9ce8fc56ccb1ae9c33c55e27fb5ab845093e
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-03-28T10:01:09+01:00

Commit Message:
FREESCAPE: redraw ui during the info menu

Changed paths:
    engines/freescape/games/dark/dark.cpp
    engines/freescape/games/driller/driller.cpp
    engines/freescape/games/eclipse/eclipse.cpp


diff --git a/engines/freescape/games/dark/dark.cpp b/engines/freescape/games/dark/dark.cpp
index 4229ce125ef..4e092dbe8f0 100644
--- a/engines/freescape/games/dark/dark.cpp
+++ b/engines/freescape/games/dark/dark.cpp
@@ -732,6 +732,8 @@ void DarkEngine::drawInfoMenu() {
 	drawStringInSurface("T-TOGGLE", 128, 81, front, black, surface);
 	drawStringInSurface("SOUND ON/OFF", 113, 88, front, black, surface);
 
+	Texture *menuTexture = _gfx->createTexture(surface);
+
 	Common::Event event;
 	bool cont = true;
 	while (!shouldQuit() && cont) {
@@ -770,7 +772,7 @@ void DarkEngine::drawInfoMenu() {
 			}
 		}
 		drawFrame();
-		drawFullscreenSurface(surface);
+		_gfx->drawTexturedRect2D(_fullscreenViewArea, _fullscreenViewArea, menuTexture);
 
 		_gfx->flipBuffer();
 		g_system->updateScreen();
@@ -781,6 +783,8 @@ void DarkEngine::drawInfoMenu() {
 	delete _savedScreen;
 	surface->free();
 	delete surface;
+
+	delete menuTexture;
 	pauseToken.clear();
 }
 
diff --git a/engines/freescape/games/driller/driller.cpp b/engines/freescape/games/driller/driller.cpp
index 5a1a78f6e04..ca1ba536975 100644
--- a/engines/freescape/games/driller/driller.cpp
+++ b/engines/freescape/games/driller/driller.cpp
@@ -320,11 +320,7 @@ void DrillerEngine::drawInfoMenu() {
 	} else if (isAmiga() || isAtariST())
 		drawStringInSurface("press any key to continue", 66, 97, front, black, surface);
 
-	drawFullscreenSurface(surface);
-
-	_gfx->flipBuffer();
-	g_system->updateScreen();
-
+	Texture *menuTexture = _gfx->createTexture(surface);
 	Common::Event event;
 	bool cont = true;
 	while (!shouldQuit() && cont) {
@@ -369,10 +365,10 @@ void DrillerEngine::drawInfoMenu() {
 			}
 		}
 		_gfx->clear(0, 0, 0, true);
-		drawBorder();
-		drawUI();
+		drawFrame();
 		if (surface)
-			drawFullscreenSurface(surface);
+			_gfx->drawTexturedRect2D(_fullscreenViewArea, _fullscreenViewArea, menuTexture);
+
 		_gfx->flipBuffer();
 		g_system->updateScreen();
 		g_system->delayMillis(15); // try to target ~60 FPS
@@ -382,6 +378,7 @@ void DrillerEngine::drawInfoMenu() {
 	delete _savedScreen;
 	surface->free();
 	delete surface;
+	delete menuTexture;
 	pauseToken.clear();
 }
 
diff --git a/engines/freescape/games/eclipse/eclipse.cpp b/engines/freescape/games/eclipse/eclipse.cpp
index adae25e662e..f9d7fb85172 100644
--- a/engines/freescape/games/eclipse/eclipse.cpp
+++ b/engines/freescape/games/eclipse/eclipse.cpp
@@ -290,6 +290,7 @@ void EclipseEngine::drawInfoMenu() {
 	drawStringInSurface("T-TOGGLE", 128, 81, front, black, surface);
 	drawStringInSurface("SOUND ON/OFF", 113, 88, front, black, surface);
 
+	Texture *menuTexture = _gfx->createTexture(surface);
 	Common::Event event;
 	bool cont = true;
 	while (!shouldQuit() && cont) {
@@ -328,7 +329,7 @@ void EclipseEngine::drawInfoMenu() {
 			}
 		}
 		drawFrame();
-		drawFullscreenSurface(surface);
+		_gfx->drawTexturedRect2D(_fullscreenViewArea, _fullscreenViewArea, menuTexture);
 
 		_gfx->flipBuffer();
 		g_system->updateScreen();
@@ -339,6 +340,7 @@ void EclipseEngine::drawInfoMenu() {
 	delete _savedScreen;
 	surface->free();
 	delete surface;
+	delete menuTexture;
 	pauseToken.clear();
 }
 


Commit: cc14d277f62418c2e10263c200c6d9fdcac1a444
    https://github.com/scummvm/scummvm/commit/cc14d277f62418c2e10263c200c6d9fdcac1a444
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-03-28T10:01:09+01:00

Commit Message:
FREESCAPE: add link with instructions on how to unpack a Driller demo

Changed paths:
    engines/freescape/detection.cpp


diff --git a/engines/freescape/detection.cpp b/engines/freescape/detection.cpp
index 519919de107..9a7b8f7e39d 100644
--- a/engines/freescape/detection.cpp
+++ b/engines/freescape/detection.cpp
@@ -296,7 +296,7 @@ static const ADGameDescription gameDescriptions[] = {
 	},
 	{
 		"driller",
-		"Packed data",
+		"This release requires unpacking, check the wiki for instructions: https://wiki.scummvm.org/index.php?title=Driller/Demos#AtariST_demos",
 		{
 			{"driller.prg", 0, "ae9b03e247def6f0793174b1cb4352b5", 1821},
 			{"data", 0, "0c927fbc6c390afd0d0c15b2d7f8766f", 10893},


Commit: 9f06410bda6105ed29420b5c4a9febca29c5d7a2
    https://github.com/scummvm/scummvm/commit/9f06410bda6105ed29420b5c4a9febca29c5d7a2
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-03-28T10:01:09+01:00

Commit Message:
FREESCAPE: fix for eclipse 2 initial area

Changed paths:
    engines/freescape/games/eclipse/cpc.cpp
    engines/freescape/games/eclipse/zx.cpp


diff --git a/engines/freescape/games/eclipse/cpc.cpp b/engines/freescape/games/eclipse/cpc.cpp
index 8c968a91aaf..34f2151b451 100644
--- a/engines/freescape/games/eclipse/cpc.cpp
+++ b/engines/freescape/games/eclipse/cpc.cpp
@@ -88,6 +88,9 @@ void EclipseEngine::loadAssetsCPCFullGame() {
 		if (isEclipse2() && it._value->getAreaID() == 1)
 			continue;
 
+		if (isEclipse2() && it._value->getAreaID() == _startArea)
+			continue;
+
 		for (int16 id = 183; id < 207; id++)
 			it._value->addObjectFromArea(id, _areaMap[255]);
 	}
diff --git a/engines/freescape/games/eclipse/zx.cpp b/engines/freescape/games/eclipse/zx.cpp
index 4dfae7aff62..483d9950094 100644
--- a/engines/freescape/games/eclipse/zx.cpp
+++ b/engines/freescape/games/eclipse/zx.cpp
@@ -73,6 +73,9 @@ void EclipseEngine::loadAssetsZXFullGame() {
 		if (isTotalEclipse2 && it._value->getAreaID() == 1)
 			continue;
 
+		if (isEclipse2() && it._value->getAreaID() == _startArea)
+			continue;
+
 		for (int16 id = 183; id < 207; id++)
 			it._value->addObjectFromArea(id, _areaMap[255]);
 	}