Alien Hovel

4 files changed, 13 insertions, 26 deletions

diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c
index 7aee0784..5acb96d8 100644
--- a/src/cgame/cg_draw.c
+++ b/src/cgame/cg_draw.c
@@ -1142,7 +1142,8 @@ static float CG_DrawScores( float y ) {
     x = 640;
     score = cg.snap->ps.persistant[PERS_SCORE];
     spectator = ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ) ||
-                ( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING );
+                ( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) ||
+                ( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING );
 
     // always show your score in the second box if not in first place
     if ( s1 != score ) {
@@ -1856,9 +1857,9 @@ static void CG_DrawCrosshair(void) {
   }
 
   if( ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ) ||
-      ( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) ) {
+      ( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) ||
+      ( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING ) )
     return;
-  }
 
   if ( cg.renderingThirdPerson ) {
     return;
@@ -2281,11 +2282,15 @@ static void CG_Draw2D( void ) {
   CG_DrawLighting();
 
   if( ( cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR ) ||
-      ( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) ) {
+      ( cg.snap->ps.stats[ STAT_STATE ] & SS_INFESTING ) ||
+      ( cg.snap->ps.stats[ STAT_STATE ] & SS_HOVELING ) )
+  {
     CG_DrawSpectator();
     CG_DrawCrosshair();
     CG_DrawCrosshairNames();
-  } else {
+  }
+  else
+  {
     // don't draw any status if dead or the scoreboard is being explicitly shown
     if ( !cg.showScores && cg.snap->ps.stats[STAT_HEALTH] > 0 ) {
       CG_DrawStatusBar();
diff --git a/src/cgame/cg_local.h b/src/cgame/cg_local.h
index 8ed1a054..5b972aa8 100644
--- a/src/cgame/cg_local.h
+++ b/src/cgame/cg_local.h
@@ -791,15 +791,6 @@ typedef struct {
   qhandle_t humanTorch3;
   qhandle_t humanTorch2;
   qhandle_t humanTorch1;
-  qhandle_t alienNav9;
-  qhandle_t alienNav8;
-  qhandle_t alienNav7;
-  qhandle_t alienNav6;
-  qhandle_t alienNav5;
-  qhandle_t alienNav4;
-  qhandle_t alienNav3;
-  qhandle_t alienNav2;
-  qhandle_t alienNav1;
   qhandle_t alienHealth;
 
   qhandle_t flameShader[ 32 ];
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c
index 8f9a6668..c26564da 100644
--- a/src/cgame/cg_main.c
+++ b/src/cgame/cg_main.c
@@ -752,7 +752,7 @@ static void CG_RegisterGraphics( void ) {
     
   /*cgs.media.creepShader = trap_R_RegisterShader( "creep" );*/
   
-  cgs.media.scannerBlipShader = trap_R_RegisterShader( "gfx/2d/alienhealth" );
+  cgs.media.scannerBlipShader = trap_R_RegisterShader( "gfx/2d/droidhealth" );
   cgs.media.scannerLineShader = trap_R_RegisterShader( "gfx/2d/func/mult2" );
   /*cgs.media.scannerShader = trap_R_RegisterShader( "gfx/2d/scanner" );*/
   
@@ -815,15 +815,6 @@ static void CG_RegisterGraphics( void ) {
   cgs.media.humanTorch3 = trap_R_RegisterShader( "humanTorch3" );
   cgs.media.humanTorch2 = trap_R_RegisterShader( "humanTorch2" );
   cgs.media.humanTorch1 = trap_R_RegisterShader( "humanTorch1" );
-  cgs.media.alienNav9 = trap_R_RegisterShader( "alienNav9" );
-  cgs.media.alienNav8 = trap_R_RegisterShader( "alienNav8" );
-  cgs.media.alienNav7 = trap_R_RegisterShader( "alienNav7" );
-  cgs.media.alienNav6 = trap_R_RegisterShader( "alienNav6" );
-  cgs.media.alienNav5 = trap_R_RegisterShader( "alienNav5" );
-  cgs.media.alienNav4 = trap_R_RegisterShader( "alienNav4" );
-  cgs.media.alienNav3 = trap_R_RegisterShader( "alienNav3" );
-  cgs.media.alienNav2 = trap_R_RegisterShader( "alienNav2" );
-  cgs.media.alienNav1 = trap_R_RegisterShader( "alienNav1" );
   cgs.media.alienHealth = trap_R_RegisterShader( "gfx/2d/droidhealth.tga" );
 
   cgs.media.armorModel = trap_R_RegisterModel( "models/powerups/armor/armor_yel.md3" );
diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c
index b8794354..8b832966 100644
--- a/src/cgame/cg_weapons.c
+++ b/src/cgame/cg_weapons.c
@@ -1331,9 +1331,9 @@ void CG_AddViewWeapon( playerState_t *ps ) {
   weaponInfo_t  *weapon;
 
   if( ( ps->persistant[PERS_TEAM] == TEAM_SPECTATOR ) ||
-      ( ps->stats[ STAT_STATE ] & SS_INFESTING ) ) {
+      ( ps->stats[ STAT_STATE ] & SS_INFESTING ) ||
+      ( ps->stats[ STAT_STATE ] & SS_HOVELING ) )
     return;
-  }
 
   //TA: no weapon carried - can't draw it
   if( ps->weapon == WP_NONE )