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

Connect Engine: fixed pango version of get_colors displaying incorrect values

Browse source
This commit is contained in:
Charles Dang 2016-10-11 22:55:53 +11:00
parent 0e2f05151f
commit 066c34ae5e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game_initialization/connect_engine.cpp
View file

@ -1409,12 +1409,12 @@ std::vector<std::string> side_engine::get_colors() const
return res;
}
std::map<std::string, std::string> side_engine::get_colors_pango() const
std::vector<std::pair<std::string, std::string>> side_engine::get_colors_pango() const
{
std::map<std::string, std::string> res;
std::vector<std::pair<std::string, std::string>> res;
for(int i = 0; i < num_colors(); ++i) {
const std::string color = get_color(i);
res.emplace(color, mp::get_color_string_pango(color));
res.push_back({color, mp::get_color_string_pango(color)});
}
return res;
}

2
src/game_initialization/connect_engine.hpp
View file

@ -225,7 +225,7 @@ public:
flg_manager& flg() { return flg_; }
std::vector<std::string> get_colors() const;
std::map<std::string, std::string> get_colors_pango() const;
std::vector<std::pair<std::string, std::string>> get_colors_pango() const;
std::string get_color(int index = -1) const;
int num_colors() const;