From 852c451bc1e4a760c699c7ba9953dad10fdc84c1 Mon Sep 17 00:00:00 2001 From: Paweł Redman Date: Sun, 4 Feb 2018 17:00:08 +0100 Subject: Show the commit hash in qvm_version. --- GNUmakefile | 2 +- src/game/g_main.c | 14 +------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index e587ebd..64cde4f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -102,7 +102,7 @@ endif export CROSS_COMPILING ifndef VERSION -VERSION=slackers +VERSION=bunkerqvm endif ifndef CLIENTBIN diff --git a/src/game/g_main.c b/src/game/g_main.c index 5c7940c..99079e8 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -23,15 +23,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "g_local.h" -#define QVM_NAME "cQVM" -#define MAJ_VERSION "5.5" - -#ifdef SVN_ID - #define QVM_VERSIONNUM MAJ_VERSION " svn" SVN_ID -#else - #define QVM_VERSIONNUM MAJ_VERSION -#endif - level_locals_t level; typedef struct @@ -304,7 +295,7 @@ static cvarTable_t gameCvarTable[ ] = { NULL, "sv_mapname", "", CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, { NULL, "P", "", CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, { NULL, "ff", "0", CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, - { NULL, "qvm_version", QVM_NAME " " QVM_VERSIONNUM " (" __DATE__ ", " __TIME__ ")", CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, + { NULL, "qvm_version", PRODUCT_VERSION, CVAR_SERVERINFO | CVAR_ROM, 0, qfalse }, // latched vars @@ -864,9 +855,6 @@ void G_InitGame( int levelTime, int randomSeed, int restart ) level.snd_fry = G_SoundIndex( "sound/misc/fry.wav" ); // FIXME standing in lava / slime - trap_Cvar_Set( "qvm_version", - QVM_NAME " " QVM_VERSIONNUM " (" __DATE__ ", " __TIME__ ")" ); - if( g_logFile.string[ 0 ] ) { if( g_logFileSync.integer ) -- cgit