Source/Nakatomi/AnimNotify/NakatomiThrowExplosiveNotify.cpp

@@ -1,15 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "../AnimNotify/NakatomiThrowExplosiveNotify.h"
-#include "Nakatomi/PlayerCharacter.h"
-
-void UNakatomiThrowExplosiveNotify::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation)
-{
-	APlayerCharacter* Character = Cast<APlayerCharacter>(MeshComp->GetOwner());
-
-	if (Character != nullptr)
-	{
-		Character->ThrowExplosive();
-	}
-}

Source/Nakatomi/AnimNotify/NakatomiThrowExplosiveNotify.h

@@ -1,21 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Animation/AnimNotifies/AnimNotify.h"
-#include "NakatomiThrowExplosiveNotify.generated.h"
-
-/**
- * 
- */
-UCLASS()
-class NAKATOMI_API UNakatomiThrowExplosiveNotify : public UAnimNotify
-{
-	GENERATED_BODY()
-
-public:
-
-	virtual void Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation) override;
-	
-};

Source/Nakatomi/AnimNotify/NakatomiThrowWeaponNotify.cpp

@@ -1,16 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-
-#include "../AnimNotify/NakatomiThrowWeaponNotify.h"
-
-#include "Nakatomi/PlayerCharacter.h"
-
-void UNakatomiThrowWeaponNotify::Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation)
-{
-	APlayerCharacter* Character = Cast<APlayerCharacter>(MeshComp->GetOwner());
-
-	if (Character != nullptr)
-	{
-		Character->ThrowWeapon();
-	}
-}

Source/Nakatomi/AnimNotify/NakatomiThrowWeaponNotify.h

@@ -1,20 +0,0 @@
-// Fill out your copyright notice in the Description page of Project Settings.
-
-#pragma once
-
-#include "CoreMinimal.h"
-#include "Animation/AnimNotifies/AnimNotify.h"
-#include "NakatomiThrowWeaponNotify.generated.h"
-
-/**
- * 
- */
-UCLASS()
-class NAKATOMI_API UNakatomiThrowWeaponNotify : public UAnimNotify
-{
-	GENERATED_BODY()
-
-public:
-	virtual void Notify(USkeletalMeshComponent* MeshComp, UAnimSequenceBase* Animation) override;
-	
-};

Source/Nakatomi/PlayerCharacter.cpp

@@ -703,50 +703,44 @@ void APlayerCharacter::ThrowWeaponCallback()
 {
 	if (CurrentWeapon)
 	{
-		PlayAnimMontage(ThrowWeaponAnimMontage);
+		PlayAnimMontage(ThrowAnimMontage);
+		
+		FVector Location;
+		FVector BoxExtent;
+		GetActorBounds(true, Location, BoxExtent, false);
+
+		FVector SpawnLocation = (BoxExtent.X * GetActorForwardVector()) * 2;
+		SpawnLocation += Location;
+		SpawnLocation.Z += BoxExtent.Z;
+
+		TSubclassOf<AWeaponThrowable> WeaponThrowableTemplate = CurrentWeapon->GetWeaponThrowableTemplate();
+
+		AWeaponThrowable* Throwable = GetWorld()->SpawnActor<AWeaponThrowable>(
+			WeaponThrowableTemplate, SpawnLocation, FRotator::ZeroRotator);
+
+		Throwable->SetWeaponSkeletalMesh(GetCurrentWeapon()->GetSkeletalMesh());
+
+		RemoveCurrentWeaponFromInventory();
 	}
 }
 
-void APlayerCharacter::ThrowWeapon()
-{
-	FVector Location;
-	FVector BoxExtent;
-	GetActorBounds(true, Location, BoxExtent, false);
-
-	FVector SpawnLocation = (BoxExtent.X * GetActorForwardVector()) * 2;
-	SpawnLocation += Location;
-	SpawnLocation.Z += BoxExtent.Z;
-
-	TSubclassOf<AWeaponThrowable> WeaponThrowableTemplate = CurrentWeapon->GetWeaponThrowableTemplate();
-
-	AWeaponThrowable* Throwable = GetWorld()->SpawnActor<AWeaponThrowable>(
-		WeaponThrowableTemplate, SpawnLocation, FRotator::ZeroRotator);
-
-	Throwable->SetWeaponSkeletalMesh(GetCurrentWeapon()->GetSkeletalMesh());
-
-	RemoveCurrentWeaponFromInventory();
-}
-
 void APlayerCharacter::ThrowExplosiveCallback()
 {
 	if (ThrowableInventory.Num() > 0)
 	{
-		PlayAnimMontage(ThrowExplosiveAnimMontage);
+		PlayAnimMontage(ThrowAnimMontage);
-	}
+		
-}
+		FVector Location;
-
+		FVector BoxExtent;
-void APlayerCharacter::ThrowExplosive()
+		GetActorBounds(true, Location, BoxExtent, false);
-{
-	FVector Location;
-	FVector BoxExtent;
-	GetActorBounds(true, Location, BoxExtent, false);
 	
-	FVector SpawnLocation = (BoxExtent.X * GetActorForwardVector()) * 2; 
+		FVector SpawnLocation = (BoxExtent.X * GetActorForwardVector()) * 2; 
-	SpawnLocation += Location;
+		SpawnLocation += Location;
-	SpawnLocation += (25.0f * GetActorForwardVector());
+		SpawnLocation += (25.0f * GetActorForwardVector());
-	SpawnLocation.Z += BoxExtent.Z;
+		SpawnLocation.Z += BoxExtent.Z;
 
-	GetWorld()->SpawnActor<AThrowable>(ThrowableInventory.Pop(), SpawnLocation, FRotator::ZeroRotator);
+		GetWorld()->SpawnActor<AThrowable>(ThrowableInventory.Pop(), SpawnLocation, FRotator::ZeroRotator);
+	}
 }
 
 AThrowable* APlayerCharacter::ThrowThrowable()

Source/Nakatomi/PlayerCharacter.h

@@ -84,10 +84,7 @@ public:
 	FOnEnemyHitDelegate OnEnemyHit;
 
 	UPROPERTY(EditDefaultsOnly)
-	UAnimMontage* ThrowWeaponAnimMontage;
+	UAnimMontage* ThrowAnimMontage;
-	
-	UPROPERTY(EditDefaultsOnly)
-	UAnimMontage* ThrowExplosiveAnimMontage;
 
 protected:
 	UPROPERTY(EditDefaultsOnly, BlueprintReadWrite)
@@ -220,11 +217,7 @@ public:
 
 	void ThrowWeaponCallback();
 
-	void ThrowWeapon();
-
 	void ThrowExplosiveCallback();
-
-	void ThrowExplosive();
 	
 	AThrowable* ThrowThrowable();