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

[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:
be73c89bc1 IMAGE: SCR: tweaked palette to match real hardware
11546b3980 FREESCAPE: tweaked zx palette to match the one in real hardware
d1bafa7642 FREESCAPE: correctly handled temporary messages in eclipse


Commit: be73c89bc15fc809342dee048302dfa49fea5fd5
    https://github.com/scummvm/scummvm/commit/be73c89bc15fc809342dee048302dfa49fea5fd5
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-03-23T14:30:26+01:00

Commit Message:
IMAGE: SCR: tweaked palette to match real hardware

Changed paths:
    image/scr.cpp


diff --git a/image/scr.cpp b/image/scr.cpp
index d270a0633c7..84b336ec352 100644
--- a/image/scr.cpp
+++ b/image/scr.cpp
@@ -83,7 +83,7 @@ bool ScrDecoder::loadStream(Common::SeekableReadStream &stream) {
 			byte ink = attr & 0x07;
 			byte paper = (attr >> 3) & 0x07;
 			byte bright = (attr >> 6) & 1;
-			byte val = bright ? 0xff : 0xcd;
+			byte val = bright ? 0xff : 0xd8;
 			for (int bit = 0; bit < 8; bit++) {
 				bool set = (byt >> (7 - bit)) & 1;
 				int color = set ? ink : paper;


Commit: 11546b3980b754d9f192d3b3016277727aed7c21
    https://github.com/scummvm/scummvm/commit/11546b3980b754d9f192d3b3016277727aed7c21
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-03-23T14:30:26+01:00

Commit Message:
FREESCAPE: tweaked zx palette to match the one in real hardware

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


diff --git a/engines/freescape/games/eclipse/zx.cpp b/engines/freescape/games/eclipse/zx.cpp
index 37fe45480b3..9182fc518ee 100644
--- a/engines/freescape/games/eclipse/zx.cpp
+++ b/engines/freescape/games/eclipse/zx.cpp
@@ -154,8 +154,10 @@ void EclipseEngine::drawZXUI(Graphics::Surface *surface) {
 	int shield = _gameStateVars[k8bitVariableShield] * 100 / _maxShield;
 	shield = shield < 0 ? 0 : shield;
 
+	uint32 yellow = _gfx->_texturePixelFormat.ARGBToColor(0xFF, 0xFF, 0xFF, 0);
+
 	if (!_currentAreaMessages.empty())
-		drawStringInSurface(_currentAreaMessages[0], 102, 141, back, front, surface);
+		drawStringInSurface(_currentAreaMessages[0], 102, 141, back, yellow, surface);
 
 	Common::String scoreStr = Common::String::format("%07d", score);
 	drawStringInSurface(scoreStr, 133, 11, back, gray, surface, 'Z' - '0' + 1);
@@ -170,13 +172,13 @@ void EclipseEngine::drawZXUI(Graphics::Surface *surface) {
 
 	drawStringInSurface(shieldStr, x, 161, back, red, surface);
 
-	drawStringInSurface(Common::String('0' + _angleRotationIndex - 3), 79, 141, back, front, surface, 'Z' - '$' + 1);
-	drawStringInSurface(Common::String('3' - _playerStepIndex), 63, 141, back, front, surface, 'Z' - '$' + 1);
-	drawStringInSurface(Common::String('7' - _playerHeightNumber), 240, 141, back, front, surface, 'Z' - '$' + 1);
+	drawStringInSurface(Common::String('0' + _angleRotationIndex - 3), 79, 141, back, yellow, surface, 'Z' - '$' + 1);
+	drawStringInSurface(Common::String('3' - _playerStepIndex), 63, 141, back, yellow, surface, 'Z' - '$' + 1);
+	drawStringInSurface(Common::String('7' - _playerHeightNumber), 240, 141, back, yellow, surface, 'Z' - '$' + 1);
 
 	if (_shootingFrames > 0) {
-		drawStringInSurface("4", 232, 141, back, front, surface, 'Z' - '$' + 1);
-		drawStringInSurface("<", 240, 141, back, front, surface, 'Z' - '$' + 1);
+		drawStringInSurface("4", 232, 141, back, yellow, surface, 'Z' - '$' + 1);
+		drawStringInSurface("<", 240, 141, back, yellow, surface, 'Z' - '$' + 1);
 	}
 	drawAnalogClock(surface, 89, 172, back, back, gray);
 	drawEclipseIndicator(surface, 215, 3, front, gray);
diff --git a/engines/freescape/games/palettes.cpp b/engines/freescape/games/palettes.cpp
index 6c405ebd3a6..06da866e995 100644
--- a/engines/freescape/games/palettes.cpp
+++ b/engines/freescape/games/palettes.cpp
@@ -63,13 +63,13 @@ byte kDrillerC64Palette[16][3] = {
 
 byte kDrillerZXPalette[9][3] = {
 	{0x00, 0x00, 0x00},
-	{0x00, 0x00, 0xee},
-	{0xee, 0x00, 0x00},
-	{0xee, 0x00, 0xee},
-	{0x00, 0xee, 0x00},
-	{0x00, 0xee, 0xee},
-	{0xee, 0xee, 0x00},
-	{0xee, 0xee, 0xee},
+	{0x00, 0x00, 0xd8},
+	{0xd8, 0x00, 0x00},
+	{0xd8, 0x00, 0xd8},
+	{0x00, 0xd8, 0x00},
+	{0x00, 0xd8, 0xd8},
+	{0xd8, 0xd8, 0x00},
+	{0xd8, 0xd8, 0xd8},
 	{0x00, 0x00, 0x00},
 };
 


Commit: d1bafa764240404b69f4ecc3962fb4a9d2fcc3dc
    https://github.com/scummvm/scummvm/commit/d1bafa764240404b69f4ecc3962fb4a9d2fcc3dc
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-03-23T14:30:26+01:00

Commit Message:
FREESCAPE: correctly handled temporary messages in eclipse

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 a9937c220c6..8c968a91aaf 100644
--- a/engines/freescape/games/eclipse/cpc.cpp
+++ b/engines/freescape/games/eclipse/cpc.cpp
@@ -159,8 +159,15 @@ void EclipseEngine::drawCPCUI(Graphics::Surface *surface) {
 	int shield = _gameStateVars[k8bitVariableShield] * 100 / _maxShield;
 	shield = shield < 0 ? 0 : shield;
 
-	if (!_currentAreaMessages.empty())
-		drawStringInSurface(_currentAreaMessages[0], 102, 135, back, front, surface);
+	Common::String message;
+	int deadline;
+	getLatestMessages(message, deadline);
+	if (deadline <= _countdown) {
+		drawStringInSurface(message, 102, 135, back, front, surface);
+		_temporaryMessages.push_back(message);
+		_temporaryMessageDeadlines.push_back(deadline);
+	} else if (!_currentAreaMessages.empty())
+		drawStringInSurface(_currentArea->_name, 102, 135, back, front, surface);
 
 	Common::String scoreStr = Common::String::format("%07d", score);
 	drawStringInSurface(scoreStr, 136, 6, back, other, surface, 'Z' - '0' + 1);
diff --git a/engines/freescape/games/eclipse/zx.cpp b/engines/freescape/games/eclipse/zx.cpp
index 9182fc518ee..eb78ba941a4 100644
--- a/engines/freescape/games/eclipse/zx.cpp
+++ b/engines/freescape/games/eclipse/zx.cpp
@@ -156,8 +156,15 @@ void EclipseEngine::drawZXUI(Graphics::Surface *surface) {
 
 	uint32 yellow = _gfx->_texturePixelFormat.ARGBToColor(0xFF, 0xFF, 0xFF, 0);
 
-	if (!_currentAreaMessages.empty())
-		drawStringInSurface(_currentAreaMessages[0], 102, 141, back, yellow, surface);
+	Common::String message;
+	int deadline;
+	getLatestMessages(message, deadline);
+	if (deadline <= _countdown) {
+		drawStringInSurface(message, 102, 141, back, yellow, surface);
+		_temporaryMessages.push_back(message);
+		_temporaryMessageDeadlines.push_back(deadline);
+	} else if (!_currentAreaMessages.empty())
+		drawStringInSurface(_currentArea->_name, 102, 141, back, yellow, surface);
 
 	Common::String scoreStr = Common::String::format("%07d", score);
 	drawStringInSurface(scoreStr, 133, 11, back, gray, surface, 'Z' - '0' + 1);