diff options
| author | Tim Angus <tim@ngus.net> | 2007-03-21 23:55:51 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2007-03-21 23:55:51 +0000 |
| commit | d899c25c571ed061bba9725cf7b35d492cc6e518 (patch) | |
| tree | 25268c9b3e381d00c2885c1fec7a54f46f56d93b /src/client/cl_ui.c | |
| parent | cb5b4648d45b3f078a6ae3da45707764ca46e241 (diff) | |
* ioq3-r1052 merge
Diffstat (limited to 'src/client/cl_ui.c')
| -rw-r--r-- | src/client/cl_ui.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/client/cl_ui.c b/src/client/cl_ui.c index c740d3e8..2ba7736a 100644 --- a/src/client/cl_ui.c +++ b/src/client/cl_ui.c @@ -690,11 +690,11 @@ The ui module is making a system call intptr_t CL_UISystemCalls( intptr_t *args ) { switch( args[0] ) { case UI_ERROR: - Com_Error( ERR_DROP, "%s", VMA(1) ); + Com_Error( ERR_DROP, "%s", (const char*)VMA(1) ); return 0; case UI_PRINT: - Com_Printf( "%s", VMA(1) ); + Com_Printf( "%s", (const char*)VMA(1) ); return 0; case UI_MILLISECONDS: @@ -1019,7 +1019,7 @@ intptr_t CL_UISystemCalls( intptr_t *args ) { return 0; default: - Com_Error( ERR_DROP, "Bad UI system trap: %i", args[0] ); + Com_Error( ERR_DROP, "Bad UI system trap: %ld", (long int) args[0] ); } @@ -1080,6 +1080,10 @@ void CL_InitUI( void ) { // init for this gamestate VM_Call( uivm, UI_INIT, (cls.state >= CA_AUTHORIZING && cls.state < CA_ACTIVE) ); } + + // reset any CVAR_CHEAT cvars registered by ui + if ( !cl_connectedToCheatServer ) + Cvar_SetCheatState(); } /* |