From a38e73f48011207635ebdf5bf741218fd859e47a Mon Sep 17 00:00:00 2001 From: nillerusr Date: Sat, 12 Feb 2022 13:45:43 +0300 Subject: [PATCH] Disable trusted key verification for sv_pure, fix mod_texture.txt loading --- filesystem/basefilesystem.cpp | 6 +++++- game/client/hud.cpp | 4 +--- game/client/wscript | 2 +- game/server/wscript | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/filesystem/basefilesystem.cpp b/filesystem/basefilesystem.cpp index c33b9582..e1ed24db 100644 --- a/filesystem/basefilesystem.cpp +++ b/filesystem/basefilesystem.cpp @@ -3445,7 +3445,7 @@ void CBaseFileSystem::EnableWhitelistFileTracking( bool bEnable, bool bCacheAllV { Error( "CBaseFileSystem::EnableWhitelistFileTracking called more than once." ); } - + m_WhitelistFileTrackingEnabled = bEnable; if ( m_WhitelistFileTrackingEnabled && bCacheAllVPKHashes ) { @@ -3619,6 +3619,9 @@ void CBaseFileSystem::NotifyFileUnloaded( const char *pszFilename, const char *p void CBaseFileSystem::SetSearchPathIsTrustedSource( CSearchPath *pSearchPath ) { +#if 1 + pSearchPath->m_bIsTrustedForPureServer = true; +#else // Broken, I am lazy to fix this // Most paths are not considered trusted pSearchPath->m_bIsTrustedForPureServer = false; @@ -3675,6 +3678,7 @@ void CBaseFileSystem::SetSearchPathIsTrustedSource( CSearchPath *pSearchPath ) Msg( "Setting %s as untrusted. (Key not in trusted key list)\n", pSearchPath->GetDebugString() ); #endif #endif +#endif } diff --git a/game/client/hud.cpp b/game/client/hud.cpp index c32f4b4f..b5869aef 100644 --- a/game/client/hud.cpp +++ b/game/client/hud.cpp @@ -458,9 +458,7 @@ void CHud::Init( void ) // check to see if we have sprites for this res; if not, step down LoadHudTextures( textureList, "scripts/hud_textures", NULL ); - - // Нахуя, а главное зачем ? - // LoadHudTextures( textureList, "scripts/mod_textures", NULL ); + LoadHudTextures( textureList, "scripts/mod_textures", NULL ); int c = textureList.Count(); for ( int index = 0; index < c; index++ ) diff --git a/game/client/wscript b/game/client/wscript index ca2ced3b..59607674 100755 --- a/game/client/wscript +++ b/game/client/wscript @@ -17,7 +17,7 @@ games = { 'hl1': ['client_base.vpc', 'client_hl1.vpc'], 'portal': ['client_base.vpc', 'client_portal.vpc'], 'hl1mp': ['client_base.vpc', 'client_hl1.vpc'], - 'css': ['client_base.vpc', 'client_cstrike.vpc'], + 'cstrike': ['client_base.vpc', 'client_cstrike.vpc'], 'dod': ['client_base.vpc', 'client_dod.vpc'] } diff --git a/game/server/wscript b/game/server/wscript index a474c2f8..ee9cbd9f 100755 --- a/game/server/wscript +++ b/game/server/wscript @@ -15,7 +15,7 @@ games = { 'portal': ['server_base.vpc', 'server_portal.vpc'], 'hl1': ['server_base.vpc', 'server_hl1.vpc'], 'hl1mp': ['server_base.vpc', 'server_hl1.vpc'], - 'css': ['server_base.vpc', 'server_cstrike.vpc', 'nav_mesh.vpc'], + 'cstrike': ['server_base.vpc', 'server_cstrike.vpc', 'nav_mesh.vpc'], 'dod': ['server_base.vpc', 'server_dod.vpc'], 'tf': [ 'server_base.vpc',