Fixes from main Repo

ValveSoftware#502 ValveSoftware#552 ValveSoftware#416
Baklojan · Jun 16, 2024 · 5dcdba0 · 5dcdba0
1 parent 77c1021
commit 5dcdba0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 8 deletions.
diff --git a/mp/src/game/server/ai_behavior_assault.cpp b/mp/src/game/server/ai_behavior_assault.cpp
@@ -1257,7 +1257,7 @@ int CAI_AssaultBehavior::TranslateSchedule( int scheduleType )
 		break;
 
 	case SCHED_HOLD_RALLY_POINT:
-		if( HasCondition(COND_NO_PRIMARY_AMMO) | HasCondition(COND_LOW_PRIMARY_AMMO) )
+		if( HasCondition(COND_NO_PRIMARY_AMMO) || HasCondition(COND_LOW_PRIMARY_AMMO) )
 		{
 			return SCHED_RELOAD;
 		}

diff --git a/mp/src/game/shared/ragdoll_shared.cpp b/mp/src/game/shared/ragdoll_shared.cpp
@@ -1,4 +1,4 @@
-//========= Copyright Valve Corporation, All rights reserved. ============//
+	//========= Copyright Valve Corporation, All rights reserved. ============//
 //
 // Purpose: 
 //
@@ -881,15 +881,16 @@ void CRagdollLRURetirement::Update( float frametime ) // EPISODIC VERSION
 
 		for ( i = m_LRU.Head(); i < m_LRU.InvalidIndex(); i = next )
 		{
-			CBaseAnimating *pRagdoll = m_LRU[i].Get();
-
 			next = m_LRU.Next(i);
-			IPhysicsObject *pObject = pRagdoll->VPhysicsGetObject();
-			if ( pRagdoll && (pRagdoll->GetEffectEntity() || ( pObject && !pObject->IsAsleep()) ) )
-				continue;
+
+			CBaseAnimating* pRagdoll = m_LRU[i].Get();
 
 			if ( pRagdoll )
 			{
+				IPhysicsObject* pObject = pRagdoll->VPhysicsGetObject();
+				if (pRagdoll->GetEffectEntity() || (pObject && !pObject->IsAsleep()))
+					continue;
+
 				// float distToPlayer = (pPlayer->GetAbsOrigin() - pRagdoll->GetAbsOrigin()).LengthSqr();
 				float distToPlayer = (PlayerOrigin - pRagdoll->GetAbsOrigin()).LengthSqr();
 
@@ -924,6 +925,14 @@ void CRagdollLRURetirement::Update( float frametime ) // EPISODIC VERSION
 
 			CBaseAnimating *pRagdoll = m_LRU[i].Get();
 
+			if (pRagdoll)
+			{
+				//Just ignore it until we're done burning/dissolving.
+				IPhysicsObject* pObject = pRagdoll->VPhysicsGetObject();
+				if (pRagdoll->GetEffectEntity() || (pObject && !pObject->IsAsleep()))
+					continue;
+			}
+
 			//Just ignore it until we're done burning/dissolving.
 			IPhysicsObject *pObject = pRagdoll->VPhysicsGetObject();
 			if ( pRagdoll && (pRagdoll->GetEffectEntity() || ( pObject && !pObject->IsAsleep()) ) )

diff --git a/mp/src/public/collisionutils.cpp b/mp/src/public/collisionutils.cpp
@@ -1666,7 +1666,7 @@ bool IntersectRayWithOBB( const Ray_t &ray, const matrix3x4_t &matOBBToWorld,
 		}
 		temp.type = 3;
 
-		MatrixITransformPlane( matOBBToWorld, temp, pTrace->plane );
+		MatrixTransformPlane( matOBBToWorld, temp, pTrace->plane );
 		return true;
 	}