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

[neuromancer]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
e60beb81dc FREESCAPE: clear color remaps in dark when changing areas
f9708d7a36 FREESCAPE: revert latest change in glPolygonOffset for OpenGL


Commit: e60beb81dce631458e63e224bb650e57cb3074fb
    https://github.com/scummvm/scummvm/commit/e60beb81dce631458e63e224bb650e57cb3074fb
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-09-16T16:30:05+02:00

Commit Message:
FREESCAPE: clear color remaps in dark when changing areas

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


diff --git a/engines/freescape/games/dark/dark.cpp b/engines/freescape/games/dark/dark.cpp
index 018a3afc9dd..793c62887bd 100644
--- a/engines/freescape/games/dark/dark.cpp
+++ b/engines/freescape/games/dark/dark.cpp
@@ -520,6 +520,10 @@ void DarkEngine::gotoArea(uint16 areaID, int entranceID) {
 	playSound(5, false);
 	// Ignore sky/ground fields
 	_gfx->_keyColor = 0;
+	// Color remaps are not restored in Dark Side
+	// since they are used to simulate a fade to black effect
+	// that should not persist
+	_currentArea->_colorRemaps.clear();
 	_gfx->setColorRemaps(&_currentArea->_colorRemaps);
 
 	swapPalette(areaID);


Commit: f9708d7a36797e85e77ba0f3aadba3ba4072cf00
    https://github.com/scummvm/scummvm/commit/f9708d7a36797e85e77ba0f3aadba3ba4072cf00
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-09-16T16:30:05+02:00

Commit Message:
FREESCAPE: revert latest change in glPolygonOffset for OpenGL

Changed paths:
    engines/freescape/gfx_opengl.cpp


diff --git a/engines/freescape/gfx_opengl.cpp b/engines/freescape/gfx_opengl.cpp
index 43aa17347cf..f6eafa711bc 100644
--- a/engines/freescape/gfx_opengl.cpp
+++ b/engines/freescape/gfx_opengl.cpp
@@ -316,7 +316,7 @@ void OpenGLRenderer::renderFace(const Common::Array<Math::Vector3d> &vertices) {
 void OpenGLRenderer::polygonOffset(bool enabled) {
 	if (enabled) {
 		glEnable(GL_POLYGON_OFFSET_FILL);
-		glPolygonOffset(-40.0f / MIN(4, _scale), 1.0f);
+		glPolygonOffset(-10.0f, 1.0f);
 	} else {
 		glPolygonOffset(0, 0);
 		glDisable(GL_POLYGON_OFFSET_FILL);