immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added loading from custom files for Audio

dev-ui
krzys-h 2013-04-13 16:35:35 +02:00
parent cdba398d29
commit 6ea0031d83
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/object/robotmain.cpp
View File

@ -643,7 +643,7 @@ CRobotMain::CRobotMain(CApplication* app)
m_visitLast = EVENT_NULL; m_visitLast = EVENT_NULL;
m_visitObject = 0; m_visitObject = 0;
m_visitArrow = 0; m_visitArrow = 0;
m_audioTrack = 0; m_audioTrack = "";
m_audioRepeat = true; m_audioRepeat = true;
m_delayWriteMessage = 0; m_delayWriteMessage = 0;
m_selectObject = 0; m_selectObject = 0;
@ -3817,7 +3817,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
FlushDisplayInfo(); FlushDisplayInfo();
m_terrain->FlushMaterials(); m_terrain->FlushMaterials();
m_audioTrack = 0; m_audioTrack = "";
m_audioRepeat = true; m_audioRepeat = true;
m_displayText->SetDelay(1.0f); m_displayText->SetDelay(1.0f);
m_displayText->SetEnable(true); m_displayText->SetEnable(true);
@ -3981,13 +3981,20 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
if (Cmd(line, "Audio") && !resetObject) if (Cmd(line, "Audio") && !resetObject)
{ {
m_audioTrack = OpInt(line, "track", 0); if(m_version < 2) {
m_audioRepeat = OpInt(line, "repeat", 1); int trackid = OpInt(line, "track", 0);
if(m_audioTrack != 0) { if(trackid != 0) {
std::stringstream filename; std::stringstream filename;
filename << "music" << std::setfill('0') << std::setw(3) << m_audioTrack << ".ogg"; filename << "music" << std::setfill('0') << std::setw(3) << trackid << ".ogg";
m_sound->CacheMusic(filename.str()); m_audioTrack = filename.str();
}
} else {
char trackname[100];
OpString(line, "filename", trackname);
m_audioTrack = trackname;
} }
m_audioRepeat = OpInt(line, "repeat", 1);
if(m_audioTrack != "") m_sound->CacheMusic(m_audioTrack);
} }
if (Cmd(line, "AudioChange") && !resetObject && m_version >= 2) if (Cmd(line, "AudioChange") && !resetObject && m_version >= 2)
@ -7153,7 +7160,7 @@ float CRobotMain::GetTracePrecision()
void CRobotMain::StartMusic() void CRobotMain::StartMusic()
{ {
CLogger::GetInstancePointer()->Debug("Starting music...\n"); CLogger::GetInstancePointer()->Debug("Starting music...\n");
if (m_audioTrack != 0) if (m_audioTrack != "")
{ {
m_sound->StopMusic(); m_sound->StopMusic();
m_sound->PlayMusic(m_audioTrack, m_audioRepeat); m_sound->PlayMusic(m_audioTrack, m_audioRepeat);

2
src/object/robotmain.h
View File

@ -461,7 +461,7 @@ protected:
bool m_cheatRadar; bool m_cheatRadar;
bool m_audioRepeat; bool m_audioRepeat;
bool m_shortCut; bool m_shortCut;
int m_audioTrack; std::string m_audioTrack;
int m_delayWriteMessage; int m_delayWriteMessage;
int m_movieInfoIndex; int m_movieInfoIndex;