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

another TC update

Browse source 
-replace the iterator invalidation workaround from string2rgb with
 something cleaner

-finish converting color palette definitions to hexadecimal
This commit is contained in:
Patrick Parker 2006-11-21 06:07:59 +00:00
parent 52392df89a
commit 8847f68420
2 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
data/team-colors.cfg
View file

@ -53,12 +53,8 @@ name= _ "Teal"
[/color_range]
[color_palette]
magenta=244,154,193,63,0,22,85,0,42,105,0,57,123,0,69,140,0,81,158,0,93,177,0,105,195,0,116,214,0,127,236,0,140,238,61,150,239,91,161,241,114,172,242,135,182,246,173,205,248,193,217,250,213,229,253,233,241
green=0,200,0,0,255,0,0,254,0,0,253,0,0,252,0,0,251,0,0,250,0,0,249,0,0,248,0,0,247,0,0,246,0,0,245,0,0,244,0,0,243,0,0,242,0,0,241,0,0,240,0,0,239,0,0,238,0,0,237,0,0,236,0,0,235,0,0,234,0,0,233,0,0,232,0,0,231,0,0,230,0,0,229,0,0,228,0,0,227,0,0,226,0,0,225,0,0,224,0,0,223,0,0,222,0,0,221,0,0,220,0,0,219,0,0,218,0,0,217,0,0,216,0,0,215,0,0,214,0,0,213,0,0,212,0,0,211,0,0,210,0,0,209,0,0,208,0,0,207,0,0,206,0,0,205,0,0,204,0,0,203,0,0,202,0,0,201,0,0,199,0,0,198,0,0,197,0,0,196,0,0,195,0,0,194,0,0,193,0,0,192,0,0,191,0,0,190,0,0,189,0,0,188,0,0,187,0,0,186,0,0,185,0,0,184,0,0,183,0,0,182,0,0,181,0,0,180,0,0,179,0,0,178,0,0,177,0,0,176,0,0,175,0,0,174,0,0,173,0,0,172,0,0,171,0,0,170,0,0,169,0,0,168,0,0,167,0,0,166,0,0,165,0,0,164,0,0,163,0,0,162,0,0,161,0,0,160,0,0,159,0,0,158,0,0,157,0,0,156,0,0,155,0,0,154,0,0,153,0,0,152,0,0,151,0,0,150,0,0,149,0,0,148,0,0,147,0,0,146,0,0,145,0,0,144,0,0,143,0,0,142,0,0,141,0,0,140,0,0,139,0,0,138,0,0,137,0,0,136,0,0,135,0,0,134,0,0,133,0,0,132,0,0,131,0,0,130,0,0,129,0,0,128,0,0,127,0,0,126,0,0,125,0,0,124,0,0,123,0,0,122,0,0,121,0,0,120,0,0,119,0,0,118,0,0,117,0,0,116,0,0,115,0,0,114,0,0,113,0,0,112,0,0,111,0,0,110,0,0,109,0,0,108,0,0,107,0,0,106,0,0,105,0,0,104,0,0,103,0,0,102,0,0,101,0,0,100,0,0,99,0,0,98,0,0,97,0,0,96,0,0,95,0,0,94,0,0,93,0,0,92,0,0,91,0,0,90,0,0,89,0,0,88,0,0,87,0,0,86,0,0,85,0,0,84,0,0,83,0,0,82,0,0,81,0,0,80,0,0,79,0,0,78,0,0,77,0,0,76,0,0,75,0,0,74,0,0,73,0,0,72,0,0,71,0,0,70,0,0,69,0,0,68,0,0,67,0,0,66,0,0,65,0,0,64,0,0,63,0,0,62,0,0,61,0,0,60,0,0,59,0,0,58,0,0,57,0,0,56,0,0,55,0,0,54,0,0,53,0,0,52,0,0,51,0,0,50,0,0,49,0,0,48,0,0,47,0,0,46,0,0,45,0,0,44,0,0,43,0,0,42,0,0,41,0,0,40,0,0,39,0,0,38,0,0,37,0,0,36,0,0,35,0,0,34,0,0,33,0,0,32,0,0,31,0,0,30,0,0,29,0,0,28,0,0,27,0,0,26,0,0,25,0,0,24,0,0,23,0,0,22,0,0,21,0,0,20,0,0,19,0,0,18,0,0,17,0,0,16,0,0,15,0,0,14,0,0,13,0,0,12,0,0,11,0,0,10,0,0,9,0,0,8,0,0,7,0,0,6,0,0,5,0,0,4,0,0,3,0,0,2,0,0,1,0
red=200,0,0,255,0,0,254,0,0,253,0,0,252,0,0,251,0,0,250,0,0,249,0,0,248,0,0,247,0,0,246,0,0,245,0,0,244,0,0,243,0,0,242,0,0,241,0,0,240,0,0,239,0,0,238,0,0,237,0,0,236,0,0,235,0,0,234,0,0,233,0,0,232,0,0,231,0,0,230,0,0,229,0,0,228,0,0,227,0,0,226,0,0,225,0,0,224,0,0,223,0,0,222,0,0,221,0,0,220,0,0,219,0,0,218,0,0,217,0,0,216,0,0,215,0,0,214,0,0,213,0,0,212,0,0,211,0,0,210,0,0,209,0,0,208,0,0,207,0,0,206,0,0,205,0,0,204,0,0,203,0,0,202,0,0,201,0,0,199,0,0,198,0,0,197,0,0,196,0,0,195,0,0,194,0,0,193,0,0,192,0,0,191,0,0,190,0,0,189,0,0,188,0,0,187,0,0,186,0,0,185,0,0,184,0,0,183,0,0,182,0,0,181,0,0,180,0,0,179,0,0,178,0,0,177,0,0,176,0,0,175,0,0,174,0,0,173,0,0,172,0,0,171,0,0,170,0,0,169,0,0,168,0,0,167,0,0,166,0,0,165,0,0,164,0,0,163,0,0,162,0,0,161,0,0,160,0,0,159,0,0,158,0,0,157,0,0,156,0,0,155,0,0,154,0,0,153,0,0,152,0,0,151,0,0,150,0,0,149,0,0,148,0,0,147,0,0,146,0,0,145,0,0,144,0,0,143,0,0,142,0,0,141,0,0,140,0,0,139,0,0,138,0,0,137,0,0,136,0,0,135,0,0,134,0,0,133,0,0,132,0,0,131,0,0,130,0,0,129,0,0,128,0,0,127,0,0,126,0,0,125,0,0,124,0,0,123,0,0,122,0,0,121,0,0,120,0,0,119,0,0,118,0,0,117,0,0,116,0,0,115,0,0,114,0,0,113,0,0,112,0,0,111,0,0,110,0,0,109,0,0,108,0,0,107,0,0,106,0,0,105,0,0,104,0,0,103,0,0,102,0,0,101,0,0,100,0,0,99,0,0,98,0,0,97,0,0,96,0,0,95,0,0,94,0,0,93,0,0,92,0,0,91,0,0,90,0,0,89,0,0,88,0,0,87,0,0,86,0,0,85,0,0,84,0,0,83,0,0,82,0,0,81,0,0,80,0,0,79,0,0,78,0,0,77,0,0,76,0,0,75,0,0,74,0,0,73,0,0,72,0,0,71,0,0,70,0,0,69,0,0,68,0,0,67,0,0,66,0,0,65,0,0,64,0,0,63,0,0,62,0,0,61,0,0,60,0,0,59,0,0,58,0,0,57,0,0,56,0,0,55,0,0,54,0,0,53,0,0,52,0,0,51,0,0,50,0,0,49,0,0,48,0,0,47,0,0,46,0,0,45,0,0,44,0,0,43,0,0,42,0,0,41,0,0,40,0,0,39,0,0,38,0,0,37,0,0,36,0,0,35,0,0,34,0,0,33,0,0,32,0,0,31,0,0,30,0,0,29,0,0,28,0,0,27,0,0,26,0,0,25,0,0,24,0,0,23,0,0,22,0,0,21,0,0,20,0,0,19,0,0,18,0,0,17,0,0,16,0,0,15,0,0,14,0,0,13,0,0,12,0,0,11,0,0,10,0,0,9,0,0,8,0,0,7,0,0,6,0,0,5,0,0,4,0,0,3,0,0,2,0,0,1,0,0
blue=0,0,200,0,0,255,0,0,254,0,0,253,0,0,252,0,0,251,0,0,250,0,0,249,0,0,248,0,0,247,0,0,246,0,0,245,0,0,244,0,0,243,0,0,242,0,0,241,0,0,240,0,0,239,0,0,238,0,0,237,0,0,236,0,0,235,0,0,234,0,0,233,0,0,232,0,0,231,0,0,230,0,0,229,0,0,228,0,0,227,0,0,226,0,0,225,0,0,224,0,0,223,0,0,222,0,0,221,0,0,220,0,0,219,0,0,218,0,0,217,0,0,216,0,0,215,0,0,214,0,0,213,0,0,212,0,0,211,0,0,210,0,0,209,0,0,208,0,0,207,0,0,206,0,0,205,0,0,204,0,0,203,0,0,202,0,0,201,0,0,199,0,0,198,0,0,197,0,0,196,0,0,195,0,0,194,0,0,193,0,0,192,0,0,191,0,0,190,0,0,189,0,0,188,0,0,187,0,0,186,0,0,185,0,0,184,0,0,183,0,0,182,0,0,181,0,0,180,0,0,179,0,0,178,0,0,177,0,0,176,0,0,175,0,0,174,0,0,173,0,0,172,0,0,171,0,0,170,0,0,169,0,0,168,0,0,167,0,0,166,0,0,165,0,0,164,0,0,163,0,0,162,0,0,161,0,0,160,0,0,159,0,0,158,0,0,157,0,0,156,0,0,155,0,0,154,0,0,153,0,0,152,0,0,151,0,0,150,0,0,149,0,0,148,0,0,147,0,0,146,0,0,145,0,0,144,0,0,143,0,0,142,0,0,141,0,0,140,0,0,139,0,0,138,0,0,137,0,0,136,0,0,135,0,0,134,0,0,133,0,0,132,0,0,131,0,0,130,0,0,129,0,0,128,0,0,127,0,0,126,0,0,125,0,0,124,0,0,123,0,0,122,0,0,121,0,0,120,0,0,119,0,0,118,0,0,117,0,0,116,0,0,115,0,0,114,0,0,113,0,0,112,0,0,111,0,0,110,0,0,109,0,0,108,0,0,107,0,0,106,0,0,105,0,0,104,0,0,103,0,0,102,0,0,101,0,0,100,0,0,99,0,0,98,0,0,97,0,0,96,0,0,95,0,0,94,0,0,93,0,0,92,0,0,91,0,0,90,0,0,89,0,0,88,0,0,87,0,0,86,0,0,85,0,0,84,0,0,83,0,0,82,0,0,81,0,0,80,0,0,79,0,0,78,0,0,77,0,0,76,0,0,75,0,0,74,0,0,73,0,0,72,0,0,71,0,0,70,0,0,69,0,0,68,0,0,67,0,0,66,0,0,65,0,0,64,0,0,63,0,0,62,0,0,61,0,0,60,0,0,59,0,0,58,0,0,57,0,0,56,0,0,55,0,0,54,0,0,53,0,0,52,0,0,51,0,0,50,0,0,49,0,0,48,0,0,47,0,0,46,0,0,45,0,0,44,0,0,43,0,0,42,0,0,41,0,0,40,0,0,39,0,0,38,0,0,37,0,0,36,0,0,35,0,0,34,0,0,33,0,0,32,0,0,31,0,0,30,0,0,29,0,0,28,0,0,27,0,0,26,0,0,25,0,0,24,0,0,23,0,0,22,0,0,21,0,0,20,0,0,19,0,0,18,0,0,17,0,0,16,0,0,15,0,0,14,0,0,13,0,0,12,0,0,11,0,0,10,0,0,9,0,0,8,0,0,7,0,0,6,0,0,5,0,0,4,0,0,3,0,0,2,0,0,1
magenta=F49AC1,3F0016,55002A,690039,7B0045,8C0051,9E005D,B10069,C30074,D6007F,EC008C,EE3D96,EF5BA1,F172AC,F287B6,F6ADCD,F8C1D9,FAD5E5,FDE9F1
green=00C800,00FF00,00FE00,00FD00,00FC00,00FB00,00FA00,00F900,00F800,00F700,00F600,00F500,00F400,00F300,00F200,00F100,00F000,00EF00,00EE00,00ED00,00EC00,00EB00,00EA00,00E900,00E800,00E700,00E600,00E500,00E400,00E300,00E200,00E100,00E000,00DF00,00DE00,00DD00,00DC00,00DB00,00DA00,00D900,00D800,00D700,00D600,00D500,00D400,00D300,00D200,00D100,00D000,00CF00,00CE00,00CD00,00CC00,00CB00,00CA00,00C900,00C700,00C600,00C500,00C400,00C300,00C200,00C100,00C000,00BF00,00BE00,00BD00,00BC00,00BB00,00BA00,00B900,00B800,00B700,00B600,00B500,00B400,00B300,00B200,00B100,00B000,00AF00,00AE00,00AD00,00AC00,00AB00,00AA00,00A900,00A800,00A700,00A600,00A500,00A400,00A300,00A200,00A100,00A000,009F00,009E00,009D00,009C00,009B00,009A00,009900,009800,009700,009600,009500,009400,009300,009200,009100,009000,008F00,008E00,008D00,008C00,008B00,008A00,008900,008800,008700,008600,008500,008400,008300,008200,008100,008000,007F00,007E00,007D00,007C00,007B00,007A00,007900,007800,007700,007600,007500,007400,007300,007200,007100,007000,006F00,006E00,006D00,006C00,006B00,006A00,006900,006800,006700,006600,006500,006400,006300,006200,006100,006000,005F00,005E00,005D00,005C00,005B00,005A00,005900,005800,005700,005600,005500,005400,005300,005200,005100,005000,004F00,004E00,004D00,004C00,004B00,004A00,004900,004800,004700,004600,004500,004400,004300,004200,004100,004000,003F00,003E00,003D00,003C00,003B00,003A00,003900,003800,003700,003600,003500,003400,003300,003200,003100,003000,002F00,002E00,002D00,002C00,002B00,002A00,002900,002800,002700,002600,002500,002400,002300,002200,002100,002000,001F00,001E00,001D00,001C00,001B00,001A00,001900,001800,001700,001600,001500,001400,001300,001200,001100,001000,000F00,000E00,000D00,000C00,000B00,000A00,000900,000800,000700,000600,000500,000400,000300,000200,000100
blue=0000C8,0000FF,0000FE,0000FD,0000FC,0000FB,0000FA,0000F9,0000F8,0000F7,0000F6,0000F5,0000F4,0000F3,0000F2,0000F1,0000F0,0000EF,0000EE,0000ED,0000EC,0000EB,0000EA,0000E9,0000E8,0000E7,0000E6,0000E5,0000E4,0000E3,0000E2,0000E1,0000E0,0000DF,0000DE,0000DD,0000DC,0000DB,0000DA,0000D9,0000D8,0000D7,0000D6,0000D5,0000D4,0000D3,0000D2,0000D1,0000D0,0000CF,0000CE,0000CD,0000CC,0000CB,0000CA,0000C9,0000C7,0000C6,0000C5,0000C4,0000C3,0000C2,0000C1,0000C0,0000BF,0000BE,0000BD,0000BC,0000BB,0000BA,0000B9,0000B8,0000B7,0000B6,0000B5,0000B4,0000B3,0000B2,0000B1,0000B0,0000AF,0000AE,0000AD,0000AC,0000AB,0000AA,0000A9,0000A8,0000A7,0000A6,0000A5,0000A4,0000A3,0000A2,0000A1,0000A0,00009F,00009E,00009D,00009C,00009B,00009A,000099,000098,000097,000096,000095,000094,000093,000092,000091,000090,00008F,00008E,00008D,00008C,00008B,00008A,000089,000088,000087,000086,000085,000084,000083,000082,000081,000080,00007F,00007E,00007D,00007C,00007B,00007A,000079,000078,000077,000076,000075,000074,000073,000072,000071,000070,00006F,00006E,00006D,00006C,00006B,00006A,000069,000068,000067,000066,000065,000064,000063,000062,000061,000060,00005F,00005E,00005D,00005C,00005B,00005A,000059,000058,000057,000056,000055,000054,000053,000052,000051,000050,00004F,00004E,00004D,00004C,00004B,00004A,000049,000048,000047,000046,000045,000044,000043,000042,000041,000040,00003F,00003E,00003D,00003C,00003B,00003A,000039,000038,000037,000036,000035,000034,000033,000032,000031,000030,00002F,00002E,00002D,00002C,00002B,00002A,000029,000028,000027,000026,000025,000024,000023,000022,000021,000020,00001F,00001E,00001D,00001C,00001B,00001A,000019,000018,000017,000016,000015,000014,000013,000012,000011,000010,00000F,00000E,00000D,00000C,00000B,00000A,000009,000008,000007,000006,000005,000004,000003,000002,000001
red=C80000,FF0000,FE0000,FD0000,FC0000,FB0000,FA0000,F90000,F80000,F70000,F60000,F50000,F40000,F30000,F20000,F10000,F00000,EF0000,EE0000,ED0000,EC0000,EB0000,EA0000,E90000,E80000,E70000,E60000,E50000,E40000,E30000,E20000,E10000,E00000,DF0000,DE0000,DD0000,DC0000,DB0000,DA0000,D90000,D80000,D70000,D60000,D50000,D40000,D30000,D20000,D10000,D00000,CF0000,CE0000,CD0000,CC0000,CB0000,CA0000,C90000,C70000,C60000,C50000,C40000,C30000,C20000,C10000,C00000,BF0000,BE0000,BD0000,BC0000,BB0000,BA0000,B90000,B80000,B70000,B60000,B50000,B40000,B30000,B20000,B10000,B00000,AF0000,AE0000,AD0000,AC0000,AB0000,AA0000,A90000,A80000,A70000,A60000,A50000,A40000,A30000,A20000,A10000,A00000,9F0000,9E0000,9D0000,9C0000,9B0000,9A0000,990000,980000,970000,960000,950000,940000,930000,920000,910000,900000,8F0000,8E0000,8D0000,8C0000,8B0000,8A0000,890000,880000,870000,860000,850000,840000,830000,820000,810000,800000,7F0000,7E0000,7D0000,7C0000,7B0000,7A0000,790000,780000,770000,760000,750000,740000,730000,720000,710000,700000,6F0000,6E0000,6D0000,6C0000,6B0000,6A0000,690000,680000,670000,660000,650000,640000,630000,620000,610000,600000,5F0000,5E0000,5D0000,5C0000,5B0000,5A0000,590000,580000,570000,560000,550000,540000,530000,520000,510000,500000,4F0000,4E0000,4D0000,4C0000,4B0000,4A0000,490000,480000,470000,460000,450000,440000,430000,420000,410000,400000,3F0000,3E0000,3D0000,3C0000,3B0000,3A0000,390000,380000,370000,360000,350000,340000,330000,320000,310000,300000,2F0000,2E0000,2D0000,2C0000,2B0000,2A0000,290000,280000,270000,260000,250000,240000,230000,220000,210000,200000,1F0000,1E0000,1D0000,1C0000,1B0000,1A0000,190000,180000,170000,160000,150000,140000,130000,120000,110000,100000,0F0000,0E0000,0D0000,0C0000,0B0000,0A0000,090000,080000,070000,060000,050000,040000,030000,020000,010000
[/color_palette]

25
src/color_range.cpp
View file

@ -84,17 +84,6 @@ std::map<Uint32, Uint32> recolor_range(const color_range& new_range, const std::
std::vector<Uint32> string2rgb(std::string s){
std::vector<Uint32> out;
std::vector<std::string> rgb_vec = utils::split(s);
//reserve two extra slots to prevent iterator invalidation
for(int alloc_tries = 0; rgb_vec.capacity() < rgb_vec.size() + 2; ++alloc_tries)
{
if(alloc_tries > 99)
{
throw std::bad_alloc();
}
rgb_vec.reserve(rgb_vec.size() + 2);
}
std::vector<std::string>::iterator c=rgb_vec.begin();
while(c!=rgb_vec.end())
{
@ -102,13 +91,15 @@ std::vector<Uint32> string2rgb(std::string s){
if(c->length() != 6)
{
//integer triplets, e.g. white="255,255,255"
while(c + 3 > rgb_vec.end())
{
rgb_vec.push_back("0");
}
rgb_hex = (0x00FF0000 & ((lexical_cast<int>(*c++))<<16)); //red
rgb_hex += (0x0000FF00 & ((lexical_cast<int>(*c++))<<8)); //green
rgb_hex += (0x000000FF & ((lexical_cast<int>(*c++))<<0)); //blue
if(c!=rgb_vec.end())
{
rgb_hex += (0x0000FF00 & ((lexical_cast<int>(*c++))<<8)); //green
if(c!=rgb_vec.end())
{
rgb_hex += (0x000000FF & ((lexical_cast<int>(*c++))<<0)); //blue
}
}
} else {
//hexadecimal format, e.g. white="FFFFFF"
char* endptr;