diff options
| author | /dev/humancontroller <devhc@example.com> | 2015-04-18 15:58:26 -0500 |
|---|---|---|
| committer | Jeff Kent <jeff@jkent.net> | 2015-06-08 17:01:01 -0500 |
| commit | 9ff64e51801485a4153c665200842e40ba80ce3b (patch) | |
| tree | d0cfa4aba0d0d53c3b99be8c090601f052ed6f78 | |
| parent | adf3449e69926e23957cf5b786c4f049e6aa068d (diff) | |
merge some changes from the old "gpp" branch: add cg_hudFilesEnable, disable a warning
| -rw-r--r-- | src/cgame/cg_main.c | 4 | ||||
| -rw-r--r-- | src/cgame/cg_weapons.c | 2 |
2 files changed, 4 insertions, 2 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 ); |