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

Remove some deprecated colour keys.

Browse source
This commit is contained in:
Mark de Wever 2011-01-10 20:38:45 +00:00
parent a9bb8f8d0d
commit 217dec545f
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gamestatus.cpp
View file

@ -235,11 +235,7 @@ void write_players(game_state& gamestate, config& cfg, const bool use_snapshot,
(*scenario_side)["name"] = carryover_side["name"];
(*scenario_side)["current_player"] = carryover_side["current_player"];
///@deprecated 1.9.2 'colour' in [side]
const std::string colour_error = "Usage of 'colour' in [side] is deprecated, support will be removed in 1.9.2.\n";
(*scenario_side)["color"] = carryover_side.get_old_attribute("color","colour",colour_error);
///@deprecated 1.9.2 'colour' also written in [side]
(*scenario_side)["colour"] = (*scenario_side)["color"];
(*scenario_side)["color"] = carryover_side["color"];
//add recallable units
foreach (const config &u, carryover_side.child_range("unit")) {

4
src/map_label.cpp
View file

@ -308,9 +308,7 @@ void terrain_label::read(const config &cfg)
loc_ = map_location(cfg, &vs);
SDL_Color color = font::LABEL_COLOR;
///@deprecated 1.9.2 'colour' in [label]
const std::string colour_error = "Usage of 'colour' in [label] is deprecated, support will be removed in 1.9.2.\n";
std::string tmp_color = cfg.get_old_attribute("color","colour", colour_error);
std::string tmp_color = cfg["color"];
text_ = cfg["text"];
team_name_ = cfg["team_name"].str();

9
src/team.cpp
View file

@ -110,12 +110,11 @@ void team::team_info::read(const config &cfg)
music = cfg["music"].str();
side = cfg["side"].to_int(1);
///@deprecated 1.9.2 Usage of 'colour' in [side]
const std::string colour_error = "Usage of 'colour' in [side] is deprecated, support will be removed in 1.9.2.\n";
if(cfg.has_old_attribute("color","colour",colour_error))
color = cfg.get_old_attribute("color","colour").str();
else
if(cfg.has_attribute("color")) {
color = cfg["color"].str();
} else {
color = cfg["side"].str();
}
// If arel starting new scenario overide settings from [ai] tags
if (!user_team_name.translatable())