qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2025-05-31 01:00:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed the string QuakeWorld from places to help avoid stepping on Id's

Browse source 
tues (not that they care to be honest..)  VERSION is gone, use the strings
QW_VERSION and QF_VERSION.  I'd like QW_VERSION to go away but I don't
think we're ready to screw with that just yet.  Note, those are strings,
not floats.

Also defined QSG_STANDARD and set all the star keys the current qw-server
does.

qw-* -> qf-*, unlike the main tree this one is not planned to be just QW.
This commit is contained in:
Joseph Carter 2000-05-13 20:51:02 +00:00
parent 497ba1a82f
commit 01eceda77e
10 changed files with 32 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/Makefile
View file

@ -1,15 +1,15 @@
# *Defines* # *Defines*
SV_name=qw-server SV_name=qf-server
SV_libs= SV_libs=
CL_SVGA_name=qw-client-svga CL_SVGA_name=qf-client-svga
CL_SVGA_libs=-lvga CL_SVGA_libs=-lvga
CL_X11_name=qw-client-x11 CL_X11_name=qf-client-x11
CL_X11_libs=-lX11 -lXext CL_X11_libs=-lX11 -lXext
CL_GLX_name=qw-client-glx CL_GLX_name=qf-client-glx
CL_GLX_libs=-lX11 -lXext -lGL CL_GLX_libs=-lX11 -lXext -lGL
DIRECTORIES= DIRECTORIES=

14
source/cl_main.c
View file

@ -174,8 +174,8 @@ CL_Version_f
*/ */
void CL_Version_f (void) void CL_Version_f (void)
{ {
Con_Printf ("Version %4.2f\n", VERSION); Con_Printf ("QuakeForge Version %s\n", QF_VERSION);
Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); Con_Printf ("Binary: "__TIME__" "__DATE__"\n");
} }
@ -419,7 +419,7 @@ void CL_Disconnect (void)
connect_time = -1; connect_time = -1;
#ifdef _WIN32 #ifdef _WIN32
SetWindowText (mainwindow, "QuakeWorld: disconnected"); SetWindowText (mainwindow, "QuakeForge: disconnected");
#endif #endif
// stop sounds (especially looping!) // stop sounds (especially looping!)
@ -875,7 +875,7 @@ void CL_ConnectionlessPacket (void)
Con_Printf("===========================\n"); Con_Printf("===========================\n");
Con_Printf("Invalid localid on command packet received from local host. " Con_Printf("Invalid localid on command packet received from local host. "
"\n|%s| != |%s|\n" "\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); s, localid.string);
Con_Printf("===========================\n"); Con_Printf("===========================\n");
Cvar_Set("localid", ""); Cvar_Set("localid", "");
@ -1069,7 +1069,7 @@ void CL_Init (void)
Info_SetValueForKey (cls.userinfo, "bottomcolor", "0", MAX_INFO_STRING); Info_SetValueForKey (cls.userinfo, "bottomcolor", "0", MAX_INFO_STRING);
Info_SetValueForKey (cls.userinfo, "rate", "2500", MAX_INFO_STRING); Info_SetValueForKey (cls.userinfo, "rate", "2500", MAX_INFO_STRING);
Info_SetValueForKey (cls.userinfo, "msg", "1", 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); Info_SetValueForStarKey (cls.userinfo, "*ver", st, MAX_INFO_STRING);
CL_InitInput (); CL_InitInput ();
@ -1504,9 +1504,9 @@ void Host_Init (quakeparms_t *parms)
host_initialized = true; 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 ("€<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> QuakeWorld Initialized <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>‚\n"); Con_Printf ("€<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> QuakeForge Initialized <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>‚\n");
} }

2
source/cl_pred.c
View file

@ -155,7 +155,7 @@ void CL_PredictMove (void)
char text[1024]; char text[1024];
cls.state = ca_active; cls.state = ca_active;
sprintf (text, "QuakeWorld: %s", cls.servername); sprintf (text, "QuakeForge: %s", cls.servername);
#ifdef _WIN32 #ifdef _WIN32
SetWindowText (mainwindow, text); SetWindowText (mainwindow, text);
#endif #endif

2
source/cl_sys_win.c
View file

@ -219,7 +219,7 @@ void Sys_Init (void)
if ((vinfo.dwMajorVersion < 4) || if ((vinfo.dwMajorVersion < 4) ||
(vinfo.dwPlatformId == VER_PLATFORM_WIN32s)) (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) if (vinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)

4
source/draw.c
View file

@ -44,7 +44,7 @@ byte *draw_chars; // 8*8 graphic characters
qpic_t *draw_disc; qpic_t *draw_disc;
qpic_t *draw_backtile; 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 */ /* Support Routines */
@ -128,8 +128,6 @@ void Draw_Init (void)
r_rectdesc.rowbytes = draw_backtile->width; r_rectdesc.rowbytes = draw_backtile->width;
Cvar_RegisterVariable (&cl_verstring); Cvar_RegisterVariable (&cl_verstring);
Cvar_Set ("cl_verstring", va("QuakeForge %2.2f", VERSION));
} }

29
source/gl_draw.c
View file

@ -59,6 +59,8 @@ cvar_t gl_nobind = {"gl_nobind", "0"};
cvar_t gl_max_size = {"gl_max_size", "1024"}; cvar_t gl_max_size = {"gl_max_size", "1024"};
cvar_t gl_picmip = {"gl_picmip", "0"}; cvar_t gl_picmip = {"gl_picmip", "0"};
cvar_t cl_verstring = {"cl_verstring", "QuakeForge " QF_VERSION};
byte *draw_chars; // 8*8 graphic characters byte *draw_chars; // 8*8 graphic characters
qpic_t *draw_disc; qpic_t *draw_disc;
qpic_t *draw_backtile; qpic_t *draw_backtile;
@ -404,9 +406,6 @@ void Draw_Init (void)
{ {
int i; int i;
qpic_t *cb; qpic_t *cb;
byte *dest;
int x;
char ver[40];
glpic_t *gl; glpic_t *gl;
int start; int start;
byte *ncdata; byte *ncdata;
@ -415,6 +414,8 @@ void Draw_Init (void)
Cvar_RegisterVariable (&gl_max_size); Cvar_RegisterVariable (&gl_max_size);
Cvar_RegisterVariable (&gl_picmip); Cvar_RegisterVariable (&gl_picmip);
Cvar_RegisterVariable (&cl_verstring);
// 3dfx can only handle 256 wide textures // 3dfx can only handle 256 wide textures
if (!Q_strncasecmp ((char *)gl_renderer, "3dfx",4) || if (!Q_strncasecmp ((char *)gl_renderer, "3dfx",4) ||
!Q_strncasecmp ((char *)gl_renderer, "Mesa",4)) !Q_strncasecmp ((char *)gl_renderer, "Mesa",4))
@ -443,11 +444,6 @@ void Draw_Init (void)
Sys_Error ("Couldn't load gfx/conback.lmp"); Sys_Error ("Couldn't load gfx/conback.lmp");
SwapPic (cb); SwapPic (cb);
sprintf (ver, "%4.2f", VERSION);
dest = cb->data + 320 + 320*186 - 11 - 8*strlen(ver);
for (x=0 ; x<strlen(ver) ; x++)
Draw_CharToConback (ver[x], dest+(x<<3));
#if 0 #if 0
conback->width = vid.conwidth; conback->width = vid.conwidth;
conback->height = vid.conheight; conback->height = vid.conheight;
@ -803,8 +799,6 @@ Draw_ConsoleBackground
*/ */
void Draw_ConsoleBackground (int lines) void Draw_ConsoleBackground (int lines)
{ {
char ver[80];
int x, i;
int y; int y;
y = (vid.height * 3) >> 2; y = (vid.height * 3) >> 2;
@ -813,19 +807,8 @@ void Draw_ConsoleBackground (int lines)
else else
Draw_AlphaPic (0, lines - vid.height, conback, (float)(1.2 * lines)/y); Draw_AlphaPic (0, lines - vid.height, conback, (float)(1.2 * lines)/y);
// hack the version number directly into the pic Draw_Alt_String (vid.conwidth - strlen(cl_verstring.string)*8 - 11,
// y = lines-186; lines-14, cl_verstring.string);
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 ; i<strlen(ver) ; i++)
Draw_Character (x + i * 8, y, ver[i] | 0x80);
}
} }

2
source/menu.c
View file

@ -1021,7 +1021,7 @@ void M_SinglePlayer_Draw (void) {
// M_DrawTransPic (72, 32, Draw_CachePic ("gfx/sp_menu.lmp") ); // M_DrawTransPic (72, 32, Draw_CachePic ("gfx/sp_menu.lmp") );
M_DrawTextBox (60, 10*8, 23, 4); M_DrawTextBox (60, 10*8, 23, 4);
M_PrintWhite (92, 12*8, "QuakeWorld is for"); M_PrintWhite (88, 12*8, "This client is for");
M_PrintWhite (88, 13*8, "Internet play only"); M_PrintWhite (88, 13*8, "Internet play only");
} }

8
source/sv_ccmds.c
View file

@ -320,14 +320,6 @@ void SV_Map_f (void)
} }
strcpy (level, Cmd_Argv(1)); strcpy (level, Cmd_Argv(1));
#if 0
if (!strcmp (level, "e1m8"))
{ // QuakeWorld can't go to e1m8
SV_BroadcastPrintf (PRINT_HIGH, "can't go to low grav level in QuakeWorld...\n");
strcpy (level, "e1m5");
}
#endif
// check to make sure the level exists // check to make sure the level exists
sprintf (expanded, "maps/%s.bsp", level); sprintf (expanded, "maps/%s.bsp", level);
COM_FOpenFile (expanded, &f); COM_FOpenFile (expanded, &f);

13
source/sv_main.c
View file

@ -528,7 +528,7 @@ void SVC_DirectConnect (void)
version = atoi(Cmd_Argv(1)); version = atoi(Cmd_Argv(1));
if (version != PROTOCOL_VERSION) if (version != PROTOCOL_VERSION)
{ {
Netchan_OutOfBandPrint (net_from, "%c\nServer is version %4.2f.\n", A2C_PRINT, VERSION); Netchan_OutOfBandPrint (net_from, "%c\nServer is version %s.\n", A2C_PRINT, QW_VERSION);
Con_Printf ("* rejected connect from version %i\n", version); Con_Printf ("* rejected connect from version %i\n", version);
return; return;
} }
@ -1374,7 +1374,12 @@ void SV_InitLocal (void)
for (i=0 ; i<MAX_MODELS ; i++) for (i=0 ; i<MAX_MODELS ; i++)
sprintf (localmodels[i], "*%i", i); sprintf (localmodels[i], "*%i", i);
Info_SetValueForStarKey (svs.info, "*version", va("%4.2f", VERSION), MAX_SERVERINFO_STRING); Info_SetValueForStarKey (svs.info, "*qf_version", QF_VERSION,
MAX_SERVERINFO_STRING);
Info_SetValueForStarKey (svs.info, "*version", QW_VERSION,
MAX_SERVERINFO_STRING);
Info_SetValueForStarKey (svs.info, "*qsg_standard", QSG_STANDARD,
MAX_SERVERINFO_STRING);
// init fraglog stuff // init fraglog stuff
svs.logsequence = 1; svs.logsequence = 1;
@ -1653,9 +1658,9 @@ void SV_Init (quakeparms_t *parms)
Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
Con_Printf ("%4.1f megabyte heap\n",parms->memsize/ (1024*1024.0)); Con_Printf ("%4.1f megabyte heap\n",parms->memsize/ (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 // process command line arguments
Cmd_StuffCmds_f (); Cmd_StuffCmds_f ();

4
source/zone.c
View file

@ -419,9 +419,9 @@ void *Hunk_AllocName (int size, char *name)
if (hunk_size - hunk_low_used - hunk_high_used < size) if (hunk_size - hunk_low_used - hunk_high_used < size)
// Sys_Error ("Hunk_Alloc: failed on %i bytes",size); // Sys_Error ("Hunk_Alloc: failed on %i bytes",size);
#ifdef _WIN32 #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 #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 #endif
h = (hunk_t *)(hunk_base + hunk_low_used); h = (hunk_t *)(hunk_base + hunk_low_used);