diff --git a/src/game/client/c_sceneentity.cpp b/src/game/client/c_sceneentity.cpp index 1ee99399ff4..d6baa846a15 100644 --- a/src/game/client/c_sceneentity.cpp +++ b/src/game/client/c_sceneentity.cpp @@ -80,13 +80,12 @@ char const *C_SceneEntity::GetSceneFileName() return g_pStringTableClientSideChoreoScenes->GetString( m_nSceneStringIndex ); } -ConVar mp_usehwmvcds( "mp_usehwmvcds", "0", NULL, "Enable the use of the hw morph vcd(s). (-1 = never, 1 = always, 0 = based upon GPU)" ); // -1 = never, 0 = if hasfastvertextextures, 1 = always +ConVar mp_usehwmvcds( "mp_usehwmvcds", "-1", NULL, "Enable the use of the hw morph vcd(s). (-1 = never, 1 = always, 0 = based upon GPU)" ); // -1 = never, 0 = if hasfastvertextextures, 1 = always bool UseHWMorphVCDs() { -// if ( mp_usehwmvcds.GetInt() == 0 ) -// return g_pMaterialSystemHardwareConfig->HasFastVertexTextures(); -// return mp_usehwmvcds.GetInt() > 0; - return false; + if ( mp_usehwmvcds.GetInt() == 0 ) + return g_pMaterialSystemHardwareConfig->HasFastVertexTextures(); + return mp_usehwmvcds.GetInt() > 0; } //----------------------------------------------------------------------------- diff --git a/src/game/server/tf/tf_player.cpp b/src/game/server/tf/tf_player.cpp index fa944e35611..8e8f96aa7b2 100644 --- a/src/game/server/tf/tf_player.cpp +++ b/src/game/server/tf/tf_player.cpp @@ -2862,7 +2862,6 @@ void CTFPlayer::PrecachePlayerModels( void ) PrecacheModel( pszModel ); } -/* if ( !IsX360() ) { // Precache the hardware facial morphed models as well. @@ -2872,7 +2871,6 @@ void CTFPlayer::PrecachePlayerModels( void ) PrecacheModel( pszHWMModel ); } } -*/ } // Always precache the silly gibs. diff --git a/src/game/shared/baseplayer_shared.cpp b/src/game/shared/baseplayer_shared.cpp index abbd3196495..9c1e1a86e88 100644 --- a/src/game/shared/baseplayer_shared.cpp +++ b/src/game/shared/baseplayer_shared.cpp @@ -88,20 +88,19 @@ #endif #ifdef CLIENT_DLL -ConVar mp_usehwmmodels( "mp_usehwmmodels", "0", NULL, "Enable the use of the hw morph models. (-1 = never, 1 = always, 0 = based upon GPU)" ); // -1 = never, 0 = if hasfastvertextextures, 1 = always +ConVar mp_usehwmmodels( "mp_usehwmmodels", "-1", NULL, "Enable the use of the hw morph models. (-1 = never, 1 = always, 0 = based upon GPU)" ); // -1 = never, 0 = if hasfastvertextextures, 1 = always #endif bool UseHWMorphModels() { -// #ifdef CLIENT_DLL -// if ( mp_usehwmmodels.GetInt() == 0 ) -// return g_pMaterialSystemHardwareConfig->HasFastVertexTextures(); -// -// return mp_usehwmmodels.GetInt() > 0; -// #else -// return false; -// #endif +#ifdef CLIENT_DLL + if ( mp_usehwmmodels.GetInt() == 0 ) + return g_pMaterialSystemHardwareConfig->HasFastVertexTextures(); + + return mp_usehwmmodels.GetInt() > 0; +#else return false; +#endif } void CopySoundNameWithModifierToken( char *pchDest, const char *pchSource, int nMaxLenInChars, const char *pchToken )