fix warnings

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

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index 281a50d4bf3e986dd28d7118282f4187417307ec..8198639a4c686174d763eb284ccc8a2f17c48bb4 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,8 +336,6 @@ 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 HUD_WouldDrawScoreboard ();
@@ -343,6 +345,8 @@ 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"));
-       hud_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);
@@ -583,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;
@@ -934,7 +950,7 @@ void CSQC_SPIDER_HUD()
        }
        */
 
-       if (sb_showscores)
+       if (scoreboard_showscores)
        {
                HUD_DrawScoreboard();
                HUD_DrawCenterPrint();
@@ -948,9 +964,6 @@ 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"
-
 void CSQC_RAPTOR_HUD()
 {
        float rockets, reload, heat, hp, shield, energy;
@@ -1004,7 +1017,7 @@ 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)
        {
                HUD_DrawScoreboard();
                HUD_DrawCenterPrint();
@@ -1114,7 +1127,7 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66;
 
 
 
-       if (sb_showscores)
+       if (scoreboard_showscores)
        {
                HUD_DrawScoreboard();
                HUD_DrawCenterPrint();
@@ -1136,31 +1149,20 @@ void CSQC_common_hud(void)
                        // hud first
                        HUD_Main();
 
-                       // is this needed?
-                       //HUD_UpdatePlayerTeams();
-
-                       if (intermission == 2) // map voting screen
+                       // scoreboard/accuracy
+                       if (intermission == 2 && !scoreboard_showaccuracy && !scoreboard_showscores) // map voting screen
                        {
-                               if(sb_showaccuracy && spectatee_status != -1) {
-                                       HUD_DrawAccuracyStats();
-                               }
-                               else if(sb_showscores) {
-                                       HUD_DrawScoreboard();
-                               }
-                               else
-                                       HUD_FinaleOverlay();
-
+                               HUD_FinaleOverlay();
                                HUD_Reset();
                        }
-                       else if (sb_showscores || sb_showaccuracy || sb_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
-                       {
-                               if(sb_showaccuracy && spectatee_status != -1)
-                                       HUD_DrawAccuracyStats();
-                               else
-                                       HUD_DrawScoreboard();
+                       else if(scoreboard_showaccuracy && spectatee_status != -1)
+                               HUD_DrawAccuracyStats();
+                       else
+                               HUD_DrawScoreboard();
 
+                       if (scoreboard_showscores || scoreboard_showaccuracy || scoreboard_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
                                HUD_Reset();
-                       }
+
                        break;
 
                case HUD_SPIDERBOT: