Source/Nakatomi/NakatomiCharacter.cpp

@@ -188,7 +188,6 @@ AWeapon* ANakatomiCharacter::InitializeWeapon(TSubclassOf<class AWeapon> weapon)
 	FActorSpawnParameters SpawnParameters;
 	SpawnParameters.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
 	AWeapon* Weapon = GetWorld()->SpawnActor<AWeapon>(weapon, SpawnParameters);
-	Weapon->SetOwner(this);
 	Weapon->AttachToComponent(GetMesh(), FAttachmentTransformRules::SnapToTargetNotIncludingScale, "WeaponHand");
 	Weapon->SetActorEnableCollision(false);
 	Weapon->SetActorHiddenInGame(true);

Source/Nakatomi/RandomWeapon.cpp

@@ -11,7 +11,7 @@ ARandomWeapon::ARandomWeapon()
 void ARandomWeapon::BeginPlay()
 {
 	WeaponProperties = RandomWeaponParameters->GenerateRandomWeaponProperties();
-	WeaponSkeletalMeshComponent->SetSkeletalMeshAsset(RandomWeaponParameters->PickRandomMesh());
+	WeaponSkeletalMesh = RandomWeaponParameters->PickRandomMesh();
 	FireSound = RandomWeaponParameters->PickRandomSoundBase();
 	FieldSystemActor = RandomWeaponParameters->PickRandomFieldSystem();
 

Source/Nakatomi/Weapon.cpp

@@ -6,14 +6,7 @@
 
 // Sets default values
 AWeapon::AWeapon()
-{	
+{
-	WeaponSkeletalMeshComponent = CreateDefaultSubobject<USkeletalMeshComponent>(TEXT("Skeletal Mesh Component"));
-	WeaponSkeletalMeshComponent->SetCollisionProfileName(FName("NoCollision"));
-	WeaponSkeletalMeshComponent->SetCollisionEnabled(ECollisionEnabled::NoCollision);
-	WeaponSkeletalMeshComponent->SetSimulatePhysics(false);
-	WeaponSkeletalMeshComponent->SetGenerateOverlapEvents(false);
-	WeaponSkeletalMeshComponent->SetNotifyRigidBodyCollision(false);
-	SetRootComponent(WeaponSkeletalMeshComponent);
 }
 
 // Called when the game starts or when spawned
@@ -26,12 +19,12 @@ void AWeapon::BeginPlay()
 
 USkeletalMesh* AWeapon::GetSkeletalMesh()
 {
-	return WeaponSkeletalMeshComponent->GetSkeletalMeshAsset();
+	return WeaponSkeletalMesh;
 }
 
 void AWeapon::SetSkeletalMesh(USkeletalMesh* USkeletalMesh)
 {
-	WeaponSkeletalMeshComponent->SetSkeletalMeshAsset(USkeletalMesh);
+	WeaponSkeletalMesh = USkeletalMesh;
 }
 
 TEnumAsByte<WeaponState>* AWeapon::GetCurrentWeaponStatus()

Source/Nakatomi/Weapon.h

@@ -29,8 +29,8 @@ class NAKATOMI_API AWeapon : public AActor
 	GENERATED_BODY()
 
 protected:
-	UPROPERTY(BlueprintReadWrite)
+	UPROPERTY(EditDefaultsOnly)
-	USkeletalMeshComponent* WeaponSkeletalMeshComponent;
+	USkeletalMesh* WeaponSkeletalMesh = nullptr;
 
 	UPROPERTY(EditDefaultsOnly)
 	TEnumAsByte<WeaponState> CurrentWeaponStatus;
@@ -65,7 +65,6 @@ public:
 
 protected:
 	// Called when the game starts or when spawned
-	UFUNCTION(Blueprintable, BlueprintCallable)
 	virtual void BeginPlay() override;
 
 public: