diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgame/cg_main.c | 4 | ||||
| -rw-r--r-- | src/cgame/cg_weapons.c | 2 | ||||
| -rw-r--r-- | src/client/cl_main.c | 22 | ||||
| -rw-r--r-- | src/game/g_main.c | 2 | ||||
| -rw-r--r-- | src/qcommon/files.c | 2 | ||||
| -rw-r--r-- | src/qcommon/qcommon.h | 2 | ||||
| -rw-r--r-- | src/server/sv_init.c | 3 | ||||
| -rw-r--r-- | src/ui/ui_main.c | 2 | ||||
| -rw-r--r-- | src/ui/ui_public.h | 4 |
9 files changed, 14 insertions, 29 deletions
diff --git a/src/cgame/cg_main.c b/src/cgame/cg_main.c index 16147cd2..25935b8b 100644 --- a/src/cgame/cg_main.c +++ b/src/cgame/cg_main.c @@ -164,6 +164,7 @@ vmCvar_t cg_noPrintDuplicate; vmCvar_t cg_noVoiceChats; vmCvar_t cg_noVoiceText; vmCvar_t cg_hudFiles; +vmCvar_t cg_hudFilesEnable; vmCvar_t cg_smoothClients; vmCvar_t pmove_fixed; vmCvar_t pmove_msec; @@ -308,6 +309,7 @@ static cvarTable_t cvarTable[ ] = { &cg_disableScannerPlane, "cg_disableScannerPlane", "0", CVAR_ARCHIVE }, { &cg_tutorial, "cg_tutorial", "1", CVAR_ARCHIVE }, { &cg_hudFiles, "cg_hudFiles", "ui/hud.txt", CVAR_ARCHIVE}, + { &cg_hudFilesEnable, "cg_hudFilesEnable", "0", CVAR_ARCHIVE}, { NULL, "cg_alienConfig", "", CVAR_ARCHIVE }, { NULL, "cg_humanConfig", "", CVAR_ARCHIVE }, { NULL, "cg_spectatorConfig", "", CVAR_ARCHIVE }, @@ -1684,7 +1686,7 @@ void CG_LoadHudMenu( void ) trap_Cvar_VariableStringBuffer( "cg_hudFiles", buff, sizeof( buff ) ); hudSet = buff; - if( hudSet[ 0 ] == '\0' ) + if( !cg_hudFilesEnable.integer || hudSet[ 0 ] == '\0' ) hudSet = "ui/hud.txt"; CG_LoadMenus( hudSet ); diff --git a/src/cgame/cg_weapons.c b/src/cgame/cg_weapons.c index 5a959c21..27aa04e8 100644 --- a/src/cgame/cg_weapons.c +++ b/src/cgame/cg_weapons.c @@ -767,7 +767,7 @@ void CG_RegisterWeapon( int weaponNum ) Com_sprintf( path, MAX_QPATH, "models/weapons/%s/animation.cfg", BG_Weapon( weaponNum )->name ); if( !CG_ParseWeaponAnimationFile( path, weaponInfo ) ) - Com_Printf( S_COLOR_RED "ERROR: failed to parse %s\n", path ); + ; //Com_Printf( S_COLOR_RED "ERROR: failed to parse %s\n", path ); // calc midpoint for rotation trap_R_ModelBounds( weaponInfo->weaponModel, mins, maxs ); diff --git a/src/client/cl_main.c b/src/client/cl_main.c index 03bd542c..34eb95af 100644 --- a/src/client/cl_main.c +++ b/src/client/cl_main.c @@ -4168,25 +4168,9 @@ void CL_GlobalServers_f( void ) { cls.numglobalservers = -1; cls.pingUpdateSource = AS_GLOBAL; - // Use the extended query for IPv6 masters - if (to.type == NA_IP6 || to.type == NA_MULTICAST6) - { - int v4enabled = Cvar_VariableIntegerValue("net_enabled") & NET_ENABLEV4; - - if(v4enabled) - { - Com_sprintf(command, sizeof(command), "getserversExt %s %s", - com_gamename->string, Cmd_Argv(2)); - } - else - { - Com_sprintf(command, sizeof(command), "getserversExt %s %s ipv6", - com_gamename->string, Cmd_Argv(2)); - } - } - else - Com_sprintf(command, sizeof(command), "getservers %s %s", - com_gamename->string, Cmd_Argv(2)); + Com_sprintf(command, sizeof(command), "getserversExt %s %i%s", + com_gamename->string, PROTOCOL_VERSION, + (Cvar_VariableIntegerValue("net_enabled") & NET_ENABLEV4 ? "" : " ipv6")); for (i=3; i < count; i++) { 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]) { 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 diff --git a/src/server/sv_init.c b/src/server/sv_init.c index 30fd3936..3fde62ef 100644 --- a/src/server/sv_init.c +++ b/src/server/sv_init.c @@ -665,8 +665,7 @@ void SV_Init (void) Cvar_Get ("sv_dlURL", "http://downloads.tremulous.net", CVAR_SERVERINFO | CVAR_ARCHIVE); sv_master[0] = Cvar_Get("sv_master1", MASTER_SERVER_NAME, 0); - sv_master[1] = Cvar_Get("sv_master2", "master.ioquake3.org", 0); - for(index = 2; index < MAX_MASTER_SERVERS; index++) + for(index = 1; index < MAX_MASTER_SERVERS; index++) sv_master[index] = Cvar_Get(va("sv_master%d", index + 1), "", CVAR_ARCHIVE); sv_reconnectlimit = Cvar_Get ("sv_reconnectlimit", "3", 0); diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index 1e6ddad7..74a937a8 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -1120,7 +1120,7 @@ static void UI_StartServerRefresh( qboolean full ) { qboolean global = ui_netSource.integer == AS_GLOBAL; - trap_Cmd_ExecuteText( EXEC_APPEND, va( "globalservers %d full empty\n", + trap_Cmd_ExecuteText( EXEC_APPEND, va( "globalservers %d 70 full empty\n", global ? 0 : 1 ) ); } } diff --git a/src/ui/ui_public.h b/src/ui/ui_public.h index 0de73dae..f1f55c2f 100644 --- a/src/ui/ui_public.h +++ b/src/ui/ui_public.h @@ -152,10 +152,10 @@ uiMenuCommand_t; typedef enum { SORT_HOST, - SORT_GAME, SORT_MAP, SORT_CLIENTS, - SORT_PING + SORT_PING, + SORT_GAME } serverSortField_t; |