ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Fix #3697", since this was not included in any

Browse Source 
of the binaries built. It is already on master.

This reverts commit eecfc5d797.
This commit is contained in:
hiker 2019-01-10 23:11:25 +11:00
parent eecfc5d797
commit 5cf79f66fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tracks/track.cpp
View File

@ -550,6 +550,7 @@ void Track::loadTrackInfo()
root->get("version", &m_version); root->get("version", &m_version);
std::vector<std::string> filenames; std::vector<std::string> filenames;
root->get("music", &filenames); root->get("music", &filenames);
getMusicInformation(filenames, m_music);
root->get("screenshot", &m_screenshot); root->get("screenshot", &m_screenshot);
root->get("gravity", &m_gravity); root->get("gravity", &m_gravity);
root->get("friction", &m_friction); root->get("friction", &m_friction);
@ -572,7 +573,6 @@ void Track::loadTrackInfo()
root->get("color-level-in", &m_color_inlevel); root->get("color-level-in", &m_color_inlevel);
root->get("color-level-out", &m_color_outlevel); root->get("color-level-out", &m_color_outlevel);
getMusicInformation(filenames, m_music);
if (m_default_number_of_laps <= 0) if (m_default_number_of_laps <= 0)
m_default_number_of_laps = 3; m_default_number_of_laps = 3;
m_actual_number_of_laps = m_default_number_of_laps; m_actual_number_of_laps = m_default_number_of_laps;
@ -702,7 +702,7 @@ void Track::getMusicInformation(std::vector<std::string>& filenames,
} // for i in filenames } // for i in filenames
if (m_music.empty() && !isInternal() && !m_is_cutscene) if (m_music.empty())
{ {
m_music.push_back(stk_config->m_default_music); m_music.push_back(stk_config->m_default_music);