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

Preferences: Handle cases of renamed orb colour ranges

Browse source
This commit is contained in:
Celtic Minstrel 2016-02-18 00:53:21 -05:00
parent eef5db9327
commit 1e71e1f0bc
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/preferences.cpp
View file

@ -267,11 +267,22 @@ void set_show_partial_orb(bool show_orb) {
}
static std::string fix_orb_color_name(const std::string& color) {
if (color.substr(0,4) == "orb_") {
if(color[4] >= '0' && color[4] <= '9') {
return color.substr(5);
} else {
return color.substr(4);
}
}
return color;
}
std::string allied_color() {
std::string ally_color = get("ally_orb_color");
if (ally_color.empty())
return game_config::colors::ally_orb_color;
return ally_color;
return fix_orb_color_name(ally_color);
}
void set_allied_color(const std::string& color_id) {
prefs["ally_orb_color"] = color_id;
@ -291,7 +302,7 @@ std::string enemy_color() {
std::string enemy_color = get("enemy_orb_color");
if (enemy_color.empty())
return game_config::colors::enemy_orb_color;
return enemy_color;
return fix_orb_color_name(enemy_color);
}
void set_enemy_color(const std::string& color_id) {
prefs["enemy_orb_color"] = color_id;
@ -301,7 +312,7 @@ std::string moved_color() {
std::string moved_color = get("moved_orb_color");
if (moved_color.empty())
return game_config::colors::moved_orb_color;
return moved_color;
return fix_orb_color_name(moved_color);
}
void set_moved_color(const std::string& color_id) {
prefs["moved_orb_color"] = color_id;
@ -311,7 +322,7 @@ std::string unmoved_color() {
std::string unmoved_color = get("unmoved_orb_color");
if (unmoved_color.empty())
return game_config::colors::unmoved_orb_color;
return unmoved_color;
return fix_orb_color_name(unmoved_color);
}
void set_unmoved_color(const std::string& color_id) {
prefs["unmoved_orb_color"] = color_id;
@ -321,7 +332,7 @@ std::string partial_color() {
std::string partmoved_color = get("partial_orb_color");
if (partmoved_color.empty())
return game_config::colors::partial_orb_color;
return partmoved_color;
return fix_orb_color_name(partmoved_color);
}
void set_partial_color(const std::string& color_id) {
prefs["partial_orb_color"] = color_id;