change game_config::default_victory_music to vector type

wesnoth · Mar 23, 2017 · 23f1cc1 · 23f1cc1
1 parent d13f76f
commit 23f1cc1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/game_config.cpp b/src/game_config.cpp
@@ -134,11 +134,10 @@ bool
 //
 // Music constants
 //
-std::string
-	title_music,
-	lobby_music,
-	default_victory_music,
-	default_defeat_music;
+std::string title_music, lobby_music;
+
+std::vector<std::string> default_defeat_music;
+std::vector<std::string> default_victory_music;
 
 //
 // Color info
@@ -272,8 +271,9 @@ void load_config(const config &v)
 
 	title_music           = v["title_music"].str();
 	lobby_music           = v["lobby_music"].str();
-	default_victory_music = v["default_victory_music"].str();
-	default_defeat_music  = v["default_defeat_music"].str();
+
+	default_victory_music = utils::split(v["default_victory_music"].str());
+	default_defeat_music  = utils::split(v["default_defeat_music"].str());
 
 	if(const config& i = v.child("colors")){
 		using namespace game_config::colors;

diff --git a/src/game_config.hpp b/src/game_config.hpp
@@ -69,9 +69,10 @@ namespace game_config
 	extern std::vector<server_info> server_list;
 
 	extern std::string title_music,
-			lobby_music,
-			default_victory_music,
-			default_defeat_music;
+		lobby_music;
+
+	extern std::vector<std::string> default_defeat_music;
+	extern std::vector<std::string> default_victory_music;
 
 	namespace colors {
 	extern std::string unmoved_orb_color,

diff --git a/src/play_controller.cpp b/src/play_controller.cpp
@@ -907,14 +907,14 @@ void play_controller::set_victory_music_list(const std::string& list)
 {
 	victory_music_ = utils::split(list);
 	if(victory_music_.empty())
-		victory_music_ = utils::split(game_config::default_victory_music);
+		victory_music_ = game_config::default_victory_music;
 }
 
 void play_controller::set_defeat_music_list(const std::string& list)
 {
 	defeat_music_  = utils::split(list);
 	if(defeat_music_.empty())
-		defeat_music_ = utils::split(game_config::default_defeat_music);
+		defeat_music_ = game_config::default_defeat_music;
 }
 
 void play_controller::check_victory()