fix scoreboard fading

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

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 9cccdb26c4833b6f151966f55b9239756b5e0fcc..8d2789e24b7ec6100d39697873f4ab0bc2edcbd8 100644 (file)
--- a/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@ -291,6 +291,10 @@ float TrueAimCheck()
                        mi = '-16 -16 -16';
                        ma = '16 16 16';
                        break;
+               case WEP_SEEKER: // projectile has a size!
+                       mi = '-2 -2 -2';
+                       ma = '2 2 2';
+                       break;
                case WEP_ELECTRO: // projectile has a size!
                        mi = '0 0 -3';
                        ma = '0 0 -3';
@@ -332,17 +336,17 @@ float TrueAimCheck()
 
 void CSQC_common_hud(void);
 
-void CSQC_kh_hud(void);
-void CSQC_ctf_hud(void);
 void PostInit(void);
 void CSQC_Demo_Camera();
-float Sbar_WouldDrawScoreboard ();
+float HUD_WouldDrawScoreboard ();
 float view_set;
 float camera_mode;
 string NextFrameCommand;
 void CSQC_SPIDER_HUD();
 void CSQC_RAPTOR_HUD();
 
+vector freeze_pmove_org, freeze_input_angles;
+
 void CSQC_UpdateView(float w, float h)
 {
        entity e;
@@ -361,10 +365,23 @@ void CSQC_UpdateView(float w, float h)
        vo = '0 0 1' * getstati(STAT_VIEWHEIGHT);
 
        warpzone_fixview_origin = pmove_org + vo;
-       warpzone_fixview_angles = input_angles;
+       warpzone_fixview_cl_viewangles = input_angles;
+       warpzone_fixview_angles = view_angles;
        WarpZone_FixView();
        pmove_org = warpzone_fixview_origin - vo;
-       input_angles = warpzone_fixview_angles;
+       input_angles = warpzone_fixview_cl_viewangles;
+       view_angles = warpzone_fixview_angles;
+
+       if(cvar("cl_lockview"))
+       {
+               pmove_org = freeze_pmove_org;
+               input_angles = view_angles = freeze_input_angles;
+               R_SetView(VF_ORIGIN, pmove_org + vo);
+               R_SetView(VF_ANGLES, view_angles);
+               //R_SetView(VF_CL_VIEWANGLES, input_angles);
+       }
+       freeze_pmove_org = pmove_org;
+       freeze_input_angles = input_angles;
 
        // Render the Scene
        if(!intermission || !view_set)
@@ -404,6 +421,7 @@ void CSQC_UpdateView(float w, float h)
        }
 #endif
 
+       TargetMusic_Advance();
        Fog_Force();
 
        drawframetime = max(0.000001, time - drawtime);
@@ -447,9 +465,7 @@ void CSQC_UpdateView(float w, float h)
                }
        }
 
-       hud_alpha_fg = cvar_or("hud_alpha_fg", 1) * (1 - cvar("_menu_alpha"));
-       sbar_currentammo = cvar("hud_showcurrentammo");
-       hud_hudselector = cvar("hud_hudselector");
+       hud_alpha_fg = cvar_or("hud_fg_alpha", 1) * (1 - cvar("_menu_alpha"));
        hud_accuracy_hud = cvar_or("hud_accuracy_hud", 1);
        ColorTranslateMode = cvar("cl_stripcolorcodes");
        activeweapon = getstati(STAT_SWITCHWEAPON);
@@ -457,7 +473,7 @@ void CSQC_UpdateView(float w, float h)
        if(f != teamplay)
        {
                teamplay = f;
-               Sbar_InitScores();
+               HUD_InitScores();
        }
 
        if(last_weapon != activeweapon) {
@@ -507,15 +523,15 @@ void CSQC_UpdateView(float w, float h)
 
        // Draw the Crosshair
        float scoreboard_active;
-       scoreboard_active = Sbar_WouldDrawScoreboard();
+       scoreboard_active = HUD_WouldDrawScoreboard();
        R_SetView(VF_DRAWCROSSHAIR, 0); //Make sure engine crosshairs are always hidden
 
        // Draw the Engine Status Bar (the default Quake HUD)
-       R_SetView(VF_DRAWENGINESBAR, 0);
+       R_SetView(VF_DRAWENGINEHUD, 0);
 
        // fetch this one only once per frame
-       sbar_showbinds = cvar("sbar_showbinds");
-       sbar_showbinds_limit = cvar("sbar_showbinds_limit");
+       hud_showbinds = cvar("hud_showbinds");
+       hud_showbinds_limit = cvar("hud_showbinds_limit");
 
        // Update the mouse position
        /*
@@ -561,13 +577,8 @@ void CSQC_UpdateView(float w, float h)
                        self.draw2d();
        self = e;
 
-       // draw sbar
+       // draw hud
        if(cvar("r_letterbox") == 0) {
-               if (cvar("cl_showspeed"))
-                       HUD_ShowSpeed();
-               if (cvar("cl_showacceleration"))
-                       HUD_ShowAcceleration();
-
                HUD_DrawCenterPrint(); // draw centerprint messages even if viewsize >= 120
        }
 
@@ -588,7 +599,7 @@ void CSQC_UpdateView(float w, float h)
                                CSQC_common_hud();
 
                // crosshair goes VERY LAST
-               if(!scoreboard_active && !ons_showmap && !camera_active && !hudconf_active) {
+               if(!scoreboard_active && !camera_active && !hudconf_active) {
                        // TrueAim check
                        float shottype;
                        float bullets, ring_scale;
@@ -939,9 +950,9 @@ void CSQC_SPIDER_HUD()
        }
        */
 
-       if (sb_showscores)
+       if (scoreboard_showscores)
        {
-               Sbar_DrawScoreboard();
+               HUD_DrawScoreboard();
                HUD_DrawCenterPrint();
        }
 
@@ -953,8 +964,9 @@ void CSQC_SPIDER_HUD()
 #define raptor_g2 "gfx/vehicles/raptor_bombs.tga"
 #define raptor_s "gfx/vehicles/shiled.tga"
 
-#define spider_a1 "gfx/hud/sb_rocket.tga"
-#define spider_a2 "gfx/sb_bullets.tga"
+// these are causing warnings!
+#define spider_a1 "gfx/hud/scoreboard_rocket.tga"
+#define spider_a2 "gfx/scoreboard_bullets.tga"
 
 void CSQC_RAPTOR_HUD()
 {
@@ -1009,9 +1021,9 @@ void CSQC_RAPTOR_HUD()
     drawpic(hudloc, raptor_g2, picsize, '1 1 1' * reload + '1 0 0' *  (1 - reload), 1, DRAWFLAG_NORMAL);
 
 
-       if (sb_showscores)
+       if (scoreboard_showscores)
        {
-               Sbar_DrawScoreboard();
+               HUD_DrawScoreboard();
                HUD_DrawCenterPrint();
        }
 
@@ -1119,9 +1131,9 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66;
 
 
 
-       if (sb_showscores)
+       if (scoreboard_showscores)
        {
-               Sbar_DrawScoreboard();
+               HUD_DrawScoreboard();
                HUD_DrawCenterPrint();
        }
 
@@ -1130,7 +1142,7 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66;
 
 void CSQC_common_hud(void)
 {
-       // Sbar_SortFrags(); done in Sbar_Draw
+       // HUD_SortFrags(); done in HUD_Draw
        float hud;
        hud = getstati(STAT_HUD);
 
@@ -1138,7 +1150,25 @@ void CSQC_common_hud(void)
        switch(hud)
        {
                case HUD_NORMAL:
+                       // hud first
                        HUD_Main();
+
+                       // scoreboard/accuracy
+                       if(scoreboard_showaccuracy && spectatee_status != -1)
+                               HUD_DrawAccuracyStats();
+                       else
+                               HUD_DrawScoreboard();
+
+                       if (intermission == 2) // map voting screen
+                               if(!scoreboard_showaccuracy && !scoreboard_showscores)
+                               {
+                                       HUD_FinaleOverlay();
+                                       HUD_Reset();
+                               }
+
+                       else if (scoreboard_showscores || scoreboard_showaccuracy || scoreboard_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
+                               HUD_Reset();
+
                        break;
 
                case HUD_SPIDERBOT: