Changed spawn params for grenade from character; added FireInDirection for AGrenade()...

UnoYakshi · UnoYakshi · commit e0b58730a163 · 2019-01-30T04:47:23.000+03:00
diff --git a/Source/Prot/ProtCharacter.cpp b/Source/Prot/ProtCharacter.cpp
@@ -301,20 +301,21 @@ void AProtCharacter::SpawnGrenade()
 	SpawnParameters.Instigator = this;
 	SpawnParameters.Owner = GetController();
 
+	// Find "crosshair" forward vector...
+	FVector camLoc;
+	FRotator camRot;
+	Controller->GetPlayerViewPoint(camLoc, camRot);
+	const FVector Direction = camRot.Vector();
+
 	AGrenade* NewGrenade = GetWorld()->SpawnActor<AGrenade>(
 		GrenadeClass,
-		GetActorLocation() + GetActorForwardVector() * 200,
+		camLoc,
 		GetActorRotation(),
 		SpawnParameters);
 	if (NewGrenade)
 	{
-		FVector MeshDir = GetActorForwardVector();
-		FVector Direction = FVector(MeshDir.X, MeshDir.Y, 0.5f);
-		NewGrenade->FireInDirection(Direction);
-	}
-	else
-	{
-		GEngine->AddOnScreenDebugMessage(-1, 5.f, FColor::Blue, TEXT("NO GRENADE"));
+		// Add speed...
+		NewGrenade->FireInDirection(Direction * 12.f);
 	}
 }
 
diff --git a/Source/Prot/Weapons/Grenade.cpp b/Source/Prot/Weapons/Grenade.cpp
@@ -28,7 +28,7 @@ AGrenade::AGrenade()
 	ProjectileMovementComp->bShouldBounce = true;
 	//ProjectileMovementComp->Bounciness = 1.0f;
 	//ProjectileMovementComp->bRotationFollowsVelocity = true;
-	ProjectileMovementComp->InitialSpeed = 10.f * 100;
+	ProjectileMovementComp->InitialSpeed = 100.f;
 	ProjectileMovementComp->MaxSpeed = 100000.f;
 
 	RadialForceComp = CreateDefaultSubobject<URadialForceComponent>(TEXT("RadialForceComp"));
