Merge pull request #30 from Mezzokoko/master

Fixed the coop equipment exploit properly
eezstreet · Feb 18, 2017 · 2899e92 · 2899e92
2 parents 120db01 + 5e048a5
commit 2899e92
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/Game/SwatGame/Classes/Doors/SwatDoor.uc b/Source/Game/SwatGame/Classes/Doors/SwatDoor.uc
@@ -2502,7 +2502,7 @@ simulated function float GetQualifyTimeForC2Charge()
 simulated function OnSkeletalRegionHit(ESkeletalRegion RegionHit, vector HitLocation, vector HitNormal, int Damage, class<DamageType> DamageType, Actor Instigator)
 {
     //if a SwatDoor's REGION_Door_BreachingSpot is hit by a ShotgunDamageType, then the door has been blasted.
-    if (RegionHit == REGION_Door_BreachingSpot && ClassIsChildOf( DamageType, class'Shotgun' ) && !ClassIsChildOf( DamageType, class'LessLethalSG' ) )
+    if (RegionHit == REGION_Door_BreachingSpot)
     {
         assertWithDescription(Instigator.IsA('SwatPawn'),
             "[tcohen] SwatDoor::OnSkeletalRegionHit() RegionHit is REGION_Door_BreachingSpot and DamageType is FrangibleBreachingAmmo, but Instigator is not a SwatPawn.");

diff --git a/Source/Game/SwatGui/Classes/SwatLoadoutPanel.uc b/Source/Game/SwatGui/Classes/SwatLoadoutPanel.uc
@@ -185,8 +185,8 @@ function InitialDisplay()
 
         DisplayEquipment( Pocket(i) );
 
-		//Scrolled( Pocket(i), false);
-		//Scrolled( Pocket(i), true );
+		if ( !CheckCampaignValid( class<actor>(EquipmentList[Pocket(i)].GetObject() ) ) )
+		{Scrolled( Pocket(i), false);}
     }
 
     DisplayTab(ActiveTab);