added scr_conforcewhiledisconnected cvar so it is possible to disable the console...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3989 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_screen.c b/cl_screen.c
index a616b57f4eec2c7f44241387b6447f490aa595aa..595808a93d389f8946e01c81b2dbceee0d49ad05 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -9,6 +9,7 @@ cvar_t scr_fov = {CVAR_SAVE, "fov","90"};       // 1 - 170
 cvar_t scr_conspeed = {CVAR_SAVE, "scr_conspeed","900"}; // LordHavoc: quake used 300
 cvar_t scr_conalpha = {CVAR_SAVE, "scr_conalpha", "1"};
 cvar_t scr_conbrightness = {CVAR_SAVE, "scr_conbrightness", "0.2"};
+cvar_t scr_conforcewhiledisconnected = {CVAR_SAVE, "scr_conforcewhiledisconnected", "1"};
 cvar_t scr_centertime = {0, "scr_centertime","2"};
 cvar_t scr_showram = {CVAR_SAVE, "showram","1"};
 cvar_t scr_showturtle = {CVAR_SAVE, "showturtle","0"};
@@ -243,7 +244,7 @@ void SCR_SetUpToDrawConsole (void)
 {
        Con_CheckResize ();
 
-       if (key_dest == key_game && cls.signon != SIGNONS)
+       if (key_dest == key_game && cls.signon != SIGNONS && scr_conforcewhiledisconnected.integer)
                key_consoleactive |= KEY_CONSOLEACTIVE_FORCED;
        else
                key_consoleactive &= ~KEY_CONSOLEACTIVE_FORCED;
@@ -461,6 +462,7 @@ void CL_Screen_Init(void)
        Cvar_RegisterVariable (&scr_conspeed);
        Cvar_RegisterVariable (&scr_conalpha);
        Cvar_RegisterVariable (&scr_conbrightness);
+       Cvar_RegisterVariable (&scr_conforcewhiledisconnected);
        Cvar_RegisterVariable (&scr_showram);
        Cvar_RegisterVariable (&scr_showturtle);
        Cvar_RegisterVariable (&scr_showpause);
@@ -477,6 +479,10 @@ void CL_Screen_Init(void)
        Cmd_AddCommand ("screenshot",SCR_ScreenShot_f);
        Cmd_AddCommand ("envmap", R_Envmap_f);
 
+       // different default in GAME_FNIGGIUM
+       if (gamemode == GAME_FNIGGIUM)
+               Cvar_SetQuick(&scr_conforcewhiledisconnected, 0);
+       
        scr_initialized = true;
 }
 

diff --git a/todo b/todo
index c6a904f623e66d42988c489c86295eccb3afabef..b5b0b8fac86a6d88da3658d42d14a2b94d677b56 100644 (file)
--- a/todo
+++ b/todo
@@ -41,9 +41,9 @@
 -n darkplaces: write a readme (Antti)
 -n dpmod: make grapple off-hand (joe hill)
 -n darkplaces: "edict -1" and other invalid numbers cause an error, should just complain (Supajoe)
-0 darkplaces: GAME_FNIGGIUM: console doesn't show unless you manually pull it down
-0 darkplaces: adaptive patch subdivision levels on X and Y based on r_subdivisions cvar
-0 darkplaces: add "skin" and "pflags" parsing to light entity loader in rtlights mode (Electro)  
+-n darkplaces: GAME_FNIGGIUM: console doesn't show unless you manually pull it down (Sajt)
+d darkplaces: adaptive patch subdivision levels on X and Y based on r_subdivisions cvar
+d darkplaces: add "skin" and "pflags" parsing to light entity loader in rtlights mode (Electro)  
 0 darkplaces: add -benchmark commandline option which plays a demo, appends the resulting min/max/avg fps to gamedir/benchmark.log with commandline so people know what settings were used, like +exec realtimelow.cfg, +exec realtimemed.cfg, etc (romi)
 0 darkplaces: add DP_EF_NOSHADOW extension (Urre)
 0 darkplaces: add DP_GFX_QUAKE3MODELTAGS, DP_GFX_SKINFILES, and any other new extensions to the wiki