From 29bfb7e3d808d94c2aa196c5f36cd06ff90b26b5 Mon Sep 17 00:00:00 2001
From: Kevin Poretti <kevinporetti@gmail.com>
Date: Thu, 11 Nov 2021 14:00:59 -0500
Subject: [PATCH] Fix problem where hitting ground with sword causes hit pause

[git-p4: depot-paths = "//depot/main/": change = 142]
---
 SwordNGun/Content/Maps/Test.umap              |   4 ++--
 .../Private/Characters/SNGCharacterBase.cpp   | Bin 12718 -> 12916 bytes
 .../Private/Characters/SNGProtagonist.cpp     | Bin 21132 -> 21258 bytes
 .../Private/Weapons/SNGHitscanWeapon.cpp      | Bin 9004 -> 9018 bytes
 .../Private/Weapons/SNGMeleeWeaponBase.cpp    | Bin 5668 -> 5680 bytes
 SwordNGun/Source/SwordNGun/SwordNGun.h        |   3 ++-
 6 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/SwordNGun/Content/Maps/Test.umap b/SwordNGun/Content/Maps/Test.umap
index 9be9cde..25dcb1e 100644
--- a/SwordNGun/Content/Maps/Test.umap
+++ b/SwordNGun/Content/Maps/Test.umap
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:018df65c93d4933b55ca460620bf3b8b8897e5510f6ac627c6e6eedab19af4a5
-size 685776
+oid sha256:ed1ffca215c50d2843ad8f50a1e89d962e952ca467ebaf479abbe79bf133e36e
+size 686331
diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp
index d658134ea04c1c330890bf481f0c572db98bcc0a..503c1e348b4bcb4d75e7199c2078d13afc3cb560 100644
GIT binary patch
delta 42
vcmZ3N{3T^W0V{V9gCm0<gFAyOgUjSxR>R4kSn4=^fjl1|cHNxI>Zk(%6ITn1

delta 16
Xcmey8vMzZ;0qf*CR=v$BYyvs}K)41h

diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp
index 6e75099eae83be09636cb6c6ffffa6950024b69b..05d9ff4b8b220f5cb937a641d58bdf4dec447a3f 100644
GIT binary patch
delta 162
zcmeBK%GkAxaf5<uJud?n11Avb1EB&#IYS0RC74cRC<fA=KwJuBWisS3qyyO{K>1X#
zd@4gCLjglRP#h#$1mq=yWs-p^5`m(5Kwb_|E)A%r2&yv^Xp%h;!t8Wo@R;oEDmdA}
Xbq#kAgCm0<gFAyOgUjZZu8Vm9lqVka

delta 40
vcmeBL#@Mrzaf5;@FDC;h11|#?kmO`=o4nCgc=86<HIvu5^K342o5BMC(w_@@

diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp
index 2704dc78b8b25bf8ca329603946a1b9f45681077..0a928ae407eaa5ee3dd004902e753d5829f5efea 100644
GIT binary patch
delta 24
fcmZ4Ew##k9JyGr;21f=z26qNm2A9pZMFV*OXJ7|Y

delta 12
Tcmdnxw#IG4J<-i?ME!UHDH{c)

diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp
index 58a4bb9aa3505ca8060e53882f065782303483ca..81b0067c9e466cac402c99c071d22dc4129057e3 100644
GIT binary patch
delta 22
ccmZ3Yvq5LWB5qD!23H0jAa>n6pSzU{08obpX8-^I

delta 12
Tcmdm>vqWdZBJR!WxSO~DBf13w

diff --git a/SwordNGun/Source/SwordNGun/SwordNGun.h b/SwordNGun/Source/SwordNGun/SwordNGun.h
index b3d87cb..876c258 100644
--- a/SwordNGun/Source/SwordNGun/SwordNGun.h
+++ b/SwordNGun/Source/SwordNGun/SwordNGun.h
@@ -4,4 +4,5 @@
 
 #include "CoreMinimal.h"
 
-#define COLLISION_WEAPON	ECC_GameTraceChannel1
\ No newline at end of file
+#define COLLISION_RANGED_WEAPON	ECC_GameTraceChannel1
+#define COLLISION_MELEE_WEAPON	ECC_GameTraceChannel2
\ No newline at end of file