Skip to content
Snippets Groups Projects

pull 5.4 changes into 5.5

Merged David Gilbert requested to merge dev/5.4 into dev/5.5
3 files
+ 12
2
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -143,6 +143,16 @@ void ARWTHVRGameModeBase::PostLogin(APlayerController* NewPlayer)
@@ -143,6 +143,16 @@ void ARWTHVRGameModeBase::PostLogin(APlayerController* NewPlayer)
}
}
}
}
 
if (GetNetMode() == NM_Standalone)
 
{
 
const FName BaseName = PawnClass->HasAnyFlags(RF_ClassDefaultObject)
 
? PawnClass->GetFName()
 
: *PawnClass->GetFName().GetPlainNameString();
 
 
SpawnInfo.Name = BaseName;
 
SpawnInfo.NameMode = FActorSpawnParameters::ESpawnActorNameMode::Requested;
 
}
 
// Spawn and possess the pawn
// Spawn and possess the pawn
APawn* ResultPawn = GetWorld()->SpawnActor<APawn>(PawnClass, StartSpot->GetTransform(), SpawnInfo);
APawn* ResultPawn = GetWorld()->SpawnActor<APawn>(PawnClass, StartSpot->GetTransform(), SpawnInfo);
NewPlayer->Possess(ResultPawn);
NewPlayer->Possess(ResultPawn);
Loading