Merge branch 'master' into Mario/vehicles

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / View.qc

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 8c9d59dd91f9a77e421d746a0b8193a8c449fb0f..b33339bedd5bf062cd435019df2c4a336b51631b 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -353,8 +353,6 @@ const float CAMERA_FREE = 1;
 const float CAMERA_CHASE = 2;
 float reticle_type;
 string NextFrameCommand;
-void CSQC_SPIDER_HUD();
-void CSQC_RAPTOR_HUD();
 
 vector freeze_org, freeze_ang;
 entity nightvision_noise, nightvision_noise2;
@@ -1566,18 +1564,7 @@ void CSQC_UpdateView(float w, float h)
                HUD_Panel_Mouse();
 
     if(hud && !intermission)
-    {
-        if(hud == HUD_SPIDERBOT)
-            CSQC_SPIDER_HUD();
-        else if(hud == HUD_WAKIZASHI)
-            CSQC_WAKIZASHI_HUD();
-        else if(hud == HUD_RAPTOR)
-            CSQC_RAPTOR_HUD();
-        else if(hud == HUD_BUMBLEBEE)
-            CSQC_BUMBLE_HUD();
-        else if(hud == HUD_BUMBLEBEE_GUN)
-            CSQC_BUMBLE_GUN_HUD();
-    }
+               VEH_ACTION(hud, VR_HUD);
 
        cl_notice_run();
 
@@ -1602,22 +1589,6 @@ void CSQC_common_hud(void)
         HUD_FinaleOverlay();
         HUD_Reset();
     }
-       /*
-       switch(hud)
-       {
-               case HUD_SPIDERBOT:
-                       CSQC_SPIDER_HUD();
-                       break;
-
-               case HUD_WAKIZASHI:
-                       CSQC_WAKIZASHI_HUD();
-                       break;
-
-        case HUD_BUMBLEBEE:
-            CSQC_BUMBLE_HUD();
-            break;
-       }
-       */
 }