diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-08-01 10:16:40 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-10 23:11:06 +0000 |
| commit | 3afa3cecfe43264e09c07ab21518ed7fe0acba7d (patch) | |
| tree | 3137f152498f6893b1bf7618e0ab5e5923de2e11 /src/qcommon | |
| parent | c039c00ca0fe051f8ed243c08d238e739027cb76 (diff) | |
- Fix already defined command warnings for minimize - Fix recursive CL_Shutdown warning and "command already defined" warnings when quitting while playing on a server that changed the gamedir.
Diffstat (limited to 'src/qcommon')
| -rw-r--r-- | src/qcommon/common.c | 10 | ||||
| -rw-r--r-- | src/qcommon/qcommon.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/qcommon/common.c b/src/qcommon/common.c index 01183da0..17ae4ee1 100644 --- a/src/qcommon/common.c +++ b/src/qcommon/common.c @@ -329,8 +329,8 @@ void QDECL Com_Error( int code, const char *fmt, ... ) { longjmp (abortframe, -1); } else { VM_Forced_Unload_Start(); - CL_Shutdown (va("Client fatal crashed: %s", com_errorMessage), qtrue); - SV_Shutdown (va("Server fatal crashed: %s", com_errorMessage)); + CL_Shutdown(va("Client fatal crashed: %s", com_errorMessage), qtrue, qtrue); + SV_Shutdown(va("Server fatal crashed: %s", com_errorMessage)); VM_Forced_Unload_Done(); } @@ -357,8 +357,8 @@ void Com_Quit_f( void ) { // Sys_Quit will kill this process anyways, so // a corrupt call stack makes no difference VM_Forced_Unload_Start(); - SV_Shutdown (p[0] ? p : "Server quit"); - CL_Shutdown (p[0] ? p : "Client quit", qtrue); + SV_Shutdown(p[0] ? p : "Server quit"); + CL_Shutdown(p[0] ? p : "Client quit", qtrue, qtrue); VM_Forced_Unload_Done(); Com_Shutdown (); FS_Shutdown(qtrue); @@ -2407,7 +2407,7 @@ void Com_GameRestart(int checksumFeed, qboolean disconnect) if(disconnect) CL_Disconnect(qfalse); - CL_Shutdown("Game directory changed", disconnect); + CL_Shutdown("Game directory changed", disconnect, qfalse); } FS_Restart(checksumFeed); diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h index 980d0cfb..16b54e33 100644 --- a/src/qcommon/qcommon.h +++ b/src/qcommon/qcommon.h @@ -946,7 +946,7 @@ void CL_InitKeyCommands( void ); void CL_Init( void ); void CL_Disconnect( qboolean showMainMenu ); -void CL_Shutdown(char *finalmsg, qboolean disconnect); +void CL_Shutdown(char *finalmsg, qboolean disconnect, qboolean quit); void CL_Frame( int msec ); qboolean CL_GameCommand( void ); void CL_KeyEvent (int key, qboolean down, unsigned time); |