Add support for CACHEPICFLAG_LINEAR (currently unused), ported from wrath-darkplaces

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 01a6fbdd1c27091dd95a747fc04c875abdc608fb..208b6303668ee24438b6d07cefb792868c349f3f 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -125,6 +125,8 @@ int                 scr_con_margin_bottom;
 
 extern int     con_vislines;
 
+extern int cl_punchangle_applied;
+
 static void SCR_ScreenShot_f(cmd_state_t *cmd);
 static void R_Envmap_f(cmd_state_t *cmd);
 
@@ -343,7 +345,7 @@ static void SCR_DrawNetGraph (void)
        graphwidth = 120;
        graphheight = 70;
        graphscale = 1.0f / 1500.0f;
-       graphlimit = rate.integer;
+       graphlimit = cl_rate.integer;
 
        netgraphsperrow = (vid_conwidth.integer + separator2) / (graphwidth * 2 + separator1 + separator2);
        netgraphsperrow = max(netgraphsperrow, 1);
@@ -2257,6 +2259,14 @@ static void SCR_DrawScreen (void)
                if ((key_dest == key_game || key_dest == key_message) && !r_letterbox.value && !scr_loading)
                        Con_DrawNotify ();      // only draw notify in game
 
+       if(cl.islocalgame)
+       {
+               if (key_dest != key_game || key_consoleactive)
+                       host.paused = true;
+               else
+                       host.paused = false;
+       }
+       
        if (cls.signon == SIGNONS)
        {
                SCR_DrawNet ();
@@ -2718,6 +2728,9 @@ void CL_UpdateScreen(void)
        double drawscreendelta;
        r_viewport_t viewport;
 
+       // TODO: Move to a better place.
+       cl_punchangle_applied = 0;
+
        if(drawscreenstart)
        {
                drawscreendelta = Sys_DirtyTime() - drawscreenstart;