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

[aquadran]

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

Summary:
a392185901 WINTERMUTE: Fixed compilation


Commit: a392185901f0c2f0d1c504e0c315fe9739eece60
    https://github.com/scummvm/scummvm/commit/a392185901f0c2f0d1c504e0c315fe9739eece60
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2025-09-28T09:23:39+02:00

Commit Message:
WINTERMUTE: Fixed compilation

Changed paths:
    engines/wintermute/ad/ad_scene.cpp
    engines/wintermute/ad/ad_scene.h
    engines/wintermute/ad/ad_scene_geometry.cpp
    engines/wintermute/ad/ad_scene_geometry.h
    engines/wintermute/base/base_surface_storage.cpp
    engines/wintermute/base/base_surface_storage.h
    engines/wintermute/base/particles/part_emitter.cpp
    engines/wintermute/base/particles/part_emitter.h
    engines/wintermute/utils/utils.h


diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 723f03a1f09..b846d03809c 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -1478,7 +1478,7 @@ bool AdScene::displayRegionContent(AdRegion *region, bool display3DOnly) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-int AdScene::compareObjs(const void *obj1, const void *obj2) {
+int32 AdScene::compareObjs(const void *obj1, const void *obj2) {
 	void *o1 = const_cast<void *>(obj1);
 	void *o2 = const_cast<void *>(obj2);
 	AdObject *object1 = *(AdObject **)o1;
diff --git a/engines/wintermute/ad/ad_scene.h b/engines/wintermute/ad/ad_scene.h
index 838376a8b9f..d47f3aed65c 100644
--- a/engines/wintermute/ad/ad_scene.h
+++ b/engines/wintermute/ad/ad_scene.h
@@ -108,7 +108,7 @@ public:
 	DECLARE_PERSISTENT(AdScene, BaseObject)
 	bool displayRegionContent(AdRegion *region = nullptr, bool display3DOnly = false);
 	bool displayRegionContentOld(AdRegion *region = nullptr);
-	static int compareObjs(const void *obj1, const void *obj2);
+	static int32 compareObjs(const void *obj1, const void *obj2);
 
 	bool updateFreeObjects();
 	bool traverseNodes(bool update = false);
diff --git a/engines/wintermute/ad/ad_scene_geometry.cpp b/engines/wintermute/ad/ad_scene_geometry.cpp
index 020026d510c..318f170c210 100644
--- a/engines/wintermute/ad/ad_scene_geometry.cpp
+++ b/engines/wintermute/ad/ad_scene_geometry.cpp
@@ -998,7 +998,7 @@ bool AdSceneGeometry::enableLights(DXVector3 point, BaseArray<char *> &ignoreLig
 }
 
 //////////////////////////////////////////////////////////////////////////
-int AdSceneGeometry::compareLights(const void *obj1, const void *obj2) {
+int32 AdSceneGeometry::compareLights(const void *obj1, const void *obj2) {
 	void *o1 = const_cast<void *>(obj1);
 	void *o2 = const_cast<void *>(obj2);
 	Light3D *light1 = *(Light3D **)o1;
diff --git a/engines/wintermute/ad/ad_scene_geometry.h b/engines/wintermute/ad/ad_scene_geometry.h
index 44f7ff03387..aefe19c0a68 100644
--- a/engines/wintermute/ad/ad_scene_geometry.h
+++ b/engines/wintermute/ad/ad_scene_geometry.h
@@ -70,7 +70,7 @@ public:
 
 	bool createLights();
 	bool enableLights(DXVector3 Point, BaseArray<char *> &IgnoreLights);
-	static int compareLights(const void *obj1, const void *obj2);
+	static int32 compareLights(const void *obj1, const void *obj2);
 
 	bool initLoop();
 	float getPointsDist(DXVector3 p1, DXVector3 p2);
diff --git a/engines/wintermute/base/base_surface_storage.cpp b/engines/wintermute/base/base_surface_storage.cpp
index 3083880fb6c..7699392b665 100644
--- a/engines/wintermute/base/base_surface_storage.cpp
+++ b/engines/wintermute/base/base_surface_storage.cpp
@@ -177,7 +177,7 @@ bool BaseSurfaceStorage::sortSurfaces() {
 
 
 //////////////////////////////////////////////////////////////////////////
-int BaseSurfaceStorage::surfaceSortCB(const void *arg1, const void *arg2) {
+int32 BaseSurfaceStorage::surfaceSortCB(const void *arg1, const void *arg2) {
 	void *o1 = const_cast<void *>(arg1);
 	void *o2 = const_cast<void *>(arg2);
 	BaseSurface *s1 = *((BaseSurface **)o1);
diff --git a/engines/wintermute/base/base_surface_storage.h b/engines/wintermute/base/base_surface_storage.h
index 1384c98d499..84cc01cdf2a 100644
--- a/engines/wintermute/base/base_surface_storage.h
+++ b/engines/wintermute/base/base_surface_storage.h
@@ -38,7 +38,7 @@ public:
 	uint32 _lastCleanupTime;
 	bool initLoop();
 	bool sortSurfaces();
-	static int surfaceSortCB(const void *arg1, const void *arg2);
+	static int32 surfaceSortCB(const void *arg1, const void *arg2);
 	bool cleanup(bool warn = false);
 	//DECLARE_PERSISTENT(BaseSurfaceStorage, BaseClass)
 
diff --git a/engines/wintermute/base/particles/part_emitter.cpp b/engines/wintermute/base/particles/part_emitter.cpp
index 03f9e46e8bb..58f0765b5e6 100644
--- a/engines/wintermute/base/particles/part_emitter.cpp
+++ b/engines/wintermute/base/particles/part_emitter.cpp
@@ -371,7 +371,7 @@ bool PartEmitter::sortParticlesByZ() {
 }
 
 //////////////////////////////////////////////////////////////////////////
-int PartEmitter::compareZ(const void *obj1, const void *obj2) {
+int32 PartEmitter::compareZ(const void *obj1, const void *obj2) {
 	void *o1 = const_cast<void *>(obj1);
 	void *o2 = const_cast<void *>(obj2);
 	PartParticle *p1 = *(PartParticle **)o1;
diff --git a/engines/wintermute/base/particles/part_emitter.h b/engines/wintermute/base/particles/part_emitter.h
index cd6d1addf06..32d4661e1aa 100644
--- a/engines/wintermute/base/particles/part_emitter.h
+++ b/engines/wintermute/base/particles/part_emitter.h
@@ -124,7 +124,7 @@ public:
 
 private:
 	PartForce *addForceByName(const char *name);
-	int static compareZ(const void *obj1, const void *obj2);
+	static int32 compareZ(const void *obj1, const void *obj2);
 	bool initParticle(PartParticle *particle, uint32 currentTime, uint32 timerDelta);
 	bool updateInternal(uint32 currentTime, uint32 timerDelta);
 	uint32 _lastGenTime;
diff --git a/engines/wintermute/utils/utils.h b/engines/wintermute/utils/utils.h
index 1b1313c5dee..746dd33d2ff 100644
--- a/engines/wintermute/utils/utils.h
+++ b/engines/wintermute/utils/utils.h
@@ -60,7 +60,7 @@ private:
 };
 
 void qsort_msvc(void *base, uint32 nmemb, uint32 size,
-                int (*compare)(const void *, const void *));
+                int32 (*compare)(const void *, const void *));
 
 } // End of namespace Wintermute