Added missing materials in gamedata

engine/cl_main.cpp

@@ -2378,6 +2378,11 @@ bool CL_ShouldLoadBackgroundLevel( const CCommand &args )
 		bIsTF2 = true;
 	}
 
+	if ( Q_stricmp( COM_GetModDirectory(), "cstrike" ) == 0 )
+	{
+		return false;
+	}
+
 	if ( bIsTF2 && IsPC() )
 		return false;
 

game/server/cstrike/cs_player.cpp

@@ -1543,7 +1543,7 @@ void CCSPlayer::UpdateMouseoverHints()
 }
 
 #ifdef GLOWS_ENABLE
-ConVar sv_enable_cs_glows("sv_enable_cs_glows", "1");
+ConVar sv_cs_enable_glows("sv_cs_enable_glows", "1", FCVAR_NOTIFY);
 #endif
 
 void CCSPlayer::PostThink()
@@ -1605,7 +1605,7 @@ void CCSPlayer::PostThink()
 	}
 
 #ifdef GLOWS_ENABLE
-	if ( sv_enable_cs_glows.GetBool() )
+	if ( sv_cs_enable_glows.GetBool() )
 	{
 		AddGlowEffect();
 	}

game/shared/cstrike/cs_gamerules.cpp

@@ -178,6 +178,7 @@ ConVar ammo_57mm_max( "ammo_57mm_max", "100", FCVAR_REPLICATED );
 ConVar ammo_hegrenade_max( "ammo_hegrenade_max", "1", FCVAR_REPLICATED );
 ConVar ammo_flashbang_max( "ammo_flashbang_max", "2", FCVAR_REPLICATED );
 ConVar ammo_smokegrenade_max( "ammo_smokegrenade_max", "1", FCVAR_REPLICATED );
+ConVar sv_cs_noblock("sv_cs_noblock", "0", FCVAR_REPLICATED | FCVAR_NOTIFY,  "1) No block on players only\n2) No block on every objects");
 
 //ConVar mp_dynamicpricing( "mp_dynamicpricing", "0", FCVAR_REPLICATED, "Enables or Disables the dynamic weapon prices" );
 
@@ -4964,12 +4965,27 @@ float CCSGameRules::GetRoundElapsedTime()
 
 bool CCSGameRules::ShouldCollide( int collisionGroup0, int collisionGroup1 )
 {
+	if ( sv_cs_noblock.GetInt() == 1 )
+	{
+		if ( collisionGroup0 >= COLLISION_GROUP_PLAYER && collisionGroup1 == COLLISION_GROUP_PLAYER )
+		{
+			return false;
+		}
+	}
+	else if ( sv_cs_noblock.GetInt() == 2 )
+	{
+		if ( collisionGroup0 >= COLLISION_GROUP_DEBRIS_TRIGGER && collisionGroup1 == COLLISION_GROUP_PLAYER )
+		{
+			return false;
+		}
+	}
+
 	if ( collisionGroup0 > collisionGroup1 )
 	{
 		// swap so that lowest is always first
 		::V_swap(collisionGroup0,collisionGroup1);
 	}
-	
+
 	//Don't stand on COLLISION_GROUP_WEAPONs
 	if( collisionGroup0 == COLLISION_GROUP_PLAYER_MOVEMENT &&
 		collisionGroup1 == COLLISION_GROUP_WEAPON )

game/shared/cstrike/cs_player_shared.cpp

@@ -41,7 +41,7 @@
 #include "obstacle_pushaway.h"
 #include "props_shared.h"
 
-ConVar weapon_accuracy_nospread( "weapon_accuracy_nospread", "0", FCVAR_REPLICATED );
+ConVar weapon_accuracy_nospread( "weapon_accuracy_nospread", "0", FCVAR_REPLICATED | FCVAR_NOTIFY );
 #define	CS_MASK_SHOOT (MASK_SOLID|CONTENTS_DEBRIS)
 
 const QAngle& CCSPlayer::GetRenderAngles()

game/shared/cstrike/fx_cs_shared.cpp

@@ -17,7 +17,7 @@
 #endif
 
 ConVar weapon_accuracy_logging( "weapon_accuracy_logging", "0", FCVAR_REPLICATED | FCVAR_DEVELOPMENTONLY | FCVAR_ARCHIVE );
-ConVar weapon_accuracy_noinaccuracy( "weapon_accuracy_noinaccuracy", "0", FCVAR_REPLICATED );
+ConVar weapon_accuracy_noinaccuracy( "weapon_accuracy_noinaccuracy", "0", FCVAR_REPLICATED | FCVAR_NOTIFY );
 
 #ifdef CLIENT_DLL
 ConVar debug_screenshot_bullet_position("debug_screenshot_bullet_position", "0");

gamedata

@@ -1 +1 @@
-Subproject commit 412730a3d58d54031325214fbe2b217814524a01
+Subproject commit dca9fd825fed9cea92b89cff674956da5483c4c8

launcher/launcher.cpp

@@ -91,7 +91,11 @@ int MessageBox( HWND hWnd, const char *message, const char *header, unsigned uTy
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
+#ifdef CSS_ENHANCED_EXECUTABLE
+#define DEFAULT_HL2_GAMEDIR	"cstrike"
+#else
 #define DEFAULT_HL2_GAMEDIR	"hl2"
+#endif
 
 #if defined( USE_SDL )
 extern void* CreateSDLMgr();
@@ -419,7 +423,7 @@ void CLogAllFiles::Init()
 
 	// game directory has not been established yet, must derive ourselves
 	char path[MAX_PATH];
-	Q_snprintf( path, sizeof(path), "%s/%s", GetBaseDirectory(), CommandLine()->ParmValue( "-game", "hl2" ) );
+	Q_snprintf( path, sizeof(path), "%s/%s", GetBaseDirectory(), CommandLine()->ParmValue( "-game", DEFAULT_HL2_GAMEDIR ) );
 	Q_FixSlashes( path );
 #ifdef WIN32
 	Q_strlower( path );
@@ -818,7 +822,7 @@ bool CSourceAppSystemGroup::PreInit()
 	if ( IsPC() )
 	{
 		// This will get called multiple times due to being here, but only the first one will do anything
-		reslistgenerator->Init( GetBaseDirectory(), CommandLine()->ParmValue( "-game", "hl2" ) );
+		reslistgenerator->Init( GetBaseDirectory(), CommandLine()->ParmValue( "-game", DEFAULT_HL2_GAMEDIR ) );
 
 		// This will also get called each time, but will actually fix up the command line as needed
 		reslistgenerator->SetupCommandLine();
@@ -1267,6 +1271,11 @@ DLL_EXPORT int LauncherMain( int argc, char **argv )
 	CommandLine()->CreateCmdLine( argc, argv );
 #endif
 
+#ifdef CSS_ENHANCED_EXECUTABLE
+	CommandLine()->AppendParm( "-game", DEFAULT_HL2_GAMEDIR );
+	CommandLine()->AppendParm( "-defaultgamedir", DEFAULT_HL2_GAMEDIR );
+#endif
+
 	// No -dxlevel or +mat_hdr_level allowed on POSIX
 #ifdef POSIX	
 	CommandLine()->RemoveParm( "-dxlevel" );

launcher/wscript

@@ -48,6 +48,9 @@ def build(bld):
 
 	install_path = bld.env.LIBDIR
 
+	if 'cstrike' == bld.options.GAMES:
+		defines += ['CSS_ENHANCED_EXECUTABLE']
+
 	bld.shlib(
 		source   = source,
 		target   = PROJECT_NAME,

launcher_main/main.cpp

@@ -4,6 +4,7 @@
 //
 //=====================================================================================//
 
+#include "tier1/strtools.h"
 #if defined( _WIN32 ) && !defined( _X360 )
 #include <windows.h>
 #include <stdio.h>

launcher_main/wscript

@@ -30,16 +30,31 @@ def build(bld):
 		source += ['launcher_main.rc']
 
 	install_path = bld.env.BINDIR
-	bld(
-		source   = source,
-		target   = PROJECT_NAME,
-		name     = PROJECT_NAME,
-		features = 'c cxx cxxprogram',
-		includes = includes,
-		defines  = defines,
-		use      = libs,
-		install_path = install_path,
-		subsystem = bld.env.MSVC_SUBSYSTEM,
-		idx      = bld.get_taskgen_count()
-	)
+
+	if 'cstrike' == bld.options.GAMES:
+		bld(
+			source   = source,
+			target   = 'css_enhanced',
+			name     = 'css_enhanced',
+			features = 'c cxx cxxprogram',
+			includes = includes,
+			defines  = defines + ['CSS_ENHANCED_EXECUTABLE'],
+			use      = libs,
+			install_path = install_path,
+			subsystem = bld.env.MSVC_SUBSYSTEM,
+			idx      = bld.get_taskgen_count()
+		)
+	else:
+		bld(
+			source   = source,
+			target   = PROJECT_NAME,
+			name     = PROJECT_NAME,
+			features = 'c cxx cxxprogram',
+			includes = includes,
+			defines  = defines,
+			use      = libs,
+			install_path = install_path,
+			subsystem = bld.env.MSVC_SUBSYSTEM,
+			idx      = bld.get_taskgen_count()
+		)