1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: crash on getting hit by high-numbered object

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6105 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-05-30 20:46:19 +00:00
parent 2d7443213b
commit 24000fd605
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/physics.cpp
+3 -2
View File
@@ -2399,8 +2399,6 @@ BOOLEAN CheckForCatcher( REAL_OBJECT *pObject, UINT16 usStructureID )
void CheckForObjectHittingMerc( REAL_OBJECT *pObject, UINT16 usStructureID ) void CheckForObjectHittingMerc( REAL_OBJECT *pObject, UINT16 usStructureID )
{ {
Assert(usStructureID<TOTAL_SOLDIERS);
SOLDIERTYPE *pSoldier; SOLDIERTYPE *pSoldier;
INT16 sDamage, sBreath; INT16 sDamage, sBreath;
@@ -2412,6 +2410,9 @@ void CheckForObjectHittingMerc( REAL_OBJECT *pObject, UINT16 usStructureID )
{ {
if ( pObject->ubLastTargetTakenDamage != (UINT8)usStructureID ) if ( pObject->ubLastTargetTakenDamage != (UINT8)usStructureID )
{ {
// Flugente: if this fails, something is very wrong indeed
Assert(usStructureID<TOTAL_SOLDIERS);
pSoldier = MercPtrs[ usStructureID ]; pSoldier = MercPtrs[ usStructureID ];
sDamage = 1; sDamage = 1;