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

Renamed r=, g=, and b=...

Browse source 
...in [objective], [gold_carryover], and [note] to red=, green=, and
blue= for consistency.
This commit is contained in:
Steven Panek 2011-10-28 23:04:45 +00:00
parent f400ee4ac5
commit e1d7f56b7c
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -82,7 +82,7 @@ Version 1.9.9+svn:
* Added $this_unit support to [harm_unit] and [find_path]
* Settings by [color_adjust] no longer expire at turn start or over save/load cycles
* Implemented bullet= for [objectives], [objective], [gold_carryover], and [note]
* Implemented r=, g=, and b= for [objective], [gold_carryover], and [note]
* Implemented red=, green=, and blue= for [objective], [gold_carryover], and [note]
* Miscellaneous and bug fixes:
* Fixed compilation on all Debian architectures (Debian bug #636193)
* Fixed handling of #ifver and #ifnver preprocessor directives in wmllint

24
data/lua/wml/objectives.lua
View file

@ -77,9 +77,9 @@ local function generate_objectives(cfg)
if condition == "win" then
local caption = obj.caption
local r = obj.r or 0
local g = obj.g or 255
local b = obj.b or 0
local r = obj.red or 0
local g = obj.green or 255
local b = obj.blue or 0
if caption then
win_objectives = win_objectives .. caption .. "\n"
@ -88,9 +88,9 @@ local function generate_objectives(cfg)
win_objectives = win_objectives .. color_prefix(r, g, b) .. objective_bullet .. description .. turn_counter .. "</span>" .. "\n"
elseif condition == "lose" then
local caption = obj.caption
local r = obj.r or 255
local g = obj.g or 0
local b = obj.b or 0
local r = obj.red or 255
local g = obj.green or 0
local b = obj.blue or 0
if caption then
lose_objectives = lose_objectives .. caption .. "\n"
@ -105,9 +105,9 @@ local function generate_objectives(cfg)
for obj in helper.child_range(cfg, "gold_carryover") do
local gold_carryover_bullet = obj.bullet or bullet
local r = obj.r or 255
local g = obj.g or 255
local b = obj.b or 192
local r = obj.red or 255
local g = obj.green or 255
local b = obj.blue or 192
if obj.bonus ~= nil then
if obj.bonus then
@ -132,9 +132,9 @@ local function generate_objectives(cfg)
for note in helper.child_range(cfg, "note") do
local note_bullet = note.bullet or bullet
local r = note.r or 255
local g = note.g or 255
local b = note.b or 255
local r = note.red or 255
local g = note.green or 255
local b = note.blue or 255
if note.description then
notes = notes .. color_prefix(r, g, b) .. note_bullet .. "<small>" .. note.description .. "</small></span>\n"