Removed Sounds/SoundsProfiles.xml and relevant code. If you don't want soundfiles to play for a character, remove or rename those soundfiles, no need for an extra xml.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2018-09-29 15:06:37 +00:00
parent 0905d5aa47
commit 487c21ffdf
14 changed files with 40 additions and 306 deletions
+14 -17
View File
@@ -11020,26 +11020,23 @@ BOOLEAN SOLDIERTYPE::InternalDoMercBattleSound( UINT8 ubBattleSoundID, INT8 bSpe
spParms.uiPan = SoundDir( pSoldier->sGridNo );
spParms.uiPriority = GROUP_PLAYER;
if ( gSoundProfileValue[pSoldier->ubProfile].EnabledSound == TRUE || pSoldier->ubProfile == NO_PROFILE )
if ( (uiSoundID = SoundPlay( zFilename_Used, &spParms )) == SOUND_ERROR )
{
if ( (uiSoundID = SoundPlay( zFilename_Used, &spParms )) == SOUND_ERROR )
{
return(FALSE);
}
else
{
pSoldier->uiBattleSoundID = uiSoundID;
return(FALSE);
}
else
{
pSoldier->uiBattleSoundID = uiSoundID;
if ( pSoldier->ubProfile != NO_PROFILE )
if ( pSoldier->ubProfile != NO_PROFILE )
{
// Get soldier's face ID
iFaceIndex = pSoldier->iFaceIndex;
// Check face index
if ( iFaceIndex != -1 )
{
// Get soldier's face ID
iFaceIndex = pSoldier->iFaceIndex;
// Check face index
if ( iFaceIndex != -1 )
{
ExternSetFaceTalking( iFaceIndex, uiSoundID );
}
ExternSetFaceTalking( iFaceIndex, uiSoundID );
}
}
}