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

[digitall]

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:
e240fc70d1 HPL1: Fix Remaining Duplicate Branch GCC Compiler Warnings


Commit: e240fc70d1befdc19fdb14fc7c12d183f76f11a0
    https://github.com/scummvm/scummvm/commit/e240fc70d1befdc19fdb14fc7c12d183f76f11a0
Author: D G Turner (digitall at scummvm.org)
Date: 2023-01-26T22:13:21Z

Commit Message:
HPL1: Fix Remaining Duplicate Branch GCC Compiler Warnings

Changed paths:
    engines/hpl1/penumbra-overture/GameEnemy_Dog.cpp
    engines/hpl1/penumbra-overture/GameEnemy_Spider.cpp


diff --git a/engines/hpl1/penumbra-overture/GameEnemy_Dog.cpp b/engines/hpl1/penumbra-overture/GameEnemy_Dog.cpp
index d6831b2b0b2..8a64b677d77 100644
--- a/engines/hpl1/penumbra-overture/GameEnemy_Dog.cpp
+++ b/engines/hpl1/penumbra-overture/GameEnemy_Dog.cpp
@@ -1288,6 +1288,8 @@ void cGameEnemyState_Dog_BreakDoor::OnUpdate(float afTimeStep) {
 
 				cGameSwingDoor *pDoor = mpInit->mpAttackHandler->GetLastSwingDoor();
 				if (pDoor) {
+// FIXME: Code identical in each branch. Development leftover?
+#if 0
 					/////////////////////////////
 					// The door is unbreakable
 					if (pDoor->GetToughness() - mpEnemyDog->mlBreakDoorStrength >= 4) {
@@ -1311,6 +1313,9 @@ void cGameEnemyState_Dog_BreakDoor::OnUpdate(float afTimeStep) {
 					else {
 						mpEnemy->AddDoorBreakCount(2);
 					}
+#else
+					mpEnemy->AddDoorBreakCount(2);
+#endif
 				}
 			}
 			mbAttacked = true;
@@ -1527,6 +1532,8 @@ void cGameEnemyState_Dog_KnockDown::OnUpdate(float afTimeStep) {
 void cGameEnemyState_Dog_KnockDown::OnAnimationOver(const tString &asName) {
 	iCharacterBody *pCharBody = mpEnemy->GetMover()->GetCharBody();
 
+// FIXME: Code identical in each branch. Development leftover?
+#if 0
 	if (mpEnemy->CheckForTeamMate(mpEnemyDog->mfCallBackupRange * 1.5f, false) &&
 		mpEnemy->CheckForTeamMate(14, true) == false) {
 		pCharBody->SetActive(true);
@@ -1536,6 +1543,10 @@ void cGameEnemyState_Dog_KnockDown::OnAnimationOver(const tString &asName) {
 		// mpEnemy->ChangeState(STATE_HUNT);
 		mpEnemy->ChangeState(STATE_FLEE);
 	}
+#else
+	pCharBody->SetActive(true);
+	mpEnemy->ChangeState(STATE_FLEE);
+#endif
 }
 
 //-----------------------------------------------------------------------
diff --git a/engines/hpl1/penumbra-overture/GameEnemy_Spider.cpp b/engines/hpl1/penumbra-overture/GameEnemy_Spider.cpp
index 7f3fef4b841..aacf30bd725 100644
--- a/engines/hpl1/penumbra-overture/GameEnemy_Spider.cpp
+++ b/engines/hpl1/penumbra-overture/GameEnemy_Spider.cpp
@@ -757,6 +757,8 @@ void cGameEnemy_Spider::ShowPlayer(const cVector3f &avPlayerFeetPos) {
 //-----------------------------------------------------------------------
 
 bool cGameEnemy_Spider::MoveToPos(const cVector3f &avFeetPos) {
+// FIXME: Code identical in each branch. Development leftover?
+#if 0
 	if (mlCurrentState == STATE_IDLE || mlCurrentState == STATE_PATROL) {
 		// SetTempPosition(avFeetPos);
 		// ChangeState(STATE_INVESTIGATE);
@@ -765,6 +767,9 @@ bool cGameEnemy_Spider::MoveToPos(const cVector3f &avFeetPos) {
 	} else {
 		return false;
 	}
+#else
+	return false;
+#endif
 }
 
 //-----------------------------------------------------------------------