Support score higher than 99 in HUD

git-svn-id: https://smokinguns.svn.sourceforge.net/svnroot/smokinguns/trunk@656 07eb42f0-b032-4355-afd3-42b1f3832223
smokin-guns · Dec 15, 2012 · 036053b · 036053b
1 parent 43e8946
commit 036053b
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 4 deletions.
diff --git a/code/cgame/cg_draw.c b/code/cgame/cg_draw.c
@@ -2,7 +2,7 @@
 ===========================================================================
 Copyright (C) 1999-2005 Id Software, Inc.
 Copyright (C) 2000-2003 Iron Claw Interactive
-Copyright (C) 2005-2010 Smokin' Guns
+Copyright (C) 2005-2012 Smokin' Guns
 
 This file is part of Smokin' Guns.
 
@@ -352,6 +352,40 @@ void CG_DrawMoneyField (int x, int y, int width, int value) {
 		l--;
 	}
 }
+
+#define	SCORE_WIDTH2 10
+#define	SCORE_WIDTH3 8
+#define	SCORE_HEIGHT2 14
+#define	SCORE_HEIGHT3 12
+void CG_DrawScoreField (int x, int y, int value) {
+	char	num[16], *ptr;
+	int		l,w,h;
+
+	value = value < 0 ? 0 : value;
+	value = value > 999 ? 999 : value;
+
+	Com_sprintf (num, sizeof(num), "%i", value);
+	l = strlen(num);
+	x += 2 ;
+	if (l>2) {
+		w = SCORE_WIDTH3 ;
+		h = SCORE_HEIGHT3 ;
+		y += (SCORE_HEIGHT2-SCORE_HEIGHT3)/2 ;
+	} else {
+		w = SCORE_WIDTH2 ;
+		h = SCORE_HEIGHT2 ;
+		x += w * (2 - l);
+	}
+
+	ptr = num;
+	while (*ptr && l)
+	{
+		CG_DrawPic( x, y, w, h, cgs.media.numbermoneyShaders[*ptr -'0'] );
+		x += w ;
+		ptr++;
+		l--;
+	}
+}
 #endif
 
 /*

diff --git a/code/cgame/cg_newdraw.c b/code/cgame/cg_newdraw.c
@@ -2,7 +2,7 @@
 ===========================================================================
 Copyright (C) 1999-2005 Id Software, Inc.
 Copyright (C) 2000-2003 Iron Claw Interactive
-Copyright (C) 2005-2010 Smokin' Guns
+Copyright (C) 2005-2012 Smokin' Guns
 
 This file is part of Smokin' Guns.
 
@@ -34,6 +34,7 @@ extern displayContextDef_t cgDC;
 #ifdef SMOKINGUNS
 void CG_DrawField (int x, int y, int width, int value);
 void CG_DrawMoneyField (int x, int y, int width, int value);
+void CG_DrawScoreField (int x, int y, int value);
 #endif
 
 // set in CG_ParseTeamInfo
@@ -2023,7 +2024,7 @@ void CG_OwnerDraw(itemDef_t *item, float x, float y, float w, float h, float tex
 		}
 		if(!(cgs.gametype == GT_DUEL && cg.snap->ps.pm_flags & PMF_FOLLOW &&
 				cg.snap->ps.pm_type != PM_CHASECAM) && score != SCORE_NOT_PRESENT) {
-			CG_DrawMoneyField (rect.x, rect.y, 2, score);
+			CG_DrawScoreField (rect.x, rect.y, score);
 		}
 		break;
 	case CG_FIELD_SCORE2:
@@ -2035,7 +2036,7 @@ void CG_OwnerDraw(itemDef_t *item, float x, float y, float w, float h, float tex
 		}
 		if(!(cgs.gametype == GT_DUEL && cg.snap->ps.pm_flags & PMF_FOLLOW &&
 				cg.snap->ps.pm_type != PM_CHASECAM) && score != SCORE_NOT_PRESENT) {
-			CG_DrawMoneyField (rect.x, rect.y, 2, score);
+			CG_DrawScoreField (rect.x, rect.y, score);
 		}
 		trap_R_SetColor(NULL);
 		break;