From 580f6b498437156ffc1e332700a914249929b7c3 Mon Sep 17 00:00:00 2001 From: Flugente Date: Sat, 13 Jul 2013 00:17:47 +0000 Subject: [PATCH] Fix: monsters did not take damage from fire git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6220 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- TileEngine/Explosion Control.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp index 7c0f49c42..767a44781 100644 --- a/TileEngine/Explosion Control.cpp +++ b/TileEngine/Explosion Control.cpp @@ -1932,13 +1932,17 @@ BOOLEAN DishOutGasDamage( SOLDIERTYPE * pSoldier, EXPLOSIVETYPE * pExplosive, IN return( fRecompileMovementCosts ); } - if ( pExplosive->ubType == EXPLOSV_CREATUREGAS || pExplosive->ubType == EXPLOSV_BURNABLEGAS) + if ( pExplosive->ubType == EXPLOSV_CREATUREGAS ) { if ( pSoldier->flags.uiStatusFlags & SOLDIER_MONSTER ) { // unaffected by own gas effects return( fRecompileMovementCosts ); } + } + + if ( pExplosive->ubType == EXPLOSV_CREATUREGAS || pExplosive->ubType == EXPLOSV_BURNABLEGAS) + { if ( sSubsequent && pSoldier->flags.fHitByGasFlags & HIT_BY_CREATUREGAS ) { // already affected by creature gas this turn @@ -1949,7 +1953,6 @@ BOOLEAN DishOutGasDamage( SOLDIERTYPE * pSoldier, EXPLOSIVETYPE * pExplosive, IN // already affected by BURNABLEGAS this turn return( fRecompileMovementCosts ); } - } else // no gas mask help from creature attacks // ATE/CJC: gas stuff