From 7a29a880de5abe7f15b0ea3f4878baf5b513a382 Mon Sep 17 00:00:00 2001
From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 9 Mar 2004 22:25:44 +0000
Subject: [PATCH] added scr_conforcewhiledisconnected cvar so it is possible to
disable the console forcing (and defaults off in GAME_FNIGGIUM)
git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@3989 d7cf8633-e32d-0410-b094-e92efae38249
---
cl_screen.c | 8 +++++++-
todo | 6 +++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/cl_screen.c b/cl_screen.c
index a616b57f..595808a9 100644
--- 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 c6a904f6..b5b0b8fa 100644
--- 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
--
2.39.5