From 49de642d7d971362683f5b3df740290083313f89 Mon Sep 17 00:00:00 2001 From: Flugente Date: Tue, 7 Jan 2014 21:04:07 +0000 Subject: [PATCH] IDs use NOBODY, profiles use NO_PROFILE git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6736 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Weapons.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Tactical/Weapons.cpp b/Tactical/Weapons.cpp index 9006aee8..7b731f8b 100644 --- a/Tactical/Weapons.cpp +++ b/Tactical/Weapons.cpp @@ -5401,8 +5401,8 @@ if (gGameExternalOptions.fUseNewCTHCalculation) // apply bonus from traits // Flugente: moved trait modifiers into a member function - UINT8 targetprofile = NOBODY; - if ( pTarget && pTarget->ubProfile != NOBODY ) + UINT8 targetprofile = NO_PROFILE; + if ( pTarget && pTarget->ubProfile != NO_PROFILE ) targetprofile = pTarget->ubProfile; fAimModifier += pSoldier->GetTraitCTHModifier( usInHand, ubAimTime, targetprofile ); @@ -5587,8 +5587,8 @@ else } // Flugente: moved trait modifiers into a member function - UINT8 targetprofile = NOBODY; - if ( pTarget && pTarget->ubProfile != NOBODY ) + UINT8 targetprofile = NO_PROFILE; + if ( pTarget && pTarget->ubProfile != NO_PROFILE ) targetprofile = pTarget->ubProfile; iTraitModifier = pSoldier->GetTraitCTHModifier( usInHand, ubAimTime, targetprofile ); @@ -7168,8 +7168,8 @@ UINT32 CalcChanceToHitGun(SOLDIERTYPE *pSoldier, INT32 sGridNo, INT16 ubAimTime, ///////////////////////////////////////////////////////////////////////////////////// // Modify for traits // Flugente: moved trait modifiers into a member function - UINT8 targetprofile = NOBODY; - if ( pTarget && pTarget->ubProfile != NOBODY ) + UINT8 targetprofile = NO_PROFILE; + if ( pTarget && pTarget->ubProfile != NO_PROFILE ) targetprofile = pTarget->ubProfile; iChance += pSoldier->GetTraitCTHModifier( usInHand, ubAimTime, targetprofile );