From 79ef9a3de1e40739632377f1508e064bd12fcea1 Mon Sep 17 00:00:00 2001
From: MH261677 <MH261677@falmouth.ac.uk>
Date: Tue, 10 Oct 2023 13:14:09 +0100
Subject: [PATCH] Fixed Crosshair Not returning to proper Position

---
 .../Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp | 6 +-----
 .../Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h   | 2 --
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
index 8e61ac7b..271d8234 100644
--- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
+++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.cpp
@@ -147,7 +147,7 @@ void ABaseWeaponClass::CancelFire()
 	UE_LOG(LogTemp, Display, TEXT("FireCancelled"));
 	bulletCountShoot = 0;
 	GunStartArrow->SetRelativeRotation(FRotator(0,0,0));
-	playerControllerRef->SetControlRotation(ogPlayerRotation);
+	playerControllerRef->SetControlRotation(FRotator(0,0,0));
 }
 
 void ABaseWeaponClass::Fire()
@@ -165,10 +165,6 @@ void ABaseWeaponClass::Fire()
 		GenerateRecoilVector();
 		ClickDetectionTimer();
 		bulletCountShoot += 1;
-		if (bulletCountShoot <= 1)
-		{
-			ogPlayerRotation = FRotator(playerControllerRef->GetControlRotation());
-		}
 		if (outHit.bBlockingHit)
 		{
 			if (!Cast<AAICharacter>(outHit.GetActor())) return;
diff --git a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h
index 4deb8c6c..98557014 100644
--- a/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h
+++ b/EndlessVendetta/Source/EndlessVendetta/WeaponSystem/BaseWeaponClass.h
@@ -135,8 +135,6 @@ public:
 	FVector newTraceEnd;
 	FCollisionQueryParams collisionParams;
 
-	FRotator ogPlayerRotation;
-
 	//UFUNCTION(BlueprintCallable, Category = "Weapons")
 	//void RecoilVerticalLimit(FHitResult Outhit);