Code review feedback pass

sunzenshen · sunzenshen · commit 431cb926f9f8 · 2026-03-21T14:22:34.000-07:00
diff --git a/src/game/server/neo/bot/behavior/neo_bot_ctg_lone_wolf.cpp b/src/game/server/neo/bot/behavior/neo_bot_ctg_lone_wolf.cpp
@@ -17,7 +17,6 @@
 //---------------------------------------------------------------------------------------------
 CNEOBotCtgLoneWolf::CNEOBotCtgLoneWolf( void )
 {
-	m_hGhost = nullptr;
 	m_bPursuingDropThreat = false;
 	m_vecDropThreatPos = CNEO_Player::VECTOR_INVALID_WAYPOINT;
 	m_closestCapturePoint = CNEO_Player::VECTOR_INVALID_WAYPOINT;
@@ -26,7 +25,6 @@ CNEOBotCtgLoneWolf::CNEOBotCtgLoneWolf( void )
 //---------------------------------------------------------------------------------------------
 ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::OnStart( CNEOBot *me, Action< CNEOBot > *priorAction )
 {
-	m_hGhost = nullptr;
 	m_hPursueTarget = nullptr;
 	m_bPursuingDropThreat = false;
 	m_useAttemptTimer.Invalidate();
@@ -84,7 +82,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval
 	}
 
 	// Always need to find the ghost to act on it
-	if ( !UpdateGhostHandle( me ) )
+	if ( !GetGhost() )
 	{
 		return Done( "Ghost not found" );
 	}
@@ -99,7 +97,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval
 	float flDistGhostToGoal = FLT_MAX;
 	if ( m_closestCapturePoint != CNEO_Player::VECTOR_INVALID_WAYPOINT )
 	{
-		const Vector& vecStart = me->IsCarryingGhost() ? me->GetAbsOrigin() : m_hGhost->GetAbsOrigin();
+		const Vector& vecStart = GetGhostPosition( me );
 		flDistGhostToGoal = vecStart.DistTo( m_closestCapturePoint );
 	}
 
@@ -112,7 +110,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval
 	float flMyTotalDist = flDistGhostToGoal; 
 	if ( !me->IsCarryingGhost() )
 	{
-		flMyTotalDist += me->GetAbsOrigin().DistTo( m_hGhost->GetAbsOrigin() );
+		flMyTotalDist += me->GetAbsOrigin().DistTo( GetGhostPosition( me ) );
 	}
 
 	// Count enemies and find if one is closer to our goal
@@ -150,7 +148,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval
 	
 	bool bSafeToCap = ((m_closestCapturePoint != CNEO_Player::VECTOR_INVALID_WAYPOINT) && (flMyTotalDistSq < flClosestEnemyDistToGoalSq));
 	
-	CWeaponGhost *pGhostWeapon = m_hGhost.Get();
+	CWeaponGhost *pGhostWeapon = GetGhost();
 	CBaseCombatCharacter *pGhostOwner = pGhostWeapon ? pGhostWeapon->GetOwner() : nullptr;
 	bool bGhostHeldByEnemy = (pGhostOwner && pGhostOwner->GetTeamNumber() != me->GetTeamNumber());
 
@@ -249,7 +247,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval
 
 		if ( !m_repathTimer.HasStarted() || m_repathTimer.IsElapsed() )
 		{
-			CNEOBotPathCompute(me, m_path, m_hGhost->GetAbsOrigin(), FASTEST_ROUTE);
+			CNEOBotPathCompute(me, m_path, GetGhostPosition( me ), FASTEST_ROUTE);
 			m_path.Update(me);
 			m_repathTimer.Start( RandomFloat( 0.3f, 0.5f ) );
 		}
@@ -264,7 +262,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval
 		// Ghost is free for taking
 		if ( bSafeToCap || (bIs1v1 && m_stalemateTimer.HasStarted() && m_stalemateTimer.IsElapsed()) )
 		{
-			float flDistToGhostSq = me->GetAbsOrigin().DistToSqr(m_hGhost->GetAbsOrigin());
+			float flDistToGhostSq = me->GetAbsOrigin().DistToSqr(GetGhostPosition( me ));
 			float flAmbushDistSq = CNEOBotCtgLoneWolf::GetDetpackDeployDistanceSq( me );
 			
 			if ( flDistToGhostSq < flAmbushDistSq)
@@ -276,13 +274,13 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval
 				else
 				{
 					// Try to cap before enemy can stop us.
-					return SuspendFor(new CNEOBotCtgCapture(m_hGhost.Get()), "Picking up ghost to make a run for it!");
+					return SuspendFor(new CNEOBotCtgCapture(GetGhost()), "Picking up ghost to make a run for it!");
 				}
 			}
 			
 			if ( !m_repathTimer.HasStarted() || m_repathTimer.IsElapsed() )
 			{
-				CNEOBotPathCompute(me, m_path, m_hGhost->GetAbsOrigin(), FASTEST_ROUTE);
+				CNEOBotPathCompute(me, m_path, GetGhostPosition( me ), FASTEST_ROUTE);
 				m_path.Update(me);
 				m_repathTimer.Start( RandomFloat( 0.2f, 0.5f ) );
 			}
@@ -303,7 +301,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval
 			}
 
 			// Hide out of sight of ghost to ambush anyone that picks up the ghost
-			float flDistToGhostSq = me->GetAbsOrigin().DistToSqr(m_hGhost->GetAbsOrigin());
+			float flDistToGhostSq = me->GetAbsOrigin().DistToSqr(GetGhostPosition( me ));
 			float flAmbushDistSq = CNEOBotCtgLoneWolf::GetDetpackDeployDistanceSq( me );
 			if (flDistToGhostSq < flAmbushDistSq)
 			{
@@ -314,7 +312,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval
 				// Get near the ghost first before surveying hiding spots
 				if ( !m_repathTimer.HasStarted() || m_repathTimer.IsElapsed() )
 				{
-					CNEOBotPathCompute(me, m_path, m_hGhost->GetAbsOrigin(), FASTEST_ROUTE);
+					CNEOBotPathCompute(me, m_path, GetGhostPosition( me ), FASTEST_ROUTE);
 					m_path.Update(me);
 					m_repathTimer.Start( RandomFloat( 0.5f, 1.0f ) );
 				}
@@ -391,7 +389,7 @@ Vector CNEOBotCtgLoneWolf::GetNearestCapturePoint( CNEOBot *me, bool bEnemyCapPo
 	
 	if ( NEORules()->m_pGhostCaps.Count() > 0 )
 	{
-		const Vector& vecStart = me->IsCarryingGhost() ? me->GetAbsOrigin() : ( m_hGhost.Get() ? m_hGhost->GetAbsOrigin() : me->GetAbsOrigin() );
+		const Vector& vecStart = GetGhostPosition( me );
 		
 		for( int i=0; i<NEORules()->m_pGhostCaps.Count(); ++i )
 		{
@@ -446,14 +444,31 @@ class CCollectPotentiallyVisibleAreas
 };
 
 //---------------------------------------------------------------------------------------------
-bool CNEOBotCtgLoneWolf::UpdateGhostHandle( CNEOBot *me )
+Vector CNEOBotCtgLoneWolf::GetGhostPosition( CNEOBot *me )
 {
-	if ( !m_hGhost )
+	if ( me->IsCarryingGhost() )
 	{
-		m_hGhost = dynamic_cast<CWeaponGhost*>( gEntList.FindEntityByClassname( nullptr, "weapon_ghost" ) );
+		return me->GetAbsOrigin();
+	}
+
+	CWeaponGhost *pGhost = GetGhost();
+	if ( pGhost )
+	{
+		CBaseEntity *pParent = pGhost->GetMoveParent();
+		if ( pParent )
+		{
+			return pParent->GetAbsOrigin();
+		}
+		return pGhost->GetAbsOrigin();
 	}
 
-	return ( m_hGhost != nullptr );
+	return me->GetAbsOrigin();
+}
+
+//---------------------------------------------------------------------------------------------
+CWeaponGhost* CNEOBotCtgLoneWolf::GetGhost()
+{
+	return NEORules()->m_pGhost;
 }
 
 //---------------------------------------------------------------------------------------------
diff --git a/src/game/server/neo/bot/behavior/neo_bot_ctg_lone_wolf.h b/src/game/server/neo/bot/behavior/neo_bot_ctg_lone_wolf.h
@@ -22,10 +22,10 @@ class CNEOBotCtgLoneWolf : public Action< CNEOBot >
 protected:
 	static float GetDetpackDeployDistanceSq( CNEOBot *me );
 	Vector GetNearestCapturePoint( CNEOBot *me, bool bEnemyCapPoint );
-	bool UpdateGhostHandle( CNEOBot *me );
+	Vector GetGhostPosition( CNEOBot *me );
+	CWeaponGhost* GetGhost();
 	ActionResult< CNEOBot > UpdateLookAround( CNEOBot *me );
 
-	CHandle<CWeaponGhost> m_hGhost;
 	CountdownTimer m_repathTimer;
 	PathFollower m_path;
 
diff --git a/src/game/server/neo/bot/behavior/neo_bot_ctg_lone_wolf_ambush.cpp b/src/game/server/neo/bot/behavior/neo_bot_ctg_lone_wolf_ambush.cpp
@@ -50,7 +50,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolfAmbush::OnStart( CNEOBot *me, Action<
 //---------------------------------------------------------------------------------------------
 ActionResult< CNEOBot >	CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float interval )
 {
-	if ( !UpdateGhostHandle( me ) )
+	if ( !GetGhost() )
 	{
 		return Done( "Ghost not found" );
 	}
@@ -63,7 +63,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float int
 	// For now, assume the bot is forgetful of exact detpack deploy location and uses ghost beacon as reference
 	// We could trace line of sight to the detpack, but most of the time bot is hiding around a corner
 	// Players could move ghost by shooting it, but ideally the bot would investigate the gunshot sources
-	Vector myVecDetpackPosChoice = m_hGhost->GetAbsOrigin(); // ghost can be moved
+	Vector myVecDetpackPosChoice = GetGhostPosition( me ); // ghost can be moved
 	float myDistToDetpackPosChoiceSq = me->GetAbsOrigin().DistToSqr( myVecDetpackPosChoice );
 
 	const CKnownEntity *threat = me->GetVisionInterface()->GetPrimaryKnownThreat( true );
@@ -111,7 +111,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float int
 		// Move closer to ghost
 		if ( !m_repathTimer.HasStarted() || m_repathTimer.IsElapsed() )
 		{
-			CNEOBotPathCompute( me, m_path, m_hGhost->GetAbsOrigin(), FASTEST_ROUTE );
+			CNEOBotPathCompute( me, m_path, GetGhostPosition( me ), FASTEST_ROUTE );
 			m_path.Update( me );
 			m_repathTimer.Start( 0.5f );
 
@@ -127,9 +127,9 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float int
 	else if ( me->IsCarryingGhost() )
 	{
 		// Drop ghost if accidentally picked it up and have set up ambush/detpack
-		if (me->GetActiveWeapon() != m_hGhost )
+		if (me->GetActiveWeapon() != GetGhost() )
 		{
-			me->Weapon_Switch( m_hGhost );
+			me->Weapon_Switch( GetGhost() );
 		}
 		else
 		{
@@ -198,7 +198,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float int
 
 	// Detpack trigger condition checks
 	bool bShouldDetonate = false;
-	CBaseCombatCharacter *pGhostOwner = m_hGhost ? m_hGhost->GetOwner() : nullptr;
+	CBaseCombatCharacter *pGhostOwner = GetGhost() ? GetGhost()->GetOwner() : nullptr;
 
 	if (!bIsDetpackDeployed)
 	{
@@ -285,7 +285,7 @@ ActionResult< CNEOBot >	CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float int
 				}
 
 				// Check if the sound happened within the detpack radius around the ghost
-				float distSqr = pSound->GetSoundOrigin().DistToSqr( m_hGhost->GetAbsOrigin() );
+				float distSqr = pSound->GetSoundOrigin().DistToSqr( GetGhostPosition( me ) );
 				if ( distSqr <= Square( NEO_DETPACK_DAMAGE_RADIUS * flThreshold ) )
 				{
 					bTriggerDetpack = true;

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`//---------------------------------------------------------------------------------------------`
`18`	`18`	`CNEOBotCtgLoneWolf::CNEOBotCtgLoneWolf( void )`
`19`	`19`	`{`
`20`		`- m_hGhost = nullptr;`
`21`	`20`	`m_bPursuingDropThreat = false;`
`22`	`21`	`m_vecDropThreatPos = CNEO_Player::VECTOR_INVALID_WAYPOINT;`
`23`	`22`	`m_closestCapturePoint = CNEO_Player::VECTOR_INVALID_WAYPOINT;`
`@@ -26,7 +25,6 @@ CNEOBotCtgLoneWolf::CNEOBotCtgLoneWolf( void )`
`26`	`25`	`//---------------------------------------------------------------------------------------------`
`27`	`26`	`ActionResult< CNEOBot > CNEOBotCtgLoneWolf::OnStart( CNEOBot me, Action< CNEOBot > priorAction )`
`28`	`27`	`{`
`29`		`- m_hGhost = nullptr;`
`30`	`28`	`m_hPursueTarget = nullptr;`
`31`	`29`	`m_bPursuingDropThreat = false;`
`32`	`30`	`m_useAttemptTimer.Invalidate();`
`@@ -84,7 +82,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval`
`84`	`82`	`}`
`85`	`83`
`86`	`84`	`// Always need to find the ghost to act on it`
`87`		`- if ( !UpdateGhostHandle( me ) )`
	`85`	`+ if ( !GetGhost() )`
`88`	`86`	`{`
`89`	`87`	`return Done( "Ghost not found" );`
`90`	`88`	`}`
`@@ -99,7 +97,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval`
`99`	`97`	`float flDistGhostToGoal = FLT_MAX;`
`100`	`98`	`if ( m_closestCapturePoint != CNEO_Player::VECTOR_INVALID_WAYPOINT )`
`101`	`99`	`{`
`102`		`- const Vector& vecStart = me->IsCarryingGhost() ? me->GetAbsOrigin() : m_hGhost->GetAbsOrigin();`
	`100`	`+ const Vector& vecStart = GetGhostPosition( me );`
`103`	`101`	`flDistGhostToGoal = vecStart.DistTo( m_closestCapturePoint );`
`104`	`102`	`}`
`105`	`103`
`@@ -112,7 +110,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval`
`112`	`110`	`float flMyTotalDist = flDistGhostToGoal;`
`113`	`111`	`if ( !me->IsCarryingGhost() )`
`114`	`112`	`{`
`115`		`- flMyTotalDist += me->GetAbsOrigin().DistTo( m_hGhost->GetAbsOrigin() );`
	`113`	`+ flMyTotalDist += me->GetAbsOrigin().DistTo( GetGhostPosition( me ) );`
`116`	`114`	`}`
`117`	`115`
`118`	`116`	`// Count enemies and find if one is closer to our goal`
`@@ -150,7 +148,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval`
`150`	`148`
`151`	`149`	`bool bSafeToCap = ((m_closestCapturePoint != CNEO_Player::VECTOR_INVALID_WAYPOINT) && (flMyTotalDistSq < flClosestEnemyDistToGoalSq));`
`152`	`150`
`153`		`- CWeaponGhost *pGhostWeapon = m_hGhost.Get();`
	`151`	`+ CWeaponGhost *pGhostWeapon = GetGhost();`
`154`	`152`	`CBaseCombatCharacter *pGhostOwner = pGhostWeapon ? pGhostWeapon->GetOwner() : nullptr;`
`155`	`153`	`bool bGhostHeldByEnemy = (pGhostOwner && pGhostOwner->GetTeamNumber() != me->GetTeamNumber());`
`156`	`154`
`@@ -249,7 +247,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval`
`249`	`247`
`250`	`248`	`if ( !m_repathTimer.HasStarted() \|\| m_repathTimer.IsElapsed() )`
`251`	`249`	`{`
`252`		`- CNEOBotPathCompute(me, m_path, m_hGhost->GetAbsOrigin(), FASTEST_ROUTE);`
	`250`	`+ CNEOBotPathCompute(me, m_path, GetGhostPosition( me ), FASTEST_ROUTE);`
`253`	`251`	`m_path.Update(me);`
`254`	`252`	`m_repathTimer.Start( RandomFloat( 0.3f, 0.5f ) );`
`255`	`253`	`}`
`@@ -264,7 +262,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval`
`264`	`262`	`// Ghost is free for taking`
`265`	`263`	`if ( bSafeToCap \|\| (bIs1v1 && m_stalemateTimer.HasStarted() && m_stalemateTimer.IsElapsed()) )`
`266`	`264`	`{`
`267`		`- float flDistToGhostSq = me->GetAbsOrigin().DistToSqr(m_hGhost->GetAbsOrigin());`
	`265`	`+ float flDistToGhostSq = me->GetAbsOrigin().DistToSqr(GetGhostPosition( me ));`
`268`	`266`	`float flAmbushDistSq = CNEOBotCtgLoneWolf::GetDetpackDeployDistanceSq( me );`
`269`	`267`
`270`	`268`	`if ( flDistToGhostSq < flAmbushDistSq)`
`@@ -276,13 +274,13 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval`
`276`	`274`	`else`
`277`	`275`	`{`
`278`	`276`	`// Try to cap before enemy can stop us.`
`279`		`- return SuspendFor(new CNEOBotCtgCapture(m_hGhost.Get()), "Picking up ghost to make a run for it!");`
	`277`	`+ return SuspendFor(new CNEOBotCtgCapture(GetGhost()), "Picking up ghost to make a run for it!");`
`280`	`278`	`}`
`281`	`279`	`}`
`282`	`280`
`283`	`281`	`if ( !m_repathTimer.HasStarted() \|\| m_repathTimer.IsElapsed() )`
`284`	`282`	`{`
`285`		`- CNEOBotPathCompute(me, m_path, m_hGhost->GetAbsOrigin(), FASTEST_ROUTE);`
	`283`	`+ CNEOBotPathCompute(me, m_path, GetGhostPosition( me ), FASTEST_ROUTE);`
`286`	`284`	`m_path.Update(me);`
`287`	`285`	`m_repathTimer.Start( RandomFloat( 0.2f, 0.5f ) );`
`288`	`286`	`}`
`@@ -303,7 +301,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval`
`303`	`301`	`}`
`304`	`302`
`305`	`303`	`// Hide out of sight of ghost to ambush anyone that picks up the ghost`
`306`		`- float flDistToGhostSq = me->GetAbsOrigin().DistToSqr(m_hGhost->GetAbsOrigin());`
	`304`	`+ float flDistToGhostSq = me->GetAbsOrigin().DistToSqr(GetGhostPosition( me ));`
`307`	`305`	`float flAmbushDistSq = CNEOBotCtgLoneWolf::GetDetpackDeployDistanceSq( me );`
`308`	`306`	`if (flDistToGhostSq < flAmbushDistSq)`
`309`	`307`	`{`
`@@ -314,7 +312,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolf::Update( CNEOBot *me, float interval`
`314`	`312`	`// Get near the ghost first before surveying hiding spots`
`315`	`313`	`if ( !m_repathTimer.HasStarted() \|\| m_repathTimer.IsElapsed() )`
`316`	`314`	`{`
`317`		`- CNEOBotPathCompute(me, m_path, m_hGhost->GetAbsOrigin(), FASTEST_ROUTE);`
	`315`	`+ CNEOBotPathCompute(me, m_path, GetGhostPosition( me ), FASTEST_ROUTE);`
`318`	`316`	`m_path.Update(me);`
`319`	`317`	`m_repathTimer.Start( RandomFloat( 0.5f, 1.0f ) );`
`320`	`318`	`}`
`@@ -391,7 +389,7 @@ Vector CNEOBotCtgLoneWolf::GetNearestCapturePoint( CNEOBot *me, bool bEnemyCapPo`
`391`	`389`
`392`	`390`	`if ( NEORules()->m_pGhostCaps.Count() > 0 )`
`393`	`391`	`{`
`394`		`- const Vector& vecStart = me->IsCarryingGhost() ? me->GetAbsOrigin() : ( m_hGhost.Get() ? m_hGhost->GetAbsOrigin() : me->GetAbsOrigin() );`
	`392`	`+ const Vector& vecStart = GetGhostPosition( me );`
`395`	`393`
`396`	`394`	`for( int i=0; i<NEORules()->m_pGhostCaps.Count(); ++i )`
`397`	`395`	`{`
`@@ -446,14 +444,31 @@ class CCollectPotentiallyVisibleAreas`
`446`	`444`	`};`
`447`	`445`
`448`	`446`	`//---------------------------------------------------------------------------------------------`
`449`		`-bool CNEOBotCtgLoneWolf::UpdateGhostHandle( CNEOBot *me )`
	`447`	`+Vector CNEOBotCtgLoneWolf::GetGhostPosition( CNEOBot *me )`
`450`	`448`	`{`
`451`		`- if ( !m_hGhost )`
	`449`	`+ if ( me->IsCarryingGhost() )`
`452`	`450`	`{`
`453`		`- m_hGhost = dynamic_cast<CWeaponGhost*>( gEntList.FindEntityByClassname( nullptr, "weapon_ghost" ) );`
	`451`	`+ return me->GetAbsOrigin();`
	`452`	`+ }`
	`453`	`+`
	`454`	`+ CWeaponGhost *pGhost = GetGhost();`
	`455`	`+ if ( pGhost )`
	`456`	`+ {`
	`457`	`+ CBaseEntity *pParent = pGhost->GetMoveParent();`
	`458`	`+ if ( pParent )`
	`459`	`+ {`
	`460`	`+ return pParent->GetAbsOrigin();`
	`461`	`+ }`
	`462`	`+ return pGhost->GetAbsOrigin();`
`454`	`463`	`}`
`455`	`464`
`456`		`- return ( m_hGhost != nullptr );`
	`465`	`+ return me->GetAbsOrigin();`
	`466`	`+}`
	`467`	`+`
	`468`	`+//---------------------------------------------------------------------------------------------`
	`469`	`+CWeaponGhost* CNEOBotCtgLoneWolf::GetGhost()`
	`470`	`+{`
	`471`	`+ return NEORules()->m_pGhost;`
`457`	`472`	`}`
`458`	`473`
`459`	`474`	`//---------------------------------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolfAmbush::OnStart( CNEOBot *me, Action<`
`50`	`50`	`//---------------------------------------------------------------------------------------------`
`51`	`51`	`ActionResult< CNEOBot > CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float interval )`
`52`	`52`	`{`
`53`		`- if ( !UpdateGhostHandle( me ) )`
	`53`	`+ if ( !GetGhost() )`
`54`	`54`	`{`
`55`	`55`	`return Done( "Ghost not found" );`
`56`	`56`	`}`
`@@ -63,7 +63,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float int`
`63`	`63`	`// For now, assume the bot is forgetful of exact detpack deploy location and uses ghost beacon as reference`
`64`	`64`	`// We could trace line of sight to the detpack, but most of the time bot is hiding around a corner`
`65`	`65`	`// Players could move ghost by shooting it, but ideally the bot would investigate the gunshot sources`
`66`		`- Vector myVecDetpackPosChoice = m_hGhost->GetAbsOrigin(); // ghost can be moved`
	`66`	`+ Vector myVecDetpackPosChoice = GetGhostPosition( me ); // ghost can be moved`
`67`	`67`	`float myDistToDetpackPosChoiceSq = me->GetAbsOrigin().DistToSqr( myVecDetpackPosChoice );`
`68`	`68`
`69`	`69`	`const CKnownEntity *threat = me->GetVisionInterface()->GetPrimaryKnownThreat( true );`
`@@ -111,7 +111,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float int`
`111`	`111`	`// Move closer to ghost`
`112`	`112`	`if ( !m_repathTimer.HasStarted() \|\| m_repathTimer.IsElapsed() )`
`113`	`113`	`{`
`114`		`- CNEOBotPathCompute( me, m_path, m_hGhost->GetAbsOrigin(), FASTEST_ROUTE );`
	`114`	`+ CNEOBotPathCompute( me, m_path, GetGhostPosition( me ), FASTEST_ROUTE );`
`115`	`115`	`m_path.Update( me );`
`116`	`116`	`m_repathTimer.Start( 0.5f );`
`117`	`117`
`@@ -127,9 +127,9 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float int`
`127`	`127`	`else if ( me->IsCarryingGhost() )`
`128`	`128`	`{`
`129`	`129`	`// Drop ghost if accidentally picked it up and have set up ambush/detpack`
`130`		`- if (me->GetActiveWeapon() != m_hGhost )`
	`130`	`+ if (me->GetActiveWeapon() != GetGhost() )`
`131`	`131`	`{`
`132`		`- me->Weapon_Switch( m_hGhost );`
	`132`	`+ me->Weapon_Switch( GetGhost() );`
`133`	`133`	`}`
`134`	`134`	`else`
`135`	`135`	`{`
`@@ -198,7 +198,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float int`
`198`	`198`
`199`	`199`	`// Detpack trigger condition checks`
`200`	`200`	`bool bShouldDetonate = false;`
`201`		`- CBaseCombatCharacter *pGhostOwner = m_hGhost ? m_hGhost->GetOwner() : nullptr;`
	`201`	`+ CBaseCombatCharacter *pGhostOwner = GetGhost() ? GetGhost()->GetOwner() : nullptr;`
`202`	`202`
`203`	`203`	`if (!bIsDetpackDeployed)`
`204`	`204`	`{`
`@@ -285,7 +285,7 @@ ActionResult< CNEOBot > CNEOBotCtgLoneWolfAmbush::Update( CNEOBot *me, float int`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`// Check if the sound happened within the detpack radius around the ghost`
`288`		`- float distSqr = pSound->GetSoundOrigin().DistToSqr( m_hGhost->GetAbsOrigin() );`
	`288`	`+ float distSqr = pSound->GetSoundOrigin().DistToSqr( GetGhostPosition( me ) );`
`289`	`289`	`if ( distSqr <= Square( NEO_DETPACK_DAMAGE_RADIUS * flThreshold ) )`
`290`	`290`	`{`
`291`	`291`	`bTriggerDetpack = true;`