0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Play Controller: removed useless optimization

Browse source
This commit is contained in:
Charles Dang 2018-01-28 16:34:29 +11:00
parent b779c91df7
commit 229b9be7eb
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/play_controller.cpp
View file

@ -897,10 +897,6 @@ bool play_controller::can_redo() const
return !linger_ && !is_browsing() && !events::commands_disabled && undo_stack().can_redo(); return !linger_ && !is_browsing() && !events::commands_disabled && undo_stack().can_redo();
} }
namespace {
static const std::string empty_str = "";
}
const std::string& play_controller::select_music(bool victory) const const std::string& play_controller::select_music(bool victory) const
{ {
const std::vector<std::string>& music_list = victory const std::vector<std::string>& music_list = victory
@ -908,7 +904,7 @@ const std::string& play_controller::select_music(bool victory) const
: (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 empty_str; return "";
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)];
} }