mirror of
https://github.com/1dot13/source.git
synced 2026-08-19 14:20:30 +02:00
- Bugfix: Externalized Music (Music.lua) (by Jazz)
o Added missing: 6 - creature start battle (CREATURE_BATTLE_xxx.wav or CREATURE_BATTLE_xxx.ogg) 7 - creepy music (CREEPY_xxx.wav or CREEPY_xxx.ogg) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6296 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -873,6 +873,10 @@ void InitPreBattleInterface( GROUP *pBattleGroup, BOOLEAN fPersistantPBI )
|
||||
UseCreatureMusic(HostileZombiesPresent());
|
||||
#endif
|
||||
|
||||
GlobalSoundID = MusicSoundValues[ SECTOR( gubPBSectorX, gubPBSectorY ) ].SoundTacticalTensor[gubPBSectorZ];
|
||||
if ( MusicSoundValues[ SECTOR( gubPBSectorX, gubPBSectorY ) ].SoundTacticalTensor[gubPBSectorZ] != -1 )
|
||||
SetMusicModeID( MUSIC_TACTICAL_ENEMYPRESENT, MusicSoundValues[ SECTOR( gubPBSectorX, gubPBSectorY ) ].SoundTacticalTensor[gubPBSectorZ] );
|
||||
else
|
||||
SetMusicMode( MUSIC_TACTICAL_ENEMYPRESENT );
|
||||
|
||||
#ifdef JA2UB
|
||||
@@ -2210,4 +2214,4 @@ void HandlePreBattleInterfaceStates()
|
||||
{
|
||||
gfTransitionMapscreenToAutoResolve = FALSE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user