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

Hopefully improved r8658:

Browse Source 
- check weapon magazine size and chance to say phrase when using gun
- always reset fSayAmmoQuotePending in InternalReduceAttackBusyCount()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8894 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2020-09-28 04:41:15 +00:00
parent 144cdc0131
commit 6194bbdbd8
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+1 -1
View File
@@ -9625,7 +9625,7 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( )
fEnterCombat = FALSE; fEnterCombat = FALSE;
} }
if ( pSoldier->flags.fSayAmmoQuotePending && ( Chance( gGameExternalOptions.iChanceSayAnnoyingPhrase ) || GetMagSize( &pSoldier->inv[pSoldier->ubAttackingHand] ) > 4 ) ) if (pSoldier->flags.fSayAmmoQuotePending)
{ {
pSoldier->flags.fSayAmmoQuotePending = FALSE; pSoldier->flags.fSayAmmoQuotePending = FALSE;
TacticalCharacterDialogue( pSoldier, QUOTE_OUT_OF_AMMO ); TacticalCharacterDialogue( pSoldier, QUOTE_OUT_OF_AMMO );
Tactical/Weapons.cpp
+10 -10
View File
@@ -2657,12 +2657,12 @@ BOOLEAN UseGunNCTH( SOLDIERTYPE *pSoldier , INT32 sTargetGridNo )
DeductAmmo( pSoldier, pSoldier->ubAttackingHand ); DeductAmmo( pSoldier, pSoldier->ubAttackingHand );
// ATE: Check if we should say quote... // ATE: Check if we should say quote...
if ( (*pObjHand)[0]->data.gun.ubGunShotsLeft == 0 && !Item[usUBItem].rocketlauncher ) if ( (*pObjHand)[0]->data.gun.ubGunShotsLeft == 0 &&
!Item[usUBItem].rocketlauncher &&
pSoldier->bTeam == gbPlayerNum &&
(Chance(gGameExternalOptions.iChanceSayAnnoyingPhrase) || GetMagSize(pObjHand) > 4))
{ {
if ( pSoldier->bTeam == gbPlayerNum ) pSoldier->flags.fSayAmmoQuotePending = TRUE;
{
pSoldier->flags.fSayAmmoQuotePending = TRUE;
}
} }
} }
else // throwing knife else // throwing knife
@@ -3419,12 +3419,12 @@ BOOLEAN UseGun( SOLDIERTYPE *pSoldier , INT32 sTargetGridNo )
DeductAmmo( pSoldier, pSoldier->ubAttackingHand ); DeductAmmo( pSoldier, pSoldier->ubAttackingHand );
// ATE: Check if we should say quote... // ATE: Check if we should say quote...
if ( (*pObjUsed)[0]->data.gun.ubGunShotsLeft == 0 && !Item[usUBItem].rocketlauncher ) if ( (*pObjUsed)[0]->data.gun.ubGunShotsLeft == 0 &&
!Item[usUBItem].rocketlauncher &&
pSoldier->bTeam == gbPlayerNum &&
(Chance(gGameExternalOptions.iChanceSayAnnoyingPhrase) || GetMagSize(pObjUsed) > 4))
{ {
if ( pSoldier->bTeam == gbPlayerNum ) pSoldier->flags.fSayAmmoQuotePending = TRUE;
{
pSoldier->flags.fSayAmmoQuotePending = TRUE;
}
} }
// NB bDoBurst will be 2 at this point for the first shot since it was incremented // NB bDoBurst will be 2 at this point for the first shot since it was incremented
// above // above