From: z411 <z411@omaera.org>
Date: Tue, 25 Jan 2022 18:53:11 +0000 (-0300)
Subject: Rank handle empty string
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6bcec62806a010b413498689692129e617b1fef2;p=xonotic%2Fxonotic-data.pk3dir.git

Rank handle empty string
---

diff --git a/qcsrc/client/hud/panel/scoreboard.qc b/qcsrc/client/hud/panel/scoreboard.qc
index fe096ecd1..a48219682 100644
--- a/qcsrc/client/hud/panel/scoreboard.qc
+++ b/qcsrc/client/hud/panel/scoreboard.qc
@@ -1301,7 +1301,7 @@ void Scoreboard_Duel_DrawTable(vector pos, bool invert, entity pl, entity tm)
 	
 	// RJZ rank
 	string rank_str = entcs_GetRank(pl.sv_entnum);
-	if(rank_str) {
+	if(rank_str != "") {
 		if(invert)
 			tmp_in.x -= stringwidth_colors(rank_str, duel_name_fontsize) + duel_name_fontsize.x * 0.5;
 		else
@@ -1317,7 +1317,7 @@ void Scoreboard_Duel_DrawTable(vector pos, bool invert, entity pl, entity tm)
 	if(invert)
 		tmp_in.x -= stringwidth_colors(tmp_str, duel_name_fontsize) + duel_name_fontsize.x * 0.5;
 	else
-		tmp_in.x += (rank_str ? stringwidth_colors(rank_str, duel_name_fontsize) : duel_score_size.x) + duel_name_fontsize.x * 0.5;
+		tmp_in.x += (rank_str != "" ? stringwidth_colors(rank_str, duel_name_fontsize) : duel_score_size.x) + duel_name_fontsize.x * 0.5;
 	drawcolorcodedstring(tmp_in, tmp_str, duel_name_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
 	
 	//LegendGuard adds a conditional sentence for country column 05-04-2021
diff --git a/qcsrc/client/hud/panel/spect.qc b/qcsrc/client/hud/panel/spect.qc
index da20acf33..818d4c927 100644
--- a/qcsrc/client/hud/panel/spect.qc
+++ b/qcsrc/client/hud/panel/spect.qc
@@ -258,7 +258,7 @@ void HUD_SpectHUD_drawDuelScore(vector pos, entity pl, bool invert)
 	
 	// RJZ rank
 	string rank_str = entcs_GetRank(pl.sv_entnum);
-	if(rank_str) {
+	if(rank_str != "") {
 		if(invert)
 			tmp.x -= stringwidth_colors(rank_str, teamname_fontsize) + teamname_fontsize.x * 0.5;
 		else
@@ -275,7 +275,7 @@ void HUD_SpectHUD_drawDuelScore(vector pos, entity pl, bool invert)
 	if(invert)
 		tmp.x -= stringwidth_colors(tmp_str, teamname_fontsize) + teamname_fontsize.x * 0.5;
 	else
-		tmp.x += (rank_str ? stringwidth_colors(rank_str, teamname_fontsize) : teamscore_size.x) + teamname_fontsize.x * 0.5;
+		tmp.x += (rank_str != "" ? stringwidth_colors(rank_str, teamname_fontsize) : teamscore_size.x) + teamname_fontsize.x * 0.5;
 	
 	drawcolorcodedstring(tmp, tmp_str, teamname_fontsize, panel_fg_alpha, DRAWFLAG_NORMAL);
 }
diff --git a/qcsrc/common/ent_cs.qh b/qcsrc/common/ent_cs.qh
index 90a6550c5..bd76c6b6b 100644
--- a/qcsrc/common/ent_cs.qh
+++ b/qcsrc/common/ent_cs.qh
@@ -143,7 +143,7 @@ REGISTER_NET_TEMP(CLIENT_ENTCS)
 	string entcs_GetRank(int i)
 	{
 		entity e = entcs_receiver(i);
-		return (e.rank != "" ? e.rank : string_null);
+		return e.rank;
 	}
 
     /**