upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-15 09:02:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove redundant function team::map_color_to()

Browse Source
This commit is contained in:
Anonymissimus 2012-02-07 23:26:26 +00:00
parent 7503e91071
commit e2b38a0c1a
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripting/lua.cpp
View File

@ -1551,7 +1551,7 @@ static int impl_side_get(lua_State *L)
return_tstring_attrib("user_team_name", t.user_team_name());
return_string_attrib("team_name", t.team_name());
return_string_attrib("name", t.name());
return_string_attrib("color", t.map_color_to());
return_string_attrib("color", t.color());
return_cstring_attrib("controller", t.controller_string());
if (strcmp(m, "recruit") == 0) {

2
src/team.cpp
View File

@ -798,7 +798,7 @@ std::string team::get_side_color_index(int side)
size_t index = size_t(side-1);
if(teams != NULL && index < teams->size()) {
const std::string side_map = (*teams)[index].map_color_to();
const std::string side_map = (*teams)[index].color();
if(!side_map.empty()) {
return side_map;
}

1
src/team.hpp
View File

@ -252,7 +252,6 @@ public:
bool auto_shroud_updates() const { return auto_shroud_updates_; }
void set_auto_shroud_updates(bool value) { auto_shroud_updates_ = value; }
bool get_disallow_observers() const {return info_.disallow_observers; };
std::string map_color_to() const { return info_.color; };
bool no_leader() const { return info_.no_leader; }
void have_leader(bool value=true) { info_.no_leader = !value; }
bool hidden() const { return info_.hidden; }