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

[mduggan]

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:
c40e667f00 TETRAEDGE: Fix float/double conversion warnings


Commit: c40e667f00d921974ebe75150c2a2d1c13f6747d
    https://github.com/scummvm/scummvm/commit/c40e667f00d921974ebe75150c2a2d1c13f6747d
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-02-20T19:51:54+09:00

Commit Message:
TETRAEDGE: Fix float/double conversion warnings

Changed paths:
    engines/tetraedge/game/character.cpp
    engines/tetraedge/game/in_game_scene.cpp


diff --git a/engines/tetraedge/game/character.cpp b/engines/tetraedge/game/character.cpp
index 3dae16c93fa..f184a8d49c8 100644
--- a/engines/tetraedge/game/character.cpp
+++ b/engines/tetraedge/game/character.cpp
@@ -1066,10 +1066,10 @@ Character::Water::Water() {
 	TeMatrix4x4 camMatrix = cam->worldTransformationMatrix();
 	Common::Array<TeVector3f32> quad;
 	quad.resize(4);
-	quad[0] = camMatrix.mult3x3(TeVector3f32(-0.1, 0.0,  0.1));
-	quad[1] = camMatrix.mult3x3(TeVector3f32( 0.1, 0.0,  0.1));
-	quad[2] = camMatrix.mult3x3(TeVector3f32(-0.1, 0.0, -0.1));
-	quad[3] = camMatrix.mult3x3(TeVector3f32( 0.1, 0.0, -0.1));
+	quad[0] = camMatrix.mult3x3(TeVector3f32(-0.1f, 0.0f,  0.1f));
+	quad[1] = camMatrix.mult3x3(TeVector3f32( 0.1f, 0.0f,  0.1f));
+	quad[2] = camMatrix.mult3x3(TeVector3f32(-0.1f, 0.0f, -0.1f));
+	quad[3] = camMatrix.mult3x3(TeVector3f32( 0.1f, 0.0f, -0.1f));
 	TeQuaternion rot = TeQuaternion::fromEuler(TeVector3f32(0, 0, 0));
 	TeIntrusivePtr<Te3DTexture> tex = Te3DTexture::makeInstance();
 	tex->load(g_engine->getCore()->findFile("texturesIngame/EauOndine1.tga"));
diff --git a/engines/tetraedge/game/in_game_scene.cpp b/engines/tetraedge/game/in_game_scene.cpp
index 76374707740..bd97ab29e55 100644
--- a/engines/tetraedge/game/in_game_scene.cpp
+++ b/engines/tetraedge/game/in_game_scene.cpp
@@ -56,13 +56,13 @@ bool InGameScene::_collisionSlide = false;
 const int InGameScene::MAX_FIRE = 50;
 const int InGameScene::MAX_SNOW = 250;
 const int InGameScene::MAX_SMOKE = 350;
-const float InGameScene::DUREE_MAX_FIRE = 32000.0;
-const float InGameScene::SCALE_FIRE = 0.1;
+const float InGameScene::DUREE_MAX_FIRE = 32000.0f;
+const float InGameScene::SCALE_FIRE = 0.1f;
 const int InGameScene::MAX_FLAKE = 10;
-const float InGameScene::DUREE_MIN_FLAKE = 3000.0;
-const float InGameScene::DUREE_MAX_FLAKE = 5000.0;
-const float InGameScene::SCALE_FLAKE = 0.1;
-const float InGameScene::DEPTH_MAX_FLAKE = 0.1;
+const float InGameScene::DUREE_MIN_FLAKE = 3000.0f;
+const float InGameScene::DUREE_MAX_FLAKE = 5000.0f;
+const float InGameScene::SCALE_FLAKE = 0.1f;
+const float InGameScene::DEPTH_MAX_FLAKE = 0.1f;
 
 
 InGameScene::InGameScene() : _character(nullptr), _charactersShadow(nullptr),