[Scummvm-git-logs] scummvm master -> 4e3f14ce7f12c072e9e21a3abc77c417e46587bf

[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:
4e3f14ce7f WINTERMUTE: WME3D: uint -> uint32


Commit: 4e3f14ce7f12c072e9e21a3abc77c417e46587bf
    https://github.com/scummvm/scummvm/commit/4e3f14ce7f12c072e9e21a3abc77c417e46587bf
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-02T22:21:48+02:00

Commit Message:
WINTERMUTE: WME3D: uint -> uint32

Changed paths:
    engines/wintermute/base/gfx/xfile_loader.h
    engines/wintermute/base/gfx/xframe_node.cpp
    engines/wintermute/base/gfx/xmodel.cpp
    engines/wintermute/base/gfx/xskinmesh.cpp


diff --git a/engines/wintermute/base/gfx/xfile_loader.h b/engines/wintermute/base/gfx/xfile_loader.h
index 147a67293ca..eda00af85e9 100644
--- a/engines/wintermute/base/gfx/xfile_loader.h
+++ b/engines/wintermute/base/gfx/xfile_loader.h
@@ -480,7 +480,7 @@ public:
 		return false;
 	}
 
-	bool getChildren(uint &num) {
+	bool getChildren(uint32 &num) {
 		if (_xobject) {
 			num = _xobject->_children.size();
 			return true;
@@ -559,7 +559,7 @@ public:
 		return false;
 	}
 
-	bool getChildren(uint &num) {
+	bool getChildren(uint32 &num) {
 		if (_file) {
 			num = _file->_xobjects.size();
 			return true;
diff --git a/engines/wintermute/base/gfx/xframe_node.cpp b/engines/wintermute/base/gfx/xframe_node.cpp
index cf0d95c8e57..60c1cdf1093 100644
--- a/engines/wintermute/base/gfx/xframe_node.cpp
+++ b/engines/wintermute/base/gfx/xframe_node.cpp
@@ -161,7 +161,7 @@ bool FrameNode::loadFromXData(const Common::String &filename, XModel *model, XFi
 
 		// Enumerate child objects.
 		res = false;
-		uint numChildren = 0;
+		uint32 numChildren = 0;
 		xobj->getChildren(numChildren);
 		for (uint32 i = 0; i < numChildren; i++) {
 			XFileData xchildData;
@@ -204,7 +204,7 @@ bool FrameNode::mergeFromXData(const Common::String &filename, XModel *model, XF
 		// Enumerate child objects.
 		res = false;
 
-		uint numChildren = 0;
+		uint32 numChildren = 0;
 		xobj->getChildren(numChildren);
 		for (uint32 i = 0; i < numChildren; i++) {
 			XFileData xchildData;
diff --git a/engines/wintermute/base/gfx/xmodel.cpp b/engines/wintermute/base/gfx/xmodel.cpp
index d6910446ac2..97bd1e7a41e 100644
--- a/engines/wintermute/base/gfx/xmodel.cpp
+++ b/engines/wintermute/base/gfx/xmodel.cpp
@@ -141,7 +141,7 @@ bool XModel::loadFromFile(const Common::String &filename, XModel *parentModel) {
 
 	_rootFrame = new FrameNode(_gameRef);
 
-	uint numChildren = 0;
+	uint32 numChildren = 0;
 	xfile->getEnum().getChildren(numChildren);
 	for (uint i = 0; i < numChildren; i++) {
 		resLoop = xfile->getEnum().getChild(i, xobj);
@@ -196,7 +196,7 @@ bool XModel::mergeFromFile(const Common::String &filename) {
 	XFileData xobj;
 	bool resLoop = false;
 
-	uint numChildren = 0;
+	uint32 numChildren = 0;
 	xfile->getEnum().getChildren(numChildren);
 	for (uint i = 0; i < numChildren; i++) {
 		resLoop = xfile->getEnum().getChild(i, xobj);
@@ -251,7 +251,7 @@ bool XModel::loadAnimationSet(const Common::String &filename, XFileData *xobj) {
 	XFileData xchildData;
 	XClassType objectType;
 
-	uint numChildren = 0;
+	uint32 numChildren = 0;
 	xobj->getChildren(numChildren);
 
 	for (uint32 i = 0; i < numChildren; i++) {
@@ -296,7 +296,7 @@ bool XModel::loadAnimation(const Common::String &filename, XFileData *xobj, Anim
 	// create the new object
 	Animation *anim = new Animation(_gameRef);
 
-	uint numChildren = 0;
+	uint32 numChildren = 0;
 	xobj->getChildren(numChildren);
 
 	for (uint32 i = 0; i < numChildren; i++) {
diff --git a/engines/wintermute/base/gfx/xskinmesh.cpp b/engines/wintermute/base/gfx/xskinmesh.cpp
index d7d4ca5267f..546014c576f 100644
--- a/engines/wintermute/base/gfx/xskinmesh.cpp
+++ b/engines/wintermute/base/gfx/xskinmesh.cpp
@@ -655,8 +655,7 @@ static bool parseTextureFilename(XFileData &fileData, char *filenameOut) {
 static bool parseMaterial(XFileData &fileData, DXMaterial *material) {
 	XFileData child;
 	XClassType type;
-	uint nbChildren;
-	uint32 i;
+	uint32 nbChildren, i;
 
 	auto materialObj = fileData.getXMaterialObject();
 	if (!materialObj) {