Skip to content

[TF] Revised/reworked Gas Passer spawnroom fixes to only take effect before a game/round starts #1568

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

Closed
wants to merge 5 commits into from
+56 −4
Closed

[TF] Revised/reworked Gas Passer spawnroom fixes to only take effect before a game/round starts #1568

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0ab3fb4
[TF] Revert Gas Passer spawnroom fixes
Bitl Oct 24, 2025
41f5584
revised fix
Bitl Oct 24, 2025
f2cb022
Update tf_weapon_jar_gas.cpp
Bitl Oct 24, 2025
71dbf2c
add gas debug command
Bitl Oct 24, 2025
3fc3c8f
Update tf_weapon_jar_gas.cpp
Bitl Oct 24, 2025
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
60 changes: 56 additions & 4 deletions src/game/shared/tf/tf_weapon_jar_gas.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
#include "func_respawnroom.h"
#endif

ConVar tf_debug_gas( "tf_debug_gas", "0", FCVAR_CHEAT | FCVAR_REPLICATED, "Visualize the gas particles." );

IMPLEMENT_NETWORKCLASS_ALIASED( TFJarGas, DT_TFWeaponJarGas )

Expand Down Expand Up @@ -366,11 +367,19 @@ bool CTFGasManager::ShouldCollide( CBaseEntity *pEnt ) const
if ( pEnt->GetTeamNumber() == GetTeamNumber() )
return false;

if ( PointsCrossRespawnRoomVisualizer( GetInitialPosition(), pEnt->GetAbsOrigin() ) )
return false;
bool bIsBeforeRound = ( TFGameRules()->State_Get() == GR_STATE_PREGAME ||
TFGameRules()->State_Get() == GR_STATE_PREROUND ||
TFGameRules()->InSetup() ||
TFGameRules()->IsInWaitingForPlayers() );

if ( PointInRespawnRoom( pEnt, pEnt->GetAbsOrigin() ) )
return false;
if ( bIsBeforeRound )
{
if ( PointsCrossRespawnRoomVisualizer( GetInitialPosition(), pEnt->GetAbsOrigin() ) )
return false;

if ( PointInRespawnRoom( pEnt, pEnt->GetAbsOrigin() ) )
return false;
}

if ( TFGameRules() && TFGameRules()->IsTruceActive() )
return false;
Expand Down Expand Up @@ -398,6 +407,12 @@ void CTFGasManager::OnCollide( CBaseEntity *pEnt, int iPointIndex )
}
#endif // GAME_DLL

void DebugGas( const Vector& vStart, const Vector& vEnd, const Vector& vMin, const Vector& vMax, const Color& color )
{
NDebugOverlay::Line( vStart, vEnd, 255, 255, 0, false, 0.0f );
NDebugOverlay::SweptBox( vStart, vEnd, vMin, vMax, vec3_angle, color.r(), color.g(), color.b(), color.a(), 0.0f );
}

//-----------------------------------------------------------------------------
// Purpose:
//-----------------------------------------------------------------------------
Expand All @@ -424,6 +439,26 @@ void CTFGasManager::Update()
{
bShouldRemove = true;
}

#ifdef GAME_DLL
// in a spawnroom while in a pre-game state?
bool bIsBeforeRound = ( TFGameRules()->State_Get() == GR_STATE_PREGAME ||
TFGameRules()->State_Get() == GR_STATE_PREROUND ||
TFGameRules()->InSetup() ||
TFGameRules()->IsInWaitingForPlayers() );
if ( bIsBeforeRound )
{
if ( PointsCrossRespawnRoomVisualizer( GetInitialPosition(), GetPointVec()[i]->m_vecPosition ) )
{
bShouldRemove = true;
}

if ( PointInRespawnRoom( NULL, GetPointVec()[i]->m_vecPosition ) )
{
bShouldRemove = true;
}
}
#endif

if ( bShouldRemove )
{
Expand Down Expand Up @@ -606,6 +641,23 @@ void CTFGasManager::Update()
}
}
#endif // CLIENT_DLL

if ( tf_debug_gas.GetBool() )
{
#ifdef GAME_DLL
Color color( 0, 0, 255, 100 );
#else
Color color( 255, 0, 0, 100 );
#endif
FOR_EACH_VEC( GetPointVec(), i )
{
float flRadius = GetRadius( GetPointVec()[i] );
Vector vMins = flRadius * Vector(-1, -1, -1);
Vector vMaxs = flRadius * Vector(1, 1, 1);

DebugGas( GetPointVec()[i]->m_vecPrevPosition, GetPointVec()[i]->m_vecPosition, vMins, vMaxs, color );
}
}
}

//-----------------------------------------------------------------------------
Expand Down