[Scummvm-git-logs] scummvm master -> 2748e889c8940ea775077c92f80695360375a0a5

[grisenti]

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:
2748e889c8 HPL1: Fix error in conditional expression


Commit: 2748e889c8940ea775077c92f80695360375a0a5
    https://github.com/scummvm/scummvm/commit/2748e889c8940ea775077c92f80695360375a0a5
Author: grisenti (emanuele at grisenti.net)
Date: 2023-12-15T08:57:49+01:00

Commit Message:
HPL1: Fix error in conditional expression

Changed paths:
    engines/hpl1/engine/physics/CharacterBody.cpp


diff --git a/engines/hpl1/engine/physics/CharacterBody.cpp b/engines/hpl1/engine/physics/CharacterBody.cpp
index 7abbb66c2f2..b1558220386 100644
--- a/engines/hpl1/engine/physics/CharacterBody.cpp
+++ b/engines/hpl1/engine/physics/CharacterBody.cpp
@@ -686,10 +686,8 @@ void iCharacterBody::Update(float afTimeStep) {
 	// Check for collision.
 	// Might wanna test this for x, y and z independently.
 	mvPosition += vPosAdd;
-
 	cVector3f vNewPos;
-	// vNewPos = mvPosition;
-	if (mvLastPosition.x != mvPosition.x || mvLastPosition.z != mvLastPosition.z) {
+	if (mvLastPosition.x != mvPosition.x || mvLastPosition.z != mvPosition.z) {
 		mpWorld->CheckShapeWorldCollision(&vNewPos, mpBody->GetShape(), cMath::MatrixTranslate(mvPosition), mpBody,
 										  false, true, mpCollideCallbackPush, mbCollideCharacter);
 	} else {