# HG changeset patch # User Wuzzy # Date 1460195812 -7200 # Node ID 9b4abde68e3bece5938068af0124479a838a80a6 # Parent ad7205e665785433f904b86606a5f2ccdc512ddc HedgeEditor: Fix broken export of team colors diff -r ad7205e66578 -r 9b4abde68e3b share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua --- a/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua Sat Apr 09 11:15:14 2016 +0200 +++ b/share/hedgewars/Data/Scripts/Multiplayer/HedgeEditor.lua Sat Apr 09 11:56:52 2016 +0200 @@ -544,17 +544,6 @@ } -local colorArray = { - {0xff0204ff, "0xff0204ff", "Red"}, - {0xff4980c1, "0xff4980c1", "Blue"}, - {0xff1de6ba, "0xff1de6ba", "Teal"}, - {0xffb541ef, "0xffb541ef", "Purple"}, - {0xffe55bb0, "0xffe55bb0", "Pink"}, - {0xff20bf00, "0xff20bf00", "Green"}, - {0xfffe8b0e, "0xfffe8b0e", "Orange"}, - {0xff5f3605, "0xff5f3605", "Brown"}, - {0xffffff01, "0xffffff01", "Yellow"} - } local fortArray = { "Cake", "Castle", "Earth", "EvilChicken", "Flowerhog", @@ -1446,19 +1435,10 @@ teamCounter = 1 end - -- try match team colour to the colours recorded in the colour array - - local tColor = 0x00000000 - for i = 1, #colorArray do - if GetClanColor(GetHogClan(gear)) == colorArray[i][1] then - tColor = colorArray[i][2] - end - end - - -- no match, just give him a default colour from the array, then - if tColor == 0x00000000 then - tColor = colorArray[teamCounter][2] - end + -- Convert color to string + local rgba = GetClanColor(GetHogClan(gear)) + local rgb = div(band(rgba, 0xFFFFFF00), 0x100) + local tColor = string.format("0x%X", rgb) if getGearValue(gear,"grave") == nil then tFort = fortArray[1+GetRandom(#fortArray)] @@ -1478,7 +1458,7 @@ table.insert (tempDataList, " AddTeam(\"" .. GetHogTeamName(gear) .."\"" .. - ", " .. "\"" ..tColor .. "\"" .. + ", " .. tColor .. ", " .. "\"" .. tGrave .. "\"" .. ", " .. "\"" .. tFort .. "\"" .. ", " .. "\"" .. tVoice .. "\"" ..