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

IDs use NOBODY, profiles use NO_PROFILE

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6736 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-01-07 21:04:07 +00:00
parent b387091a8c
commit 49de642d7d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Weapons.cpp
+6 -6
View File
@@ -5401,8 +5401,8 @@ if (gGameExternalOptions.fUseNewCTHCalculation)
// apply bonus from traits // apply bonus from traits
// Flugente: moved trait modifiers into a member function // Flugente: moved trait modifiers into a member function
UINT8 targetprofile = NOBODY; UINT8 targetprofile = NO_PROFILE;
if ( pTarget && pTarget->ubProfile != NOBODY ) if ( pTarget && pTarget->ubProfile != NO_PROFILE )
targetprofile = pTarget->ubProfile; targetprofile = pTarget->ubProfile;
fAimModifier += pSoldier->GetTraitCTHModifier( usInHand, ubAimTime, targetprofile ); fAimModifier += pSoldier->GetTraitCTHModifier( usInHand, ubAimTime, targetprofile );
@@ -5587,8 +5587,8 @@ else
} }
// Flugente: moved trait modifiers into a member function // Flugente: moved trait modifiers into a member function
UINT8 targetprofile = NOBODY; UINT8 targetprofile = NO_PROFILE;
if ( pTarget && pTarget->ubProfile != NOBODY ) if ( pTarget && pTarget->ubProfile != NO_PROFILE )
targetprofile = pTarget->ubProfile; targetprofile = pTarget->ubProfile;
iTraitModifier = pSoldier->GetTraitCTHModifier( usInHand, ubAimTime, targetprofile ); iTraitModifier = pSoldier->GetTraitCTHModifier( usInHand, ubAimTime, targetprofile );
@@ -7168,8 +7168,8 @@ UINT32 CalcChanceToHitGun(SOLDIERTYPE *pSoldier, INT32 sGridNo, INT16 ubAimTime,
///////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////
// Modify for traits // Modify for traits
// Flugente: moved trait modifiers into a member function // Flugente: moved trait modifiers into a member function
UINT8 targetprofile = NOBODY; UINT8 targetprofile = NO_PROFILE;
if ( pTarget && pTarget->ubProfile != NOBODY ) if ( pTarget && pTarget->ubProfile != NO_PROFILE )
targetprofile = pTarget->ubProfile; targetprofile = pTarget->ubProfile;
iChance += pSoldier->GetTraitCTHModifier( usInHand, ubAimTime, targetprofile ); iChance += pSoldier->GetTraitCTHModifier( usInHand, ubAimTime, targetprofile );