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

change game_config::default_victory_music to vector type

Browse source
This commit is contained in:
gfgtdf 2017-03-21 13:56:11 +01:00
parent d13f76fdd6
commit 23f1cc1349
3 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/game_config.cpp
View file

@ -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;

7
src/game_config.hpp
View file

@ -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,

4
src/play_controller.cpp
View file

@ -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()