From eb1ee4a71a21b8d0b1c09d142111a599c7119c48 Mon Sep 17 00:00:00 2001 From: Shadooow Date: Sun, 13 Jun 2021 03:20:07 +0000 Subject: [PATCH] further lowered the damage of Joe punching mercs in interrogation cutscene to prevent him knocking the merc unconcious which resulted to endless clock issue git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9078 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Soldier Control.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp index 25b159575..98dd2694f 100644 --- a/Tactical/Soldier Control.cpp +++ b/Tactical/Soldier Control.cpp @@ -6128,7 +6128,8 @@ void SOLDIERTYPE::EVENT_SoldierGotHit( UINT16 usWeaponIndex, INT16 sDamage, INT1 if ( AreInMeanwhile( ) && gCurrentMeanwhileDef.ubMeanwhileID == INTERROGATION ) { sBreathLoss = 0; - sDamage /= 2; + sDamage /= 4; + sDamage = max(1, sDamage); } #endif ubReason = TAKE_DAMAGE_HANDTOHAND;