Merge remote-tracking branch 'origin/master' into 1.10
This commit is contained in:
@@ -1322,6 +1322,14 @@ void NetworkReplicator::MapObjectId(Guid& objectId)
|
||||
}
|
||||
}
|
||||
|
||||
void NetworkReplicator::AddObjectIdMapping(const ScriptingObject* obj, const Guid& objectId)
|
||||
{
|
||||
CHECK(obj);
|
||||
const Guid id = obj->GetID();
|
||||
NETWORK_REPLICATOR_LOG(Info, "[NetworkReplicator] Remap object ID={} into object {}:{}", objectId, id.ToString(), obj->GetType().ToString());
|
||||
IdsRemappingTable[objectId] = id;
|
||||
}
|
||||
|
||||
ScriptingObject* NetworkReplicator::ResolveForeignObject(Guid objectId)
|
||||
{
|
||||
if (const auto& object = ResolveObject(objectId))
|
||||
|
||||
Reference in New Issue
Block a user