upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 15:50:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert 229b9be7eb59 and re-add with comment

Browse Source
This commit is contained in:
Charles Dang 2018-01-29 01:43:50 +11:00
parent 69cd6640d0
commit 99051100a4
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/play_controller.cpp
View File

@ -903,8 +903,12 @@ const std::string& play_controller::select_music(bool victory) const
? (gamestate_->get_game_data()->get_victory_music().empty() ? game_config::default_victory_music : gamestate_->get_game_data()->get_victory_music()) ? (gamestate_->get_game_data()->get_victory_music().empty() ? game_config::default_victory_music : gamestate_->get_game_data()->get_victory_music())
: (gamestate_->get_game_data()->get_defeat_music().empty() ? game_config::default_defeat_music : gamestate_->get_game_data()->get_defeat_music()); : (gamestate_->get_game_data()->get_defeat_music().empty() ? game_config::default_defeat_music : gamestate_->get_game_data()->get_defeat_music());
if(music_list.empty()) if(music_list.empty()) {
return ""; // Since this function returns a reference, we can't return a temporary empty string.
static const std::string empty_str = "";
return empty_str;
}
return music_list[randomness::rng::default_instance().get_random_int(0, music_list.size()-1)]; return music_list[randomness::rng::default_instance().get_random_int(0, music_list.size()-1)];
} }