qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-25 05:11:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

We now have two versions, what we first identify ourselves as, which is

Browse source 
2.40, and the quakeforge version, fixes the annoying spectator bug..
This commit is contained in:
Zephaniah E. Hull 2000-01-16 12:19:30 +00:00
parent f5c1241960
commit 0391657e6b
9 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
acconfig.h
View file

@ -1,4 +1,5 @@
/* Version string */ /* Version string */
#undef QF_VERSION
#undef VERSION #undef VERSION
/* Define if you have the XFree86 DGA extension */ /* Define if you have the XFree86 DGA extension */

4
common/draw.c
View file

@ -630,9 +630,9 @@ void Draw_ConsoleBackground (int lines)
qpic_t *conback; qpic_t *conback;
static char saveback[320*8]; static char saveback[320*8];
#ifdef QUAKEWORLD #ifdef QUAKEWORLD
char ver[] = "QuakeForge (Software QW) " VERSION; char ver[] = "QuakeForge (Software QW) " QF_VERSION;
#else #else
char ver[] = "QuakeForge (Software UQ) " VERSION; char ver[] = "QuakeForge (Software UQ) " QF_VERSION;
#endif #endif
conback = Draw_CachePic ("gfx/conback.lmp"); conback = Draw_CachePic ("gfx/conback.lmp");

4
common/gl_draw.c
View file

@ -810,9 +810,9 @@ Draw_ConsoleBackground
void Draw_ConsoleBackground (int lines) void Draw_ConsoleBackground (int lines)
{ {
#ifdef QUAKEWORLD #ifdef QUAKEWORLD
char ver[] = "QuakeForge (GL QW) " VERSION; char ver[] = "QuakeForge (GL QW) " QF_VERSION;
#else #else
char ver[] = "QuakeForge (GL UQ) " VERSION; char ver[] = "QuakeForge (GL UQ) " QF_VERSION;
#endif #endif
int x, i; int x, i;
int y; int y;

4
common/sys_linux.c
View file

@ -295,9 +295,9 @@ int main (int c, char **v) {
} else { } else {
fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NDELAY); fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NDELAY);
#ifdef QUAKEWORLD #ifdef QUAKEWORLD
printf ("QuakeForge (QW Client) v%s\n", VERSION); printf ("QuakeForge (QW Client) v%s\n", QF_VERSION);
#else #else
printf ("QuakeForge (UQuake) v%s\n", VERSION); printf ("QuakeForge (UQuake) v%s\n", QF_VERSION);
#endif #endif
} }

3
configure.in
View file

@ -3,7 +3,8 @@ AC_PREREQ(2.13)
AC_INIT(common/crc.h) AC_INIT(common/crc.h)
dnl Version of this release 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_CANONICAL_SYSTEM
AC_LANG_C AC_LANG_C

20
qw_client/cl_main.c
View file

@ -145,7 +145,7 @@ jmp_buf host_abort;
void Master_Connect_f (void); 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[] = char emodel_name[] =
{ 'e' ^ 0xff, 'm' ^ 0xff, 'o' ^ 0xff, 'd' ^ 0xff, 'e' ^ 0xff, 'l' ^ 0xff, 0 }; { '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) void CL_Version_f (void)
{ {
Con_Printf ("Version %s\n", VERSION); Con_Printf ("Version %s\n", QF_VERSION);
Con_Printf ("Exe: "__TIME__" "__DATE__"\n"); Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
} }
@ -592,12 +592,17 @@ void CL_FullServerinfo_f (void)
strcpy (cl.serverinfo, Cmd_Argv(1)); strcpy (cl.serverinfo, Cmd_Argv(1));
if ((p = Info_ValueForKey(cl.serverinfo, "*version")) && *p) { if ((p = Info_ValueForKey(cl.serverinfo, "*qf_version")) && *p) {
v = Q_atof(p);
if (v) { if (v) {
if (!server_version) if (!server_version)
Con_Printf("Version %1.2f Server\n", v); Con_Printf("QuakeForge Version %s Server\n", p);
server_version = v; 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, "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);
Info_SetValueForStarKey(cls.userinfo, "*qf_ver", QF_VERSION, MAX_INFO_STRING);
Info_SetValueForStarKey(cls.userinfo, "*ver", VERSION, MAX_INFO_STRING); Info_SetValueForStarKey(cls.userinfo, "*ver", VERSION, MAX_INFO_STRING);
CL_InitInput (); CL_InitInput ();
@ -1503,7 +1509,7 @@ void Host_Init (quakeparms_t *parms)
host_initialized = true; 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"); Con_Printf ("€<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> QuakeWorld Initialized <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>‚\n");
} }

2
qw_common/client.h
View file

@ -340,7 +340,7 @@ extern lightstyle_t cl_lightstyle[MAX_LIGHTSTYLES];
extern dlight_t cl_dlights[MAX_DLIGHTS]; extern dlight_t cl_dlights[MAX_DLIGHTS];
extern qboolean nomaster; extern qboolean nomaster;
extern float server_version; // version of server we connected to extern char *server_version; // version of server we connected to
//============================================================================= //=============================================================================

3
qw_server/sv_main.c
View file

@ -1380,6 +1380,7 @@ void SV_InitLocal (void)
for (i=0 ; i<MAX_MODELS ; i++) for (i=0 ; i<MAX_MODELS ; i++)
snprintf(localmodels[i], sizeof(localmodels[i]), "*%i", 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); Info_SetValueForStarKey (svs.info, "*version", VERSION, MAX_SERVERINFO_STRING);
// init fraglog stuff // init fraglog stuff
@ -1701,7 +1702,7 @@ 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 %s\n\n", VERSION); Con_Printf ("\nServer Version %s\n\n", QF_VERSION);
Con_Printf ("======== QuakeWorld Initialized ========\n"); Con_Printf ("======== QuakeWorld Initialized ========\n");

4
uquake/host_cmd.c
View file

@ -79,7 +79,7 @@ void Host_Status_f (void)
print = SV_ClientPrintf; print = SV_ClientPrintf;
print ("host: %s\n", Cvar_VariableString ("hostname")); print ("host: %s\n", Cvar_VariableString ("hostname"));
print ("version: %s\n", VERSION); print ("version: %s\n", QF_VERSION);
if (tcpipAvailable) if (tcpipAvailable)
print ("tcp/ip: %s\n", my_tcpip_address); print ("tcp/ip: %s\n", my_tcpip_address);
if (ipxAvailable) if (ipxAvailable)
@ -962,7 +962,7 @@ void Host_Name_f (void)
void Host_Version_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"); Con_Printf ("Exe: "__TIME__" "__DATE__"\n");
} }