[Scummvm-git-logs] scummvm master -> 0c009616cd0677a2e3fc11c7fbc3ad8f5d9b8324

[sluicebox]

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

Summary:
25e67fb2c1 HPL1: Add newline at EOF
0c009616cd HPL1: Fix MSVC build error


Commit: 25e67fb2c1fdc781d95524f121d6a6fd07a3e076
    https://github.com/scummvm/scummvm/commit/25e67fb2c1fdc781d95524f121d6a6fd07a3e076
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-09-26T19:43:01-07:00

Commit Message:
HPL1: Add newline at EOF

Changed paths:
    engines/hpl1/engine/impl/SDLTexture.cpp
    engines/hpl1/engine/impl/texture_tgl.cpp
    engines/hpl1/engine/impl/vertex_buffer_tgl.cpp
    engines/hpl1/graphics.h
    engines/hpl1/static_string.h
    engines/hpl1/string.h


diff --git a/engines/hpl1/engine/impl/SDLTexture.cpp b/engines/hpl1/engine/impl/SDLTexture.cpp
index 3e711b57ec4..9b026e3db40 100644
--- a/engines/hpl1/engine/impl/SDLTexture.cpp
+++ b/engines/hpl1/engine/impl/SDLTexture.cpp
@@ -654,4 +654,4 @@ GLenum cSDLTexture::GetGLWrap(eTextureWrap aMode) {
 
 } // namespace hpl
 
-#endif // USE_OPENGL
\ No newline at end of file
+#endif // USE_OPENGL
diff --git a/engines/hpl1/engine/impl/texture_tgl.cpp b/engines/hpl1/engine/impl/texture_tgl.cpp
index 656e1fbfe83..4c0b85225bd 100644
--- a/engines/hpl1/engine/impl/texture_tgl.cpp
+++ b/engines/hpl1/engine/impl/texture_tgl.cpp
@@ -496,4 +496,3 @@ TGLenum TGLTexture::GetGLWrap(eTextureWrap aMode) {
 }
 
 } // namespace hpl
-  //-----------------------------------------------------------------------
\ No newline at end of file
diff --git a/engines/hpl1/engine/impl/vertex_buffer_tgl.cpp b/engines/hpl1/engine/impl/vertex_buffer_tgl.cpp
index e2e87b881bf..245cb9932b3 100644
--- a/engines/hpl1/engine/impl/vertex_buffer_tgl.cpp
+++ b/engines/hpl1/engine/impl/vertex_buffer_tgl.cpp
@@ -483,4 +483,4 @@ void VertexBufferTGL::SetVertexStates(tVertexFlag aFlags) {
 
 //-----------------------------------------------------------------------
 
-} // namespace hpl
\ No newline at end of file
+} // namespace hpl
diff --git a/engines/hpl1/graphics.h b/engines/hpl1/graphics.h
index 2906a76ba70..b115be6c4ef 100644
--- a/engines/hpl1/graphics.h
+++ b/engines/hpl1/graphics.h
@@ -38,4 +38,4 @@ bool useOpenGL();
 
 } // namespace Hpl1
 
-#endif
\ No newline at end of file
+#endif
diff --git a/engines/hpl1/static_string.h b/engines/hpl1/static_string.h
index 62d23094fbb..8b24ad99d33 100644
--- a/engines/hpl1/static_string.h
+++ b/engines/hpl1/static_string.h
@@ -49,4 +49,4 @@ inline bool operator<(const StaticString &lhs, const StaticString &rhs) {
 	return scumm_stricmp(lhs.c_str(), rhs.c_str()) < 0;
 }
 
-} // namespace Hpl1
\ No newline at end of file
+} // namespace Hpl1
diff --git a/engines/hpl1/string.h b/engines/hpl1/string.h
index e89162440a2..995c39e8969 100644
--- a/engines/hpl1/string.h
+++ b/engines/hpl1/string.h
@@ -32,4 +32,4 @@ Common::String fileDir(const Common::String &path);
 
 } // namespace Hpl1
 
-#endif
\ No newline at end of file
+#endif


Commit: 0c009616cd0677a2e3fc11c7fbc3ad8f5d9b8324
    https://github.com/scummvm/scummvm/commit/0c009616cd0677a2e3fc11c7fbc3ad8f5d9b8324
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2023-09-26T19:43:37-07:00

Commit Message:
HPL1: Fix MSVC build error

Changed paths:
    engines/hpl1/engine/graphics/Mesh.cpp


diff --git a/engines/hpl1/engine/graphics/Mesh.cpp b/engines/hpl1/engine/graphics/Mesh.cpp
index c37dbb1c03d..609832d4351 100755
--- a/engines/hpl1/engine/graphics/Mesh.cpp
+++ b/engines/hpl1/engine/graphics/Mesh.cpp
@@ -697,7 +697,7 @@ iCollideShape *cMesh::CreateCollideShapeFromCollider(cMeshCollider *pCollider, i
 	// Collider creation and updating changed between the version of the Newton physics library we are using and the original version. The changes are probably in dgBody::UpdateCollisionMatrix
 	// (or in one of the functions called inside of it), called when at the creation of the helmet's PhysicsBodyNewton and after modifying the body's transformation matrix later in the loading process.
 	if (GetName() == "iron_mine_helmet.dae") {
-		return apWorld->CreateBoxShape(pCollider->mvSize - cVector3f(0.04, 0.0, 0.04), &pCollider->m_mtxOffset);
+		return apWorld->CreateBoxShape(pCollider->mvSize - cVector3f(0.04f, 0.0f, 0.04f), &pCollider->m_mtxOffset);
 	}
 	switch (pCollider->mType) {
 	case eCollideShapeType_Box: