Handle each type individually

Author: D1GQ

Reactor/Networking/Serialization/MessageSerializer.cs

@@ -91,12 +91,13 @@ public static void Serialize(this MessageWriter writer, object @object)
             case Vector2 i:
                 writer.Write(i);
                 break;
-            case Enum i:
-                writer.WritePacked(Convert.ToInt32(i, CultureInfo.InvariantCulture));
-                break;
             case string i:
                 writer.Write(i);
                 break;
+            case Enum i:
+                var underlyingValue = Convert.ChangeType(i, Enum.GetUnderlyingType(i.GetType()), CultureInfo.InvariantCulture);
+                Serialize(writer, underlyingValue);
+                break;
             default:
                 var converter = FindConverter(@object.GetType());
                 if (converter != null)
@@ -157,14 +158,16 @@ public static object Deserialize(this MessageReader reader, Type objectType)
             return reader.ReadVector2();
         }
 
-        if (objectType.IsEnum)
+        if (objectType == typeof(string))
         {
-            return Enum.ToObject(objectType, reader.ReadPackedInt32());
+            return reader.ReadString();
         }
 
-        if (objectType == typeof(string))
+        if (objectType.IsEnum)
         {
-            return reader.ReadString();
+            var underlyingType = Enum.GetUnderlyingType(objectType);
+            var underlyingValue = Deserialize(reader, underlyingType);
+            return Enum.ToObject(objectType, underlyingValue);
         }
 
         var converter = FindConverter(objectType);