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

- Bugfix: Externalized Music (Music.lua) (by Jazz)

Browse Source 
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:
Wanne
2013-08-20 08:33:32 +00:00
parent ab02106512
commit 643612540d
12 changed files with 133 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Music Control.cpp
+24 -2
View File
@@ -11,6 +11,7 @@
#include "strategicmap.h"
#endif
#include "Overhead Types.h"
//extern int iScreenMode;
static UINT32 uiMusicHandle = NO_SAMPLE;
@@ -168,6 +169,25 @@ BOOLEAN MusicPlay(UINT32 uiNum, UINT32 MusicMode, BOOLEAN NewSound )
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 );
}
}
uiMusicHandle = SoundPlayStreamedFile(zFileName, &spParms);
@@ -542,6 +562,8 @@ static BOOLEAN StartMusicBasedOnMode(void)
{
static BOOLEAN fFirstTime = TRUE;
static BOOLEAN fCivGroup = FALSE;
if (fFirstTime)
{
fFirstTime = FALSE;
@@ -581,7 +603,7 @@ static BOOLEAN StartMusicBasedOnMode(void)
else
{
SetSoundID = TRUE;
MusicPlay(NewSoundID,MUSIC_TACTICAL_NOTHING,TRUE);
MusicPlay(NewSoundID,MUSIC_TACTICAL_CREEPY_MUSIC,TRUE);
}
}
else
@@ -646,7 +668,7 @@ static BOOLEAN StartMusicBasedOnMode(void)
else
{
SetSoundID = TRUE;
MusicPlay(NewSoundID,MUSIC_TACTICAL_BATTLE,TRUE);
MusicPlay(NewSoundID,MUSIC_TACTICAL_BATTLE_MUSIC,TRUE);
}
}
else
Utils/Music Control.h
+9
View File
@@ -1,6 +1,8 @@
#ifndef _MUSIC_CONTROL_H_
#define _MUSIC_CONTROL_H_
#include "Overhead Types.h"
enum MusicList
{
MARIMBAD2_MUSIC,
@@ -34,6 +36,10 @@ enum MusicMode
MUSIC_TACTICAL_DEATH,
MUSIC_LAPTOP,
MUSIC_OLD_TYPE,
MUSIC_TACTICAL_BATTLE_MUSIC,
MUSIC_TACTICAL_CREEPY_MUSIC,
OTHER_MUSIC_TACTICAL,
MUSIC_TACTICAL_CIV_GROUP_BATTLE,
};
typedef struct
@@ -44,6 +50,9 @@ typedef struct
INT32 SoundTacticalNothing[4];
INT32 SoundTacticalTensor[4];
INT32 SoundTacticalDeath[4];
INT32 SoundTacticalBattleCreature[4];
INT32 SoundTacticalBattleCreepy[4];
INT32 SoundTacticalBattleGroup[NUM_CIV_GROUPS];
} MUSIC_SOUND_VALUES;