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

Fix: monsters did not take damage from fire

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6220 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2013-07-13 00:17:47 +00:00
parent a1f49b3ca3
commit 580f6b4984
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TileEngine/Explosion Control.cpp
+5 -2
View File
@@ -1932,13 +1932,17 @@ BOOLEAN DishOutGasDamage( SOLDIERTYPE * pSoldier, EXPLOSIVETYPE * pExplosive, IN
return( fRecompileMovementCosts ); return( fRecompileMovementCosts );
} }
if ( pExplosive->ubType == EXPLOSV_CREATUREGAS || pExplosive->ubType == EXPLOSV_BURNABLEGAS) if ( pExplosive->ubType == EXPLOSV_CREATUREGAS )
{ {
if ( pSoldier->flags.uiStatusFlags & SOLDIER_MONSTER ) if ( pSoldier->flags.uiStatusFlags & SOLDIER_MONSTER )
{ {
// unaffected by own gas effects // unaffected by own gas effects
return( fRecompileMovementCosts ); return( fRecompileMovementCosts );
} }
}
if ( pExplosive->ubType == EXPLOSV_CREATUREGAS || pExplosive->ubType == EXPLOSV_BURNABLEGAS)
{
if ( sSubsequent && pSoldier->flags.fHitByGasFlags & HIT_BY_CREATUREGAS ) if ( sSubsequent && pSoldier->flags.fHitByGasFlags & HIT_BY_CREATUREGAS )
{ {
// already affected by creature gas this turn // already affected by creature gas this turn
@@ -1949,7 +1953,6 @@ BOOLEAN DishOutGasDamage( SOLDIERTYPE * pSoldier, EXPLOSIVETYPE * pExplosive, IN
// already affected by BURNABLEGAS this turn // already affected by BURNABLEGAS this turn
return( fRecompileMovementCosts ); return( fRecompileMovementCosts );
} }
} }
else // no gas mask help from creature attacks else // no gas mask help from creature attacks
// ATE/CJC: gas stuff // ATE/CJC: gas stuff