aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--code/qcommon/q_shared.h6
-rw-r--r--code/unix/linux_glimp.c4
-rw-r--r--code/unix/sdl_glimp.c5
-rw-r--r--code/win32/win_glimp.c8
-rw-r--r--code/win32/win_syscon.c2
5 files changed, 11 insertions, 14 deletions
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index c2edca1..72f083e 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -26,7 +26,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
// q_shared.h -- included first by ALL program modules.
// A user mod should never modify this file
-#define Q3_VERSION "ioQ3 1.34-rc1"
+#define Q3_VERSION "ioq3 1.33"
+#define CLIENT_WINDOW_TITLE "icculus.org/quake3"
+#define CLIENT_WINDOW_ICON "ioq3"
+#define CONSOLE_WINDOW_TITLE "icculus.org/quake3 console"
+#define CONSOLE_WINDOW_ICON "ioq3 console"
// 1.32 released 7-10-2002
#define MAX_TEAMNAME 32
diff --git a/code/unix/linux_glimp.c b/code/unix/linux_glimp.c
index 32eac3f..1a0b4fd 100644
--- a/code/unix/linux_glimp.c
+++ b/code/unix/linux_glimp.c
@@ -81,8 +81,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define HAVE_XF86DGA
#endif
-#define WINDOW_CLASS_NAME "Quake III: Arena"
-
typedef enum
{
RSERR_OK,
@@ -1150,7 +1148,7 @@ int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen )
0, visinfo->depth, InputOutput,
visinfo->visual, mask, &attr);
- XStoreName( dpy, win, WINDOW_CLASS_NAME );
+ XStoreName( dpy, win, CLIENT_WINDOW_TITLE );
/* GH: Don't let the window be resized */
sizehints.flags = PMinSize | PMaxSize;
diff --git a/code/unix/sdl_glimp.c b/code/unix/sdl_glimp.c
index 3c5dc6d..29fe0ed 100644
--- a/code/unix/sdl_glimp.c
+++ b/code/unix/sdl_glimp.c
@@ -89,9 +89,6 @@ typedef void *QGLContext;
static QGLContext opengl_context;
-#define WINDOW_CLASS_NAME "Quake III: Arena"
-#define WINDOW_CLASS_NAME_BRIEF "quake3"
-
//#define KBD_DBG
typedef enum
@@ -632,7 +629,7 @@ static int GLW_SetMode( const char *drivername, int mode, qboolean fullscreen )
SDL_GL_SetAttribute( SDL_GL_STENCIL_SIZE, tstencilbits );
SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
- SDL_WM_SetCaption(WINDOW_CLASS_NAME, WINDOW_CLASS_NAME_BRIEF);
+ SDL_WM_SetCaption(CLIENT_WINDOW_TITLE, CLIENT_WINDOW_ICON);
SDL_ShowCursor(0);
SDL_EnableUNICODE(1);
SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
diff --git a/code/win32/win_glimp.c b/code/win32/win_glimp.c
index b6c602a..4f97f04 100644
--- a/code/win32/win_glimp.c
+++ b/code/win32/win_glimp.c
@@ -57,8 +57,6 @@ typedef enum {
#define TRY_PFD_FAIL_SOFT 1
#define TRY_PFD_FAIL_HARD 2
-#define WINDOW_CLASS_NAME "Quake 3: Arena"
-
static void GLW_InitExtensions( void );
static rserr_t GLW_SetMode( const char *drivername,
int mode,
@@ -600,7 +598,7 @@ static qboolean GLW_CreateWindow( const char *drivername, int width, int height,
wc.hCursor = LoadCursor (NULL,IDC_ARROW);
wc.hbrBackground = (void *)COLOR_GRAYTEXT;
wc.lpszMenuName = 0;
- wc.lpszClassName = WINDOW_CLASS_NAME;
+ wc.lpszClassName = CLIENT_WINDOW_TITLE;
if ( !RegisterClass( &wc ) )
{
@@ -669,8 +667,8 @@ static qboolean GLW_CreateWindow( const char *drivername, int width, int height,
g_wv.hWnd = CreateWindowEx (
exstyle,
- WINDOW_CLASS_NAME,
- "Quake 3: Arena",
+ CLIENT_WINDOW_TITLE,
+ CLIENT_WINDOW_TITLE,
stylebits,
x, y, w, h,
NULL,
diff --git a/code/win32/win_syscon.c b/code/win32/win_syscon.c
index 2308c0f..3e14840 100644
--- a/code/win32/win_syscon.c
+++ b/code/win32/win_syscon.c
@@ -334,7 +334,7 @@ void Sys_CreateConsole( void )
s_wcd.hWnd = CreateWindowEx( 0,
DEDCLASS,
- "Quake 3 Console",
+ CONSOLE_WINDOW_TITLE,
DEDSTYLE,
( swidth - 600 ) / 2, ( sheight - 450 ) / 2 , rect.right - rect.left + 1, rect.bottom - rect.top + 1,
NULL,