[Scummvm-git-logs] scummvm master -> 7789b83d2c28cf6a7adbafada4efed6576e3eefc
neuromancer
noreply at scummvm.org
Tue Feb 27 20:57:03 UTC 2024
This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2524f2ff29 FREESCAPE: moved drawEclipse to the Renderer class
28188fdc06 FREESCAPE: implemented OpenGLShaderRenderer::renderPlayerShootBall
6bb46594e5 FREESCAPE: initial implementation of OpenGLShaderRenderer::drawCelestialBody
4b274ebe6c FREESCAPE: implemented EclipseEngine::drawSensorShoot
665876793f FREESCAPE: show health as a number in eclipse in dos and zx
7789b83d2c FREESCAPE: show health as a number in eclipse in cpc
Commit: 2524f2ff299529f87c662ba56ae646a17dda232f
https://github.com/scummvm/scummvm/commit/2524f2ff299529f87c662ba56ae646a17dda232f
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-02-27T21:56:01+01:00
Commit Message:
FREESCAPE: moved drawEclipse to the Renderer class
Changed paths:
engines/freescape/gfx.cpp
engines/freescape/gfx.h
engines/freescape/gfx_opengl.cpp
engines/freescape/gfx_opengl.h
diff --git a/engines/freescape/gfx.cpp b/engines/freescape/gfx.cpp
index 2b601e5ecb1..4b9491206a8 100644
--- a/engines/freescape/gfx.cpp
+++ b/engines/freescape/gfx.cpp
@@ -996,6 +996,14 @@ void Renderer::drawBackground(uint8 color) {
clear(r1, g1, b1);
}
+void Renderer::drawEclipse(byte color1, byte color2, float progress) {
+ Math::Vector3d sunPosition(-5000, 1200, 0);
+ float radius = 500.0;
+ drawCelestialBody(sunPosition, radius, color1);
+ Math::Vector3d moonPosition(-5000, 1200, 0 + 500 * progress);
+ drawCelestialBody(moonPosition, radius, color2);
+}
+
Graphics::RendererType determinateRenderType() {
Common::String rendererConfig = ConfMan.get("renderer");
Graphics::RendererType desiredRendererType = Graphics::Renderer::parseTypeCode(rendererConfig);
diff --git a/engines/freescape/gfx.h b/engines/freescape/gfx.h
index 83c23ea55f6..97b21b3e5c9 100644
--- a/engines/freescape/gfx.h
+++ b/engines/freescape/gfx.h
@@ -98,7 +98,9 @@ public:
virtual void clear(uint8 r, uint8 g, uint8 b, bool ignoreViewport = false) = 0;
virtual void drawFloor(uint8 color) = 0;
virtual void drawBackground(uint8 color);
- virtual void drawEclipse(uint8 color1, uint8 color2, float difference) {};
+
+ void drawEclipse(uint8 color1, uint8 color2, float difference);
+ virtual void drawCelestialBody(Math::Vector3d position, float radius, uint8 color) {};
Common::Rect viewport() const;
virtual Common::Point nativeResolution() { return Common::Point(_screenW, _screenH); }
diff --git a/engines/freescape/gfx_opengl.cpp b/engines/freescape/gfx_opengl.cpp
index 8a31660df67..cdc7f241d0d 100644
--- a/engines/freescape/gfx_opengl.cpp
+++ b/engines/freescape/gfx_opengl.cpp
@@ -328,14 +328,6 @@ void OpenGLRenderer::drawCelestialBody(Math::Vector3d position, float radius, by
glPopMatrix();
}
-void OpenGLRenderer::drawEclipse(byte color1, byte color2, float progress) {
- Math::Vector3d sunPosition(-5000, 1200, 0);
- float radius = 500.0;
- drawCelestialBody(sunPosition, radius, color1);
- Math::Vector3d moonPosition(-5000, 1200, 0 + 500 * progress);
- drawCelestialBody(moonPosition, radius, color2);
-}
-
void OpenGLRenderer::renderPlayerShootBall(byte color, const Common::Point position, int frame, const Common::Rect viewArea) {
uint8 r, g, b;
diff --git a/engines/freescape/gfx_opengl.h b/engines/freescape/gfx_opengl.h
index e450a39cb41..6cdd5a10552 100644
--- a/engines/freescape/gfx_opengl.h
+++ b/engines/freescape/gfx_opengl.h
@@ -109,8 +109,7 @@ public:
virtual void flipBuffer() override;
virtual void drawFloor(uint8 color) override;
- virtual void drawEclipse(uint8 color1, uint8 color2, float difference) override;
- void drawCelestialBody(Math::Vector3d position, float radius, uint8 color);
+ void drawCelestialBody(Math::Vector3d position, float radius, uint8 color) override;
virtual Graphics::Surface *getScreenshot() override;
};
Commit: 28188fdc068a59363157b21d96ee2dc6cf5856c6
https://github.com/scummvm/scummvm/commit/28188fdc068a59363157b21d96ee2dc6cf5856c6
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-02-27T21:56:01+01:00
Commit Message:
FREESCAPE: implemented OpenGLShaderRenderer::renderPlayerShootBall
Changed paths:
engines/freescape/gfx_opengl.cpp
engines/freescape/gfx_opengl_shaders.cpp
diff --git a/engines/freescape/gfx_opengl.cpp b/engines/freescape/gfx_opengl.cpp
index cdc7f241d0d..8af986a338b 100644
--- a/engines/freescape/gfx_opengl.cpp
+++ b/engines/freescape/gfx_opengl.cpp
@@ -360,10 +360,9 @@ void OpenGLRenderer::renderPlayerShootBall(byte color, const Common::Point posit
copyToVertexArray(0, Math::Vector3d(ball_position.x, ball_position.y, 0));
for(int i = 0; i <= triangleAmount; i++) {
- copyToVertexArray(i + 1,
- Math::Vector3d(ball_position.x + (radius * cos(i * twicePi / triangleAmount)),
- ball_position.y + (radius * sin(i * twicePi / triangleAmount)), 0)
- );
+ float x = ball_position.x + (radius * cos(i * twicePi / triangleAmount));
+ float y = ball_position.y + (radius * sin(i * twicePi / triangleAmount));
+ copyToVertexArray(i + 1, Math::Vector3d(x, y, 0));
}
glVertexPointer(3, GL_FLOAT, 0, _verts);
diff --git a/engines/freescape/gfx_opengl_shaders.cpp b/engines/freescape/gfx_opengl_shaders.cpp
index ec55d52ace2..de376d04253 100644
--- a/engines/freescape/gfx_opengl_shaders.cpp
+++ b/engines/freescape/gfx_opengl_shaders.cpp
@@ -186,7 +186,60 @@ float remap(float f, float s) {
return 2. * f / s - 1;
}
-void OpenGLShaderRenderer::renderPlayerShootBall(byte color, const Common::Point position, int frame, const Common::Rect viewArea) {}
+void OpenGLShaderRenderer::renderPlayerShootBall(byte color, const Common::Point _position, int frame, const Common::Rect viewArea) {
+ uint8 r, g, b;
+
+ Math::Matrix4 identity;
+ identity(0, 0) = 1.0;
+ identity(1, 1) = 1.0;
+ identity(2, 2) = 1.0;
+ identity(3, 3) = 1.0;
+
+ _triangleShader->use();
+ _triangleShader->setUniform("useStipple", false);
+ _triangleShader->setUniform("mvpMatrix", identity);
+
+ if (_renderMode == Common::kRenderCGA || _renderMode == Common::kRenderZX) {
+ r = g = b = 255;
+ } else {
+ r = g = b = 255;
+ glEnable(GL_BLEND);
+ glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ZERO);
+ }
+
+ glDisable(GL_DEPTH_TEST);
+ glDepthMask(GL_FALSE);
+
+ useColor(r, g, b);
+
+ int triangleAmount = 20;
+ float twicePi = (float)(2.0 * M_PI);
+ float coef = (9 - frame) / 9.0;
+ float radius = (1 - coef) * 4.0;
+
+ Common::Point position(_position.x, _screenH - _position.y);
+
+ Common::Point initial_position(viewArea.left + viewArea.width() / 2 + 2, _screenH - (viewArea.height() + viewArea.top));
+ Common::Point ball_position = coef * position + (1 - coef) * initial_position;
+
+ glEnableClientState(GL_VERTEX_ARRAY);
+ copyToVertexArray(0, Math::Vector3d(remap(ball_position.x, _screenW), remap(ball_position.y, _screenH), 0));
+
+ for(int i = 0; i <= triangleAmount; i++) {
+ float x = remap(ball_position.x + (radius * cos(i * twicePi / triangleAmount)), _screenW);
+ float y = remap(ball_position.y + (radius * sin(i * twicePi / triangleAmount)), _screenH);
+ copyToVertexArray(i + 1, Math::Vector3d(x, y, 0));
+ }
+
+ glBindBuffer(GL_ARRAY_BUFFER, _triangleVBO);
+ glBufferData(GL_ARRAY_BUFFER, (triangleAmount + 2) * 3 * sizeof(float), _verts, GL_DYNAMIC_DRAW);
+ glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), nullptr);
+ glDrawArrays(GL_TRIANGLE_FAN, 0, (triangleAmount + 2));
+
+ glDisable(GL_BLEND);
+ glEnable(GL_DEPTH_TEST);
+ glDepthMask(GL_TRUE);
+}
void OpenGLShaderRenderer::renderPlayerShootRay(byte color, const Common::Point position, const Common::Rect viewArea) {
uint8 r, g, b;
Commit: 6bb46594e57e70434d9c481ed9ce33e82c1db830
https://github.com/scummvm/scummvm/commit/6bb46594e57e70434d9c481ed9ce33e82c1db830
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-02-27T21:56:01+01:00
Commit Message:
FREESCAPE: initial implementation of OpenGLShaderRenderer::drawCelestialBody
Changed paths:
engines/freescape/gfx_opengl_shaders.cpp
engines/freescape/gfx_opengl_shaders.h
diff --git a/engines/freescape/gfx_opengl_shaders.cpp b/engines/freescape/gfx_opengl_shaders.cpp
index de376d04253..0d7deaa4ce2 100644
--- a/engines/freescape/gfx_opengl_shaders.cpp
+++ b/engines/freescape/gfx_opengl_shaders.cpp
@@ -293,6 +293,57 @@ void OpenGLShaderRenderer::renderPlayerShootRay(byte color, const Common::Point
glDepthMask(GL_TRUE);
}
+void OpenGLShaderRenderer::drawCelestialBody(Math::Vector3d position, float radius, byte color) {
+ uint8 r1, g1, b1, r2, g2, b2;
+ byte *stipple = nullptr;
+ getRGBAt(color, r1, g1, b1, r2, g2, b2, stipple);
+
+ useColor(r1, g1, b1);
+
+ int triangleAmount = 20;
+ float twicePi = (float)(2.0 * M_PI);
+
+ // Quick billboard effect inspired from this code:
+ // http://www.lighthouse3d.com/opengl/billboarding/index.php?billCheat
+ /*Math::Matrix4 mvpMatrix = _mvpMatrix;
+
+ for(int i = 2; i < 4; i++)
+ for(int j = 2; j < 4; j++ ) {
+ if (i == 2)
+ continue;
+ if (i == j)
+ _mvpMatrix.setValue(i, j, 1.0);
+ else
+ _mvpMatrix.setValue(i, j, 0.0);
+ }*/
+
+ _triangleShader->use();
+ _triangleShader->setUniform("useStipple", false);
+ _triangleShader->setUniform("mvpMatrix", _mvpMatrix);
+
+ glDisable(GL_DEPTH_TEST);
+ glDepthMask(GL_FALSE);
+
+ glEnableClientState(GL_VERTEX_ARRAY);
+ copyToVertexArray(0, position);
+
+ for(int i = 0; i <= triangleAmount; i++) {
+ float x = position.x();
+ float y = position.y() + (radius * cos(i * twicePi / triangleAmount));
+ float z = position.z() + (radius * sin(i * twicePi / triangleAmount));
+ copyToVertexArray(i + 1, Math::Vector3d(x, y, z));
+ }
+
+ glBindBuffer(GL_ARRAY_BUFFER, _triangleVBO);
+ glBufferData(GL_ARRAY_BUFFER, (triangleAmount + 2) * 3 * sizeof(float), _verts, GL_DYNAMIC_DRAW);
+ glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 3 * sizeof(float), nullptr);
+ glDrawArrays(GL_TRIANGLE_FAN, 0, (triangleAmount + 2));
+
+ glEnable(GL_DEPTH_TEST);
+ glDepthMask(GL_TRUE);
+ //_mvpMatrix = mvpMatrix;
+}
+
void OpenGLShaderRenderer::renderCrossair(const Common::Point crossairPosition) {
Math::Matrix4 identity;
identity(0, 0) = 1.0;
diff --git a/engines/freescape/gfx_opengl_shaders.h b/engines/freescape/gfx_opengl_shaders.h
index 599d64a51b6..889fa7934ab 100644
--- a/engines/freescape/gfx_opengl_shaders.h
+++ b/engines/freescape/gfx_opengl_shaders.h
@@ -83,6 +83,7 @@ public:
virtual void renderSensorShoot(byte color, const Math::Vector3d sensor, const Math::Vector3d player, const Common::Rect viewPort) override;
virtual void renderPlayerShootBall(byte color, const Common::Point position, int frame, const Common::Rect viewPort) override;
virtual void renderPlayerShootRay(byte color, const Common::Point position, const Common::Rect viewPort) override;
+ void drawCelestialBody(Math::Vector3d position, float radius, uint8 color) override;
virtual void renderCrossair(const Common::Point crossairPosition) override;
Commit: 4b274ebe6c4fff59fce882a7c4929fa0f42e2206
https://github.com/scummvm/scummvm/commit/4b274ebe6c4fff59fce882a7c4929fa0f42e2206
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-02-27T21:56:01+01:00
Commit Message:
FREESCAPE: implemented EclipseEngine::drawSensorShoot
Changed paths:
engines/freescape/games/eclipse/eclipse.cpp
engines/freescape/games/eclipse/eclipse.h
diff --git a/engines/freescape/games/eclipse/eclipse.cpp b/engines/freescape/games/eclipse/eclipse.cpp
index 9cfdb7eb635..6247c4217e9 100644
--- a/engines/freescape/games/eclipse/eclipse.cpp
+++ b/engines/freescape/games/eclipse/eclipse.cpp
@@ -346,6 +346,74 @@ void EclipseEngine::drawIndicator(Graphics::Surface *surface, int xPosition, int
}
}
+void EclipseEngine::drawSensorShoot(Sensor *sensor) {
+ Math::Vector3d target;
+ float distance = 5;
+ int axisToSkip = -1;
+
+ if (sensor->_axis == 0x1 || sensor->_axis == 0x2)
+ axisToSkip = 0;
+
+ if (sensor->_axis == 0x10 || sensor->_axis == 0x20)
+ axisToSkip = 2;
+
+ for (int i = 0; i < 3; i++) {
+ for (int j = 0; j < 3; j++) {
+ if (i == j) {
+ target = sensor->getOrigin();
+ if (i != axisToSkip)
+ target.setValue(i, target.getValue(i) + distance);
+
+ _gfx->renderSensorShoot(1, sensor->getOrigin(), target, _viewArea);
+
+ target = sensor->getOrigin();
+
+ if (i != axisToSkip)
+ target.setValue(i, target.getValue(i) - distance);
+
+ _gfx->renderSensorShoot(1, sensor->getOrigin(), target, _viewArea);
+ } else {
+ target = sensor->getOrigin();
+ if (i != axisToSkip)
+ target.setValue(i, target.getValue(i) + distance);
+
+ if (j != axisToSkip)
+ target.setValue(j, target.getValue(j) + distance);
+
+ _gfx->renderSensorShoot(1, sensor->getOrigin(), target, _viewArea);
+
+ target = sensor->getOrigin();
+ if (i != axisToSkip)
+ target.setValue(i, target.getValue(i) + distance);
+
+ if (j != axisToSkip)
+ target.setValue(j, target.getValue(j) - distance);
+
+ _gfx->renderSensorShoot(1, sensor->getOrigin(), target, _viewArea);
+
+ target = sensor->getOrigin();
+
+ if (i != axisToSkip)
+ target.setValue(i, target.getValue(i) - distance);
+
+ if (j != axisToSkip)
+ target.setValue(j, target.getValue(j) - distance);
+
+ _gfx->renderSensorShoot(1, sensor->getOrigin(), target, _viewArea);
+
+ target = sensor->getOrigin();
+ if (i != axisToSkip)
+ target.setValue(i, target.getValue(i) - distance);
+
+ if (j != axisToSkip)
+ target.setValue(j, target.getValue(j) + distance);
+
+ _gfx->renderSensorShoot(1, sensor->getOrigin(), target, _viewArea);
+ }
+ }
+ }
+}
+
void EclipseEngine::updateTimeVariables() {
if (_gameStateControl != kFreescapeGameStatePlaying)
return;
diff --git a/engines/freescape/games/eclipse/eclipse.h b/engines/freescape/games/eclipse/eclipse.h
index 9dc980e1c8e..9d02f767530 100644
--- a/engines/freescape/games/eclipse/eclipse.h
+++ b/engines/freescape/games/eclipse/eclipse.h
@@ -45,6 +45,8 @@ public:
void drawInfoMenu() override;
void drawIndicator(Graphics::Surface *surface, int xPosition, int yPosition, int separation);
+ void drawSensorShoot(Sensor *sensor) override;
+
void loadAssets() override;
void loadAssetsDOSFullGame() override;
void pressedKey(const int keycode) override;
Commit: 665876793f59f9f70210d5f95bace7f8d953f2af
https://github.com/scummvm/scummvm/commit/665876793f59f9f70210d5f95bace7f8d953f2af
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-02-27T21:56:01+01:00
Commit Message:
FREESCAPE: show health as a number in eclipse in dos and zx
Changed paths:
engines/freescape/games/eclipse/dos.cpp
engines/freescape/games/eclipse/zx.cpp
diff --git a/engines/freescape/games/eclipse/dos.cpp b/engines/freescape/games/eclipse/dos.cpp
index 6cf5c4c0082..bf864d5cd24 100644
--- a/engines/freescape/games/eclipse/dos.cpp
+++ b/engines/freescape/games/eclipse/dos.cpp
@@ -101,7 +101,7 @@ void EclipseEngine::loadAssetsDOSFullGame() {
void EclipseEngine::drawDOSUI(Graphics::Surface *surface) {
int score = _gameStateVars[k8bitVariableScore];
- int shield = _gameStateVars[k8bitVariableShield];
+ int shield = _gameStateVars[k8bitVariableShield] * 100 / _maxShield;
uint32 yellow = _gfx->_texturePixelFormat.ARGBToColor(0xFF, 0xFF, 0xFF, 0x55);
uint32 black = _gfx->_texturePixelFormat.ARGBToColor(0xFF, 0x00, 0x00, 0x00);
uint32 white = _gfx->_texturePixelFormat.ARGBToColor(0xFF, 0xFF, 0xFF, 0xFF);
@@ -122,8 +122,14 @@ void EclipseEngine::drawDOSUI(Graphics::Surface *surface) {
Common::String scoreStr = Common::String::format("%07d", score);
drawStringInSurface(scoreStr, 136, 6, black, white, surface, 'Z' - '0' + 1);
- Common::String shieldStr = Common::String::format("%02d", shield * 100 / _maxShield);
- drawStringInSurface(shieldStr, 171, 162, black, redish, surface);
+ int x = 171;
+ if (shield < 10)
+ x = 179;
+ else if (shield < 100)
+ x = 175;
+
+ Common::String shieldStr = Common::String::format("%d", shield);
+ drawStringInSurface(shieldStr, x, 162, black, redish, surface);
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);
diff --git a/engines/freescape/games/eclipse/zx.cpp b/engines/freescape/games/eclipse/zx.cpp
index 97066863aec..679602aee36 100644
--- a/engines/freescape/games/eclipse/zx.cpp
+++ b/engines/freescape/games/eclipse/zx.cpp
@@ -101,6 +101,10 @@ void EclipseEngine::drawZXUI(Graphics::Surface *surface) {
_gfx->readFromPalette(7, r, g, b);
uint32 gray = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
+ _gfx->readFromPalette(2, r, g, b);
+ uint32 red = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
+
+ int shield = _gameStateVars[k8bitVariableShield] * 100 / _maxShield;
int score = _gameStateVars[k8bitVariableScore];
if (!_currentAreaMessages.empty())
@@ -109,6 +113,16 @@ void EclipseEngine::drawZXUI(Graphics::Surface *surface) {
Common::String scoreStr = Common::String::format("%07d", score);
drawStringInSurface(scoreStr, 133, 11, back, gray, surface, 'Z' - '0' + 1);
+ Common::String shieldStr = Common::String::format("%d", shield);
+
+ int x = 171;
+ if (shield < 10)
+ x = 179;
+ else if (shield < 100)
+ x = 175;
+
+ 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);
Commit: 7789b83d2c28cf6a7adbafada4efed6576e3eefc
https://github.com/scummvm/scummvm/commit/7789b83d2c28cf6a7adbafada4efed6576e3eefc
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2024-02-27T21:56:01+01:00
Commit Message:
FREESCAPE: show health as a number in eclipse in cpc
Changed paths:
engines/freescape/games/eclipse/cpc.cpp
engines/freescape/games/eclipse/dos.cpp
diff --git a/engines/freescape/games/eclipse/cpc.cpp b/engines/freescape/games/eclipse/cpc.cpp
index 998c865acfe..c081db86d7c 100644
--- a/engines/freescape/games/eclipse/cpc.cpp
+++ b/engines/freescape/games/eclipse/cpc.cpp
@@ -93,6 +93,7 @@ void EclipseEngine::drawCPCUI(Graphics::Surface *surface) {
uint32 other = _gfx->_texturePixelFormat.ARGBToColor(0xFF, r, g, b);
int score = _gameStateVars[k8bitVariableScore];
+ int shield = _gameStateVars[k8bitVariableShield] * 100 / _maxShield;
if (!_currentAreaMessages.empty())
drawStringInSurface(_currentAreaMessages[0], 102, 135, back, front, surface);
@@ -100,6 +101,15 @@ void EclipseEngine::drawCPCUI(Graphics::Surface *surface) {
Common::String scoreStr = Common::String::format("%07d", score);
drawStringInSurface(scoreStr, 136, 6, back, other, surface, 'Z' - '0' + 1);
+ int x = 171;
+ if (shield < 10)
+ x = 179;
+ else if (shield < 100)
+ x = 175;
+
+ Common::String shieldStr = Common::String::format("%d", shield);
+ drawStringInSurface(shieldStr, x, 162, back, other, surface);
+
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);
diff --git a/engines/freescape/games/eclipse/dos.cpp b/engines/freescape/games/eclipse/dos.cpp
index bf864d5cd24..df856246ed0 100644
--- a/engines/freescape/games/eclipse/dos.cpp
+++ b/engines/freescape/games/eclipse/dos.cpp
@@ -102,6 +102,7 @@ void EclipseEngine::loadAssetsDOSFullGame() {
void EclipseEngine::drawDOSUI(Graphics::Surface *surface) {
int score = _gameStateVars[k8bitVariableScore];
int shield = _gameStateVars[k8bitVariableShield] * 100 / _maxShield;
+
uint32 yellow = _gfx->_texturePixelFormat.ARGBToColor(0xFF, 0xFF, 0xFF, 0x55);
uint32 black = _gfx->_texturePixelFormat.ARGBToColor(0xFF, 0x00, 0x00, 0x00);
uint32 white = _gfx->_texturePixelFormat.ARGBToColor(0xFF, 0xFF, 0xFF, 0xFF);
More information about the Scummvm-git-logs
mailing list