mirror of
https://github.com/1dot13/source.git
synced 2026-09-09 14:46:05 +02:00
New Feature: mp3 audio format is now supported in addition to .wav and .ogg
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8579 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -349,11 +349,15 @@ UINT32 PlayVoice( void )
|
|||||||
UINT16 iSlot = gIMPVoice[iCurrentVoice].voiceset;
|
UINT16 iSlot = gIMPVoice[iCurrentVoice].voiceset;
|
||||||
Assert( (iSlot >= 0) && (iSlot <= 999) );
|
Assert( (iSlot >= 0) && (iSlot <= 999) );
|
||||||
|
|
||||||
|
sprintf( zFileName, "Speech\\%03d_001.mp3", iSlot );
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
sprintf( zFileName, "Speech\\%03d_001.ogg", iSlot );
|
sprintf( zFileName, "Speech\\%03d_001.ogg", iSlot );
|
||||||
if ( !FileExists( zFileName ) )
|
if ( !FileExists( zFileName ) )
|
||||||
{
|
{
|
||||||
sprintf( zFileName, "Speech\\%03d_001.wav", iSlot );
|
sprintf( zFileName, "Speech\\%03d_001.wav", iSlot );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return(PlayJA2SampleFromFile( zFileName, RATE_11025, MIDVOLUME, 1, MIDDLEPAN ));
|
return(PlayJA2SampleFromFile( zFileName, RATE_11025, MIDVOLUME, 1, MIDDLEPAN ));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2341,10 +2341,14 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
|
|||||||
{
|
{
|
||||||
sprintf( zFileName, "NPC_SPEECH\\d_%03d_%03d.ogg", usVoiceSet, usQuoteNum );
|
sprintf( zFileName, "NPC_SPEECH\\d_%03d_%03d.ogg", usVoiceSet, usQuoteNum );
|
||||||
if ( !FileExists( zFileName ) )
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
|
sprintf( zFileName, "NPC_SPEECH\\d_%03d_%03d.mp3", usVoiceSet, usQuoteNum );
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
{
|
{
|
||||||
sprintf( zFileName, "NPC_SPEECH\\d_%03d_%03d.wav", usVoiceSet, usQuoteNum );
|
sprintf( zFileName, "NPC_SPEECH\\d_%03d_%03d.wav", usVoiceSet, usQuoteNum );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
// #endif
|
// #endif
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@@ -2485,20 +2489,32 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
|
|||||||
// Lesh: patch to allow playback ogg speech files
|
// Lesh: patch to allow playback ogg speech files
|
||||||
sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.ogg",ubFileNumID,usQuoteNum );
|
sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.ogg",ubFileNumID,usQuoteNum );
|
||||||
|
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
|
sprintf( zFileName, "NPC_SPEECH\\%03d_%03d.mp3", ubFileNumID, usQuoteNum );
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
|
sprintf( zFileName, "NPC_SPEECH\\%03d_%03d.wav", ubFileNumID, usQuoteNum );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// WANNE: We do not have any speech files for the other (!= HERVE) santos bartenders, take HERVE speech files
|
// WANNE: We do not have any speech files for the other (!= HERVE) santos bartenders, take HERVE speech files
|
||||||
if (isBartenderSantos && HERVE != ubFileNumID && !FileExists(zFileName))
|
if (isBartenderSantos && HERVE != ubFileNumID && !FileExists(zFileName))
|
||||||
{
|
{
|
||||||
ubFileNumID = HERVE;
|
ubFileNumID = HERVE;
|
||||||
sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.ogg",ubFileNumID,usQuoteNum );
|
sprintf( zFileName,"NPC_SPEECH\\%03d_%03d.ogg",ubFileNumID,usQuoteNum );
|
||||||
}
|
|
||||||
|
|
||||||
// We do not have *.ogg file, take *.WAV file
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
|
sprintf( zFileName, "NPC_SPEECH\\%03d_%03d.mp3", ubFileNumID, usQuoteNum );
|
||||||
if ( !FileExists( zFileName ) )
|
if ( !FileExists( zFileName ) )
|
||||||
{
|
{
|
||||||
sprintf( zFileName, "NPC_SPEECH\\%03d_%03d.wav", ubFileNumID, usQuoteNum );
|
sprintf( zFileName, "NPC_SPEECH\\%03d_%03d.wav", ubFileNumID, usQuoteNum );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// assume EDT files are in EDT directory on HARD DRIVE
|
// assume EDT files are in EDT directory on HARD DRIVE
|
||||||
@@ -2540,10 +2556,15 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
|
|||||||
|
|
||||||
if ( !FileExists( zFileName ) )
|
if ( !FileExists( zFileName ) )
|
||||||
{
|
{
|
||||||
sprintf( zFileName,"SPEECH\\%03d_%03d.wav",usVoiceSet,usQuoteNum );
|
sprintf( zFileName,"SPEECH\\%03d_%03d.mp3",usVoiceSet,usQuoteNum );
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
sprintf( zFileName,"SPEECH\\r_%03d_%03d.wav",usVoiceSet,usQuoteNum );
|
sprintf( zFileName,"SPEECH\\r_%03d_%03d.wav",usVoiceSet,usQuoteNum );
|
||||||
|
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
|
sprintf( zFileName, "SPEECH\\r_%03d_%03d.mp3", usVoiceSet, usQuoteNum );
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//<SB> Also check for Russian Gold sound files (identical to international ones)
|
//<SB> Also check for Russian Gold sound files (identical to international ones)
|
||||||
@@ -2551,10 +2572,14 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
|
|||||||
{
|
{
|
||||||
sprintf( zFileName,"SPEECH\\%03d_%03d.ogg",usVoiceSet,usQuoteNum );
|
sprintf( zFileName,"SPEECH\\%03d_%03d.ogg",usVoiceSet,usQuoteNum );
|
||||||
if ( !FileExists( zFileName ) )
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
|
sprintf( zFileName,"SPEECH\\%03d_%03d.mp3",usVoiceSet,usQuoteNum );
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
{
|
{
|
||||||
sprintf( zFileName, "SPEECH\\%03d_%03d.wav", usVoiceSet, usQuoteNum );
|
sprintf( zFileName, "SPEECH\\%03d_%03d.wav", usVoiceSet, usQuoteNum );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
//</SB>
|
//</SB>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2567,6 +2592,9 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
|
|||||||
// build name of wav file (characternum + quotenum)
|
// build name of wav file (characternum + quotenum)
|
||||||
sprintf( zFileName, "SPEECH\\%03d_%03d.ogg", usVoiceSet, usQuoteNum );
|
sprintf( zFileName, "SPEECH\\%03d_%03d.ogg", usVoiceSet, usQuoteNum );
|
||||||
|
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
|
sprintf( zFileName, "SPEECH\\%03d_%03d.mp3", usVoiceSet, usQuoteNum );
|
||||||
if ( !FileExists( zFileName ) )
|
if ( !FileExists( zFileName ) )
|
||||||
{
|
{
|
||||||
sprintf( zFileName, "SPEECH\\%03d_%03d.wav", usVoiceSet, usQuoteNum );
|
sprintf( zFileName, "SPEECH\\%03d_%03d.wav", usVoiceSet, usQuoteNum );
|
||||||
@@ -2574,6 +2602,7 @@ CHAR8 *GetDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, BOOLEAN
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// assume EDT files are in EDT directory on HARD DRIVE
|
// assume EDT files are in EDT directory on HARD DRIVE
|
||||||
@@ -2601,20 +2630,28 @@ CHAR8 *GetSnitchDialogueDataFilename( UINT8 ubCharacterNum, UINT16 usQuoteNum, B
|
|||||||
{
|
{
|
||||||
sprintf( zFileName, "SPEECH\\SNITCH\\NAMES\\%03d_%03d.ogg", usVoiceSet, usQuoteNum );
|
sprintf( zFileName, "SPEECH\\SNITCH\\NAMES\\%03d_%03d.ogg", usVoiceSet, usQuoteNum );
|
||||||
if ( !FileExists( zFileName ) )
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
|
sprintf( zFileName, "SPEECH\\SNITCH\\NAMES\\%03d_%03d.mp3", usVoiceSet, usQuoteNum );
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
{
|
{
|
||||||
sprintf( zFileName, "SPEECH\\SNITCH\\NAMES\\%03d_%03d.wav", usVoiceSet, usQuoteNum );
|
sprintf( zFileName, "SPEECH\\SNITCH\\NAMES\\%03d_%03d.wav", usVoiceSet, usQuoteNum );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sprintf( zFileName, "SPEECH\\SNITCH\\%03d_%03d.ogg", usVoiceSet, usQuoteNum );
|
sprintf( zFileName, "SPEECH\\SNITCH\\%03d_%03d.ogg", usVoiceSet, usQuoteNum );
|
||||||
if ( !FileExists( zFileName ) )
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
|
sprintf( zFileName, "SPEECH\\SNITCH\\%03d_%03d.mp3", usVoiceSet, usQuoteNum );
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
{
|
{
|
||||||
sprintf( zFileName, "SPEECH\\SNITCH\\%03d_%03d.wav", usVoiceSet, usQuoteNum );
|
sprintf( zFileName, "SPEECH\\SNITCH\\%03d_%03d.wav", usVoiceSet, usQuoteNum );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// assume EDT files are in EDT directory on HARD DRIVE
|
// assume EDT files are in EDT directory on HARD DRIVE
|
||||||
|
|||||||
@@ -10898,10 +10898,14 @@ BOOLEAN SOLDIERTYPE::InternalDoMercBattleSound( UINT8 ubBattleSoundID, INT8 bSpe
|
|||||||
// check: is there a sound with a bigger number?
|
// check: is there a sound with a bigger number?
|
||||||
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.ogg", usVoiceSet, gBattleSndsData[ubSoundID].zName, numsounds + 1 );
|
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.ogg", usVoiceSet, gBattleSndsData[ubSoundID].zName, numsounds + 1 );
|
||||||
|
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
|
{
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.mp3", usVoiceSet, gBattleSndsData[ubSoundID].zName, numsounds + 1 );
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.wav", usVoiceSet, gBattleSndsData[ubSoundID].zName, numsounds + 1 );
|
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.wav", usVoiceSet, gBattleSndsData[ubSoundID].zName, numsounds + 1 );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if ( FileExists( zFilename ) )
|
if ( FileExists( zFilename ) )
|
||||||
{
|
{
|
||||||
@@ -10919,9 +10923,14 @@ BOOLEAN SOLDIERTYPE::InternalDoMercBattleSound( UINT8 ubBattleSoundID, INT8 bSpe
|
|||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.ogg", usVoiceSet, gBattleSndsData[ubSoundID].zName, soundtoplay );
|
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.ogg", usVoiceSet, gBattleSndsData[ubSoundID].zName, soundtoplay );
|
||||||
|
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
|
{
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.mp3", usVoiceSet, gBattleSndsData[ubSoundID].zName, soundtoplay );
|
||||||
|
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.wav", usVoiceSet, gBattleSndsData[ubSoundID].zName, soundtoplay );
|
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.wav", usVoiceSet, gBattleSndsData[ubSoundID].zName, soundtoplay );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\%03d_%s.ogg", usVoiceSet, gBattleSndsData[ubSoundID].zName );
|
sprintf( zFilename, "BATTLESNDS\\%03d_%s.ogg", usVoiceSet, gBattleSndsData[ubSoundID].zName );
|
||||||
@@ -10935,6 +10944,12 @@ BOOLEAN SOLDIERTYPE::InternalDoMercBattleSound( UINT8 ubBattleSoundID, INT8 bSpe
|
|||||||
|
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.wav", usVoiceSet, gBattleSndsData[ubSoundID].zName, 1 );
|
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.wav", usVoiceSet, gBattleSndsData[ubSoundID].zName, 1 );
|
||||||
|
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\%03d_%s.mp3", usVoiceSet, gBattleSndsData[ubSoundID].zName );
|
||||||
|
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\%03d_%s%d.mp3", usVoiceSet, gBattleSndsData[ubSoundID].zName, 1 );
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
@@ -10944,20 +10959,28 @@ BOOLEAN SOLDIERTYPE::InternalDoMercBattleSound( UINT8 ubBattleSoundID, INT8 bSpe
|
|||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\f_%s.ogg", gBattleSndsData[ubSoundID].zName );
|
sprintf( zFilename, "BATTLESNDS\\f_%s.ogg", gBattleSndsData[ubSoundID].zName );
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
|
{
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\f_%s.mp3", gBattleSndsData[ubSoundID].zName );
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\f_%s.wav", gBattleSndsData[ubSoundID].zName );
|
sprintf( zFilename, "BATTLESNDS\\f_%s.wav", gBattleSndsData[ubSoundID].zName );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\m_%s.ogg", gBattleSndsData[ubSoundID].zName );
|
sprintf( zFilename, "BATTLESNDS\\m_%s.ogg", gBattleSndsData[ubSoundID].zName );
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
|
{
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\m_%s.mp3", gBattleSndsData[ubSoundID].zName );
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\m_%s.wav", gBattleSndsData[ubSoundID].zName );
|
sprintf( zFilename, "BATTLESNDS\\m_%s.wav", gBattleSndsData[ubSoundID].zName );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// Check if we can play this!
|
// Check if we can play this!
|
||||||
@@ -10972,58 +10995,82 @@ BOOLEAN SOLDIERTYPE::InternalDoMercBattleSound( UINT8 ubBattleSoundID, INT8 bSpe
|
|||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\kid%d_dying.ogg", pSoldier->ubBattleSoundID );
|
sprintf( zFilename, "BATTLESNDS\\kid%d_dying.ogg", pSoldier->ubBattleSoundID );
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
|
{
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\kid%d_dying.mp3", pSoldier->ubBattleSoundID );
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\kid%d_dying.wav", pSoldier->ubBattleSoundID );
|
sprintf( zFilename, "BATTLESNDS\\kid%d_dying.wav", pSoldier->ubBattleSoundID );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\kid%d_%s.ogg", pSoldier->ubBattleSoundID, gBattleSndsData[ubSoundID].zName );
|
sprintf( zFilename, "BATTLESNDS\\kid%d_%s.ogg", pSoldier->ubBattleSoundID, gBattleSndsData[ubSoundID].zName );
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
|
{
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\kid%d_%s.mp3", pSoldier->ubBattleSoundID, gBattleSndsData[ubSoundID].zName );
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\kid%d_%s.wav", pSoldier->ubBattleSoundID, gBattleSndsData[ubSoundID].zName );
|
sprintf( zFilename, "BATTLESNDS\\kid%d_%s.wav", pSoldier->ubBattleSoundID, gBattleSndsData[ubSoundID].zName );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else if ( pSoldier->IsZombie( ) ) // Madd: add zombie sounds
|
else if ( pSoldier->IsZombie( ) ) // Madd: add zombie sounds
|
||||||
{
|
{
|
||||||
if ( ubSoundID == BATTLE_SOUND_DIE1 )
|
if ( ubSoundID == BATTLE_SOUND_DIE1 )
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\zombie_die.ogg" );
|
sprintf( zFilename, "BATTLESNDS\\zombie_die.ogg" );
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
|
{
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\zombie_die.mp3" );
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\zombie_die.wav" );
|
sprintf( zFilename, "BATTLESNDS\\zombie_die.wav" );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\zombie_%s.ogg", gBattleSndsData[ubSoundID].zName );
|
sprintf( zFilename, "BATTLESNDS\\zombie_%s.ogg", gBattleSndsData[ubSoundID].zName );
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
|
{
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\zombie_%s.mp3", gBattleSndsData[ubSoundID].zName );
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\zombie_%s.wav", gBattleSndsData[ubSoundID].zName );
|
sprintf( zFilename, "BATTLESNDS\\zombie_%s.wav", gBattleSndsData[ubSoundID].zName );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if ( ubSoundID == BATTLE_SOUND_DIE1 )
|
if ( ubSoundID == BATTLE_SOUND_DIE1 )
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\bad%d_die.ogg", pSoldier->ubBattleSoundID );
|
sprintf( zFilename, "BATTLESNDS\\bad%d_die.ogg", pSoldier->ubBattleSoundID );
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
|
{
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\bad%d_die.mp3", pSoldier->ubBattleSoundID );
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\bad%d_die.wav", pSoldier->ubBattleSoundID );
|
sprintf( zFilename, "BATTLESNDS\\bad%d_die.wav", pSoldier->ubBattleSoundID );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\bad%d_%s.ogg", pSoldier->ubBattleSoundID, gBattleSndsData[ubSoundID].zName );
|
sprintf( zFilename, "BATTLESNDS\\bad%d_%s.ogg", pSoldier->ubBattleSoundID, gBattleSndsData[ubSoundID].zName );
|
||||||
if ( !FileExists( zFilename ) )
|
if ( !FileExists( zFilename ) )
|
||||||
|
{
|
||||||
|
sprintf( zFilename, "BATTLESNDS\\bad%d_%s.mp3", pSoldier->ubBattleSoundID, gBattleSndsData[ubSoundID].zName );
|
||||||
|
if ( !FileExists( zFilename ) )
|
||||||
{
|
{
|
||||||
sprintf( zFilename, "BATTLESNDS\\bad%d_%s.wav", pSoldier->ubBattleSoundID, gBattleSndsData[ubSoundID].zName );
|
sprintf( zFilename, "BATTLESNDS\\bad%d_%s.wav", pSoldier->ubBattleSoundID, gBattleSndsData[ubSoundID].zName );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Play sound!
|
// Play sound!
|
||||||
memset( &spParms, 0xff, sizeof(SOUNDPARMS) );
|
memset( &spParms, 0xff, sizeof(SOUNDPARMS) );
|
||||||
|
|||||||
+25
-41
@@ -151,57 +151,41 @@ BOOLEAN MusicPlay(UINT32 uiNum)
|
|||||||
if ( NewSound == FALSE && MusicMode == MUSIC_OLD_TYPE )
|
if ( NewSound == FALSE && MusicMode == MUSIC_OLD_TYPE )
|
||||||
{
|
{
|
||||||
#endif
|
#endif
|
||||||
|
sprintf( zFileName, "%s.mp3", szMusicList[uiNum] );
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
sprintf( zFileName, "%s.ogg", szMusicList[uiNum] );
|
sprintf( zFileName, "%s.ogg", szMusicList[uiNum] );
|
||||||
if ( !FileExists( zFileName ) )
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
sprintf( zFileName, "%s.wav", szMusicList[uiNum] );
|
sprintf( zFileName, "%s.wav", szMusicList[uiNum] );
|
||||||
|
}
|
||||||
|
}
|
||||||
#ifdef NEWMUSIC
|
#ifdef NEWMUSIC
|
||||||
}
|
}
|
||||||
else if ( NewSound == TRUE )
|
else if ( NewSound == TRUE )
|
||||||
{
|
{
|
||||||
//sprintf( zFileName, szMusicList[15] );
|
CHAR8 modstr[32] = "";
|
||||||
if ( MusicMode == MUSIC_TACTICAL_NOTHING )
|
|
||||||
|
switch ( MusicMode )
|
||||||
{
|
{
|
||||||
sprintf( zFileName, "%s\\NOTHING_%d.ogg", szMusicList[15], uiNum);
|
case MUSIC_TACTICAL_NOTHING: sprintf( modstr, "NOTHING_" ); break;
|
||||||
if ( !FileExists( zFileName ) )
|
case MUSIC_TACTICAL_ENEMYPRESENT: sprintf( modstr, "TENSOR_" ); break;
|
||||||
sprintf( zFileName, "%s\\NOTHING_%d.wav", szMusicList[15], uiNum );
|
case MUSIC_TACTICAL_BATTLE: sprintf( modstr, "BATTLE_" ); break;
|
||||||
}
|
case MUSIC_TACTICAL_VICTORY: sprintf( modstr, "TRIUMPH_" ); break;
|
||||||
else if ( MusicMode == MUSIC_TACTICAL_ENEMYPRESENT )
|
case MUSIC_TACTICAL_BATTLE_MUSIC: sprintf( modstr, "CREATURE_BATTLE_" ); break;
|
||||||
{
|
case MUSIC_TACTICAL_CREEPY_MUSIC: sprintf( modstr, "CREEPY_" ); break;
|
||||||
sprintf( zFileName, "%s\\TENSOR_%d.ogg", szMusicList[15], uiNum);
|
default: break;
|
||||||
if ( !FileExists( zFileName ) )
|
|
||||||
sprintf( zFileName, "%s\\TENSOR_%d.wav", szMusicList[15], uiNum );
|
|
||||||
}
|
|
||||||
else if ( MusicMode == MUSIC_TACTICAL_BATTLE )
|
|
||||||
{
|
|
||||||
sprintf( zFileName, "%s\\BATTLE_%d.ogg", szMusicList[15], uiNum);
|
|
||||||
if ( !FileExists( zFileName ) )
|
|
||||||
sprintf( zFileName, "%s\\BATTLE_%d.wav", szMusicList[15], uiNum );
|
|
||||||
}
|
|
||||||
else if ( MusicMode == MUSIC_TACTICAL_VICTORY )
|
|
||||||
{
|
|
||||||
sprintf( zFileName, "%s\\TRIUMPH_%d.ogg", szMusicList[15], uiNum);
|
|
||||||
if ( !FileExists( zFileName ) )
|
|
||||||
sprintf( zFileName, "%s\\TRIUMPH_%d.wav", szMusicList[15], uiNum );
|
|
||||||
}
|
|
||||||
else if ( MusicMode == MUSIC_TACTICAL_BATTLE_MUSIC )
|
|
||||||
{
|
|
||||||
sprintf( zFileName, "%s\\CREATURE_BATTLE_%d.ogg", szMusicList[15], uiNum);
|
|
||||||
if ( !FileExists( zFileName ) )
|
|
||||||
sprintf( zFileName, "%s\\CREATURE_BATTLE_%d.wav", szMusicList[15], uiNum );
|
|
||||||
}
|
|
||||||
else if ( MusicMode == MUSIC_TACTICAL_CREEPY_MUSIC )
|
|
||||||
{
|
|
||||||
sprintf( zFileName, "%s\\CREEPY_%d.ogg", szMusicList[15], uiNum);
|
|
||||||
if ( !FileExists( zFileName ) )
|
|
||||||
sprintf( zFileName, "%s\\CREEPY_%d.wav", szMusicList[15], uiNum );
|
|
||||||
}
|
|
||||||
else if ( MusicMode == OTHER_MUSIC_TACTICAL )
|
|
||||||
{
|
|
||||||
sprintf( zFileName, "%s\\%d.ogg", szMusicList[15], uiNum);
|
|
||||||
if ( !FileExists( zFileName ) )
|
|
||||||
sprintf( zFileName, "%s\\%d.wav", szMusicList[15], uiNum );
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sprintf( zFileName, "%s\\%s%d.ogg", szMusicList[15], modstr, uiNum );
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
|
sprintf( zFileName, "%s\\%s%d.wav", szMusicList[15], modstr, uiNum );
|
||||||
|
if ( !FileExists( zFileName ) )
|
||||||
|
{
|
||||||
|
sprintf( zFileName, "%s\\%s%d.mp3", szMusicList[15], modstr, uiNum );
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
uiMusicHandle = SoundPlayStreamedFile(zFileName, &spParms);
|
uiMusicHandle = SoundPlayStreamedFile(zFileName, &spParms);
|
||||||
|
|||||||
Reference in New Issue
Block a user