xutaxkamay/css_enhanced_waf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added sv_cs_noblock

Browse source
This commit is contained in:
unknown 2024-09-15 20:44:45 +02:00
parent 55557c8d16
commit 4ceda5d415
4 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
game/server/cstrike/cs_player.cpp
View file

@ -1543,7 +1543,7 @@ void CCSPlayer::UpdateMouseoverHints()
} }
#ifdef GLOWS_ENABLE #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 #endif
void CCSPlayer::PostThink() void CCSPlayer::PostThink()
@ -1605,7 +1605,7 @@ void CCSPlayer::PostThink()
} }
#ifdef GLOWS_ENABLE #ifdef GLOWS_ENABLE
if ( sv_enable_cs_glows.GetBool() ) if ( sv_cs_enable_glows.GetBool() )
{ {
AddGlowEffect(); AddGlowEffect();
} }

18
game/shared/cstrike/cs_gamerules.cpp
View file

@ -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_hegrenade_max( "ammo_hegrenade_max", "1", FCVAR_REPLICATED );
ConVar ammo_flashbang_max( "ammo_flashbang_max", "2", FCVAR_REPLICATED ); ConVar ammo_flashbang_max( "ammo_flashbang_max", "2", FCVAR_REPLICATED );
ConVar ammo_smokegrenade_max( "ammo_smokegrenade_max", "1", 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" ); //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 ) 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 ) if ( collisionGroup0 > collisionGroup1 )
{ {
// swap so that lowest is always first // swap so that lowest is always first
::V_swap(collisionGroup0,collisionGroup1); ::V_swap(collisionGroup0,collisionGroup1);
} }
//Don't stand on COLLISION_GROUP_WEAPONs //Don't stand on COLLISION_GROUP_WEAPONs
if( collisionGroup0 == COLLISION_GROUP_PLAYER_MOVEMENT && if( collisionGroup0 == COLLISION_GROUP_PLAYER_MOVEMENT &&
collisionGroup1 == COLLISION_GROUP_WEAPON ) collisionGroup1 == COLLISION_GROUP_WEAPON )

2
game/shared/cstrike/cs_player_shared.cpp
View file

@ -41,7 +41,7 @@
#include "obstacle_pushaway.h" #include "obstacle_pushaway.h"
#include "props_shared.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) #define CS_MASK_SHOOT (MASK_SOLID|CONTENTS_DEBRIS)
const QAngle& CCSPlayer::GetRenderAngles() const QAngle& CCSPlayer::GetRenderAngles()

2
game/shared/cstrike/fx_cs_shared.cpp
View file

@ -17,7 +17,7 @@
#endif #endif
ConVar weapon_accuracy_logging( "weapon_accuracy_logging", "0", FCVAR_REPLICATED | FCVAR_DEVELOPMENTONLY | FCVAR_ARCHIVE ); 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 #ifdef CLIENT_DLL
ConVar debug_screenshot_bullet_position("debug_screenshot_bullet_position", "0"); ConVar debug_screenshot_bullet_position("debug_screenshot_bullet_position", "0");