diff options
-rw-r--r-- | src/common.c | 2 | ||||
-rw-r--r-- | src/common.h | 2 | ||||
-rw-r--r-- | src/in_evdev.c | 4 | ||||
-rw-r--r-- | src/snd_dx.c | 2 | ||||
-rw-r--r-- | src/sys_win.c | 10 | ||||
-rw-r--r-- | src/vid_sdl.c | 8 | ||||
-rw-r--r-- | src/vid_win.c | 6 | ||||
-rw-r--r-- | src/win_dbg.c | 2 |
8 files changed, 19 insertions, 17 deletions
diff --git a/src/common.c b/src/common.c index 6f65dbd..84e144c 100644 --- a/src/common.c +++ b/src/common.c @@ -1999,7 +1999,7 @@ void Qcommon_Init( int argc, char **argv ) { NET_Config( NET_SERVER ); } - Com_Printf( "====== " APPLICATION " initialized ======\n\n" ); + Com_Printf( "====== " PRODUCT " initialized ======\n\n" ); Com_LPrintf( PRINT_NOTICE, APPLICATION " " VERSION ", " __DATE__ "\n" ); Com_Printf( "http://skuller.net/q2pro/\n\n" ); diff --git a/src/common.h b/src/common.h index 00df578..1f2e36c 100644 --- a/src/common.h +++ b/src/common.h @@ -25,6 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include <errno.h> #include "error.h" +#define PRODUCT "Q2PRO" + #if USE_CLIENT #define APPLICATION "q2pro" #else diff --git a/src/in_evdev.c b/src/in_evdev.c index b563a25..53986fa 100644 --- a/src/in_evdev.c +++ b/src/in_evdev.c @@ -159,13 +159,13 @@ static void GrabMouse( grab_t grab ) { if( grab == IN_GRAB ) { SDL_WM_GrabInput( SDL_GRAB_ON ); - SDL_WM_SetCaption( "[" APPLICATION "]", APPLICATION ); + SDL_WM_SetCaption( "[" PRODUCT "]", APPLICATION ); SDL_ShowCursor( SDL_DISABLE ); evdev.io->wantread = qtrue; } else { if( evdev.grabbed == IN_GRAB ) { SDL_WM_GrabInput( SDL_GRAB_OFF ); - SDL_WM_SetCaption( APPLICATION, APPLICATION ); + SDL_WM_SetCaption( PRODUCT, APPLICATION ); } if( grab == IN_HIDE ) { SDL_ShowCursor( SDL_DISABLE ); diff --git a/src/snd_dx.c b/src/snd_dx.c index 17a41a0..beb87ea 100644 --- a/src/snd_dx.c +++ b/src/snd_dx.c @@ -262,7 +262,7 @@ static sndinitstat_t DS_Init (void) { if (MessageBox (NULL, "The sound hardware is in use by another app.\n\n" - "Select Retry to try to start sound again or Cancel to run " APPLICATION " with no sound.", + "Select Retry to try to start sound again or Cancel to run " PRODUCT " with no sound.", "Sound not available", MB_RETRYCANCEL | MB_SETFOREGROUND | MB_ICONEXCLAMATION) != IDRETRY) { diff --git a/src/sys_win.c b/src/sys_win.c index 211ab29..4ca0a6c 100644 --- a/src/sys_win.c +++ b/src/sys_win.c @@ -356,7 +356,7 @@ static void Sys_ConsoleInit( void ) { sys_con.printf = Sys_Printf; gotConsole = qtrue; - SetConsoleTitle( APPLICATION " console" ); + SetConsoleTitle( PRODUCT " console" ); SetConsoleCtrlHandler( Sys_ConsoleCtrlHandler, TRUE ); GetConsoleMode( hinput, &mode ); mode |= ENABLE_WINDOW_INPUT; @@ -631,7 +631,7 @@ void Sys_Error( const char *error, ... ) { Sleep( INFINITE ); } #endif - MessageBoxA( NULL, text, APPLICATION " Fatal Error", MB_ICONERROR | MB_OK ); + MessageBoxA( NULL, text, PRODUCT " Fatal Error", MB_ICONERROR | MB_OK ); } exit( 1 ); @@ -702,13 +702,13 @@ void Sys_Init( void ) { iswinnt = qtrue; if( vinfo.dwMajorVersion < 4 ) { - Sys_Error( APPLICATION " requires windows version 4 or greater" ); + Sys_Error( PRODUCT " requires windows version 4 or greater" ); } if( vinfo.dwPlatformId == VER_PLATFORM_WIN32s ) { - Sys_Error( APPLICATION " doesn't run on Win32s" ); + Sys_Error( PRODUCT " doesn't run on Win32s" ); } else if( vinfo.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) { if( vinfo.dwMinorVersion == 0 ) { - Sys_Error( APPLICATION " doesn't run on Win95" ); + Sys_Error( PRODUCT " doesn't run on Win95" ); } iswinnt = qfalse; } diff --git a/src/vid_sdl.c b/src/vid_sdl.c index d446b99..d690c0e 100644 --- a/src/vid_sdl.c +++ b/src/vid_sdl.c @@ -297,7 +297,7 @@ static qboolean init_video( void ) { } } - SDL_WM_SetCaption( APPLICATION, APPLICATION ); + SDL_WM_SetCaption( PRODUCT, APPLICATION ); SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL ); @@ -769,7 +769,7 @@ static void ShutdownMouse( void ) { // release the mouse SDL_ShowCursor( SDL_ENABLE ); SDL_WM_GrabInput( SDL_GRAB_OFF ); - SDL_WM_SetCaption( APPLICATION, APPLICATION ); + SDL_WM_SetCaption( PRODUCT, APPLICATION ); memset( &sdl.mouse, 0, sizeof( sdl.mouse ) ); } @@ -796,11 +796,11 @@ static void GrabMouse( grab_t grab ) { if( grab == IN_GRAB ) { AcquireMouse(); - SDL_WM_SetCaption( "[" APPLICATION "]", APPLICATION ); + SDL_WM_SetCaption( "[" PRODUCT "]", APPLICATION ); } else { if( sdl.mouse.grabbed == IN_GRAB ) { SDL_WM_GrabInput( SDL_GRAB_OFF ); - SDL_WM_SetCaption( APPLICATION, APPLICATION ); + SDL_WM_SetCaption( PRODUCT, APPLICATION ); } if( grab == IN_HIDE ) { SDL_ShowCursor( SDL_DISABLE ); diff --git a/src/vid_win.c b/src/vid_win.c index 8488a44..88f6a04 100644 --- a/src/vid_win.c +++ b/src/vid_win.c @@ -794,7 +794,7 @@ void Win_Init( void ) { // create the window win.wnd = CreateWindow( _T( WINDOW_CLASS_NAME ), - _T( APPLICATION ), + _T( PRODUCT ), 0, //style 0, 0, 0, 0, NULL, @@ -909,7 +909,7 @@ static void Win_AcquireMouse( void ) { ClipCursor( &rc ); #ifndef __COREDLL__ - SetWindowText( win.wnd, "[" APPLICATION "]" ); + SetWindowText( win.wnd, "[" PRODUCT "]" ); #endif } @@ -929,7 +929,7 @@ static void Win_DeAcquireMouse( void ) { ReleaseCapture(); #ifndef __COREDLL__ - SetWindowText( win.wnd, APPLICATION ); + SetWindowText( win.wnd, PRODUCT ); #endif } diff --git a/src/win_dbg.c b/src/win_dbg.c index 1ac7127..b6a2907 100644 --- a/src/win_dbg.c +++ b/src/win_dbg.c @@ -129,7 +129,7 @@ DWORD Sys_ExceptionHandler( DWORD exceptionCode, LPEXCEPTION_POINTERS exceptionI Win_Shutdown(); #endif - ret = MessageBox( NULL, APPLICATION " has encountered an unhandled " + ret = MessageBox( NULL, PRODUCT " has encountered an unhandled " "exception and needs to be terminated.\n" "Would you like to generate a crash report?", "Unhandled Exception", |