[Scummvm-git-logs] scummvm master -> 88dd2c60da983bed743be92e6a404a1841384041
neuromancer
noreply at scummvm.org
Wed Oct 2 20:43:11 UTC 2024
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7b714f6d6f FREESCAPE: corrected Driller Amiga/Atari UI text positions
f9d3dcbfbb FREESCAPE: corrected CPC dark UI text positions
d6faa4f1db FREESCAPE: corrected CPC driller UI text positions
88dd2c60da FREESCAPE: added CD release of castle into detection tables
Commit: 7b714f6d6f0912c8d6254fd2f5305e00155dec67
https://github.com/scummvm/scummvm/commit/7b714f6d6f0912c8d6254fd2f5305e00155dec67
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-10-02T22:44:39+02:00
Commit Message:
FREESCAPE: corrected Driller Amiga/Atari UI text positions
Changed paths:
engines/freescape/games/driller/amiga.cpp
diff --git a/engines/freescape/games/driller/amiga.cpp b/engines/freescape/games/driller/amiga.cpp
index 881c7d1fa76..413870979d1 100644
--- a/engines/freescape/games/driller/amiga.cpp
+++ b/engines/freescape/games/driller/amiga.cpp
@@ -174,11 +174,11 @@ void DrillerEngine::drawAmigaAtariSTUI(Graphics::Surface *surface) {
}
drawStringInSurface(_currentArea->_name, 188, 185, primaryFontColor, secondaryFontColor, black, surface);
- drawStringInSurface(Common::String::format("%07d", score), 240, 129, primaryFontColor, secondaryFontColor, black, surface);
+ drawStringInSurface(Common::String::format("%07d", score), 241, 129, primaryFontColor, secondaryFontColor, black, surface);
int seconds, minutes, hours;
getTimeFromCountdown(seconds, minutes, hours);
- drawStringInSurface(Common::String::format("%02d:", hours), 208, 7, primaryFontColor, secondaryFontColor, black, surface);
+ drawStringInSurface(Common::String::format("%02d:", hours), 210, 7, primaryFontColor, secondaryFontColor, black, surface);
drawStringInSurface(Common::String::format("%02d:", minutes), 230, 7, primaryFontColor, secondaryFontColor, black, surface);
drawStringInSurface(Common::String::format("%02d", seconds), 254, 7, primaryFontColor, secondaryFontColor, black, surface);
Commit: f9d3dcbfbb3da4c77d3a3254036aa757f6314315
https://github.com/scummvm/scummvm/commit/f9d3dcbfbb3da4c77d3a3254036aa757f6314315
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-10-02T22:44:39+02:00
Commit Message:
FREESCAPE: corrected CPC dark UI text positions
Changed paths:
engines/freescape/games/dark/cpc.cpp
diff --git a/engines/freescape/games/dark/cpc.cpp b/engines/freescape/games/dark/cpc.cpp
index d910283ec3f..184b94111b3 100644
--- a/engines/freescape/games/dark/cpc.cpp
+++ b/engines/freescape/games/dark/cpc.cpp
@@ -91,13 +91,13 @@ void DarkEngine::drawCPCUI(Graphics::Surface *surface) {
int score = _gameStateVars[k8bitVariableScore];
int ecds = _gameStateVars[kVariableActiveECDs];
- drawStringInSurface(Common::String::format("%04d", int(2 * _position.x())), 199, 137, front, back, surface);
- drawStringInSurface(Common::String::format("%04d", int(2 * _position.z())), 199, 145, front, back, surface);
- drawStringInSurface(Common::String::format("%04d", int(2 * _position.y())), 199, 153, front, back, surface);
+ drawStringInSurface(Common::String::format("%04d", int(2 * _position.x())), 200, 137, front, back, surface);
+ drawStringInSurface(Common::String::format("%04d", int(2 * _position.z())), 200, 145, front, back, surface);
+ drawStringInSurface(Common::String::format("%04d", int(2 * _position.y())), 200, 153, front, back, surface);
drawStringInSurface(Common::String::format("%02d", int(_angleRotations[_angleRotationIndex])), 72, 168, front, back, surface);
drawStringInSurface(Common::String::format("%3d", _playerSteps[_playerStepIndex]), 72, 177, front, back, surface);
- drawStringInSurface(Common::String::format("%07d", score), 94, 8, front, back, surface);
+ drawStringInSurface(Common::String::format("%07d", score), 95, 8, front, back, surface);
drawStringInSurface(Common::String::format("%3d%%", ecds), 191, 8, front, back, surface);
int seconds, minutes, hours;
@@ -116,21 +116,24 @@ void DarkEngine::drawCPCUI(Graphics::Surface *surface) {
int energy = _gameStateVars[k8bitVariableEnergy]; // called fuel in this game
int shield = _gameStateVars[k8bitVariableShield];
+ _gfx->readFromPalette(_gfx->_inkColor, r, g, b);
+ uint32 inkColor = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
+
if (shield >= 0) {
Common::Rect shieldBar;
- shieldBar = Common::Rect(72, 140, 143 - (_maxShield - shield), 148);
- surface->fillRect(shieldBar, back);
+ shieldBar = Common::Rect(72, 141 - 1, 143 - (_maxShield - shield), 146);
+ surface->fillRect(shieldBar, inkColor);
- shieldBar = Common::Rect(72, 141, 143 - (_maxShield - shield), 147);
+ shieldBar = Common::Rect(72, 143 - 1, 143 - (_maxShield - shield), 144);
surface->fillRect(shieldBar, front);
}
if (energy >= 0) {
Common::Rect energyBar;
- energyBar = Common::Rect(72, 147, 143 - (_maxEnergy - energy), 155);
- surface->fillRect(energyBar, back);
+ energyBar = Common::Rect(72, 147 + 1, 143 - (_maxEnergy - energy), 155 - 1);
+ surface->fillRect(energyBar, inkColor);
- energyBar = Common::Rect(72, 148, 143 - (_maxEnergy - energy), 154);
+ energyBar = Common::Rect(72, 148 + 2, 143 - (_maxEnergy - energy), 154 - 2);
surface->fillRect(energyBar, front);
}
drawBinaryClock(surface, 300, 124, front, back);
Commit: d6faa4f1dbc780dbf6a1ff92f5d50c7865e3d2bb
https://github.com/scummvm/scummvm/commit/d6faa4f1dbc780dbf6a1ff92f5d50c7865e3d2bb
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-10-02T22:44:39+02:00
Commit Message:
FREESCAPE: corrected CPC driller UI text positions
Changed paths:
engines/freescape/games/driller/cpc.cpp
diff --git a/engines/freescape/games/driller/cpc.cpp b/engines/freescape/games/driller/cpc.cpp
index 04cb7f3484d..8d4e6a41b7c 100644
--- a/engines/freescape/games/driller/cpc.cpp
+++ b/engines/freescape/games/driller/cpc.cpp
@@ -172,15 +172,15 @@ void DrillerEngine::drawCPCUI(Graphics::Surface *surface) {
int score = _gameStateVars[k8bitVariableScore];
drawStringInSurface(_currentArea->_name, 200, 185, front, back, surface);
- drawStringInSurface(Common::String::format("%04d", int(2 * _position.x())), 150, 145, front, back, surface);
- drawStringInSurface(Common::String::format("%04d", int(2 * _position.z())), 150, 153, front, back, surface);
- drawStringInSurface(Common::String::format("%04d", int(2 * _position.y())), 150, 161, front, back, surface);
+ drawStringInSurface(Common::String::format("%04d", int(2 * _position.x())), 151, 145, front, back, surface);
+ drawStringInSurface(Common::String::format("%04d", int(2 * _position.z())), 151, 153, front, back, surface);
+ drawStringInSurface(Common::String::format("%04d", int(2 * _position.y())), 151, 161, front, back, surface);
if (_playerHeightNumber >= 0)
drawStringInSurface(Common::String::format("%d", _playerHeightNumber), 54, 161, front, back, surface);
else
drawStringInSurface(Common::String::format("%s", "J"), 54, 161, front, back, surface);
- drawStringInSurface(Common::String::format("%02d", int(_angleRotations[_angleRotationIndex])), 46, 145, front, back, surface);
+ drawStringInSurface(Common::String::format("%02d", int(_angleRotations[_angleRotationIndex])), 47, 145, front, back, surface);
drawStringInSurface(Common::String::format("%3d", _playerSteps[_playerStepIndex]), 44, 153, front, back, surface);
drawStringInSurface(Common::String::format("%07d", score), 239, 129, front, back, surface);
@@ -188,7 +188,7 @@ void DrillerEngine::drawCPCUI(Graphics::Surface *surface) {
getTimeFromCountdown(seconds, minutes, hours);
drawStringInSurface(Common::String::format("%02d", hours), 209, 8, front, back, surface);
drawStringInSurface(Common::String::format("%02d", minutes), 232, 8, front, back, surface);
- drawStringInSurface(Common::String::format("%02d", seconds), 254, 8, front, back, surface);
+ drawStringInSurface(Common::String::format("%02d", seconds), 255, 8, front, back, surface);
Common::String message;
int deadline;
Commit: 88dd2c60da983bed743be92e6a404a1841384041
https://github.com/scummvm/scummvm/commit/88dd2c60da983bed743be92e6a404a1841384041
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-10-02T22:44:39+02:00
Commit Message:
FREESCAPE: added CD release of castle into detection tables
Changed paths:
engines/freescape/detection.cpp
diff --git a/engines/freescape/detection.cpp b/engines/freescape/detection.cpp
index 21a2a588f79..5f1a7d2896d 100644
--- a/engines/freescape/detection.cpp
+++ b/engines/freescape/detection.cpp
@@ -796,6 +796,22 @@ static const ADGameDescription gameDescriptions[] = {
ADGF_UNSTABLE,
GUIO4(GUIO_NOMIDI, GAMEOPTION_TRAVEL_ROCK, GUIO_RENDEREGA, GUIO_RENDERCGA)
},
+ {
+ "castlemaster",
+ "CD release",
+ {
+ {"CASTLE.EXE", 0, "7601f74572b3c99bfc8d3f6d9d43d356", 29804},
+ {"CMC.EXE", 0, "c7f651402307693048604e0f47c5c9e9", 57216},
+ {"CME.EXE", 0, "e01f1561cbdc48d0a20823fdb852bdf1", 89296},
+ {"CMH.EXE", 0, "76ac58ed66451689e84823706e000b6e", 60016},
+ {"CMT.EXE", 0, "8c8621b5927d090bb7a4dca8d39cbfcf", 78816},
+ AD_LISTEND
+ },
+ Common::EN_ANY,
+ Common::kPlatformDOS,
+ ADGF_UNSUPPORTED,
+ GUIO4(GUIO_NOMIDI, GAMEOPTION_TRAVEL_ROCK, GUIO_RENDEREGA, GUIO_RENDERCGA)
+ },
{
"castlemaster",
"",
@@ -812,7 +828,6 @@ static const ADGameDescription gameDescriptions[] = {
ADGF_UNSTABLE,
GUIO4(GUIO_NOMIDI, GAMEOPTION_TRAVEL_ROCK, GUIO_RENDEREGA, GUIO_RENDERCGA)
},
-
// 3D Construction Kit games
{
"3dkit",
More information about the Scummvm-git-logs
mailing list