mirror of
https://git.code.sf.net/p/quake/quakeforge-old
synced 2024-11-24 21:01:17 +00:00
We now have two versions, what we first identify ourselves as, which is
2.40, and the quakeforge version, fixes the annoying spectator bug..
This commit is contained in:
parent
f5c1241960
commit
0391657e6b
9 changed files with 27 additions and 18 deletions
|
@ -1,4 +1,5 @@
|
|||
/* Version string */
|
||||
#undef QF_VERSION
|
||||
#undef VERSION
|
||||
|
||||
/* Define if you have the XFree86 DGA extension */
|
||||
|
|
|
@ -630,9 +630,9 @@ void Draw_ConsoleBackground (int lines)
|
|||
qpic_t *conback;
|
||||
static char saveback[320*8];
|
||||
#ifdef QUAKEWORLD
|
||||
char ver[] = "QuakeForge (Software QW) " VERSION;
|
||||
char ver[] = "QuakeForge (Software QW) " QF_VERSION;
|
||||
#else
|
||||
char ver[] = "QuakeForge (Software UQ) " VERSION;
|
||||
char ver[] = "QuakeForge (Software UQ) " QF_VERSION;
|
||||
#endif
|
||||
|
||||
conback = Draw_CachePic ("gfx/conback.lmp");
|
||||
|
|
|
@ -810,9 +810,9 @@ Draw_ConsoleBackground
|
|||
void Draw_ConsoleBackground (int lines)
|
||||
{
|
||||
#ifdef QUAKEWORLD
|
||||
char ver[] = "QuakeForge (GL QW) " VERSION;
|
||||
char ver[] = "QuakeForge (GL QW) " QF_VERSION;
|
||||
#else
|
||||
char ver[] = "QuakeForge (GL UQ) " VERSION;
|
||||
char ver[] = "QuakeForge (GL UQ) " QF_VERSION;
|
||||
#endif
|
||||
int x, i;
|
||||
int y;
|
||||
|
|
|
@ -295,9 +295,9 @@ int main (int c, char **v) {
|
|||
} else {
|
||||
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NDELAY);
|
||||
#ifdef QUAKEWORLD
|
||||
printf ("QuakeForge (QW Client) v%s\n", VERSION);
|
||||
printf ("QuakeForge (QW Client) v%s\n", QF_VERSION);
|
||||
#else
|
||||
printf ("QuakeForge (UQuake) v%s\n", VERSION);
|
||||
printf ("QuakeForge (UQuake) v%s\n", QF_VERSION);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -3,7 +3,8 @@ AC_PREREQ(2.13)
|
|||
AC_INIT(common/crc.h)
|
||||
|
||||
dnl Version of this release
|
||||
AC_DEFINE(VERSION,"0.1.0-pre")
|
||||
AC_DEFINE(QF_VERSION,"0.1.0-pre")
|
||||
AC_DEFINE(VERSION,"2.40")
|
||||
|
||||
AC_CANONICAL_SYSTEM
|
||||
AC_LANG_C
|
||||
|
|
|
@ -145,7 +145,7 @@ jmp_buf host_abort;
|
|||
|
||||
void Master_Connect_f (void);
|
||||
|
||||
float server_version = 0; // version of server we connected to
|
||||
char *server_version = NULL; // version of server we connected to
|
||||
|
||||
char emodel_name[] =
|
||||
{ 'e' ^ 0xff, 'm' ^ 0xff, 'o' ^ 0xff, 'd' ^ 0xff, 'e' ^ 0xff, 'l' ^ 0xff, 0 };
|
||||
|
@ -184,7 +184,7 @@ CL_Version_f
|
|||
*/
|
||||
void CL_Version_f (void)
|
||||
{
|
||||
Con_Printf ("Version %s\n", VERSION);
|
||||
Con_Printf ("Version %s\n", QF_VERSION);
|
||||
Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
|
||||
}
|
||||
|
||||
|
@ -592,12 +592,17 @@ void CL_FullServerinfo_f (void)
|
|||
|
||||
strcpy (cl.serverinfo, Cmd_Argv(1));
|
||||
|
||||
if ((p = Info_ValueForKey(cl.serverinfo, "*version")) && *p) {
|
||||
v = Q_atof(p);
|
||||
if ((p = Info_ValueForKey(cl.serverinfo, "*qf_version")) && *p) {
|
||||
if (v) {
|
||||
if (!server_version)
|
||||
Con_Printf("Version %1.2f Server\n", v);
|
||||
server_version = v;
|
||||
Con_Printf("QuakeForge Version %s Server\n", p);
|
||||
server_version = strdup(p);
|
||||
}
|
||||
} else if ((p = Info_ValueForKey(cl.serverinfo, "*version")) && *p) {
|
||||
if (v) {
|
||||
if (!server_version)
|
||||
Con_Printf("Version %s Server\n", p);
|
||||
server_version = strdup(p);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1082,6 +1087,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);
|
||||
Info_SetValueForStarKey(cls.userinfo, "*qf_ver", QF_VERSION, MAX_INFO_STRING);
|
||||
Info_SetValueForStarKey(cls.userinfo, "*ver", VERSION, MAX_INFO_STRING);
|
||||
|
||||
CL_InitInput ();
|
||||
|
@ -1503,7 +1509,7 @@ void Host_Init (quakeparms_t *parms)
|
|||
|
||||
host_initialized = true;
|
||||
|
||||
Con_Printf ("\nClient Version %s\n\n", VERSION);
|
||||
Con_Printf ("\nClient Version %s\n\n", QF_VERSION);
|
||||
|
||||
Con_Printf ("€<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> QuakeWorld Initialized <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>‚\n");
|
||||
}
|
||||
|
|
|
@ -340,7 +340,7 @@ extern lightstyle_t cl_lightstyle[MAX_LIGHTSTYLES];
|
|||
extern dlight_t cl_dlights[MAX_DLIGHTS];
|
||||
|
||||
extern qboolean nomaster;
|
||||
extern float server_version; // version of server we connected to
|
||||
extern char *server_version; // version of server we connected to
|
||||
|
||||
//=============================================================================
|
||||
|
||||
|
|
|
@ -1380,6 +1380,7 @@ void SV_InitLocal (void)
|
|||
for (i=0 ; i<MAX_MODELS ; i++)
|
||||
snprintf(localmodels[i], sizeof(localmodels[i]), "*%i", i);
|
||||
|
||||
Info_SetValueForStarKey (svs.info, "*qf_version", QF_VERSION, MAX_SERVERINFO_STRING);
|
||||
Info_SetValueForStarKey (svs.info, "*version", VERSION, MAX_SERVERINFO_STRING);
|
||||
|
||||
// init fraglog stuff
|
||||
|
@ -1701,7 +1702,7 @@ void SV_Init (quakeparms_t *parms)
|
|||
Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
|
||||
Con_Printf ("%4.1f megabyte heap\n",parms->memsize/ (1024*1024.0));
|
||||
|
||||
Con_Printf ("\nServer Version %s\n\n", VERSION);
|
||||
Con_Printf ("\nServer Version %s\n\n", QF_VERSION);
|
||||
|
||||
Con_Printf ("======== QuakeWorld Initialized ========\n");
|
||||
|
||||
|
|
|
@ -79,7 +79,7 @@ void Host_Status_f (void)
|
|||
print = SV_ClientPrintf;
|
||||
|
||||
print ("host: %s\n", Cvar_VariableString ("hostname"));
|
||||
print ("version: %s\n", VERSION);
|
||||
print ("version: %s\n", QF_VERSION);
|
||||
if (tcpipAvailable)
|
||||
print ("tcp/ip: %s\n", my_tcpip_address);
|
||||
if (ipxAvailable)
|
||||
|
@ -962,7 +962,7 @@ void Host_Name_f (void)
|
|||
|
||||
void Host_Version_f (void)
|
||||
{
|
||||
Con_Printf ("Version %s\n", VERSION);
|
||||
Con_Printf ("Version %s\n", QF_VERSION);
|
||||
Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue