From 1828e60c92aad4a285fb6949bef5a33c113506e1 Mon Sep 17 00:00:00 2001 From: erihel Date: Fri, 26 Apr 2013 15:34:02 +0200 Subject: * Changed order of reading Audio and AudioChange (issue #173) --- src/object/robotmain.cpp | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp index 2729e91..f2ec838 100644 --- a/src/object/robotmain.cpp +++ b/src/object/robotmain.cpp @@ -3980,25 +3980,7 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) { m_displayText->SetDelay(OpFloat(line, "factor", 1.0f)); } - - if (Cmd(line, "Audio") && !resetObject) - { - if(m_version < 2) { - int trackid = OpInt(line, "track", 0); - if(trackid != 0) { - std::stringstream filename; - filename << "music" << std::setfill('0') << std::setw(3) << trackid << ".ogg"; - 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) { int i = m_audioChangeTotal; @@ -4019,6 +4001,23 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject) } } + if (Cmd(line, "Audio") && !resetObject) + { + if(m_version < 2) { + int trackid = OpInt(line, "track", 0); + if(trackid != 0) { + std::stringstream filename; + filename << "music" << std::setfill('0') << std::setw(3) << trackid << ".ogg"; + 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, "AmbientColor") && !resetObject) { -- cgit v1.2.3-1-g7c22