From 222dfbe60dee579af84fc39de11523fd548644df Mon Sep 17 00:00:00 2001
From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 5 Sep 2010 14:22:44 +0300
Subject: [PATCH] Oops! Do this properly and fix an issue. Now it can be merged

---
 data/qcsrc/client/main.qh |  2 ++
 data/qcsrc/client/sbar.qc | 26 ++++++++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/data/qcsrc/client/main.qh b/data/qcsrc/client/main.qh
index e0196266..7353394b 100644
--- a/data/qcsrc/client/main.qh
+++ b/data/qcsrc/client/main.qh
@@ -80,6 +80,8 @@ const float COLOR_SPECTATOR = 1337;
 #define ST_NAME -2
 #define ST_HEALTH -3
 
+#define STP_NAME -1
+
 float sbar_field[MAX_SBAR_FIELDS + 1];
 float sbar_size[MAX_SBAR_FIELDS + 1];
 string sbar_title[MAX_SBAR_FIELDS + 1];
diff --git a/data/qcsrc/client/sbar.qc b/data/qcsrc/client/sbar.qc
index 0022a7c1..303b9978 100644
--- a/data/qcsrc/client/sbar.qc
+++ b/data/qcsrc/client/sbar.qc
@@ -716,16 +716,6 @@ string Sbar_GetField(entity pl, float field)
 
 string Sbar_GetStomachField(entity pl, float field)
 {
-	sbar_field_rgb = '1 1 1';
-	sbar_field_icon0 = "";
-	sbar_field_icon1 = "";
-	sbar_field_icon2 = "";
-	sbar_field_icon0_rgb = '1 1 1';
-	sbar_field_icon1_rgb = '1 1 1';
-	sbar_field_icon2_rgb = '1 1 1';
-	sbar_field_icon0_alpha = 1;
-	sbar_field_icon1_alpha = 1;
-	sbar_field_icon2_alpha = 1;
 	switch(field)
 	{
 		case ST_HIGHLIGHT:
@@ -743,6 +733,18 @@ string Sbar_GetStomachField(entity pl, float field)
 	//return "error";
 }
 
+string Sbar_GetStomachFieldPred(entity pl, float field)
+{
+	switch(field)
+	{
+		case STP_NAME:
+			return GetPlayerName(pl.sv_entnum);
+		default:
+			return "N/A";
+	}
+	//return "error";
+}
+
 float xmin, xmax, ymin, ymax, sbwidth;
 float sbar_fixscoreboardcolumnwidth_len;
 float sbar_fixscoreboardcolumnwidth_iconlen;
@@ -1016,9 +1018,9 @@ void Sbar_PrintStomachboardItemPred(vector pos, entity pl)
 		if(field == SP_SEPARATOR)
 			break;
 
-		str = Sbar_GetStomachField(pl, field);
+		str = Sbar_GetStomachFieldPred(pl, field);
 
-		if(field == ST_NAME) {
+		if(field == STP_NAME) {
 			f = stof(getplayerkey(pl.sv_entnum, "colors"));
 			drawpic(pos, "gfx/sb_playercolor_base", '22 11 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
 			drawpic(pos, "gfx/sb_playercolor_shirt", '22 11 0', colormapPaletteColor(floor(f / 16), 0), sbar_alpha_fg, DRAWFLAG_NORMAL);
-- 
2.39.2