1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

If a gun has a magazine size < 5, the 'out of ammo' soundfile is only displayed with a chance of CHANCE_SAY_ANNOYING_PHRASE (JA2_Options.ini). This should make using guns with tiny magazine sizes less annoying.

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8658 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2019-02-03 14:11:56 +00:00
parent 494c4500e5
commit e7e268d957
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+1 -1
View File
@@ -9388,7 +9388,7 @@ SOLDIERTYPE *InternalReduceAttackBusyCount( )
fEnterCombat = FALSE;
}
if ( pSoldier->flags.fSayAmmoQuotePending )
if ( pSoldier->flags.fSayAmmoQuotePending && ( Chance( gGameExternalOptions.iChanceSayAnnoyingPhrase ) || GetMagSize( &pSoldier->inv[pSoldier->ubAttackingHand] ) > 4 ) )
{
pSoldier->flags.fSayAmmoQuotePending = FALSE;
TacticalCharacterDialogue( pSoldier, QUOTE_OUT_OF_AMMO );
Tactical/Points.cpp
+3 -2
View File
@@ -2910,7 +2910,7 @@ BOOLEAN EnoughAmmo( SOLDIERTYPE *pSoldier, BOOLEAN fDisplay, INT8 bInvPos )
return ( TRUE );
}
if ( fDisplay )
if ( fDisplay && ( Chance( gGameExternalOptions.iChanceSayAnnoyingPhrase ) || GetMagSize( pObjUsed, 0 ) > 4 ) )
{
TacticalCharacterDialogue( pSoldier, QUOTE_OUT_OF_AMMO );
}
@@ -2921,10 +2921,11 @@ BOOLEAN EnoughAmmo( SOLDIERTYPE *pSoldier, BOOLEAN fDisplay, INT8 bInvPos )
{
if ( (*pObjUsed)[0]->data.gun.ubGunShotsLeft == 0 )
{
if ( fDisplay )
if ( fDisplay && ( Chance( gGameExternalOptions.iChanceSayAnnoyingPhrase ) || GetMagSize( pObjUsed, 0 ) > 4 ) )
{
TacticalCharacterDialogue( pSoldier, QUOTE_OUT_OF_AMMO );
}
return( FALSE );
}