[Scummvm-git-logs] scummvm master -> 3260af46bf821ebba8b34158aae92ec39fae4a4d
aquadran
noreply at scummvm.org
Sun Oct 27 16:56:41 UTC 2024
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:
3260af46bf WINTERMUTE: Fixed warnings
Commit: 3260af46bf821ebba8b34158aae92ec39fae4a4d
https://github.com/scummvm/scummvm/commit/3260af46bf821ebba8b34158aae92ec39fae4a4d
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2024-10-27T17:56:36+01:00
Commit Message:
WINTERMUTE: Fixed warnings
Changed paths:
engines/wintermute/base/gfx/xskinmesh.cpp
diff --git a/engines/wintermute/base/gfx/xskinmesh.cpp b/engines/wintermute/base/gfx/xskinmesh.cpp
index 377a15b710b..a2b56bcd3d9 100644
--- a/engines/wintermute/base/gfx/xskinmesh.cpp
+++ b/engines/wintermute/base/gfx/xskinmesh.cpp
@@ -196,7 +196,7 @@ bool DXMesh::generateAdjacency(uint32 *adjacency) {
for (i = 0; i < _numVertices; i++) {
DXVector3 *vertex = (DXVector3 *)(vertices + _vertexSize * i);
- sortedVertices[i]._firstSharedIndex = -1;
+ sortedVertices[i]._firstSharedIndex = (uint32)-1;
sortedVertices[i]._key = vertex->_x + vertex->_y + vertex->_z;
sortedVertices[i]._vertexIndex = i;
}
@@ -204,7 +204,7 @@ bool DXMesh::generateAdjacency(uint32 *adjacency) {
uint32 *firstSharedIndex = &sortedVertices[indices[i]]._firstSharedIndex;
sharedIndices[i] = *firstSharedIndex;
*firstSharedIndex = i;
- adjacency[i] = -1;
+ adjacency[i] = (uint32)-1;
}
qsort(sortedVertices, _numVertices, sizeof(DXVertexMetadata), compareVertexKeys);
@@ -531,8 +531,8 @@ static bool parseFVFData(XFileData &fileData, struct MeshData */*meshData*/) {
static bool parseDeclData(XFileData &fileData, struct MeshData *meshData) {
uint32 i, vertexSize = 0;
- uint32 normalOffset = -1;
- uint32 textureOffset = -1;
+ uint32 normalOffset = (uint32)-1;
+ uint32 textureOffset = (uint32)-1;
//uint32 tangentOffset = -1;
//uint32 binormalOffset = -1;
More information about the Scummvm-git-logs
mailing list