Fix for drugged icon not displaying on merc portrait immediately when taking drug from map screen (by Shadooow).

Fix for playing full burst firing sound with less bullets than the usual for the gun burst fire in chamber (by Shadooow).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@9011 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Sevenfm
2021-05-07 18:12:32 +00:00
parent 92c2fc53f1
commit 037a70b253
2 changed files with 6 additions and 0 deletions
+1
View File
@@ -221,6 +221,7 @@ BOOLEAN ApplyDrugs_New( SOLDIERTYPE *pSoldier, UINT16 usItem, UINT16 uStatusUsed
// Dirty panel
fInterfacePanelDirty = DIRTYLEVEL2;
fCharacterInfoPanelDirty = TRUE;
return TRUE;
}
+5
View File
@@ -1991,6 +1991,11 @@ void PlayWeaponSound(SOLDIERTYPE *pSoldier, OBJECTTYPE *pObjHand, OBJECTTYPE *pO
UINT32 uiResult = SOUND_ERROR;
BOOLEAN fSkipSound = FALSE;
//shadooow: fixes playing full burst sound with just one or two bullets in chamber
if ((*pObjHand)[0]->data.gun.ubGunShotsLeft < bShotsToFire)
{
bShotsToFire = (*pObjHand)[0]->data.gun.ubGunShotsLeft;
}
if (usNoisefactor < gGameExternalOptions.gubMaxPercentNoiseSilencedSound || Weapon[usUBItem].ubAttackVolume <= 10)
{
fSilenced = TRUE;