diff --git a/source/Makefile b/source/Makefile index 72a2dd6..76a3da5 100644 --- a/source/Makefile +++ b/source/Makefile @@ -1,15 +1,15 @@ # *Defines* -SV_name=qw-server +SV_name=qf-server SV_libs= -CL_SVGA_name=qw-client-svga +CL_SVGA_name=qf-client-svga CL_SVGA_libs=-lvga -CL_X11_name=qw-client-x11 +CL_X11_name=qf-client-x11 CL_X11_libs=-lX11 -lXext -CL_GLX_name=qw-client-glx +CL_GLX_name=qf-client-glx CL_GLX_libs=-lX11 -lXext -lGL DIRECTORIES= diff --git a/source/cl_main.c b/source/cl_main.c index 7df0b10..ad300ae 100644 --- a/source/cl_main.c +++ b/source/cl_main.c @@ -174,8 +174,8 @@ CL_Version_f */ void CL_Version_f (void) { - Con_Printf ("Version %4.2f\n", VERSION); - Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); + Con_Printf ("QuakeForge Version %s\n", QF_VERSION); + Con_Printf ("Binary: "__TIME__" "__DATE__"\n"); } @@ -419,7 +419,7 @@ void CL_Disconnect (void) connect_time = -1; #ifdef _WIN32 - SetWindowText (mainwindow, "QuakeWorld: disconnected"); + SetWindowText (mainwindow, "QuakeForge: disconnected"); #endif // stop sounds (especially looping!) @@ -875,7 +875,7 @@ void CL_ConnectionlessPacket (void) Con_Printf("===========================\n"); Con_Printf("Invalid localid on command packet received from local host. " "\n|%s| != |%s|\n" - "You may need to reload your server browser and QuakeWorld.\n", + "You may need to reload your server browser and QuakeForge.\n", s, localid.string); Con_Printf("===========================\n"); Cvar_Set("localid", ""); @@ -1069,7 +1069,7 @@ void CL_Init (void) Info_SetValueForKey (cls.userinfo, "bottomcolor", "0", MAX_INFO_STRING); Info_SetValueForKey (cls.userinfo, "rate", "2500", MAX_INFO_STRING); Info_SetValueForKey (cls.userinfo, "msg", "1", MAX_INFO_STRING); - sprintf (st, "%4.2f-%04d", VERSION, build_number()); + sprintf (st, "%s-%04d", QW_VERSION, build_number()); Info_SetValueForStarKey (cls.userinfo, "*ver", st, MAX_INFO_STRING); CL_InitInput (); @@ -1504,9 +1504,9 @@ void Host_Init (quakeparms_t *parms) host_initialized = true; - Con_Printf ("\nClient Version %4.2f (Build %04d)\n\n", VERSION, build_number()); + Con_Printf ("\nClient Version %s (Build %04d)\n\n", QF_VERSION, build_number()); - Con_Printf (" QuakeWorld Initialized \n"); + Con_Printf (" QuakeForge Initialized \n"); } diff --git a/source/cl_pred.c b/source/cl_pred.c index f5bf3e6..4f86633 100644 --- a/source/cl_pred.c +++ b/source/cl_pred.c @@ -155,7 +155,7 @@ void CL_PredictMove (void) char text[1024]; cls.state = ca_active; - sprintf (text, "QuakeWorld: %s", cls.servername); + sprintf (text, "QuakeForge: %s", cls.servername); #ifdef _WIN32 SetWindowText (mainwindow, text); #endif diff --git a/source/cl_sys_win.c b/source/cl_sys_win.c index d6615bf..ab7aec7 100644 --- a/source/cl_sys_win.c +++ b/source/cl_sys_win.c @@ -219,7 +219,7 @@ void Sys_Init (void) if ((vinfo.dwMajorVersion < 4) || (vinfo.dwPlatformId == VER_PLATFORM_WIN32s)) { - Sys_Error ("QuakeWorld requires at least Win95 or NT 4.0"); + Sys_Error ("This version of QuakeForge requires at least Win95 or NT 4.0"); } if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) diff --git a/source/draw.c b/source/draw.c index 85f4c85..24ef85a 100644 --- a/source/draw.c +++ b/source/draw.c @@ -44,7 +44,7 @@ byte *draw_chars; // 8*8 graphic characters qpic_t *draw_disc; qpic_t *draw_backtile; -cvar_t cl_verstring = {"cl_verstring", "set in Draw_Init"}; +cvar_t cl_verstring = {"cl_verstring", "QuakeForge " QF_VERSION}; //============================================================================= /* Support Routines */ @@ -128,8 +128,6 @@ void Draw_Init (void) r_rectdesc.rowbytes = draw_backtile->width; Cvar_RegisterVariable (&cl_verstring); - - Cvar_Set ("cl_verstring", va("QuakeForge %2.2f", VERSION)); } diff --git a/source/gl_draw.c b/source/gl_draw.c index cbd49c1..ef8f10b 100644 --- a/source/gl_draw.c +++ b/source/gl_draw.c @@ -59,6 +59,8 @@ cvar_t gl_nobind = {"gl_nobind", "0"}; cvar_t gl_max_size = {"gl_max_size", "1024"}; cvar_t gl_picmip = {"gl_picmip", "0"}; +cvar_t cl_verstring = {"cl_verstring", "QuakeForge " QF_VERSION}; + byte *draw_chars; // 8*8 graphic characters qpic_t *draw_disc; qpic_t *draw_backtile; @@ -404,9 +406,6 @@ void Draw_Init (void) { int i; qpic_t *cb; - byte *dest; - int x; - char ver[40]; glpic_t *gl; int start; byte *ncdata; @@ -415,6 +414,8 @@ void Draw_Init (void) Cvar_RegisterVariable (&gl_max_size); Cvar_RegisterVariable (&gl_picmip); + Cvar_RegisterVariable (&cl_verstring); + // 3dfx can only handle 256 wide textures if (!Q_strncasecmp ((char *)gl_renderer, "3dfx",4) || !Q_strncasecmp ((char *)gl_renderer, "Mesa",4)) @@ -443,11 +444,6 @@ void Draw_Init (void) Sys_Error ("Couldn't load gfx/conback.lmp"); SwapPic (cb); - sprintf (ver, "%4.2f", VERSION); - dest = cb->data + 320 + 320*186 - 11 - 8*strlen(ver); - for (x=0 ; xwidth = vid.conwidth; conback->height = vid.conheight; @@ -803,8 +799,6 @@ Draw_ConsoleBackground */ void Draw_ConsoleBackground (int lines) { - char ver[80]; - int x, i; int y; y = (vid.height * 3) >> 2; @@ -813,19 +807,8 @@ void Draw_ConsoleBackground (int lines) else Draw_AlphaPic (0, lines - vid.height, conback, (float)(1.2 * lines)/y); - // hack the version number directly into the pic -// y = lines-186; - y = lines-14; - if (!cls.download) { -#ifdef __linux__ - sprintf (ver, "LinuxGL (%4.2f) QuakeWorld", LINUX_VERSION); -#else - sprintf (ver, "GL (%4.2f) QuakeWorld", GLQUAKE_VERSION); -#endif - x = vid.conwidth - (strlen(ver)*8 + 11) - (vid.conwidth*8/320)*7; - for (i=0 ; imemsize/ (1024*1024.0)); - Con_Printf ("\nServer Version %4.2f (Build %04d)\n\n", VERSION, build_number()); + Con_Printf ("\nServer Version %s (Build %04d)\n\n", QW_VERSION, build_number()); - Con_Printf ("======== QuakeWorld Initialized ========\n"); + Con_Printf ("======== QuakeForge Initialized ========\n"); // process command line arguments Cmd_StuffCmds_f (); diff --git a/source/zone.c b/source/zone.c index 038023e..16542ed 100644 --- a/source/zone.c +++ b/source/zone.c @@ -419,9 +419,9 @@ void *Hunk_AllocName (int size, char *name) if (hunk_size - hunk_low_used - hunk_high_used < size) // Sys_Error ("Hunk_Alloc: failed on %i bytes",size); #ifdef _WIN32 - Sys_Error ("Not enough RAM allocated. Try starting using \"-heapsize 16000\" on the QuakeWorld command line."); + Sys_Error ("Not enough RAM allocated. Try starting using \"-heapsize 16000\" on the QuakeForge command line."); #else - Sys_Error ("Not enough RAM allocated. Try starting using \"-mem 16\" on the QuakeWorld command line."); + Sys_Error ("Not enough RAM allocated. Try starting using \"-mem 16\" on the QuakeForge command line."); #endif h = (hunk_t *)(hunk_base + hunk_low_used);