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

Game Config: fixup color_info not parsing the color range correctly

Browse source
This commit is contained in:
Charles Dang 2016-12-04 00:12:33 +11:00
parent 44f8d2e539
commit cc5071f2e9
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game_config.cpp
View file

@ -477,10 +477,12 @@ const color_range& color_info(const std::string& name)
}
std::vector<color_t> temp;
try {
temp.push_back(color_t::from_hex_string(name));
} catch(std::invalid_argument& e) {
throw config::error(_("Invalid color range: ") + name);
for(const auto& s : utils::split(name)) {
try {
temp.push_back(color_t::from_hex_string(s));
} catch(std::invalid_argument& e) {
throw config::error(_("Invalid color in range: ") + s);
}
}
team_rgb_range.insert({name, color_range(temp)});