Author: espreon
Date: Sat Nov 5 21:30:28 2011
New Revision: 51867
URL: http://svn.gna.org/viewcvs/wesnoth?rev=51867&view=rev
Log:
'colour' -> 'color'.
Modified:
trunk/data/multiplayer/eras.cfg
Modified: trunk/data/multiplayer/eras.cfg
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/multiplayer/eras.cfg?rev=51867&r1=51866&r2=51867&view=diff
==============================================================================
--- trunk/data/multiplayer/eras.cfg (original)
+++ trunk/data/multiplayer/eras.cfg Sat Nov 5 21:30:28 2011
@@ -112,27 +112,27 @@
-- Up to here
local total = units + team.gold + income
local r, g, b = 255, 255, 255
- if team.__cfg.colour == 1 then r, g, b = 255, 0, 0
- elseif team.__cfg.colour == 2 then r, g, b = 0, 0, 255
- elseif team.__cfg.colour == 3 then r, g, b = 0, 255, 0
- elseif team.__cfg.colour == 4 then r, g, b = 155, 48, 255
- elseif team.__cfg.colour == 5 then r, g, b = 0, 0, 0
- elseif team.__cfg.colour == 6 then r, g, b = 165, 42, 42
- elseif team.__cfg.colour == 7 then r, g, b = 255, 165, 0
- elseif team.__cfg.colour == 8 then r, g, b = 255, 255, 255
- elseif team.__cfg.colour == 9 then r, g, b = 0, 128, 128
end
+ if team.__cfg.color == 1 then r, g, b = 255, 0, 0
+ elseif team.__cfg.color == 2 then r, g, b = 0, 0, 255
+ elseif team.__cfg.color == 3 then r, g, b = 0, 255, 0
+ elseif team.__cfg.color == 4 then r, g, b = 155, 48, 255
+ elseif team.__cfg.color == 5 then r, g, b = 0, 0, 0
+ elseif team.__cfg.color == 6 then r, g, b = 165, 42, 42
+ elseif team.__cfg.color == 7 then r, g, b = 255, 165, 0
+ elseif team.__cfg.color == 8 then r, g, b = 255, 255, 255
+ elseif team.__cfg.color == 9 then r, g, b = 0, 128, 128
end
side_comparison = side_comparison ..
string.format("<span foreground=\"#%02x%02x%02x\">Side
%d</span>: Income score = %d Unit score = %d Gold = %d\nGrand total:
<b>%d</b>\n",
r, g, b, side, income, units, team.gold, total)
if total > total_score then
- colour = string.format("#%02x%02x%02x", r, g, b)
+ color = string.format("#%02x%02x%02x", r, g, b)
side_num = side
total_score = total
end
until true -- end ugly hack
end
side_comparison = side_comparison ..
- string.format("\n<span foreground=\"%s\">Side %d</span>
has the advantage.", colour, side_num)
+ string.format("\n<span foreground=\"%s\">Side %d</span>
has the advantage.", color, side_num)
wesnoth.fire("message", { message = side_comparison, speaker =
"narrator", image = "wesnoth-icon.png"})
>>
[/lua]
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
