[iortcw] 96/497: - Pushed warmup Objective prints little lower - Added fancy Warmup print in corner as in OSP..

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to annotated tag 1.42d
in repository iortcw.

commit 4dab8b23bf295a53047f3bd4096d67264f0176cf
Author: nate.afk at gmail.com <nate.afk at gmail.com@e65d2741-a53d-b2dc-ae96-bb75fa5e4c4a>
Date:   Mon Apr 28 02:13:06 2014 +0000

    - Pushed warmup Objective prints little lower
    - Added fancy Warmup print in corner as in OSP..
---
 MP/code/cgame/cg_draw.c | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/MP/code/cgame/cg_draw.c b/MP/code/cgame/cg_draw.c
index f7fc77d..ed40832 100644
--- a/MP/code/cgame/cg_draw.c
+++ b/MP/code/cgame/cg_draw.c
@@ -2644,17 +2644,18 @@ static void CG_DrawWarmup( void ) {
 
 		cw = 10;
 
-		w = CG_DrawStrlen( s );
-		CG_DrawStringExt( 320 - w * cw / 2, 140, s, colorWhite,
-						  qfalse, qtrue, cw, (int)( cw * 1.5 ), 0 );
-
-		w = CG_DrawStrlen( s1 );
-		CG_DrawStringExt( 320 - w * cw / 2, 160, s1, colorWhite,
-						  qfalse, qtrue, cw, (int)( cw * 1.5 ), 0 );
-
-		w = CG_DrawStrlen( s2 );
-		CG_DrawStringExt( 320 - w * cw / 2, 180, s2, colorWhite,
-						  qfalse, qtrue, cw, (int)( cw * 1.5 ), 0 );
+		// L0 - Pushed all lower for 20 so it's no so stacked..
+		w = CG_DrawStrlen(s); 
+		CG_DrawStringExt(320 - w * cw / 2, 160, s, colorWhite,
+			qfalse, qtrue, cw, (int)(cw * 1.5), 0);
+
+		w = CG_DrawStrlen(s1);
+		CG_DrawStringExt(320 - w * cw / 2, 180, s1, colorWhite,
+			qfalse, qtrue, cw, (int)(cw * 1.5), 0);
+
+		w = CG_DrawStrlen(s2);
+		CG_DrawStringExt(320 - w * cw / 2, 200, s2, colorWhite,
+			qfalse, qtrue, cw, (int)(cw * 1.5), 0);
 	}
 }
 
@@ -3097,11 +3098,17 @@ void CG_DrawObjectiveIcons( void ) {
 	seconds -= mins * 60;
 	tens = seconds / 10;
 	seconds -= tens * 10;
-	if ( msec < 0 ) {
-		fade = fabs( sin( cg.time * 0.002 ) ) * cg_hudAlpha.value;
-		s = va( "0:00" );
-	} else {
-		s = va( "%i:%i%i", mins, tens, seconds ); // float cast to line up with reinforce time
+	
+	if (cgs.gamestate != GS_PLAYING) {
+		fade = fabs(sin(cg.time * 0.002)) * cg_hudAlpha.value;
+		s = va("^3Warmup");
+	}
+	else if (msec < 0) {
+		fade = fabs(sin(cg.time * 0.002)) * cg_hudAlpha.value;
+		s = va("0:00");
+	}
+	else {
+		s = va("%i:%i%i", mins, tens, seconds); // float cast to line up with reinforce time
 		fade = cg_hudAlpha.value;
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/iortcw.git