tech
/
engine
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Getting rid of the version number, now using build numbers only. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1418 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-10-04 21:08:06 +00:00
parent 37392cfd7c
commit 8ca97dc86b
14 changed files with 37 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
engine/client/cl_main.c
View File

@ -238,19 +238,8 @@ CL_Version_f
*/
void CL_Version_f (void)
{
#ifdef VERSION3PART
#ifdef DISTRIBUTION
Con_TPrintf (TLC_VERSIONST3, DISTRIBUTION, VERSION, build_number());
#else
Con_TPrintf (TCL_VERSION3, VERSION, build_number());
#endif
#else
#ifdef DISTRIBUTION
Con_TPrintf (TLC_VERSIONST2, DISTRIBUTION, VERSION, build_number());
#else
Con_TPrintf (TLC_VERSION2, VERSION, build_number());
#endif
#endif
Con_TPrintf (TLC_VERSIONST, DISTRIBUTION, build_number());
Con_TPrintf (TL_EXEDATETIME, __DATE__, __TIME__);
}
@ -2354,11 +2343,8 @@ void CL_Init (void)
cls.state = ca_disconnected;
#ifdef VERSION3PART
sprintf (st, "%s %4.3f-%04d", DISTRIBUTION, VERSION, build_number());
#else
sprintf (st, "%s %4.2f-%04d", DISTRIBUTION, VERSION, build_number());
#endif
sprintf (st, "%s %i", DISTRIBUTION, build_number());
sprintf (st, "%s", DISTRIBUTION);
Info_SetValueForStarKey (cls.userinfo, "*ver", st, MAX_INFO_STRING);
@ -3131,11 +3117,7 @@ void Host_Init (quakeparms_t *parms)
#endif
Con_TPrintf (TL_NL);
#ifdef VERSION3PART
Con_TPrintf (TCL_VERSION3, VERSION, build_number());
#else
Con_TPrintf (TLC_VERSION2, VERSION, build_number());
#endif
Con_TPrintf (TL_VERSION, DISTRIBUTION, build_number());
Con_TPrintf (TL_NL);
Con_TPrintf (TLC_QUAKEWORLD_INITED);

6
engine/client/valid.c
View File

@ -240,9 +240,9 @@ void ValidationPrintVersion(char *f_query_string)
}
if (*sr)
Cbuf_AddText (va("say "DISTRIBUTION"Quake v%4.3f-%i "PLATFORM"/%s/%s\n", VERSION, build_number(), q_renderername, sr), RESTRICT_RCON);
Cbuf_AddText (va("say "DISTRIBUTION"Quake v%i "PLATFORM"/%s/%s\n", build_number(), q_renderername, sr), RESTRICT_RCON);
else
Cbuf_AddText (va("say "DISTRIBUTION"Quake v%4.3f-%i "PLATFORM"/%s\n", VERSION, build_number(), q_renderername), RESTRICT_RCON);
Cbuf_AddText (va("say "DISTRIBUTION"Quake v%i "PLATFORM"/%s\n", build_number(), q_renderername), RESTRICT_RCON);
}
void Validation_FilesModified (void)
{
@ -408,7 +408,7 @@ void InitValidation(void)
if (Security_Init)
{
switch(Security_Init(va("%s %.2f %i", DISTRIBUTION, VERSION, build_number())))
switch(Security_Init(va("%s %.2f %i", DISTRIBUTION, 2.57, build_number())))
{
case SECURITY_INIT_BAD_CHECKSUM:
Con_Printf("Checksum failed. Security module does not support this build. Go upgrade it.\n");

2
engine/client/zqtp.c
View File

@ -889,7 +889,7 @@ static char *Macro_Version (void)
{
/* you probably don't need date, but it's included as this is likly to be used by
q2 servers checking for cheats. */
return va("%.2f "DISTRIBUTION" ["__DATE__"] (%i)", VERSION, build_number());
return va("%.2f "DISTRIBUTION" ["__DATE__"] (%i)", 2.57, build_number());
}

6
engine/common/bothdefs.h
View File

@ -231,13 +231,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define PROTOCOLEXTENSIONS
#define PRE_SAYONE 2.487 //FIXME: remove.
//#define PRE_SAYONE 2.487 //FIXME: remove.
// defs common to client and server
#define VERSION 2.56
//#define VERSION3PART //add the 3rd decimal point of a more precise version.
//#define VERSION 2.56
#define DISTRIBUTION "FTE"
#define DISTRIBUTIONLONG "Forethought Entertainment"

4
engine/common/tlout.h
View File

@ -143,8 +143,8 @@
"STL_SERVERSPAWNED \"Server spawned.\\n\"\n"
"TL_EXEDATETIME \"Exe: %s %s\\n\"\n"
"TL_HEAPSIZE \"%4.1f megabyte heap\\n\"\n"
"TL_VERSION2 \"\\nVersion %4.2f (Build %04d)\\n\\n\"\n"
"TL_SERVERVERSION2 \"\\n%s Version %4.2f (Build %04d)\\n\\n\"\n"
"TL_VERSION \"\\nBuild %i\\n\\n\"\n"
"TL_SERVERVERSION \"\\n%s Build %i\\n\\n\"\n"
"STL_SAVESYNTAX \"save <savename> : save a game\\n\"\n"
"STL_NORELATIVEPATHS \"Relative pathnames are not allowed.\\n\"\n"
"STL_SAVEGAMETO \"Saving game to %s...\\n\"\n"

6
engine/common/translate.c
View File

@ -151,8 +151,7 @@ static char *defaultlanguagetext =
"STL_SERVERSPAWNED \"Server spawned.\\n\"\n"
"TL_EXEDATETIME \"Exe: %s %s\\n\"\n"
"TL_HEAPSIZE \"%4.1f megs RAM available.\\n\"\n"
"TL_VERSION2 \"\\nVersion %4.2f (Build %04d)\\n\\n\"\n"
"TL_SERVERVERSION2 \"\\n%s Version %4.2f (Build %04d)\\n\\n\"\n"
"TL_VERSION \"\\n%s Build %i\\n\\n\"\n"
"STL_SAVESYNTAX \"save <savename> : save a game\\n\"\n"
"STL_NORELATIVEPATHS \"Relative pathnames are not allowed.\\n\"\n"
"STL_SAVEGAMETO \"Saving game to %s...\\n\"\n"
@ -192,9 +191,6 @@ static char *defaultlanguagetext =
"STL_SNAPTOOMANYFILES \"Snap: Couldn't create a file, clean some out.\\n\"\n"
"STL_SNAPREQUEST \"Requesting snap from user %d...\\n\"\n"
"STL_SNAPUSAGE \"Usage: snap <userid>\\n\"\n"
"TLC_VERSIONST3 \"Version %s %4.3f (Build %i)\\n\"\n"
"TLC_VERSIONST2 \"Version %s %4.2f (Build %i)\\n\"\n"
"TLC_VERSION2 \"Version %4.2f (Build %i)\\n\"\n"
"TLC_BADSERVERADDRESS \"Bad server address\\n\"\n"
"TLC_ILLEGALSERVERADDRESS \"Illegal server address\\n\"\n"
"TLC_CONNECTINGTO \"Connecting to %s...\\n\"\n"

21
engine/common/translate.h
View File

@ -183,13 +183,8 @@
NAME(TL_EXEDATETIME)
NAME(TL_HEAPSIZE)
#ifdef VERSION3PART
NAME(TL_VERSION3)
NAME(TL_SERVERVERSION3)
#else
NAME(TL_VERSION2)
NAME(TL_SERVERVERSION2)
#endif
NAME(TL_VERSION)
//savegame.c
NAME(STL_SAVESYNTAX)
@ -235,9 +230,8 @@
NAME(STL_SNAPUSAGE)
NAME(TLC_VERSIONST3)
NAME(TLC_VERSIONST2)
NAME(TLC_VERSION2)
NAME(TLC_VERSIONST)
NAME(TLC_BADSERVERADDRESS)
NAME(TLC_ILLEGALSERVERADDRESS)
NAME(TLC_CONNECTINGTO)
@ -332,13 +326,6 @@ void SV_InitLanguages(void);
#define langtext(t,l) languagetext[t][l]
#ifdef VERSION3PART
#define TL_VERSION TL_VERSION3
#define TL_SERVERVERSION TL_SERVERVERSION3
#else
#define TL_VERSION TL_VERSION2
#define TL_SERVERVERSION TL_SERVERVERSION2
#endif
#define LANGDEFAULT 1

BIN
engine/dotnet/dotnet.suo
View File

Binary file not shown.

6
engine/dotnet/dotnet.vcproj
View File

@ -324,6 +324,9 @@
<File
RelativePath="..\common\cvar.c">
</File>
<File
RelativePath="..\common\fs.c">
</File>
<File
RelativePath="..\common\gl_q2bsp.c">
</File>
@ -385,6 +388,9 @@
<File
RelativePath="..\gl\gl_draw.c">
</File>
<File
RelativePath="..\gl\gl_heightmap.c">
</File>
<File
RelativePath="..\gl\gl_hlmdl.c">
</File>

6
engine/gl/gl_draw.c
View File

@ -956,11 +956,7 @@ TRACE(("dbg: GLDraw_ReInit: Allocating upload buffers\n"));
if (draw_chars)
{
#ifdef DISTRIBUTION
sprintf (ver, "%s %4.2f", DISTRIBUTION, VERSION);
#else
sprintf (ver, "%4.2f", VERSION);
#endif
sprintf (ver, "%i", build_number());
dest = cb->data + 320 + 320*186 - 11 - 8*strlen(ver);
for (x=0 ; x<strlen(ver) ; x++)
GLDraw_CharToConback (ver[x], dest+(x<<3));

8
engine/server/pr_cmds.c
View File

@ -672,20 +672,20 @@ progsnum_t AddProgs(char *name)
if ((f = PR_FindFunction (svprogfuncs, "VersionChat", num )))
{
pr_globals = PR_globals(svprogfuncs, num);
G_FLOAT(OFS_PARM0) = VERSION;
G_FLOAT(OFS_PARM0) = build_number();
PR_ExecuteProgram (svprogfuncs, f);
fl = G_FLOAT(OFS_RETURN);
if (fl < 0)
SV_Error ("PR_LoadProgs: progs.dat is not compatable with EXE version");
else if ((int) (fl*1000) != (int) (VERSION*1000))
Con_DPrintf("Warning: Progs may not be fully compatable\n (%4.2f != %4.2f)\n", fl, VERSION);
else if ((int) (fl) != (int) (build_number()))
Con_DPrintf("Warning: Progs may not be fully compatable\n (%4.2f != %i)\n", fl, build_number());
}
if ((f = PR_FindFunction (svprogfuncs, "FTE_init", num )))
{
pr_globals = PR_globals(svprogfuncs, num);
G_FLOAT(OFS_PARM0) = VERSION;
G_FLOAT(OFS_PARM0) = build_number();
PR_ExecuteProgram (svprogfuncs, f);
}

2
engine/server/sv_init.c
View File

@ -925,7 +925,7 @@ void SV_SpawnServer (char *server, char *startspot, qboolean noents, qboolean us
if (progstype == PROG_QW && pr_imitatemvdsv.value>0)
{
ent->v->targetname = PR_NewString(svprogfuncs, "mvdsv", 0);
ent->v->netname = PR_NewString(svprogfuncs, va("%s %f %s, build %d\nBuild date: " __DATE__ ", " __TIME__ "", DISTRIBUTIONLONG, VERSION, PLATFORM, build_number()), 0);
ent->v->netname = PR_NewString(svprogfuncs, va("%s %f %s, build %d\nBuild date: " __DATE__ ", " __TIME__ "", DISTRIBUTIONLONG, 2.4, PLATFORM, build_number()), 0);
ent->v->impulse = 0;//QWE_VERNUM;
ent->v->items = 103;
}

14
engine/server/sv_main.c
View File

@ -1251,7 +1251,7 @@ client_t *SVC_DirectConnect(void)
if (strcmp(Info_ValueForKey(userinfo[0], "protocol"), "darkplaces 3"))
{
SV_RejectMessage (SCP_BAD, "Server is version %4.2f.\n", VERSION);
SV_RejectMessage (SCP_BAD, "Server is "DISTRIBUTION" build %i.\n", build_number());
Con_Printf ("* rejected connect from incompatable client\n");
return NULL;
}
@ -1282,7 +1282,7 @@ client_t *SVC_DirectConnect(void)
numssclients = atoi(Cmd_Argv(0)+7);
if (numssclients<1 || numssclients > 4)
{
SV_RejectMessage (SCP_BAD, "Server is version %4.2f.\n", VERSION);
SV_RejectMessage (SCP_BAD, "Server is "DISTRIBUTION" build %i.\n", build_number());
Con_Printf ("* rejected connect from broken client\n");
return NULL;
}
@ -1301,7 +1301,7 @@ client_t *SVC_DirectConnect(void)
}
else if (version != PROTOCOL_VERSION)
{
SV_RejectMessage (SCP_BAD, "Server is version %4.2f.\n", VERSION);
SV_RejectMessage (SCP_BAD, "Server is build %i.\n", build_number());
Con_Printf ("* rejected connect from version %i\n", version);
return NULL;
}
@ -3105,11 +3105,7 @@ void SV_InitLocal (void)
// if (svs.protocolextensions)
// Info_SetValueForStarKey (svs.info, "*"DISTRIBUTION"_ext", va("%x", svs.protocolextensions), MAX_SERVERINFO_STRING);
#ifdef VERSION3PART
Info_SetValueForStarKey (svs.info, "*version", va("%s %4.3f-%i", DISTRIBUTION, VERSION, build_number()), MAX_SERVERINFO_STRING);
#else
Info_SetValueForStarKey (svs.info, "*version", va("%s %4.2f-%i", DISTRIBUTION, VERSION, build_number()), MAX_SERVERINFO_STRING);
#endif
Info_SetValueForStarKey (svs.info, "*version", va("%s %i", DISTRIBUTION, build_number()), MAX_SERVERINFO_STRING);
Info_SetValueForStarKey (svs.info, "*z_ext", va("%i", SUPPORTED_Z_EXTENSIONS), MAX_SERVERINFO_STRING);
@ -3629,7 +3625,7 @@ void SV_Init (quakeparms_t *parms)
Con_TPrintf (TL_EXEDATETIME, __DATE__, __TIME__);
Con_TPrintf (TL_HEAPSIZE,parms->memsize/ (1024*1024.0));
Con_TPrintf (TL_SERVERVERSION, DISTRIBUTION, VERSION, build_number());
Con_TPrintf (TL_VERSION, DISTRIBUTION, build_number());
Con_TPrintf (STL_INITED);

4
engine/server/sv_user.c
View File

@ -276,9 +276,9 @@ void SVNQ_New_f (void)
MSG_WriteByte (&host_client->netchan.message, svc_print);
#ifdef DISTRIBUTION
sprintf (message, "%c\n" DISTRIBUTION " QuakeWorld version %4.2f server\n", 2, VERSION);
sprintf (message, "%c\n" DISTRIBUTION " QuakeWorld build %i server\n", 2, build_number());
#else
sprintf (message, "%c\nQUAKEWORLD VERSION %4.2f SERVER\n", 2, VERSION);
sprintf (message, "%c\nQUAKEWORLD BUILD %i SERVER\n", 2, build_number());
#endif
MSG_WriteString (&host_client->netchan.message,message);