From 29779ce432d34c9f0bc8878761d07c194162e6d0 Mon Sep 17 00:00:00 2001 From: molivier Date: Thu, 2 Dec 2004 09:46:27 +0000 Subject: [PATCH] - Removed Con_SafePrint and Con_SafePrintf since they now does the same things as Con_Print and Con_Printf - Moved log initialization right after memory initialization to make the log functions available as early as possible - Moved the removal of "qconsole.log" (when -condebug is in the command line) in FS_Init - Moved the "Console initialized." message so it is actually printed at console - Removed the declaration of "con_chars" (it doesn't exist anymore) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@4818 d7cf8633-e32d-0410-b094-e92efae38249 --- cd_sdl.c | 2 +- common.c | 1 - conproc.c | 6 +++--- console.c | 37 ++------------------------------- console.h | 5 +---- fs.c | 4 ++++ snd_sdl.c | 4 ++-- snd_win.c | 58 ++++++++++++++++++++++++++-------------------------- sys_shared.c | 1 + vid_wgl.c | 16 +++++++-------- 10 files changed, 51 insertions(+), 83 deletions(-) diff --git a/cd_sdl.c b/cd_sdl.c index 11eb01ea..916d6797 100644 --- a/cd_sdl.c +++ b/cd_sdl.c @@ -130,7 +130,7 @@ int CDAudio_SysUpdate (void) void CDAudio_SysInit (void) { if( SDL_InitSubSystem( SDL_INIT_CDROM ) == -1 ) - Con_SafePrint( "Failed to init the CDROM SDL subsystem!\n" ); + Con_Print( "Failed to init the CDROM SDL subsystem!\n" ); Cmd_AddCommand( "cddrive", CDAudio_SDL_CDDrive_f ); } diff --git a/common.c b/common.c index 75c7ae9b..a6dca4ea 100644 --- a/common.c +++ b/common.c @@ -992,7 +992,6 @@ void COM_Init (void) Mathlib_Init(); FS_Init (); - Log_Init (); COM_CheckRegistered (); } diff --git a/conproc.c b/conproc.c index a991fe5d..d2a016ba 100644 --- a/conproc.c +++ b/conproc.c @@ -59,7 +59,7 @@ void InitConProc (HANDLE hFile, HANDLE heventParent, HANDLE heventChild) if (!heventDone) { - Con_SafePrint("Couldn't create heventDone\n"); + Con_Print("Couldn't create heventDone\n"); return; } @@ -71,7 +71,7 @@ void InitConProc (HANDLE hFile, HANDLE heventParent, HANDLE heventChild) &dwID)) { CloseHandle (heventDone); - Con_SafePrint("Couldn't create QHOST thread\n"); + Con_Print("Couldn't create QHOST thread\n"); return; } @@ -114,7 +114,7 @@ DWORD RequestProc (DWORD dwNichts) // hfileBuffer is invalid. Just leave. if (!pBuffer) { - Con_SafePrint("Invalid hfileBuffer\n"); + Con_Print("Invalid hfileBuffer\n"); break; } diff --git a/console.c b/console.c index 592e338e..a053432a 100644 --- a/console.c +++ b/console.c @@ -129,7 +129,6 @@ void Log_Init (void) { Cvar_SetQuick (&log_file, "qconsole.log"); Cvar_SetValueQuick (&log_sync, 1); - unlink (va("%s/qconsole.log", fs_gamedir)); } } @@ -433,8 +432,6 @@ void Con_Init (void) con_linewidth = -1; Con_CheckResize (); - Con_Print("Console initialized.\n"); - // register our cvars Cvar_RegisterVariable (&con_notifytime); Cvar_RegisterVariable (&con_notify); @@ -444,7 +441,9 @@ void Con_Init (void) Cmd_AddCommand ("messagemode", Con_MessageMode_f); Cmd_AddCommand ("messagemode2", Con_MessageMode2_f); Cmd_AddCommand ("clear", Con_Clear_f); + con_initialized = true; + Con_Print("Console initialized.\n"); } @@ -704,38 +703,6 @@ void Con_DPrintf(const char *fmt, ...) } -/* -================ -Con_SafePrint - -Okay to call even when the screen can't be updated -================== -*/ -void Con_SafePrint(const char *msg) -{ - Con_Print(msg); -} - -/* -================== -Con_SafePrintf - -Okay to call even when the screen can't be updated -================== -*/ -void Con_SafePrintf(const char *fmt, ...) -{ - va_list argptr; - char msg[MAXPRINTMSG]; - - va_start(argptr,fmt); - vsprintf(msg,fmt,argptr); - va_end(argptr); - - Con_Print(msg); -} - - /* ============================================================================== diff --git a/console.h b/console.h index 19dc08ce..a6267b9c 100644 --- a/console.h +++ b/console.h @@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern int con_totallines; extern int con_backscroll; extern qboolean con_initialized; -extern qbyte *con_chars; void Con_CheckResize (void); void Con_Init (void); @@ -36,8 +35,6 @@ void Con_Print(const char *txt); void Con_Printf(const char *fmt, ...); void Con_DPrint(const char *msg); void Con_DPrintf(const char *fmt, ...); -void Con_SafePrint(const char *msg); -void Con_SafePrintf(const char *fmt, ...); void Con_Clear_f (void); void Con_DrawNotify (void); void Con_ClearNotify (void); @@ -60,7 +57,7 @@ void Con_DisplayList(const char **list); void Log_Init (void); void Log_Close (void); void Log_Start (void); -// Log_Print and Log_Printf can be used as soon as the FS initialization is done + void Log_Print(const char *logfilename, const char *msg); void Log_Printf(const char *logfilename, const char *fmt, ...); diff --git a/fs.c b/fs.c index 8298a5e9..157a9c7b 100644 --- a/fs.c +++ b/fs.c @@ -1031,6 +1031,10 @@ void FS_Init (void) Cvar_SetQuick (&scr_screenshot_name, com_modname); } } + + // If "-condebug" is in the command line, remove the previous log file + if (COM_CheckParm ("-condebug") != 0) + unlink (va("%s/qconsole.log", fs_gamedir)); } diff --git a/snd_sdl.c b/snd_sdl.c index 4b262a69..de0f3dc9 100644 --- a/snd_sdl.c +++ b/snd_sdl.c @@ -87,7 +87,7 @@ qboolean SNDDMA_Init(void) // Init the SDL Audio subsystem if( SDL_InitSubSystem( SDL_INIT_AUDIO ) ) { - Con_SafePrint( "Initializing the SDL Audio subsystem failed!\n" ); + Con_Print( "Initializing the SDL Audio subsystem failed!\n" ); return false; } @@ -124,7 +124,7 @@ qboolean SNDDMA_Init(void) spec.samples = AUDIO_SDL_SAMPLES; if( SDL_OpenAudio( &spec, NULL ) ) { - Con_SafePrint( "Failed to open the audio device!\n" ); + Con_Print( "Failed to open the audio device!\n" ); Con_DPrintf( "Audio Specification:\n" "\tChannels : %i\n" diff --git a/snd_win.c b/snd_win.c index 3a1de319..8197b256 100644 --- a/snd_win.c +++ b/snd_win.c @@ -218,7 +218,7 @@ sndinitstat SNDDMA_InitDirect (void) if (hInstDS == NULL) { - Con_SafePrint("Couldn't load dsound.dll\n"); + Con_Print("Couldn't load dsound.dll\n"); return SIS_FAILURE; } @@ -226,7 +226,7 @@ sndinitstat SNDDMA_InitDirect (void) if (!pDirectSoundCreate) { - Con_SafePrint("Couldn't get DS proc addr\n"); + Con_Print("Couldn't get DS proc addr\n"); return SIS_FAILURE; } } @@ -235,7 +235,7 @@ sndinitstat SNDDMA_InitDirect (void) { if (hresult != DSERR_ALLOCATED) { - Con_SafePrint("DirectSound create failed\n"); + Con_Print("DirectSound create failed\n"); return SIS_FAILURE; } @@ -245,7 +245,7 @@ sndinitstat SNDDMA_InitDirect (void) "Sound not available", MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY) { - Con_SafePrint("DirectSoundCreate failure\n hardware already in use\n"); + Con_Print("DirectSoundCreate failure\n hardware already in use\n"); return SIS_NOTAVAIL; } } @@ -254,19 +254,19 @@ sndinitstat SNDDMA_InitDirect (void) if (DS_OK != pDS->lpVtbl->GetCaps (pDS, &dscaps)) { - Con_SafePrint("Couldn't get DS caps\n"); + Con_Print("Couldn't get DS caps\n"); } if (dscaps.dwFlags & DSCAPS_EMULDRIVER) { - Con_SafePrint("No DirectSound driver installed\n"); + Con_Print("No DirectSound driver installed\n"); FreeSound (); return SIS_FAILURE; } if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_EXCLUSIVE)) { - Con_SafePrint("Set coop level failed\n"); + Con_Print("Set coop level failed\n"); FreeSound (); return SIS_FAILURE; } @@ -293,12 +293,12 @@ sndinitstat SNDDMA_InitDirect (void) if (DS_OK != pDSPBuf->lpVtbl->SetFormat (pDSPBuf, &pformat)) { if (snd_firsttime) - Con_SafePrint("Set primary sound buffer format: no\n"); + Con_Print("Set primary sound buffer format: no\n"); } else { if (snd_firsttime) - Con_SafePrint("Set primary sound buffer format: yes\n"); + Con_Print("Set primary sound buffer format: yes\n"); primary_format_set = true; } @@ -320,7 +320,7 @@ sndinitstat SNDDMA_InitDirect (void) if (DS_OK != pDS->lpVtbl->CreateSoundBuffer(pDS, &dsbuf, &pDSBuf, NULL)) { - Con_SafePrint("DS:CreateSoundBuffer Failed\n"); + Con_Print("DS:CreateSoundBuffer Failed\n"); FreeSound (); return SIS_FAILURE; } @@ -331,19 +331,19 @@ sndinitstat SNDDMA_InitDirect (void) if (DS_OK != pDSBuf->lpVtbl->GetCaps (pDSBuf, &dsbcaps)) { - Con_SafePrint("DS:GetCaps failed\n"); + Con_Print("DS:GetCaps failed\n"); FreeSound (); return SIS_FAILURE; } if (snd_firsttime) - Con_SafePrint("Using secondary sound buffer\n"); + Con_Print("Using secondary sound buffer\n"); } else { if (DS_OK != pDS->lpVtbl->SetCooperativeLevel (pDS, mainwindow, DSSCL_WRITEPRIMARY)) { - Con_SafePrint("Set coop level failed\n"); + Con_Print("Set coop level failed\n"); FreeSound (); return SIS_FAILURE; } @@ -355,14 +355,14 @@ sndinitstat SNDDMA_InitDirect (void) } pDSBuf = pDSPBuf; - Con_SafePrint("Using primary sound buffer\n"); + Con_Print("Using primary sound buffer\n"); } // Make sure mixer is active pDSBuf->lpVtbl->Play(pDSBuf, 0, 0, DSBPLAY_LOOPING); if (snd_firsttime) - Con_SafePrintf(" %d channel(s)\n" + Con_Printf(" %d channel(s)\n" " %d bits/sample\n" " %d samples/sec\n", shm->format.channels, shm->format.width * 8, shm->format.speed); @@ -376,14 +376,14 @@ sndinitstat SNDDMA_InitDirect (void) { if (hresult != DSERR_BUFFERLOST) { - Con_SafePrint("SNDDMA_InitDirect: DS::Lock Sound Buffer Failed\n"); + Con_Print("SNDDMA_InitDirect: DS::Lock Sound Buffer Failed\n"); FreeSound (); return SIS_FAILURE; } if (++reps > 10000) { - Con_SafePrint("SNDDMA_InitDirect: DS: couldn't restore buffer\n"); + Con_Print("SNDDMA_InitDirect: DS: couldn't restore buffer\n"); FreeSound (); return SIS_FAILURE; } @@ -453,7 +453,7 @@ qboolean SNDDMA_InitWav (void) { if (hr != MMSYSERR_ALLOCATED) { - Con_SafePrint("waveOutOpen failed\n"); + Con_Print("waveOutOpen failed\n"); return false; } @@ -463,7 +463,7 @@ qboolean SNDDMA_InitWav (void) "Sound not available", MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY) { - Con_SafePrint("waveOutOpen failure;\n hardware already in use\n"); + Con_Print("waveOutOpen failure;\n hardware already in use\n"); return false; } } @@ -477,14 +477,14 @@ qboolean SNDDMA_InitWav (void) hData = GlobalAlloc(GMEM_MOVEABLE | GMEM_SHARE, gSndBufSize); if (!hData) { - Con_SafePrint("Sound: Out of memory.\n"); + Con_Print("Sound: Out of memory.\n"); FreeSound (); return false; } lpData = GlobalLock(hData); if (!lpData) { - Con_SafePrint("Sound: Failed to lock.\n"); + Con_Print("Sound: Failed to lock.\n"); FreeSound (); return false; } @@ -500,7 +500,7 @@ qboolean SNDDMA_InitWav (void) if (hWaveHdr == NULL) { - Con_SafePrint("Sound: Failed to Alloc header.\n"); + Con_Print("Sound: Failed to Alloc header.\n"); FreeSound (); return false; } @@ -509,7 +509,7 @@ qboolean SNDDMA_InitWav (void) if (lpWaveHdr == NULL) { - Con_SafePrint("Sound: Failed to lock header.\n"); + Con_Print("Sound: Failed to lock header.\n"); FreeSound (); return false; } @@ -525,7 +525,7 @@ qboolean SNDDMA_InitWav (void) if (waveOutPrepareHeader(hWaveOut, lpWaveHdr+i, sizeof(WAVEHDR)) != MMSYSERR_NOERROR) { - Con_SafePrint("Sound: failed to prepare wave headers\n"); + Con_Print("Sound: failed to prepare wave headers\n"); FreeSound (); return false; } @@ -575,12 +575,12 @@ qboolean SNDDMA_Init(void) snd_isdirect = true; if (snd_firsttime) - Con_SafePrint("DirectSound initialized\n"); + Con_Print("DirectSound initialized\n"); } else { snd_isdirect = false; - Con_SafePrint("DirectSound failed to init\n"); + Con_Print("DirectSound failed to init\n"); } } } @@ -599,11 +599,11 @@ qboolean SNDDMA_Init(void) if (snd_iswave) { if (snd_firsttime) - Con_SafePrint("Wave sound initialized\n"); + Con_Print("Wave sound initialized\n"); } else { - Con_SafePrint("Wave sound failed to init\n"); + Con_Print("Wave sound failed to init\n"); } } } @@ -693,7 +693,7 @@ void SNDDMA_Submit(void) if (wResult != MMSYSERR_NOERROR) { - Con_SafePrint("Failed to write block to device\n"); + Con_Print("Failed to write block to device\n"); FreeSound (); return; } diff --git a/sys_shared.c b/sys_shared.c index ff897498..9bebbde3 100644 --- a/sys_shared.c +++ b/sys_shared.c @@ -33,6 +33,7 @@ void Sys_Shared_EarlyInit(void) const char* os; Memory_Init (); + Log_Init (); COM_InitArgv(); COM_InitGameType(); diff --git a/vid_wgl.c b/vid_wgl.c index d5cd194e..4726150c 100644 --- a/vid_wgl.c +++ b/vid_wgl.c @@ -1177,7 +1177,7 @@ qboolean IN_InitDInput (void) if (hInstDI == NULL) { - Con_SafePrint("Couldn't load dinput.dll\n"); + Con_Print("Couldn't load dinput.dll\n"); return false; } } @@ -1188,7 +1188,7 @@ qboolean IN_InitDInput (void) if (!pDirectInputCreate) { - Con_SafePrint("Couldn't get DI proc addr\n"); + Con_Print("Couldn't get DI proc addr\n"); return false; } } @@ -1206,7 +1206,7 @@ qboolean IN_InitDInput (void) if (FAILED(hr)) { - Con_SafePrint("Couldn't open DI mouse device\n"); + Con_Print("Couldn't open DI mouse device\n"); return false; } @@ -1215,7 +1215,7 @@ qboolean IN_InitDInput (void) if (FAILED(hr)) { - Con_SafePrint("Couldn't set DI mouse format\n"); + Con_Print("Couldn't set DI mouse format\n"); return false; } @@ -1225,7 +1225,7 @@ qboolean IN_InitDInput (void) if (FAILED(hr)) { - Con_SafePrint("Couldn't set DI coop level\n"); + Con_Print("Couldn't set DI coop level\n"); return false; } @@ -1236,7 +1236,7 @@ qboolean IN_InitDInput (void) if (FAILED(hr)) { - Con_SafePrint("Couldn't set DI buffersize\n"); + Con_Print("Couldn't set DI buffersize\n"); return false; } @@ -1263,11 +1263,11 @@ void IN_StartupMouse (void) if (dinput) { - Con_SafePrint("DirectInput initialized\n"); + Con_Print("DirectInput initialized\n"); } else { - Con_SafePrint("DirectInput not initialized\n"); + Con_Print("DirectInput not initialized\n"); } } -- 2.39.2