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

Killed 'colour'.

Browse source
This commit is contained in:
Steven Panek 2012-01-30 01:40:30 +00:00
parent 791e90a2c9
commit e093fc6b5c
8 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -13,6 +13,8 @@ Version 1.11.0-svn:
* WML engine:
* new action tag: [clear_menu_item] id=...
* new key: [set_menu_item][command]delayed_variable_substitution=yes|no
* Removed support for the deprecated "colour=", "debug_border_colour=",
and [colour_adjust]
* Miscellaneous and bug fixes:
* Fix wrong preferences path suffix (1.1 instead of 1.10) on Linux and other
platforms using XDG layout (no compiled-in preferences path override,

2
data/lua/wml-tags.lua
View file

@ -942,14 +942,12 @@ function wml_actions.store_side(cfg)
team_name = t.team_name,
user_team_name = t.user_team_name,
color = t.color,
colour = t.color,
gold = t.gold,
side = side_number
}
wesnoth.set_variable(string.format("%s[%u]", variable, index), container)
index = index + 1
end
-- colour deprecated starting with 1.9.0
end
function wml_actions.add_ai_behavior(cfg)

2
data/schema-gui.cfg
View file

@ -138,7 +138,7 @@
# Base things that are only (mostly) derived from
[control:widget]
debug_border_colour="optional string" #TODO: colour
debug_border_color="optional string"
debug_border_mode="optional unsigned"
definition="optional identifier"
help="optional string"

2
data/tools/emacs_mode/wesnoth-wml-data.el
View file

@ -351,7 +351,7 @@
("widget" nil nil)
("schema"
("widget" "resolution_definition" "control_definition" "state_definition" "settings" "row" "gui" "grid" "column" "unit_type" "units" "toplevel" "topic" "theme" "textdomain" "section" "resolution" "race" "portrait" "partialresolution" "movetype" "lua" "hotkey" "help" "game_config" "fonts" "font" "entry" "campaign" "binary_path" "ais" "ai" "advanced_preference" "description" "about" "root")
("use_tooltip_on_label_overflow" "tooltip" "linked_group" "label" "help" "definition" "debug_border_mode" "debug_border_colour" "_grid" "description" "_foreground" "_background" "top_border" "right_border" "left_border" "bottom_border" "_resolution" "wrap" "valign" "halign" "border" "unsigned" "variation_name" "alignments" "sort_topics_type" "side_of_screen" "hexlist" "flag_image_type" "inherit" "id" "about_preference_type" "images" "pathlist" "path" "boolean" "float" "integer" "tstring" "string" "identifierlist" "identifier"))
("use_tooltip_on_label_overflow" "tooltip" "linked_group" "label" "help" "definition" "debug_border_mode" "debug_border_color" "_grid" "description" "_foreground" "_background" "top_border" "right_border" "left_border" "bottom_border" "_resolution" "wrap" "valign" "halign" "border" "unsigned" "variation_name" "alignments" "sort_topics_type" "side_of_screen" "hexlist" "flag_image_type" "inherit" "id" "about_preference_type" "images" "pathlist" "path" "boolean" "float" "integer" "tstring" "string" "identifierlist" "identifier"))
("resolution_definition" nil
("text_font_style" "window_width" "window_height" "text_font_size" "text_extra_width" "text_extra_height" "min_width" "min_height" "max_width" "max_height" "default_width" "default_height"))
("control_definition" nil

9
src/game_events.cpp
View file

@ -893,15 +893,6 @@ WML_HANDLER_FUNCTION(color_adjust, /*event_info*/, cfg)
color_adjust(cfg);
}
//Function handling old name
///@deprecated 1.9.2 'colour_adjust' instead of 'color_adjust'
//deprecation message added 1.9.10
WML_HANDLER_FUNCTION(colour_adjust, /*event_info*/, cfg)
{
WRN_NG << "[colour_adjust] is deprecated, use [color_adjust]\n";
color_adjust(cfg);
}
WML_HANDLER_FUNCTION(scroll, /*event_info*/, cfg)
{
game_display &screen = *resources::screen;

2
src/gamestatus.cpp
View file

@ -891,7 +891,7 @@ protected:
"current_player", "countdown_time", "action_bonus_count",
"flag", "flag_icon", "objectives", "objectives_changed",
"disallow_observers", "allow_player", "no_leader",
"hidden", "music", "color", "colour", "ai_config", "gold",
"hidden", "music", "color", "ai_config", "gold",
"start_gold", "team_rgb", "village_gold", "recall_cost",
"controller", "persistent", "share_view",
"share_maps", "recruit", "fog", "shroud", "shroud_data",

2
src/gui/auxiliary/window_builder/control.cpp
View file

@ -38,7 +38,7 @@ tbuilder_control::tbuilder_control(const config& cfg)
, use_tooltip_on_label_overflow(true)
#ifndef LOW_MEM
, debug_border_mode(cfg["debug_border_mode"])
, debug_border_color(decode_color(cfg["debug_border_colour"]))
, debug_border_color(decode_color(cfg["debug_border_color"]))
#endif
{
if(definition.empty()) {

4
src/multiplayer_connect.cpp
View file

@ -700,8 +700,6 @@ config connect::side::get_config() const
res["user_team_name"] = parent_->user_team_names_[team_];
res["allow_player"] = allow_player_;
res["color"] = color_ + 1;
///@deprecated 1.9.2 'colour' also written
res["colour"] = color_ + 1;
res["gold"] = gold_;
res["income"] = income_;
@ -722,7 +720,7 @@ config connect::side::get_config() const
if(parent_->params_.use_map_settings && enabled_) {
config trimmed = cfg_;
static char const *attrs[] = { "side", "controller", "id",
"team_name", "user_team_name", "color", "colour", "gold",
"team_name", "user_team_name", "color", "gold",
"income", "allow_changes" };
foreach (const char *attr, attrs) {
trimmed.remove_attribute(attr);