]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Unfold CSQC_common_hud(void)
authorterencehill <piuntn@gmail.com>
Thu, 8 Oct 2015 19:16:55 +0000 (21:16 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 8 Oct 2015 19:16:55 +0000 (21:16 +0200)
qcsrc/client/view.qc

index defec0708fb3d643f51162b0597c9bad04983233..f982b59d7d66fc890845981290ce89aef0353e99 100644 (file)
@@ -394,8 +394,6 @@ float TrueAimCheck()
        return SHOTTYPE_HITWORLD;
 }
 
-void CSQC_common_hud(void);
-
 void PostInit(void);
 void CSQC_Demo_Camera();
 float HUD_WouldDrawScoreboard();
@@ -1031,7 +1029,17 @@ void HUD_Draw()
 
        if(autocvar_r_letterbox == 0)
                if(autocvar_viewsize < 120)
-                       CSQC_common_hud();
+               {
+                       if(!(gametype == MAPINFO_TYPE_RACE || gametype == MAPINFO_TYPE_CTS))
+                               Accuracy_LoadLevels();
+
+                       HUD_Main();
+                       HUD_Vehicle();
+                       HUD_DrawScoreboard();
+
+                       if (scoreboard_active || intermission == 2)
+                               HUD_Reset();
+               }
 
        // crosshair goes VERY LAST
        UpdateDamage();
@@ -1894,20 +1902,6 @@ void CSQC_UpdateView(float w, float h)
        setproperty(VF_SIZE, '1 0 0' * w + '0 1 0' * h);
 }
 
-void CSQC_common_hud(void)
-{
-       if(!(gametype == MAPINFO_TYPE_RACE || gametype == MAPINFO_TYPE_CTS))
-               Accuracy_LoadLevels();
-
-       HUD_Main(); // always run these functions for alpha checks
-       HUD_Vehicle();
-       HUD_DrawScoreboard();
-
-       // scoreboard/accuracy, map/gametype voting screen
-       if (scoreboard_active || intermission == 2)
-               HUD_Reset();
-}
-
 
 // following vectors must be global to allow seamless switching between camera modes
 vector camera_offset, current_camera_offset, mouse_angles, current_angles, current_origin, current_position;