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

Support disabling race intro and start sounds

Browse Source
This commit is contained in:
Antonius Riha 2016-05-02 11:32:04 +02:00
parent 0503855b7d
commit d4f1f28070
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modes/cutscene_world.cpp
View File

@ -58,7 +58,8 @@ CutsceneWorld::CutsceneWorld() : World()
m_aborted = false; m_aborted = false;
WorldStatus::setClockMode(CLOCK_NONE); WorldStatus::setClockMode(CLOCK_NONE);
m_use_highscores = false; m_use_highscores = false;
m_play_racestart_sounds = false; m_play_track_intro_sound = false;
m_play_ready_set_go_sounds = false;
m_fade_duration = 1.0f; m_fade_duration = 1.0f;
} // CutsceneWorld } // CutsceneWorld

11
src/modes/world_status.cpp
View File

@ -39,7 +39,8 @@ WorldStatus::WorldStatus()
m_start_sound = SFXManager::get()->createSoundSource("start_race"); m_start_sound = SFXManager::get()->createSoundSource("start_race");
m_track_intro_sound = SFXManager::get()->createSoundSource("track_intro"); m_track_intro_sound = SFXManager::get()->createSoundSource("track_intro");
m_play_racestart_sounds = true; m_play_track_intro_sound = UserConfigParams::m_music;
m_play_ready_set_go_sounds = true;
IrrlichtDevice *device = irr_driver->getDevice(); IrrlichtDevice *device = irr_driver->getDevice();
@ -149,7 +150,7 @@ void WorldStatus::update(const float dt)
m_auxiliary_timer = 0.0f; m_auxiliary_timer = 0.0f;
m_phase = TRACK_INTRO_PHASE; m_phase = TRACK_INTRO_PHASE;
if (m_play_racestart_sounds) if (m_play_track_intro_sound)
{ {
m_track_intro_sound->play(); m_track_intro_sound->play();
} }
@ -186,7 +187,7 @@ void WorldStatus::update(const float dt)
m_auxiliary_timer = 0.0f; m_auxiliary_timer = 0.0f;
if (m_play_racestart_sounds) if (m_play_ready_set_go_sounds)
m_prestart_sound->play(); m_prestart_sound->play();
m_phase = READY_PHASE; m_phase = READY_PHASE;
@ -200,7 +201,7 @@ void WorldStatus::update(const float dt)
case READY_PHASE: case READY_PHASE:
if (m_auxiliary_timer > 1.0) if (m_auxiliary_timer > 1.0)
{ {
if (m_play_racestart_sounds) if (m_play_ready_set_go_sounds)
{ {
m_prestart_sound->play(); m_prestart_sound->play();
} }
@ -224,7 +225,7 @@ void WorldStatus::update(const float dt)
{ {
// set phase is over, go to the next one // set phase is over, go to the next one
m_phase = GO_PHASE; m_phase = GO_PHASE;
if (m_play_racestart_sounds) if (m_play_ready_set_go_sounds)
{ {
m_start_sound->play(); m_start_sound->play();
} }

3
src/modes/world_status.hpp
View File

@ -97,7 +97,8 @@ protected:
double m_time; double m_time;
ClockType m_clock_mode; ClockType m_clock_mode;
bool m_play_racestart_sounds; bool m_play_track_intro_sound;
bool m_play_ready_set_go_sounds;
private: private:
Phase m_phase; Phase m_phase;