diff options
| author | Tim Angus <tim@ngus.net> | 2015-06-08 23:15:03 +0100 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2015-06-08 23:15:03 +0100 |
| commit | 6204532c35bab4977d3bd4d2bf7a9a3b90e9620e (patch) | |
| tree | d0cfa4aba0d0d53c3b99be8c090601f052ed6f78 /src/qcommon | |
| parent | b8b66865c8ff4c756fe3544decb5504dbc2abdf7 (diff) | |
| parent | 9ff64e51801485a4153c665200842e40ba80ce3b (diff) | |
Merge pull request #12 from jkent/gpp
gpp compat changes
Diffstat (limited to 'src/qcommon')
| -rw-r--r-- | src/qcommon/files.c | 2 | ||||
| -rw-r--r-- | src/qcommon/qcommon.h | 2 |
2 files changed, 2 insertions, 2 deletions
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]) { diff --git a/src/qcommon/qcommon.h b/src/qcommon/qcommon.h index 98d1f1ec..9dd6df43 100644 --- a/src/qcommon/qcommon.h +++ b/src/qcommon/qcommon.h @@ -256,7 +256,7 @@ extern int demo_protocols[]; #define MASTER_SERVER_NAME "master.tremulous.net" #endif -#define PORT_MASTER 30710 +#define PORT_MASTER 30700 #define PORT_SERVER 30720 #define NUM_SERVER_PORTS 4 // broadcast scan this many ports after // PORT_SERVER so a single machine can |