Skip to content

Revert "team based blocking and options" #709

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nullsystem merged 1 commit into from
Oct 13, 2024
Merged

Revert "team based blocking and options" #709

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 7 additions & 21 deletions mp/src/game/shared/gamemovement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,20 +801,6 @@ Vector CGameMovement::GetPlayerViewOffset( bool ducked ) const
#endif
}

inline void UTIL_TraceRayMovement( const Ray_t &ray, unsigned int mask,
const IHandleEntity *ignore, int collisionGroup, trace_t *ptr, ShouldHitFunc_t pExtraShouldHitCheckFn = NULL )
{
CTraceFilterSimple traceFilter( ignore, collisionGroup, pExtraShouldHitCheckFn );
traceFilter.m_bIgnoreNeoCollide = false;

enginetrace->TraceRay( ray, mask, &traceFilter, ptr );

if( r_visualizetraces.GetBool() )
{
DebugDrawLine( ptr->startpos, ptr->endpos, 255, 0, 0, true, -1.0f );
}
}

#if 0
//-----------------------------------------------------------------------------
// Traces player movement + position
Expand All @@ -833,7 +819,7 @@ CBaseHandle CGameMovement::TestPlayerPosition( const Vector& pos, int collisionG
{
Ray_t ray;
ray.Init( pos, pos, GetPlayerMins(), GetPlayerMaxs() );
UTIL_TraceRayMovement( ray, PlayerSolidMask(), mv->m_nPlayerHandle.Get(), collisionGroup, &pm );
UTIL_TraceRay( ray, PlayerSolidMask(), mv->m_nPlayerHandle.Get(), collisionGroup, &pm );
if ( (pm.contents & PlayerSolidMask()) && pm.m_pEnt )
{
return pm.m_pEnt->GetRefEHandle();
Expand Down Expand Up @@ -3754,7 +3740,7 @@ void TracePlayerBBoxForGround( const Vector& start, const Vector& end, const Vec
mins = minsSrc;
maxs.Init( MIN( 0, maxsSrc.x ), MIN( 0, maxsSrc.y ), maxsSrc.z );
ray.Init( start, end, mins, maxs );
UTIL_TraceRayMovement( ray, fMask, player, collisionGroup, &pm );
UTIL_TraceRay( ray, fMask, player, collisionGroup, &pm );
if ( pm.m_pEnt && pm.plane.normal[2] >= 0.7)
{
pm.fraction = fraction;
Expand All @@ -3766,7 +3752,7 @@ void TracePlayerBBoxForGround( const Vector& start, const Vector& end, const Vec
mins.Init( MAX( 0, minsSrc.x ), MAX( 0, minsSrc.y ), minsSrc.z );
maxs = maxsSrc;
ray.Init( start, end, mins, maxs );
UTIL_TraceRayMovement( ray, fMask, player, collisionGroup, &pm );
UTIL_TraceRay( ray, fMask, player, collisionGroup, &pm );
if ( pm.m_pEnt && pm.plane.normal[2] >= 0.7)
{
pm.fraction = fraction;
Expand All @@ -3778,7 +3764,7 @@ void TracePlayerBBoxForGround( const Vector& start, const Vector& end, const Vec
mins.Init( minsSrc.x, MAX( 0, minsSrc.y ), minsSrc.z );
maxs.Init( MIN( 0, maxsSrc.x ), maxsSrc.y, maxsSrc.z );
ray.Init( start, end, mins, maxs );
UTIL_TraceRayMovement( ray, fMask, player, collisionGroup, &pm );
UTIL_TraceRay( ray, fMask, player, collisionGroup, &pm );
if ( pm.m_pEnt && pm.plane.normal[2] >= 0.7)
{
pm.fraction = fraction;
Expand All @@ -3790,7 +3776,7 @@ void TracePlayerBBoxForGround( const Vector& start, const Vector& end, const Vec
mins.Init( MAX( 0, minsSrc.x ), minsSrc.y, minsSrc.z );
maxs.Init( maxsSrc.x, MIN( 0, maxsSrc.y ), maxsSrc.z );
ray.Init( start, end, mins, maxs );
UTIL_TraceRayMovement( ray, fMask, player, collisionGroup, &pm );
UTIL_TraceRay( ray, fMask, player, collisionGroup, &pm );
if ( pm.m_pEnt && pm.plane.normal[2] >= 0.7)
{
pm.fraction = fraction;
Expand Down Expand Up @@ -5125,7 +5111,7 @@ void CGameMovement::TracePlayerBBox( const Vector& start, const Vector& end, uns

Ray_t ray;
ray.Init( start, end, GetPlayerMins(), GetPlayerMaxs() );
UTIL_TraceRayMovement( ray, fMask, mv->m_nPlayerHandle.Get(), collisionGroup, &pm );
UTIL_TraceRay( ray, fMask, mv->m_nPlayerHandle.Get(), collisionGroup, &pm );

}

Expand All @@ -5140,6 +5126,6 @@ void CGameMovement::TryTouchGround( const Vector& start, const Vector& end, con

Ray_t ray;
ray.Init( start, end, mins, maxs );
UTIL_TraceRayMovement( ray, fMask, mv->m_nPlayerHandle.Get(), collisionGroup, &pm );
UTIL_TraceRay( ray, fMask, mv->m_nPlayerHandle.Get(), collisionGroup, &pm );
}

33 changes: 13 additions & 20 deletions mp/src/game/shared/neo/neo_gamerules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,6 @@ ConVar neo_sv_readyup_autointermission("neo_sv_readyup_autointermission", "0", F
// Both CLIENT_DLL + GAME_DLL, but server-side setting so it's replicated onto client to read the values
ConVar neo_sv_readyup_lobby("neo_sv_readyup_lobby", "0", FCVAR_REPLICATED, "If enabled, players would need to ready up and match the players total requirements to start a game.", true, 0.0f, true, 1.0f);

enum ENeoCollision
{
NEOCOLLISION_NONE = 0,
NEOCOLLISION_TEAM,
NEOCOLLISION_ALL,

NEOCOLLISION__TOTAL,
};

ConVar neo_sv_collision("neo_sv_collision", "0", FCVAR_REPLICATED, "0 = No collision (default), 1 = Team-based collision, 2 = All player collision", true, 0.0f, true, NEOCOLLISION__TOTAL - 1);

REGISTER_GAMERULES_CLASS( CNEORules );

BEGIN_NETWORK_TABLE_NOBASE( CNEORules, DT_NEORules )
Expand Down Expand Up @@ -481,18 +470,22 @@ int CNEORules::DefaultFOV(void)
#endif
}

bool CNEORules::ShouldCollide(const CBaseEntity *ent0, const CBaseEntity *ent1) const
bool CNEORules::ShouldCollide(int collisionGroup0, int collisionGroup1)
{
const int ent0Group = ent0->GetCollisionGroup();
const int ent1Group = ent1->GetCollisionGroup();
const int iNeoCol = neo_sv_collision.GetInt();
if (iNeoCol != NEOCOLLISION_ALL && ent0Group == COLLISION_GROUP_PLAYER && ent1Group == COLLISION_GROUP_PLAYER)
if (collisionGroup0 > collisionGroup1)
{
return (iNeoCol == NEOCOLLISION_TEAM) ?
(static_cast<const CNEO_Player *>(ent0)->GetTeamNumber() != static_cast<const CNEO_Player *>(ent1)->GetTeamNumber()) :
false;
// swap so that lowest is always first
V_swap(collisionGroup0, collisionGroup1);
}
return const_cast<CNEORules *>(this)->CTeamplayRules::ShouldCollide(ent0Group, ent1Group);

if ((collisionGroup0 == COLLISION_GROUP_PLAYER || collisionGroup0 == COLLISION_GROUP_PLAYER_MOVEMENT) &&
(collisionGroup1 == COLLISION_GROUP_PROJECTILE || collisionGroup1 == COLLISION_GROUP_WEAPON ||
collisionGroup1 == COLLISION_GROUP_PLAYER || collisionGroup1 == COLLISION_GROUP_PLAYER_MOVEMENT))
{
return false;
}

return CTeamplayRules::ShouldCollide(collisionGroup0, collisionGroup1);
}

extern ConVar mp_chattime;
Expand Down
2 changes: 1 addition & 1 deletion mp/src/game/shared/neo/neo_gamerules.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ class CNEORules : public CHL2MPRules, public CGameEventListener

virtual void ClientDisconnected(edict_t* pClient) OVERRIDE;
#endif
bool ShouldCollide(const CBaseEntity *ent0, const CBaseEntity *ent1) const;
virtual bool ShouldCollide( int collisionGroup0, int collisionGroup1 ) OVERRIDE;

virtual const char* GetGameName() { return NEO_GAME_NAME; }

Expand Down
23 changes: 0 additions & 23 deletions mp/src/game/shared/util_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@
bool NPC_CheckBrushExclude( CBaseEntity *pEntity, CBaseEntity *pBrush );
#endif

#ifdef NEO
#include "neo_gamerules.h"
#endif


// memdbgon must be the last include file in a .cpp file!!!
#include "tier0/memdbgon.h"
Expand Down Expand Up @@ -278,9 +274,6 @@ bool StandardFilterRules( IHandleEntity *pHandleEntity, int fContentsMask )
CTraceFilterSimple::CTraceFilterSimple( const IHandleEntity *passedict, int collisionGroup,
ShouldHitFunc_t pExtraShouldHitFunc )
{
#ifdef NEO
m_bIgnoreNeoCollide = true;
#endif
m_pPassEnt = passedict;
m_collisionGroup = collisionGroup;
m_pExtraShouldHitCheckFunction = pExtraShouldHitFunc;
Expand Down Expand Up @@ -308,24 +301,8 @@ bool CTraceFilterSimple::ShouldHitEntity( IHandleEntity *pHandleEntity, int cont
return false;
if ( !pEntity->ShouldCollide( m_collisionGroup, contentsMask ) )
return false;
#ifdef NEO
if (!m_bIgnoreNeoCollide && m_pPassEnt)
{
const CBaseEntity *pThisEntity = EntityFromEntityHandle(m_pPassEnt);
if (pEntity && pThisEntity && !static_cast<CNEORules *>(g_pGameRules)->ShouldCollide(pThisEntity, pEntity))
{
return false;
}
}
else
{
if ( pEntity && !g_pGameRules->ShouldCollide( m_collisionGroup, pEntity->GetCollisionGroup() ) )
return false;
}
#else
if ( pEntity && !g_pGameRules->ShouldCollide( m_collisionGroup, pEntity->GetCollisionGroup() ) )
return false;
#endif
if ( m_pExtraShouldHitCheckFunction &&
(! ( m_pExtraShouldHitCheckFunction( pHandleEntity, contentsMask ) ) ) )
return false;
Expand Down
3 changes: 0 additions & 3 deletions mp/src/game/shared/util_shared.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,6 @@ class CTraceFilterSimple : public CTraceFilter
virtual void SetCollisionGroup( int iCollisionGroup ) { m_collisionGroup = iCollisionGroup; }

const IHandleEntity *GetPassEntity( void ){ return m_pPassEnt;}
#ifdef NEO
bool m_bIgnoreNeoCollide;
#endif

private:
const IHandleEntity *m_pPassEnt;
Expand Down