summaryrefslogtreecommitdiff
path: root/src/cgame/cg_draw.c
diff options
context:
space:
mode:
authorPaweł Redman <pawel.redman@gmail.com>2015-06-26 01:29:00 +0200
committerPaweł Redman <pawel.redman@gmail.com>2015-06-26 01:29:00 +0200
commitb28d5f6dbedd5b895eed4cc5b730581df3b2215d (patch)
tree9bb750d3f30ff731ce2c60f6a845fff25f20b668 /src/cgame/cg_draw.c
parent6c7152aada204bfdfa6e39cdfea5e10440e0ed36 (diff)
Initial implementation of Wraith.
Diffstat (limited to 'src/cgame/cg_draw.c')
-rw-r--r--src/cgame/cg_draw.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 754b446..4782c00 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -1101,6 +1101,11 @@ static float CG_ChargeProgress( void )
max = LEVEL4_TRAMPLE_CHARGE_MAX;
}
}
+ else if( cg.snap->ps.weapon == WP_ALEVEL1 )
+ {
+ min = 0;
+ max = LEVEL1_WARP_TIME;
+ }
else if( cg.snap->ps.weapon == WP_LUCIFER_CANNON || cg.snap->ps.weapon == WP_FLAMER )
{
@@ -4131,6 +4136,27 @@ static void CG_DrawHealthBars( void )
}
}
+/*
+=================
+CG_DrawWarpOverlay
+=================
+*/
+static void CG_DrawWarpOverlay( void )
+{
+ if( !( cg.predictedPlayerEntity.currentState.eFlags & EF_WARPING ) ||
+ cg.renderingThirdPerson )
+ {
+ return;
+ }
+
+ trap_R_SetColor( NULL );
+ CG_DrawPic( 0, 0, 640, 480, cgs.media.warpOverlay );
+
+ if( cg.warpExitBlocked )
+ {
+ CG_DrawPic( 0, 0, 640, 480, cgs.media.warpOverlayBlocked );
+ }
+}
//==================================================================================
@@ -4154,6 +4180,8 @@ static void CG_Draw2D( void )
// (only 2D that can't be disabled)
CG_DrawLighting( );
+ CG_DrawWarpOverlay( );
+
if( cg_draw2D.integer == 0 )
return;