diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-06-21 11:18:35 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 21:47:33 +0000 |
| commit | 555eaebb1b7cb7c4a5e1036892b0effbd62766ae (patch) | |
| tree | 1038802c3629c85c47a62a5013f2a7271d485bec /src/client/cl_ui.c | |
| parent | e09392335162f87cd16257506e600268c2cd8ec9 (diff) | |
- Improve game_restart: * differing screen resolutions and network settings are now honoured when changing fs_game * Fix hunk memory leak on game_restart * Move cls.state and cls.servername to clc so connection state is fully preserved over game_restart * Revert back to previous fs_game after disconnecting from a server that triggered a game_restart * Fix error dialog popping up after every game_restart if an error happened previously (reported by Ensiform) - Fixed that not all commands added by CL_Init() would be removed by CL_Shutdown()
Diffstat (limited to 'src/client/cl_ui.c')
| -rw-r--r-- | src/client/cl_ui.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/client/cl_ui.c b/src/client/cl_ui.c index 8ee5d1b4..faa1237a 100644 --- a/src/client/cl_ui.c +++ b/src/client/cl_ui.c @@ -32,8 +32,8 @@ GetClientState */ static void GetClientState( uiClientState_t *state ) { state->connectPacketCount = clc.connectPacketCount; - state->connState = cls.state; - Q_strncpyz( state->servername, cls.servername, sizeof( state->servername ) ); + state->connState = clc.state; + Q_strncpyz( state->servername, clc.servername, sizeof( state->servername ) ); Q_strncpyz( state->updateInfoString, cls.updateInfoString, sizeof( state->updateInfoString ) ); Q_strncpyz( state->messageString, clc.serverMessage, sizeof( state->messageString ) ); state->clientNum = cl.snap.ps.clientNum; @@ -1103,7 +1103,7 @@ void CL_InitUI( void ) { v = VM_Call( uivm, UI_GETAPIVERSION ); if (v == UI_OLD_API_VERSION) { // init for this gamestate - VM_Call( uivm, UI_INIT, (cls.state >= CA_AUTHORIZING && cls.state < CA_ACTIVE)); + VM_Call( uivm, UI_INIT, (clc.state >= CA_AUTHORIZING && clc.state < CA_ACTIVE)); } else if (v != UI_API_VERSION) { Com_Error( ERR_DROP, "User Interface is version %d, expected %d", v, UI_API_VERSION ); @@ -1111,7 +1111,7 @@ void CL_InitUI( void ) { } else { // init for this gamestate - VM_Call( uivm, UI_INIT, (cls.state >= CA_AUTHORIZING && cls.state < CA_ACTIVE) ); + VM_Call( uivm, UI_INIT, (clc.state >= CA_AUTHORIZING && clc.state < CA_ACTIVE) ); // show where the ui folder was loaded from Cmd_ExecuteString( "which ui/\n" ); |