[Scummvm-git-logs] scummvm master -> 219b133b95d1d17bb56da96f6158c5db8fb8c77c

[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:
71d46fd30f FREESCAPE: Fix step number UI in Dark-Side
d72b11c63e FREESCAPE: Fix position numbers UI in Dark-Side
219b133b95 FREESCAPE: Fix shield and energy bars UI in Dark-Side


Commit: 71d46fd30f093dbcb0cc73216fbc54d86fde8125
    https://github.com/scummvm/scummvm/commit/71d46fd30f093dbcb0cc73216fbc54d86fde8125
Author: akramhany (akramhany65 at gmail.com)
Date: 2025-02-26T14:36:09+01:00

Commit Message:
FREESCAPE: Fix step number UI in Dark-Side

Changed paths:
    engines/freescape/games/dark/dos.cpp


diff --git a/engines/freescape/games/dark/dos.cpp b/engines/freescape/games/dark/dos.cpp
index 7fe5acd692d..3ed2f04530e 100644
--- a/engines/freescape/games/dark/dos.cpp
+++ b/engines/freescape/games/dark/dos.cpp
@@ -182,6 +182,9 @@ void DarkEngine::drawDOSUI(Graphics::Surface *surface) {
 	_gfx->readFromPalette(color, r, g, b);
 	uint32 back = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
 
+	Common::Rect stepBackgroundRect = Common::Rect(69, 177, 98, 185);
+	surface->fillRect(stepBackgroundRect, back);
+
 	int score = _gameStateVars[k8bitVariableScore];
 	int ecds = _gameStateVars[kVariableActiveECDs];
 	drawStringInSurface(Common::String::format("%04d", int(2 * _position.x())), 199, 137, front, back, surface);


Commit: d72b11c63e8501a246c7ee7cd2a8e2b553045657
    https://github.com/scummvm/scummvm/commit/d72b11c63e8501a246c7ee7cd2a8e2b553045657
Author: akramhany (akramhany65 at gmail.com)
Date: 2025-02-26T14:36:09+01:00

Commit Message:
FREESCAPE: Fix position numbers UI in Dark-Side

Changed paths:
    engines/freescape/games/dark/dos.cpp


diff --git a/engines/freescape/games/dark/dos.cpp b/engines/freescape/games/dark/dos.cpp
index 3ed2f04530e..dd9a4fa60a8 100644
--- a/engines/freescape/games/dark/dos.cpp
+++ b/engines/freescape/games/dark/dos.cpp
@@ -185,6 +185,9 @@ void DarkEngine::drawDOSUI(Graphics::Surface *surface) {
 	Common::Rect stepBackgroundRect = Common::Rect(69, 177, 98, 185);
 	surface->fillRect(stepBackgroundRect, back);
 
+	Common::Rect positionBackgroundRect = Common::Rect(199, 135, 232, 160);
+	surface->fillRect(positionBackgroundRect, back);
+
 	int score = _gameStateVars[k8bitVariableScore];
 	int ecds = _gameStateVars[kVariableActiveECDs];
 	drawStringInSurface(Common::String::format("%04d", int(2 * _position.x())), 199, 137, front, back, surface);


Commit: 219b133b95d1d17bb56da96f6158c5db8fb8c77c
    https://github.com/scummvm/scummvm/commit/219b133b95d1d17bb56da96f6158c5db8fb8c77c
Author: akramhany (akramhany65 at gmail.com)
Date: 2025-02-26T14:36:09+01:00

Commit Message:
FREESCAPE: Fix shield and energy bars UI in Dark-Side

Changed paths:
    engines/freescape/games/dark/dos.cpp


diff --git a/engines/freescape/games/dark/dos.cpp b/engines/freescape/games/dark/dos.cpp
index dd9a4fa60a8..425e8fed152 100644
--- a/engines/freescape/games/dark/dos.cpp
+++ b/engines/freescape/games/dark/dos.cpp
@@ -220,19 +220,23 @@ void DarkEngine::drawDOSUI(Graphics::Surface *surface) {
 
 	if (shield >= 0) {
 		Common::Rect shieldBar;
-		shieldBar = Common::Rect(72, 139, 151 - (_maxShield - shield), 146);
+		shieldBar = Common::Rect(72, 140, 151 - (_maxShield - shield), 141); // Upper outer shieldBar
+		surface->fillRect(shieldBar, front);
+		shieldBar = Common::Rect(72, 145, 151 - (_maxShield - shield), 146); // Lower outer shieldBar
 		surface->fillRect(shieldBar, front);
 
-		shieldBar = Common::Rect(72, 140, 151 - (_maxShield - shield), 145);
+		shieldBar = Common::Rect(72, 142, 151 - (_maxShield - shield), 144); // Inner shieldBar
 		surface->fillRect(shieldBar, blue);
 	}
 
 	if (energy >= 0) {
 		Common::Rect energyBar;
-		energyBar = Common::Rect(72, 147, 151 - (_maxEnergy - energy), 154);
+		energyBar = Common::Rect(72, 148, 151 - (_maxEnergy - energy), 149); // Upper outer energyBar
+		surface->fillRect(energyBar, front);
+		energyBar = Common::Rect(72, 153, 151 - (_maxEnergy - energy), 154); // Lower outer energyBar
 		surface->fillRect(energyBar, front);
 
-		energyBar = Common::Rect(72, 148, 151 - (_maxEnergy - energy), 153);
+		energyBar = Common::Rect(72, 150, 151 - (_maxEnergy - energy), 152); // Inner energyBar
 		surface->fillRect(energyBar, blue);
 	}
 	uint32 clockColor = _renderMode == Common::kRenderCGA ? front : _gfx->_texturePixelFormat.ARGBToColor(0xFF, 0xFF, 0xFF, 0xFF);