marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Play frontend music by tag.

shapetextures
Sven Eberhardt 2015-12-12 12:08:45 -05:00
parent bf63f2ef17
commit 171080cbd5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/c4group/C4Components.h
View File

@ -164,7 +164,7 @@
#define C4CFN_PlayerFiles "*.ocp"
#define C4CFN_MaterialFiles "*.ocm"
#define C4CFN_ObjectInfoFiles "*.oci"
#define C4CFN_MusicFiles "*.mid"
#define C4CFN_MusicFiles "*.ogg"
#define C4CFN_SoundFiles "*.wav|*.ogg"
#define C4CFN_PNGFiles "*.png"
#define C4CFN_BitmapFiles "*.bmp"
@ -198,6 +198,6 @@
#define C4FLS_Objects "Names*.txt|Desc*.txt|*.ocd"
#define C4FLS_System "*.hlp|*.cnt|Language*.txt|*.fon|*.fnt|*.ttf|*.ttc|*.fot|*.otf|Fonts.txt|StringTbl*.txt|PlayerControls.txt|*.c|Names.txt"
#define C4FLS_Sound C4CFN_SoundFiles "|" C4CFN_SoundSubgroups
#define C4FLS_Music "Frontend.*|Credits.*"
#define C4FLS_Music C4CFN_MusicFiles
#endif

2
src/game/C4Application.cpp
View File

@ -544,7 +544,7 @@ bool C4Application::PreInit()
if (!Game.PreInit()) return false;
// Music
if (!MusicSystem.Init("Frontend.*"))
if (!MusicSystem.Init("frontend"))
Log(LoadResStr("IDS_PRC_NOMUSIC"));
Game.SetInitProgress(fUseStartupDialog ? 34.0f : 2.0f);

4
src/platform/C4MusicSystem.cpp
View File

@ -720,8 +720,8 @@ int C4MusicSystem::SetPlayList(const char *szPlayList, bool fForceSwitch, int fa
// Ignore frontend and credits music
for (pFile = Songs; pFile; pFile = pFile->pNext)
if (*GetFilename(pFile->FileName) != '@' &&
!SEqual2(GetFilename(pFile->FileName), "Credits.") &&
!SEqual2(GetFilename(pFile->FileName), "Frontend."))
!pFile->HasCategory("frontend") &&
!pFile->HasCategory("credits"))
{
ASongCount++;
pFile->NoPlay = false;