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/qcommon/qcommon.h | |
| 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/qcommon/qcommon.h')
| -rw-r--r-- | src/qcommon/qcommon.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h index 4b1d48c2..10f548e3 100644 --- a/src/qcommon/qcommon.h +++ b/src/qcommon/qcommon.h @@ -585,7 +585,7 @@ qboolean FS_Initialized( void ); void FS_InitFilesystem ( void ); void FS_Shutdown( qboolean closemfp ); -qboolean FS_ConditionalRestart( int checksumFeed ); +qboolean FS_ConditionalRestart(int checksumFeed, qboolean disconnect); void FS_Restart( int checksumFeed ); // shutdown and restart the filesystem so changes to fs_gamedir can take effect @@ -796,7 +796,7 @@ void QDECL Com_Printf( const char *fmt, ... ) __attribute__ ((format (printf, void QDECL Com_DPrintf( const char *fmt, ... ) __attribute__ ((format (printf, 1, 2))); void QDECL Com_Error( int code, const char *fmt, ... ) __attribute__ ((format (printf, 2, 3))); void Com_Quit_f( void ); -void Com_GameRestart(int checksumFeed, qboolean clientRestart); +void Com_GameRestart(int checksumFeed, qboolean disconnect); int Com_Milliseconds( void ); // will be journaled properly unsigned Com_BlockChecksum( const void *buffer, int length ); @@ -847,6 +847,7 @@ extern int time_backend; // renderer backend time extern int com_frameTime; extern qboolean com_errorEntered; +extern qboolean com_fullyInitialized; extern fileHandle_t com_journalFile; extern fileHandle_t com_journalDataFile; @@ -936,7 +937,7 @@ void CL_InitKeyCommands( void ); void CL_Init( void ); void CL_Disconnect( qboolean showMainMenu ); -void CL_Shutdown( char *finalmsg ); +void CL_Shutdown(char *finalmsg, qboolean disconnect); void CL_Frame( int msec ); qboolean CL_GameCommand( void ); void CL_KeyEvent (int key, qboolean down, unsigned time); @@ -966,12 +967,15 @@ void CL_ForwardCommandToServer( const char *string ); void CL_CDDialog( void ); // bring up the "need a cd to play" dialog -void CL_ShutdownAll( void ); -// shutdown all the client stuff - void CL_FlushMemory( void ); // dump all memory on an error +void CL_ShutdownAll(qboolean shutdownRef); +// shutdown client + +void CL_InitRef(void); +// initialize renderer interface + void CL_StartHunkUsers( qboolean rendererOnly ); // start all the client stuff using the hunk |