Skip to content

Commit 5ffd0af

Browse files
update
Cleaning up some of the script.
1 parent cbe5688 commit 5ffd0af

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

com.unity.netcode.gameobjects/Editor/NetworkObjectEditor.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ namespace Unity.Netcode.Editor
1414
[CanEditMultipleObjects]
1515
public class NetworkObjectEditor : UnityEditor.Editor
1616
{
17+
private const NetworkObject.OwnershipStatus k_AllOwnershipFlags = NetworkObject.OwnershipStatus.RequestRequired | NetworkObject.OwnershipStatus.Transferable | NetworkObject.OwnershipStatus.Distributable;
18+
private const int k_SessionOwnerFlagAsInt = (int)NetworkObject.OwnershipStatus.SessionOwner;
19+
1720
private bool m_Initialized;
1821
private NetworkObject m_NetworkObject;
1922
private bool m_ShowObservers;
@@ -115,12 +118,9 @@ public override void OnInspectorGUI()
115118
EditorGUI.BeginChangeCheck();
116119
serializedObject.UpdateIfRequiredOrScript();
117120
var ownershipProperty = serializedObject.FindProperty(nameof(NetworkObject.Ownership));
118-
var sceneObjectProperty = serializedObject.FindProperty(nameof(NetworkObject.IsSceneObject));
119121
var previousOwnership = (NetworkObject.OwnershipStatus)ownershipProperty.intValue;
120-
var allFilter = NetworkObject.OwnershipStatus.RequestRequired | NetworkObject.OwnershipStatus.Transferable | NetworkObject.OwnershipStatus.Distributable;
121-
var hadAll = previousOwnership == allFilter;
122-
var wasNone = previousOwnership == 0;
123-
var hadSessionOwner = ownershipProperty.intValue == (int)NetworkObject.OwnershipStatus.SessionOwner;
122+
var hadAll = previousOwnership == k_AllOwnershipFlags;
123+
var hadSessionOwner = ownershipProperty.intValue == k_SessionOwnerFlagAsInt;
124124
DrawPropertiesExcluding(serializedObject, k_HiddenFields);
125125

126126
var currentOwnership = (NetworkObject.OwnershipStatus)ownershipProperty.intValue;
@@ -131,15 +131,15 @@ public override void OnInspectorGUI()
131131
{
132132
if (ownershipProperty.intValue == -1 && !hadAll)
133133
{
134-
ownershipProperty.intValue = (int)allFilter;
134+
ownershipProperty.intValue = (int)k_AllOwnershipFlags;
135135
}
136136
else if ((hadAll && !hadSessionOwner) || (!hadAll && !hadSessionOwner))
137137
{
138-
ownershipProperty.intValue = (int)NetworkObject.OwnershipStatus.SessionOwner;
138+
ownershipProperty.intValue = k_SessionOwnerFlagAsInt;
139139
}
140140
else if (hadSessionOwner && hasSessionOwner)
141141
{
142-
ownershipProperty.intValue &= (int)~NetworkObject.OwnershipStatus.SessionOwner;
142+
ownershipProperty.intValue &= ~k_SessionOwnerFlagAsInt;
143143
}
144144
}
145145
}

0 commit comments

Comments
 (0)