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

[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:
f37ee05a7a WINTERMUTE: Fixed AmigaOS4 compilation


Commit: f37ee05a7a39e24495e043b34afcd2de672719d1
    https://github.com/scummvm/scummvm/commit/f37ee05a7a39e24495e043b34afcd2de672719d1
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-09-11T23:42:24+02:00

Commit Message:
WINTERMUTE: Fixed AmigaOS4 compilation

Changed paths:
    engines/wintermute/base/gfx/xframe_node.cpp
    engines/wintermute/base/gfx/xmaterial.cpp
    engines/wintermute/base/gfx/xmesh.cpp
    engines/wintermute/base/gfx/xmodel.cpp


diff --git a/engines/wintermute/base/gfx/xframe_node.cpp b/engines/wintermute/base/gfx/xframe_node.cpp
index 0f29e52ac36..c14b7640c64 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;
-		uint32 numChildren = 0;
+		uint numChildren = 0;
 		xobj->getChildren(numChildren);
 		for (uint32 i = 0; i < numChildren; i++) {
 			XFileData xchildData;
@@ -211,7 +211,7 @@ bool FrameNode::mergeFromXData(const Common::String &filename, XModel *model, XF
 		// Enumerate child objects.
 		res = false;
 
-		uint32 numChildren = 0;
+		uint numChildren = 0;
 		xobj->getChildren(numChildren);
 		for (uint32 i = 0; i < numChildren; i++) {
 			XFileData xchildData;
diff --git a/engines/wintermute/base/gfx/xmaterial.cpp b/engines/wintermute/base/gfx/xmaterial.cpp
index 144afccf52d..6f57b4f2fe0 100644
--- a/engines/wintermute/base/gfx/xmaterial.cpp
+++ b/engines/wintermute/base/gfx/xmaterial.cpp
@@ -163,7 +163,7 @@ bool Material::loadFromX(XFileData *xobj, const Common::String &filename) {
 	_emissive.b() = material->_emissiveB;
 	_emissive.a() = 1.0f;
 
-	uint32 numChildren = 0;
+	uint numChildren = 0;
 	xobj->getChildren(numChildren);
 
 	for (uint32 i = 0; i < numChildren; i++) {
diff --git a/engines/wintermute/base/gfx/xmesh.cpp b/engines/wintermute/base/gfx/xmesh.cpp
index d0e7387c09c..ebcdc0b2062 100644
--- a/engines/wintermute/base/gfx/xmesh.cpp
+++ b/engines/wintermute/base/gfx/xmesh.cpp
@@ -91,7 +91,7 @@ bool XMesh::loadFromXData(const Common::String &filename, XFileData *xobj, Commo
 
 	parseFaces(mesh, faceCount, indexCountPerFace);
 
-	uint32 numChildren = 0;
+	uint numChildren = 0;
 	xobj->getChildren(numChildren);
 
 	for (uint32 i = 0; i < numChildren; i++) {
@@ -618,7 +618,7 @@ bool XMesh::parseMaterials(XFileData *xobj, int faceCount, const Common::String
 	_indexRanges.push_back(currentIndex);
 	_numAttrs = _indexRanges.size() - 1;
 
-	uint32 numChildren = 0;
+	uint numChildren = 0;
 	xobj->getChildren(numChildren);
 
 	for (uint32 i = 0; i < numChildren; i++) {
diff --git a/engines/wintermute/base/gfx/xmodel.cpp b/engines/wintermute/base/gfx/xmodel.cpp
index e3f444a79ba..de72a18526a 100644
--- a/engines/wintermute/base/gfx/xmodel.cpp
+++ b/engines/wintermute/base/gfx/xmodel.cpp
@@ -148,7 +148,7 @@ bool XModel::loadFromFile(const Common::String &filename, XModel *parentModel) {
 		if (!resLoop)
 			break;
 
-		bool res = _rootFrame->loadFromXData(filename, this, &xobj, _materialReferences);
+		res = _rootFrame->loadFromXData(filename, this, &xobj, _materialReferences);
 		if (!res) {
 			BaseEngine::LOG(0, "Error loading top level object from '%s'", filename.c_str());
 			break;
@@ -251,7 +251,7 @@ bool XModel::loadAnimationSet(const Common::String &filename, XFileData *xobj) {
 	XFileData xchildData;
 	XClassType objectType;
 
-	uint32 numChildren = 0;
+	uint 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);
 
-	uint32 numChildren = 0;
+	uint numChildren = 0;
 	xobj->getChildren(numChildren);
 
 	for (uint32 i = 0; i < numChildren; i++) {