Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/game/client/c_sceneentity.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

//-----------------------------------------------------------------------------
Expand Down
2 changes: 0 additions & 2 deletions src/game/server/tf/tf_player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2862,7 +2862,6 @@ void CTFPlayer::PrecachePlayerModels( void )
PrecacheModel( pszModel );
}

/*
if ( !IsX360() )
{
// Precache the hardware facial morphed models as well.
Expand All @@ -2872,7 +2871,6 @@ void CTFPlayer::PrecachePlayerModels( void )
PrecacheModel( pszHWMModel );
}
}
*/
}

// Always precache the silly gibs.
Expand Down
17 changes: 8 additions & 9 deletions src/game/shared/baseplayer_shared.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down