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

[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:
1786291804 FREESCAPE: first support for ui symbols in eclipse for DOS
736b88b7b5 FREESCAPE: support for some ui symbols in eclipse for zx
e1ba144760 FREESCAPE: support for some ui symbols in eclipse for cpc


Commit: 178629180400a7d02f83d6f4d5fbfd3f4bde7b7a
    https://github.com/scummvm/scummvm/commit/178629180400a7d02f83d6f4d5fbfd3f4bde7b7a
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-01-07T19:16:13+01:00

Commit Message:
FREESCAPE: first support for ui symbols in eclipse for DOS

Changed paths:
    engines/freescape/games/eclipse/dos.cpp
    engines/freescape/games/eclipse/eclipse.cpp
    engines/freescape/loaders/8bitBinaryLoader.cpp


diff --git a/engines/freescape/games/eclipse/dos.cpp b/engines/freescape/games/eclipse/dos.cpp
index aac934f7f83..b8d6b9c9902 100644
--- a/engines/freescape/games/eclipse/dos.cpp
+++ b/engines/freescape/games/eclipse/dos.cpp
@@ -82,7 +82,17 @@ void EclipseEngine::drawDOSUI(Graphics::Surface *surface) {
 	} else if (!_currentAreaMessages.empty())
 		drawStringInSurface(_currentArea->_name, 102, 135, black, yellow, surface);
 
-	drawStringInSurface(Common::String::format("%07d", score), 136, 6, black, white, surface);
+	Common::String scoreStr = Common::String::format("%07d", score);
+	drawStringInSurface(scoreStr, 136, 6, black, white, surface, 'Z' - '0' + 1);
+
+	drawStringInSurface(Common::String('0' + _angleRotationIndex - 3), 79, 135, black, yellow, surface, 'Z' - '$' + 1);
+	drawStringInSurface(Common::String('3' - _playerStepIndex), 63, 135, black, yellow, surface, 'Z' - '$' + 1);
+	drawStringInSurface(Common::String('7' - _playerHeightNumber), 240, 135, black, yellow, surface, 'Z' - '$' + 1);
+
+	if (_shootingFrames > 0) {
+		drawStringInSurface("4", 232, 135, black, yellow, surface, 'Z' - '$' + 1);
+		drawStringInSurface("<", 240, 135, black, yellow, surface, 'Z' - '$' + 1);
+	}
 }
 
 } // End of namespace Freescape
\ No newline at end of file
diff --git a/engines/freescape/games/eclipse/eclipse.cpp b/engines/freescape/games/eclipse/eclipse.cpp
index 6a7dc294305..ce8a8df8f4d 100644
--- a/engines/freescape/games/eclipse/eclipse.cpp
+++ b/engines/freescape/games/eclipse/eclipse.cpp
@@ -81,6 +81,11 @@ EclipseEngine::EclipseEngine(OSystem *syst, const ADGameDescription *gd) : Frees
 	_playerSteps.push_back(1);
 	_playerSteps.push_back(10);
 	_playerSteps.push_back(25);
+
+	_angleRotationIndex = 1;
+	_angleRotations.push_back(5);
+	_angleRotations.push_back(10);
+	_angleRotations.push_back(15);
 }
 
 void EclipseEngine::initGameState() {
diff --git a/engines/freescape/loaders/8bitBinaryLoader.cpp b/engines/freescape/loaders/8bitBinaryLoader.cpp
index ebe21e8ffb1..1961ba080da 100644
--- a/engines/freescape/loaders/8bitBinaryLoader.cpp
+++ b/engines/freescape/loaders/8bitBinaryLoader.cpp
@@ -858,7 +858,7 @@ void FreescapeEngine::loadFonts(byte *font, int charNumber) {
 
 void FreescapeEngine::loadFonts(Common::SeekableReadStream *file, int offset) {
 	file->seek(offset);
-	int charNumber = 60;
+	int charNumber = 85;
 	byte *font = nullptr;
 	if (isDOS() || isSpectrum() || isCPC() || isC64()) {
 		font = (byte *)malloc(6 * charNumber);


Commit: 736b88b7b5e08c3abd113f4a9d05dfb29de9c601
    https://github.com/scummvm/scummvm/commit/736b88b7b5e08c3abd113f4a9d05dfb29de9c601
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-01-07T19:16:13+01:00

Commit Message:
FREESCAPE: support for some ui symbols in eclipse for zx

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


diff --git a/engines/freescape/games/eclipse/zx.cpp b/engines/freescape/games/eclipse/zx.cpp
index ba287106836..c3a50af2d51 100644
--- a/engines/freescape/games/eclipse/zx.cpp
+++ b/engines/freescape/games/eclipse/zx.cpp
@@ -98,16 +98,25 @@ void EclipseEngine::drawZXUI(Graphics::Surface *surface) {
 	_gfx->readFromPalette(color, r, g, b);
 	uint32 back = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
 
-	color = _currentArea->_inkColor;
+	_gfx->readFromPalette(7, r, g, b);
+	uint32 gray = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
 
-	_gfx->readFromPalette(color, r, g, b);
-	//uint32 other = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
-
-	//int score = _gameStateVars[k8bitVariableScore];
+	int score = _gameStateVars[k8bitVariableScore];
 
 	if (!_currentAreaMessages.empty())
 		drawStringInSurface(_currentAreaMessages[0], 102, 141, back, front, surface);
-	//drawStringInSurface(Common::String::format("%08d", score), 136, 6, back, other, surface);
+
+	Common::String scoreStr = Common::String::format("%07d", score);
+	drawStringInSurface(scoreStr, 133, 11, back, gray, surface, 'Z' - '0' + 1);
+
+	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);
+
+	if (_shootingFrames > 0) {
+		drawStringInSurface("4", 232, 141, back, front, surface, 'Z' - '$' + 1);
+		drawStringInSurface("<", 240, 141, back, front, surface, 'Z' - '$' + 1);
+	}
 }
 
 } // End of namespace Freescape


Commit: e1ba144760a1b96d0c4762f34c3e2d9bae35b7a4
    https://github.com/scummvm/scummvm/commit/e1ba144760a1b96d0c4762f34c3e2d9bae35b7a4
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-01-07T19:16:13+01:00

Commit Message:
FREESCAPE: support for some ui symbols in eclipse for cpc

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


diff --git a/engines/freescape/games/eclipse/cpc.cpp b/engines/freescape/games/eclipse/cpc.cpp
index 24fc03ee755..a2be29c8aba 100644
--- a/engines/freescape/games/eclipse/cpc.cpp
+++ b/engines/freescape/games/eclipse/cpc.cpp
@@ -98,7 +98,18 @@ void EclipseEngine::drawCPCUI(Graphics::Surface *surface) {
 
 	if (!_currentAreaMessages.empty())
 		drawStringInSurface(_currentAreaMessages[0], 102, 135, back, front, surface);
-	drawStringInSurface(Common::String::format("%08d", score), 136, 6, back, other, surface);
+
+	Common::String scoreStr = Common::String::format("%07d", score);
+	drawStringInSurface(scoreStr, 136, 6, back, other, surface, 'Z' - '0' + 1);
+
+	drawStringInSurface(Common::String('0' + _angleRotationIndex - 3), 79, 135, back, front, surface, 'Z' - '$' + 1);
+	drawStringInSurface(Common::String('3' - _playerStepIndex), 63, 135, back, front, surface, 'Z' - '$' + 1);
+	drawStringInSurface(Common::String('7' - _playerHeightNumber), 240, 135, back, front, surface, 'Z' - '$' + 1);
+
+	if (_shootingFrames > 0) {
+		drawStringInSurface("4", 232, 135, back, front, surface, 'Z' - '$' + 1);
+		drawStringInSurface("<", 240, 135, back, front, surface, 'Z' - '$' + 1);
+	}
 }
 
 } // End of namespace Freescape