Skip to content

Commit 2787941

Browse files
Merge pull request #892 from UltraStar-Deluxe/remove-useless-color-function
cleanup GetPlayerLightColor vs GetPlayerLightColorV2
2 parents d816e69 + d526a60 commit 2787941

File tree

2 files changed

+1
-68
lines changed

2 files changed

+1
-68
lines changed

src/base/UThemes.pas

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1369,7 +1369,6 @@ function GetLyricBarColor(Color: integer): TRGB;
13691369

13701370
function GetPlayerColor(Color: integer): TRGB;
13711371
function GetPlayerLightColor(Color: integer): TRGB;
1372-
function GetPlayerLightColorV2(Color: integer): TRGB;
13731372
procedure LoadPlayersColors;
13741373
procedure LoadTeamsColors;
13751374

@@ -3273,72 +3272,6 @@ function GetPlayerColor(Color: integer): TRGB;
32733272
end;
32743273

32753274
function GetPlayerLightColor(Color: integer): TRGB;
3276-
begin
3277-
case (Color) of
3278-
1://blue
3279-
begin
3280-
Result.R := 145/255;
3281-
Result.G := 215/255;
3282-
Result.B := 240/255;
3283-
end;
3284-
2: //red
3285-
begin
3286-
Result.R := 245/255;
3287-
Result.G := 162/255;
3288-
Result.B := 162/255;
3289-
end;
3290-
3: //green
3291-
begin
3292-
Result.R := 152/255;
3293-
Result.G := 250/255;
3294-
Result.B := 153/255;
3295-
end;
3296-
4: //yellow
3297-
begin
3298-
Result.R := 255/255;
3299-
Result.G := 246/255;
3300-
Result.B := 143/255;
3301-
end;
3302-
5: //orange
3303-
begin
3304-
Result.R := 255/255;
3305-
Result.G := 204/255;
3306-
Result.B := 156/255;
3307-
end;
3308-
6: //pink
3309-
begin
3310-
Result.R := 255/255;
3311-
Result.G := 192/255;
3312-
Result.B := 205/255;
3313-
end;
3314-
7: //purple
3315-
begin
3316-
Result.R := 240/255;
3317-
Result.G := 170/255;
3318-
Result.B := 255/255;
3319-
end;
3320-
8: //gold
3321-
begin
3322-
Result.R := 255/255;
3323-
Result.G := 214/255;
3324-
Result.B := 118/255;
3325-
end;
3326-
9: //gray
3327-
begin
3328-
Result.R := 220/255;
3329-
Result.G := 220/255;
3330-
Result.B := 220/255;
3331-
end;
3332-
else
3333-
begin
3334-
Result.R := 145/255;
3335-
Result.G := 215/255;
3336-
Result.B := 240/255;
3337-
end;
3338-
end;
3339-
end;
3340-
3341-
function GetPlayerLightColorV2(Color: integer): TRGB;
33423275
begin
33433276
case (Color) of
33443277
1://blue

src/screens/UScreenName.pas

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ procedure TScreenName.PlayerColorButton(K: integer);
732732
Col, DesCol: TRGB;
733733
begin
734734

735-
Col := GetPlayerLightColorV2(K);
735+
Col := GetPlayerLightColor(K);
736736

737737
Button[PlayerName].SelectColR:= Col.R;
738738
Button[PlayerName].SelectColG:= Col.G;

0 commit comments

Comments
 (0)