[Scummvm-git-logs] scummvm master -> 3ecc12c6694d3903f17d953cabb1a0724627bafe

[aquadran]

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

Summary:
3ecc12c669 WINTERMUTE: Fixed regression regarding wrong index type in pickPoly


Commit: 3ecc12c6694d3903f17d953cabb1a0724627bafe
    https://github.com/scummvm/scummvm/commit/3ecc12c6694d3903f17d953cabb1a0724627bafe
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-12T17:41:32+02:00

Commit Message:
WINTERMUTE: Fixed regression regarding wrong index type in pickPoly

Changed paths:
    engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
    engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
    engines/wintermute/base/gfx/xmesh.cpp


diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
index dcd89f8dd5c..cefa8d383a2 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
@@ -52,7 +52,7 @@ bool XMeshOpenGL::render(XModel *model) {
 		return false;
 
 	float *vertexData = _blendedMesh->_meshLoader->_vertexData;
-	auto indexData = (uint32 *)_blendedMesh->getIndexBuffer().ptr();
+	uint32 *indexData = (uint32 *)_blendedMesh->getIndexBuffer().ptr();
 	if (vertexData == nullptr) {
 		return false;
 	}
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
index 0d3756a0f5e..0f8a8d94b33 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
@@ -53,7 +53,7 @@ XMeshOpenGLShader::~XMeshOpenGLShader() {
 
 bool XMeshOpenGLShader::loadFromXData(const Common::String &filename, XFileData *xobj) {
 	if (XMesh::loadFromXData(filename, xobj)) {
-		auto indexData = _blendedMesh->getIndexBuffer().ptr();
+		uint32 *indexData = (uint32 *)_blendedMesh->getIndexBuffer().ptr();
 		uint32 indexDataSize = _blendedMesh->getIndexBuffer().size() / sizeof(uint32);
 		float *vertexData = _blendedMesh->_meshLoader->_vertexData;
 		uint32 vertexCount = _blendedMesh->_meshLoader->_vertexCount;
diff --git a/engines/wintermute/base/gfx/xmesh.cpp b/engines/wintermute/base/gfx/xmesh.cpp
index cd18be8f005..f17cc6bbe54 100644
--- a/engines/wintermute/base/gfx/xmesh.cpp
+++ b/engines/wintermute/base/gfx/xmesh.cpp
@@ -340,7 +340,7 @@ bool XMesh::updateShadowVol(ShadowVolume *shadow, Math::Matrix4 &modelMat, const
 
 	uint32 numEdges = 0;
 
-	auto indexData = (uint32 *)_blendedMesh->getIndexBuffer().ptr();
+	uint32 *indexData = (uint32 *)_blendedMesh->getIndexBuffer().ptr();
 	uint32 indexDataSize = _blendedMesh->getIndexBuffer().size() / sizeof(uint32);
 	Common::Array<bool> isFront(indexDataSize / 3, false);
 
@@ -429,7 +429,7 @@ bool XMesh::pickPoly(Math::Vector3d *pickRayOrig, Math::Vector3d *pickRayDir) {
 
 	bool res = false;
 
-	auto indexData = _blendedMesh->getIndexBuffer().ptr();
+	uint32 *indexData = (uint32 *)_blendedMesh->getIndexBuffer().ptr();
 	uint32 indexDataSize = _blendedMesh->getIndexBuffer().size() / sizeof(uint32);
 	for (uint16 i = 0; i < indexDataSize; i += 3) {
 		uint16 index1 = indexData[i + 0];