Source/Nakatomi/StaticMeshPickup.cpp

@@ -15,7 +15,8 @@ void AStaticMeshPickup::BeginPlay()
 {
 	Super::BeginPlay();
 
-	StartingLocation = StaticMeshComponent->GetRelativeLocation();
+	StaticMeshComponent->SetWorldLocation(this->GetActorLocation());
+	StartingLocation = this->GetActorLocation();
 	StaticMeshComponent->SetCollisionProfileName(FName("NoCollision"));
 }
 
@@ -25,10 +26,10 @@ void AStaticMeshPickup::Tick(float DeltaTime)
 
 	if (StaticMeshComponent)
 	{
-		// Rotate StaticMesh in desired direction
+		// Rotate Weapon in desired direction
 		StaticMeshComponent->AddLocalRotation((SpinRotation * RotationSpeed) * DeltaTime);
 
-		// Bob StaticMesh up and down
+		// Bob weapon up and down
 		const float Time = GetWorld()->GetRealTimeSeconds();
 		const float Sine = FMath::Abs(FMath::Sin(Time * MovementSpeed));
 		StaticMeshComponent->SetRelativeLocation(StartingLocation + ((MovementDirection * Sine) * MovementDistance));