Implement ValveSoftware#1534

Author: Bitl

game/quiver/info_changelog.txt

@@ -84,6 +84,7 @@ Added the following Source SDK Pull Requests:
 	- #1528: Add a non full charge sound check to tf_weapon_sniperrifle.cpp
 	- #1529: Add DevMsgs for returns in CBaseCombatWeapon::WeaponSound
 	- #1530: Allow null caller on team_control_point's SetOwner input
+	- #1534: Fix cleanup collect on MvM currency rest logic
 
 Details:
 - Fixed a bug where the mini-crit damage effect doesn't show up when your shield breaks.

src/game/server/tf/entity_currencypack.cpp

@@ -195,6 +195,25 @@ void CCurrencyPack::ComeToRest( void )
 		return;
 	}
 
+#ifdef BDSBASE
+	// See if we've come to rest in a trigger_hurt
+	if (IsTakingTriggerHurtDamageAtPoint(GetAbsOrigin()))
+	{
+		TFGameRules()->DistributeCurrencyAmount(m_nAmount);
+		m_bTouched = true;
+		UTIL_Remove(this);
+		return;
+	}
+
+	// Or a func_respawnroom (robots can drop money in their own spawn)
+	if (PointInRespawnRoom(NULL, GetAbsOrigin()))
+	{
+		TFGameRules()->DistributeCurrencyAmount(m_nAmount);
+		m_bTouched = true;
+		UTIL_Remove(this);
+		return;
+	}
+#else
 	// See if we've come to rest in a trigger_hurt
 	for ( int i = 0; i < ITriggerHurtAutoList::AutoList().Count(); i++ )
 	{
@@ -212,21 +231,6 @@ void CCurrencyPack::ComeToRest( void )
 			}
 		}
 	}
-
-#ifdef BDSBASE
-	// Or a func_respawnroom (robots can drop money in their own spawn)
-	for (int i = 0; i < IFuncRespawnRoomAutoList::AutoList().Count(); i++)
-	{
-		CFuncRespawnRoom* pRespawnRoom = static_cast<CFuncRespawnRoom*>(IFuncRespawnRoomAutoList::AutoList()[i]);
-		Vector vecMins, vecMaxs;
-		pRespawnRoom->GetCollideable()->WorldSpaceSurroundingBounds(&vecMins, &vecMaxs);
-		if (IsPointInBox(GetCollideable()->GetCollisionOrigin(), vecMins, vecMaxs))
-		{
-			TFGameRules()->DistributeCurrencyAmount(m_nAmount);
-			m_bTouched = true;
-			UTIL_Remove(this);
-		}
-	}
 #endif
 }