COVERAGE! Also fixes prvm always running as PRVMSLOWINTERPRETER :(

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 2867607d88da1157118e3afd2f2012b13815d6cf..f476d3c09e6d94a0d8c3a908f1013b52d17b4e02 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -694,7 +694,9 @@ static void SCR_SetUpToDrawConsole (void)
 {
        // lines of console to display
        float conlines;
+#ifdef CONFIG_MENU
        static int framecounter = 0;
+#endif
 
        Con_CheckResize ();
 
@@ -707,8 +709,8 @@ static void SCR_SetUpToDrawConsole (void)
                        framecounter++;
        }
        else
-#endif
                framecounter = 0;
+#endif
 
        if (scr_conforcewhiledisconnected.integer && key_dest == key_game && cls.signon != SIGNONS)
                key_consoleactive |= KEY_CONSOLEACTIVE_FORCED;
@@ -2770,7 +2772,7 @@ void CL_UpdateScreen(void)
 
        loadingscreendone = false;
 
-       if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
+       if(IS_NEXUIZ_DERIVED(gamemode))
        {
                // play a bit with the palette (experimental)
                palette_rgb_pantscolormap[15][0] = (unsigned char) (128 + 127 * sin(cl.time / exp(1.0f) + 0.0f*M_PI/3.0f));