From 0dc07614a40eea65ab4ffc74b7501f85900149af Mon Sep 17 00:00:00 2001
From: Shadooow <Shadooow@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Fri, 25 Jun 2021 21:21:28 +0000
Subject: [PATCH] more god mod tweaks: - prevented morale drop from getting
 damaged - fixed sometimes taking damage in autoresolve

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9106 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Strategic/Auto Resolve.cpp   | 4 ++++
 Tactical/Soldier Control.cpp | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/Strategic/Auto Resolve.cpp b/Strategic/Auto Resolve.cpp
index a0cb05e4..96beb413 100644
--- a/Strategic/Auto Resolve.cpp	
+++ b/Strategic/Auto Resolve.cpp	
@@ -4782,6 +4782,10 @@ void AttackTarget( SOLDIERCELL *pAttacker, SOLDIERCELL *pTarget )
 
 		// WANNE: Why is impact here always set to 0? The impact was calculated a few lines before!
 		//iImpact = 0;
+		if (gfGodModeCheat && pTarget->pSoldier->bTeam == OUR_TEAM)
+		{
+			iImpact = 0;
+		}
 
 		// WANNE: Just for safty.
 		if (iImpact < 0)
diff --git a/Tactical/Soldier Control.cpp b/Tactical/Soldier Control.cpp
index bc0a0162..a096577d 100644
--- a/Tactical/Soldier Control.cpp	
+++ b/Tactical/Soldier Control.cpp	
@@ -5873,6 +5873,12 @@ void SOLDIERTYPE::EVENT_SoldierGotHit( UINT16 usWeaponIndex, INT16 sDamage, INT1
 	UINT8		ubCombinedLoss, ubVolume, ubReason;
 	//	SOLDIERTYPE * pNewSoldier;
 
+	if (gfGodModeCheat && this->bTeam == OUR_TEAM)
+	{
+		sDamage = 0;
+		ubSpecial = FIRE_WEAPON_NO_SPECIAL;
+	}
+
 	ubReason = 0;
 
 	DebugMsg( TOPIC_JA2, DBG_LEVEL_3, "EVENT_SoldierGotHit" );