From 02d5a09a555eda05f6208409ff07a60144b69840 Mon Sep 17 00:00:00 2001 From: terencehill Date: Thu, 8 Oct 2015 21:16:55 +0200 Subject: [PATCH] Unfold CSQC_common_hud(void) --- qcsrc/client/view.qc | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index defec0708..f982b59d7 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -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; -- 2.39.2