From 24000fd6054e85544905bf7db5da27e8e63dc3e8 Mon Sep 17 00:00:00 2001
From: Flugente <Flugente@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 30 May 2013 20:46:19 +0000
Subject: [PATCH] Fix: crash on getting hit by high-numbered object

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6105 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 TileEngine/physics.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/TileEngine/physics.cpp b/TileEngine/physics.cpp
index 0d8a9aff..cb4f1349 100644
--- a/TileEngine/physics.cpp
+++ b/TileEngine/physics.cpp
@@ -2399,8 +2399,6 @@ BOOLEAN CheckForCatcher( REAL_OBJECT *pObject, UINT16 usStructureID )
 
 void CheckForObjectHittingMerc( REAL_OBJECT *pObject, UINT16 usStructureID )
 {
-    Assert(usStructureID<TOTAL_SOLDIERS);
-
 	SOLDIERTYPE *pSoldier;
 	INT16		sDamage, sBreath;
 
@@ -2412,6 +2410,9 @@ void CheckForObjectHittingMerc( REAL_OBJECT *pObject, UINT16 usStructureID )
 		{
 			if ( pObject->ubLastTargetTakenDamage != (UINT8)usStructureID )
 			{
+				// Flugente: if this fails, something is very wrong indeed
+				Assert(usStructureID<TOTAL_SOLDIERS);
+
 				pSoldier = MercPtrs[ usStructureID ];
 
 				sDamage = 1;