Skip to content
This repository has been archived by the owner on Aug 29, 2024. It is now read-only.

Fix missing conversion from UTF8 #1343

Merged
merged 2 commits into from
Sep 11, 2019
Merged

Fix missing conversion from UTF8 #1343

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2f5fd1
Fix missing conversion from UTF8
yumnuska Sep 10, 2019
553fd16
Merge branch 'master' into bugfix/spatialreceiver-utf8
yumnuska Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions SpatialGDK/Source/SpatialGDK/Private/Interop/SpatialReceiver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ void USpatialReceiver::QueryForStartupActor(AActor* Actor, Worker_EntityId Entit
{
if (Op.status_code != WORKER_STATUS_CODE_SUCCESS)
{
UE_LOG(LogSpatialReceiver, Warning, TEXT("Entity Query Failed! %s"), Op.message);
UE_LOG(LogSpatialReceiver, Warning, TEXT("Entity Query Failed! %s"), UTF8_TO_TCHAR(Op.message));
return;
}

Expand Down Expand Up @@ -925,7 +925,7 @@ void USpatialReceiver::HandleIndividualAddComponent(const Worker_AddComponentOp&
return;
}

// Object already exists, we can apply data directly.
// Object already exists, we can apply data directly.
if (UObject* Object = PackageMap->GetObjectFromUnrealObjectRef(FUnrealObjectRef(Op.entity_id, Offset)).Get())
{
ApplyComponentData(Object, NetDriver->GetActorChannelByEntityId(Op.entity_id), Op.data);
Expand Down Expand Up @@ -1743,7 +1743,7 @@ void USpatialReceiver::ResolveIncomingOperations(UObject* Object, const FUnrealO

USpatialActorChannel* DependentChannel = ChannelObjectPair.Key.Get();
UObject* ReplicatingObject = ChannelObjectPair.Value.Get();

// Check whether the resolved object has been torn off, or is on an actor that has been torn off.
if (AActor* AsActor = Cast<AActor>(ReplicatingObject))
{
Expand Down Expand Up @@ -1977,4 +1977,4 @@ void USpatialReceiver::OnHeartbeatComponentUpdate(const Worker_ComponentUpdateOp
NetConnection->CleanUp();
AuthorityPlayerControllerConnectionMap.Remove(Op.entity_id);
}
}
}