[Scummvm-git-logs] scummvm master -> 8a7a1bef4abbce1f88d40d117fed0a7a83258d51

[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:
f26d9224cb FREESCAPE: small fixes to reduce glitches in the screenshots
8a7a1bef4a FREESCAPE: removed calls to glEnableClientState(GL_VERTEX_ARRAY) in the shader renderer


Commit: f26d9224cb0b77a10179e3f2f9bf504557ffc985
    https://github.com/scummvm/scummvm/commit/f26d9224cb0b77a10179e3f2f9bf504557ffc985
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-09-22T16:37:42+02:00

Commit Message:
FREESCAPE: small fixes to reduce glitches in the screenshots

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


diff --git a/engines/freescape/games/dark/cpc.cpp b/engines/freescape/games/dark/cpc.cpp
index cddee0588ad..638a005e8bb 100644
--- a/engines/freescape/games/dark/cpc.cpp
+++ b/engines/freescape/games/dark/cpc.cpp
@@ -29,8 +29,7 @@
 namespace Freescape {
 
 void DarkEngine::initCPC() {
-	_viewArea = Common::Rect(36, 24, 284, 124);
-
+	_viewArea = Common::Rect(36, 24, 284, 125);
 }
 
 extern byte kCPCPaletteTitleData[4][3];
diff --git a/engines/freescape/games/dark/dos.cpp b/engines/freescape/games/dark/dos.cpp
index 3caa28e70c8..9465c4f863b 100644
--- a/engines/freescape/games/dark/dos.cpp
+++ b/engines/freescape/games/dark/dos.cpp
@@ -38,9 +38,9 @@ byte kDarkCGAPalettePinkBlue[4][3] = {
 
 byte kDarkCGAPaletteRedGreen[4][3] = {
 	{0x00, 0x00, 0x00},
-	{0x00, 0xaa, 0x00},
-	{0xaa, 0x00, 0x00},
 	{0xaa, 0x55, 0x00},
+	{0xaa, 0x00, 0x00},
+	{0x00, 0xaa, 0x00},
 };
 
 static const CGAPaletteEntry rawCGAPaletteByArea[] {
@@ -79,9 +79,9 @@ static const CGAPaletteEntry rawCGAPaletteByArea[] {
 
 void DarkEngine::initDOS() {
 	if (_renderMode == Common::kRenderEGA)
-		_viewArea = Common::Rect(40, 24, 279, 124);
+		_viewArea = Common::Rect(40, 24, 280, 125);
 	else if (_renderMode == Common::kRenderCGA)
-		_viewArea = Common::Rect(40, 24, 279, 124);
+		_viewArea = Common::Rect(40, 24, 280, 125);
 	else
 		error("Invalid or unknown render mode");
 


Commit: 8a7a1bef4abbce1f88d40d117fed0a7a83258d51
    https://github.com/scummvm/scummvm/commit/8a7a1bef4abbce1f88d40d117fed0a7a83258d51
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-09-22T16:37:42+02:00

Commit Message:
FREESCAPE: removed calls to glEnableClientState(GL_VERTEX_ARRAY) in the shader renderer

Changed paths:
    engines/freescape/gfx_opengl_shaders.cpp


diff --git a/engines/freescape/gfx_opengl_shaders.cpp b/engines/freescape/gfx_opengl_shaders.cpp
index 89db9762851..dbcd98546de 100644
--- a/engines/freescape/gfx_opengl_shaders.cpp
+++ b/engines/freescape/gfx_opengl_shaders.cpp
@@ -168,7 +168,6 @@ void OpenGLShaderRenderer::renderSensorShoot(byte color, const Math::Vector3d se
 	glColor3ub(255, 255, 255);
 
 	glLineWidth(20);
-	glEnableClientState(GL_VERTEX_ARRAY);
 	copyToVertexArray(0, sensor);
 	copyToVertexArray(1, target);
 
@@ -263,7 +262,7 @@ void OpenGLShaderRenderer::renderCrossair(const Common::Point crossairPosition)
 
 	glLineWidth(8); // It will not work in every OpenGL implementation since the
 					 // spec doesn't require support for line widths other than 1
-	glEnableClientState(GL_VERTEX_ARRAY);
+
 	copyToVertexArray(0, Math::Vector3d(remap(crossairPosition.x - 3, _screenW), remap(_screenH - crossairPosition.y, _screenH), 0));
 	copyToVertexArray(1, Math::Vector3d(remap(crossairPosition.x - 1, _screenW), remap(_screenH - crossairPosition.y, _screenH), 0));