Remove custom OptionalType and use the default c# nullable type.

2022-03-01 17:27:56 -05:00
parent cc08afe269
commit c14f1eb3dc
89 changed files with 924 additions and 976 deletions
@@ -90,6 +90,35 @@ namespace Game.Entities
        public T GetValue() { return _value; }
    }

+    public class OptionalUpdateField<T> : IUpdateField<T> where T : new()
+    {
+        bool _hasValue;
+        public T _value;
+        public int BlockBit;
+        public int Bit;
+
+        public OptionalUpdateField(int blockBit, int bit)
+        {
+            BlockBit = blockBit;
+            Bit = bit;
+        }
+
+        public static implicit operator T(OptionalUpdateField<T> updateField)
+        {
+            return updateField._value;
+        }
+
+        public void SetValue(T value)
+        {
+            _hasValue = true;
+            _value = value;
+        }
+
+        public T GetValue() { return _value; }
+
+        public bool HasValue() { return _hasValue; }
+    }
+    
    public class UpdateFieldArray<T> where T : new()
    {
        public T[] _values;
@@ -351,6 +380,12 @@ namespace Game.Entities
                ((IHasChangesMask)updateField._value).ClearChangesMask();
        }

+        public void ClearChangesMask<U>(OptionalUpdateField<U> updateField) where U : new()
+        {
+            if (typeof(IHasChangesMask).IsAssignableFrom(typeof(U)))
+                ((IHasChangesMask)updateField._value).ClearChangesMask();
+        }
+
        public void ClearChangesMask<U>(UpdateFieldArray<U> updateField) where U : new()
        {
            if (typeof(IHasChangesMask).IsAssignableFrom(typeof(U)))