diff options
| author | /dev/humancontroller <devhc@example.com> | 2015-04-18 15:53:35 -0500 |
|---|---|---|
| committer | Jeff Kent <jeff@jkent.net> | 2015-06-08 17:01:01 -0500 |
| commit | adf3449e69926e23957cf5b786c4f049e6aa068d (patch) | |
| tree | 948ec8e2f4c8e612e0adf75a6add6fcd67b1b89c | |
| parent | 716b3ff876671b1711814cf99ae8e7264147c87a (diff) | |
merge some changes from the old "gpp" branch: edit version tags and the set the default fs_game to "gpp"
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/game/g_main.c | 2 | ||||
| -rw-r--r-- | src/qcommon/files.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -94,7 +94,7 @@ endif export CROSS_COMPILING ifndef VERSION -VERSION=1.2.0 +VERSION=gpp1 endif ifndef CLIENTBIN diff --git a/src/game/g_main.c b/src/game/g_main.c index b749321f..2d3be8e1 100644 --- a/src/game/g_main.c +++ b/src/game/g_main.c @@ -271,7 +271,7 @@ static cvarTable_t gameCvarTable[ ] = { &g_censorship, "g_censorship", "", CVAR_ARCHIVE, 0, qfalse }, - { &g_tag, "g_tag", "main", CVAR_INIT, 0, qfalse } + { &g_tag, "g_tag", "gpp", CVAR_INIT, 0, qfalse } }; static size_t gameCvarTableSize = ARRAY_LEN( gameCvarTable ); diff --git a/src/qcommon/files.c b/src/qcommon/files.c index 576ad9d2..e791194b 100644 --- a/src/qcommon/files.c +++ b/src/qcommon/files.c @@ -3202,7 +3202,7 @@ static void FS_Startup( const char *gameName ) homePath = fs_basepath->string; } fs_homepath = Cvar_Get ("fs_homepath", homePath, CVAR_INIT|CVAR_PROTECTED ); - fs_gamedirvar = Cvar_Get ("fs_game", "", CVAR_INIT|CVAR_SYSTEMINFO ); + fs_gamedirvar = Cvar_Get ("fs_game", "gpp", CVAR_INIT|CVAR_SYSTEMINFO ); // add search path elements in reverse priority order if (fs_basepath->string[0]) { |