[Scummvm-git-logs] scummvm master -> 39127758286599291ee661715d48e7a202563d80

mduggan noreply at scummvm.org
Tue Jan 17 01:06:44 UTC 2023


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:
3912775828 TETRAEDGE: Fix gcc compiler warnings


Commit: 39127758286599291ee661715d48e7a202563d80
    https://github.com/scummvm/scummvm/commit/39127758286599291ee661715d48e7a202563d80
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-01-17T10:06:29+09:00

Commit Message:
TETRAEDGE: Fix gcc compiler warnings

Changed paths:
    engines/tetraedge/te/te_image.cpp
    engines/tetraedge/te/te_model.cpp


diff --git a/engines/tetraedge/te/te_image.cpp b/engines/tetraedge/te/te_image.cpp
index 72cba1e30ff..7cf40e0f8f4 100644
--- a/engines/tetraedge/te/te_image.cpp
+++ b/engines/tetraedge/te/te_image.cpp
@@ -31,7 +31,7 @@ namespace Tetraedge {
 TeImage::TeImage() : ManagedSurface(), _teFormat(INVALID) {
 }
 
-TeImage::TeImage(const TeImage &other) {
+TeImage::TeImage(const TeImage &other) : ManagedSurface(other) {
 	error("TODO: Implement TeImage::TeImage copy constructor");
 }
 
diff --git a/engines/tetraedge/te/te_model.cpp b/engines/tetraedge/te/te_model.cpp
index b80265f1701..96a6a808eed 100644
--- a/engines/tetraedge/te/te_model.cpp
+++ b/engines/tetraedge/te/te_model.cpp
@@ -130,9 +130,9 @@ void TeModel::forceMatrix(const TeMatrix4x4 &matrix) {
 
 TeTRS TeModel::getBone(TeIntrusivePtr<TeModelAnimation> anim, uint num) {
 	if (anim) {
-		int bone = anim->findBone(_bones[num]._name);
-		if (bone != -1)
-			return anim->getTRS(bone, anim->curFrame2(), false);
+		int boneNo = anim->findBone(_bones[num]._name);
+		if (boneNo != -1)
+			return anim->getTRS(boneNo, anim->curFrame2(), false);
 	}
 	return _bones[num]._trs;
 }




More information about the Scummvm-git-logs mailing list