1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: wrong sound played

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8505 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2017-11-01 16:54:08 +00:00
parent 605b07368f
commit 7b1ba8f7f2
5 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Soldier Control.cpp
+4 -4
View File
@@ -6161,7 +6161,7 @@ void SOLDIERTYPE::EVENT_SoldierGotHit( UINT16 usWeaponIndex, INT16 sDamage, INT1
}
else
{
this->DoMercBattleSound( (INT8)(BATTLE_SOUND_HIT1 + Random( 2 )) );
this->DoMercBattleSound( BATTLE_SOUND_HIT1 );
}
}
}
@@ -6685,14 +6685,14 @@ void SoldierGotHitExplosion( SOLDIERTYPE *pSoldier, UINT16 usWeaponIndex, INT16
{
if ( sRange >= 2 && sRange <= 4 )
{
pSoldier->DoMercBattleSound( (INT8)(BATTLE_SOUND_HIT1 + Random( 2 )) );
pSoldier->DoMercBattleSound( BATTLE_SOUND_HIT1 );
pSoldier->EVENT_InitNewSoldierAnim( CHARIOTS_OF_FIRE, 0, FALSE );
return;
}
else if ( sRange <= 1 )
{
pSoldier->DoMercBattleSound( (INT8)(BATTLE_SOUND_HIT1 + Random( 2 )) );
pSoldier->DoMercBattleSound( BATTLE_SOUND_HIT1 );
pSoldier->EVENT_InitNewSoldierAnim( BODYEXPLODING, 0, FALSE );
return;
@@ -21598,7 +21598,7 @@ void SOLDIERTYPE::HandleSoldierTakeDamageFeedback( void )
{
this->uiTimeSinceLastBleedGrunt = GetJA2Clock( );
this->DoMercBattleSound( (INT8)(BATTLE_SOUND_HIT1 + Random( 2 )) );
this->DoMercBattleSound( BATTLE_SOUND_HIT1 );
}
}