From: Mario Date: Sun, 12 Feb 2017 03:00:34 +0000 (+1000) Subject: Fix rankings too X-Git-Tag: xonotic-v0.8.2~227 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=857affb616530ef0f446173d7457ea4069d12382;p=xonotic%2Fxonotic-data.pk3dir.git Fix rankings too --- diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc index a728f2447..b736dced6 100644 --- a/qcsrc/client/hud/panel/modicons.qc +++ b/qcsrc/client/hud/panel/modicons.qc @@ -494,7 +494,7 @@ int race_CheckName(string net_name) { int i; for (i=RANKINGS_CNT-1;i>=0;--i) - if(grecordholder[i] == net_name) + if(strdecolorize(grecordholder[i]) == strdecolorize(net_name)) return i+1; return 0; } @@ -583,7 +583,7 @@ void HUD_Mod_Race(vector pos, vector mySize) a = bound(0, race_status_time - time, 1); string s; - s = textShortenToWidth(race_status_name, squareSize, '1 1 0' * 0.1 * squareSize, stringwidth_colors); + s = textShortenToWidth(ColorTranslateRGB(race_status_name), squareSize, '1 1 0' * 0.1 * squareSize, stringwidth_colors); float rank; if(race_status > 0) @@ -605,7 +605,7 @@ void HUD_Mod_Race(vector pos, vector mySize) drawcolorcodedstring_aspect(namepos, s, '1 0.2 0' * squareSize, panel_fg_alpha * a, DRAWFLAG_NORMAL); drawstring_aspect(rankpos, rankname, '1 0.15 0' * squareSize, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); } else if(race_status == 2) { - if(race_status_name == entcs_GetName(player_localnum) || !race_myrank || race_myrank < rank) + if(strdecolorize(race_status_name) == strdecolorize(entcs_GetName(player_localnum)) || !race_myrank || race_myrank < rank) drawpic_aspect_skin(medalPos + '0.1 0 0' * squareSize, "race_newrankgreen", '1 1 0' * 0.8 * squareSize, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); else drawpic_aspect_skin(medalPos + '0.1 0 0' * squareSize, "race_newrankyellow", '1 1 0' * 0.8 * squareSize, '1 1 1', panel_fg_alpha * a, DRAWFLAG_NORMAL); diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 4fbb2f282..a24d07d3a 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -1170,7 +1170,7 @@ NET_HANDLE(TE_CSQC_RACE, bool isNew) strunzone(grecordholder[pos-1]); grecordholder[pos-1] = strzone(ReadString()); grecordtime[pos-1] = ReadInt24_t(); - if(grecordholder[pos-1] == entcs_GetName(player_localnum)) + if(strdecolorize(grecordholder[pos-1]) == strdecolorize(entcs_GetName(player_localnum))) race_myrank = pos; break; case RACE_NET_SERVER_STATUS: