0020 build, with crashfix on impact events.

Deaod · Oct 2, 2018 · a6ca9fd · a6ca9fd
1 parent bb67884
commit a6ca9fd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/System/LCWeapons.int b/System/LCWeapons.int
@@ -0,0 +1,5 @@
+[Public]
+Object=(Name=LCWeapons_0020.LCMutator,Class=Class,MetaClass=Engine.Mutator,Description="Lag Compensator")
+Object=(Name=LCWeapons_0020.FV_ColoredShock,Class=Class,MetaClass=Engine.Mutator,Description="LC: ColoredShock, Requires Lag Compensator mutator loaded!")
+Object=(Name=ChamRifle_v2.Rifle_HeadshotMut,Class=Class,MetaClass=Engine.Mutator,Description="Cham Rifle")
+
diff --git a/classes/LCStatics.uc b/classes/LCStatics.uc
@@ -4,8 +4,8 @@
 
 class LCStatics expands Object;
 
-#exec OBJ LOAD FILE="LCPureUtil.u" PACKAGE=LCWeapons_0019
-#exec OBJ LOAD FILE="SiegeUtil_A.u" PACKAGE=LCWeapons_0019
+#exec OBJ LOAD FILE="LCPureUtil.u" PACKAGE=LCWeapons_0020
+#exec OBJ LOAD FILE="SiegeUtil_A.u" PACKAGE=LCWeapons_0020
 
 const MULTIPLIER = 0x015a4e35;
 const INCREMENT = 1;

diff --git a/classes/XC_ImpactEvents.uc b/classes/XC_ImpactEvents.uc
@@ -131,8 +131,8 @@ event PostTouch( Actor Other)
 	if ( PendingTouch != none && PendingTouch != self )
 	{
 		Player.Actor.PendingTouch = PendingTouch;
-		PendingTouch.PostTouch( Player.Actor);
-		PendingTouch = none;
+		PendingTouch = none; //Infinite loop prevention
+		Player.Actor.PendingTouch.PostTouch( Player.Actor);
 	}
 }