[Scummvm-git-logs] scummvm master -> 501f5418ee1d00f92a241806297d51d26fff2b07

[digitall]

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:
501f5418ee WATCHMAKER: Further GCC Compiler Warning Fixes


Commit: 501f5418ee1d00f92a241806297d51d26fff2b07
    https://github.com/scummvm/scummvm/commit/501f5418ee1d00f92a241806297d51d26fff2b07
Author: D G Turner (digitall at scummvm.org)
Date: 2023-05-28T01:06:31+01:00

Commit Message:
WATCHMAKER: Further GCC Compiler Warning Fixes

Changed paths:
    engines/watchmaker/3d/geometry.cpp


diff --git a/engines/watchmaker/3d/geometry.cpp b/engines/watchmaker/3d/geometry.cpp
index 5ba39fee421..fd6acef4695 100644
--- a/engines/watchmaker/3d/geometry.cpp
+++ b/engines/watchmaker/3d/geometry.cpp
@@ -3280,14 +3280,11 @@ void ProcessMaterialList(void) {
  *                  SortMesh
  * --------------------------------------------------*/
 static int SortMesh(const void *element1, const void *element2) {
-	t3dMESH **mm1, **mm2;
-	t3dMESH *m1, *m2;
+	const t3dMESH * const *mm1 = (const t3dMESH * const *)(element1);
+	const t3dMESH * const *mm2 = (const t3dMESH * const *)(element2);
 
-	mm1 = (t3dMESH **)(element1);
-	mm2 = (t3dMESH **)(element2);
-
-	m1 = *mm1;
-	m2 = *mm2;
+	const t3dMESH *m1 = *mm1;
+	const t3dMESH *m2 = *mm2;
 
 	/*  DebugLogWindow("%s",m1->Name);
 	    DebugLogWindow("%s",m2->Name);