aboutsummaryrefslogtreecommitdiffstats
path: root/code/client/cl_cgame.c
diff options
context:
space:
mode:
authortjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-03-02 17:32:22 +0000
committertjw <tjw@edf5b092-35ff-0310-97b2-ce42778d08ea>2007-03-02 17:32:22 +0000
commitd13b3695113e9843c50b8c9712dabd9df2a4d442 (patch)
tree3fa9754f512fe88c8c5e8ad114a7aae4baa84430 /code/client/cl_cgame.c
parent5691dfa32ca097d737193e0b3362ad29bda336c5 (diff)
downloadioquake3-aero-d13b3695113e9843c50b8c9712dabd9df2a4d442.tar.gz
ioquake3-aero-d13b3695113e9843c50b8c9712dabd9df2a4d442.zip
* (bug 3018) need to call Cvar_SetCheatState() after CG_INIT and UI_INIT to
override user-defined cvar values for CVAR_CHEAT cvars that could be registered in cgame and ui. git-svn-id: svn://svn.icculus.org/quake3/trunk@1048 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/client/cl_cgame.c')
-rw-r--r--code/client/cl_cgame.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/code/client/cl_cgame.c b/code/client/cl_cgame.c
index e2c682e..d767b8a 100644
--- a/code/client/cl_cgame.c
+++ b/code/client/cl_cgame.c
@@ -746,6 +746,10 @@ void CL_InitCGame( void ) {
// otherwise server commands sent just before a gamestate are dropped
VM_Call( cgvm, CG_INIT, clc.serverMessageSequence, clc.lastExecutedServerCommand, clc.clientNum );
+ // reset any CVAR_CHEAT cvars registered by cgame
+ if ( !cl_connectedToCheatServer )
+ Cvar_SetCheatState();
+
// we will send a usercmd this frame, which
// will cause the server to send us the first snapshot
cls.state = CA_PRIMED;