From e10a9b35584ad7dac04a9ae9e414b6e164dbcd09 Mon Sep 17 00:00:00 2001 From: lalien Date: Tue, 20 Jun 2006 21:17:51 +0000 Subject: [PATCH] - damage radius fixed git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@274 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 2 +- TileEngine/Explosion Control.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index 3345bd54..5fd9721e 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,7 +23,7 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.273" }; + INT16 zVersionLabel[256] = { L"Release v1.13.274" }; #endif diff --git a/TileEngine/Explosion Control.cpp b/TileEngine/Explosion Control.cpp index e1724a81..fa114918 100644 --- a/TileEngine/Explosion Control.cpp +++ b/TileEngine/Explosion Control.cpp @@ -1573,15 +1573,15 @@ BOOLEAN ExpAffect( INT16 sBombGridNo, INT16 sGridNo, UINT32 uiDist, UINT16 usIte uiRoll = PreRandom( 100 ); // Calculate wound amount - INT16 newDamage = pExplosive->ubDamage + (INT16)(( pExplosive->ubDamage * gGameExternalOptions.ubExplosivesDamageMultiplier) / 100) ); //lal - + INT16 newDamage = pExplosive->ubDamage + (INT16)(( pExplosive->ubDamage * gGameExternalOptions.ubExplosivesDamageMultiplier) / 100); //lal + sWoundAmt = newDamage + (INT16) ( (newDamage * uiRoll) / 100 ); // Calculate breath amount ( if stun damage applicable ) - INT16 newBreath = pExplosive->ubStunDamage + (INT16)(( pExplosive->ubStunDamage * gGameExternalOptions.ubExplosivesDamageMultiplier) / 100) ); //lal - + INT16 newBreath = pExplosive->ubStunDamage + (INT16)(( pExplosive->ubStunDamage * gGameExternalOptions.ubExplosivesDamageMultiplier) / 100); //lal + sBreathAmt = ( newBreath * 100 ) + (INT16) ( ( ( newBreath / 2 ) * 100 * uiRoll ) / 100 ) ; @@ -1620,7 +1620,7 @@ BOOLEAN ExpAffect( INT16 sBombGridNo, INT16 sGridNo, UINT32 uiDist, UINT16 usIte sBreathAmt = 0; // damage structures - if ( uiDist <= __max( 1, (UINT32) (pExplosive->ubDamage / 30) ) ) + if ( uiDist <= __max( 1, (UINT32) (newDamage / 30) ) ) { if ( Item[ usItem ].usItemClass & IC_GRENADE ) {