1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 16:07:24 +08:00

Update naming of enum fields in ObjType

This commit is contained in:
Salman Ahmed 2024-05-01 17:22:52 +03:00
parent 16bae4f004
commit e8a6381395
2 changed files with 58 additions and 58 deletions

View File

@ -123,58 +123,58 @@ namespace osu.Game.IO.Legacy
switch (t) switch (t)
{ {
case ObjType.boolType: case ObjType.BoolType:
return ReadBoolean(); return ReadBoolean();
case ObjType.byteType: case ObjType.ByteType:
return ReadByte(); return ReadByte();
case ObjType.uint16Type: case ObjType.UInt16Type:
return ReadUInt16(); return ReadUInt16();
case ObjType.uint32Type: case ObjType.UInt32Type:
return ReadUInt32(); return ReadUInt32();
case ObjType.uint64Type: case ObjType.UInt64Type:
return ReadUInt64(); return ReadUInt64();
case ObjType.sbyteType: case ObjType.SByteType:
return ReadSByte(); return ReadSByte();
case ObjType.int16Type: case ObjType.Int16Type:
return ReadInt16(); return ReadInt16();
case ObjType.int32Type: case ObjType.Int32Type:
return ReadInt32(); return ReadInt32();
case ObjType.int64Type: case ObjType.Int64Type:
return ReadInt64(); return ReadInt64();
case ObjType.charType: case ObjType.CharType:
return ReadChar(); return ReadChar();
case ObjType.stringType: case ObjType.StringType:
return base.ReadString(); return base.ReadString();
case ObjType.singleType: case ObjType.SingleType:
return ReadSingle(); return ReadSingle();
case ObjType.doubleType: case ObjType.DoubleType:
return ReadDouble(); return ReadDouble();
case ObjType.decimalType: case ObjType.DecimalType:
return ReadDecimal(); return ReadDecimal();
case ObjType.dateTimeType: case ObjType.DateTimeType:
return ReadDateTime(); return ReadDateTime();
case ObjType.byteArrayType: case ObjType.ByteArrayType:
return ReadByteArray(); return ReadByteArray();
case ObjType.charArrayType: case ObjType.CharArrayType:
return ReadCharArray(); return ReadCharArray();
case ObjType.otherType: case ObjType.OtherType:
throw new IOException("Deserialization of arbitrary type is not supported."); throw new IOException("Deserialization of arbitrary type is not supported.");
default: default:
@ -185,25 +185,25 @@ namespace osu.Game.IO.Legacy
public enum ObjType : byte public enum ObjType : byte
{ {
nullType, NullType,
boolType, BoolType,
byteType, ByteType,
uint16Type, UInt16Type,
uint32Type, UInt32Type,
uint64Type, UInt64Type,
sbyteType, SByteType,
int16Type, Int16Type,
int32Type, Int32Type,
int64Type, Int64Type,
charType, CharType,
stringType, StringType,
singleType, SingleType,
doubleType, DoubleType,
decimalType, DecimalType,
dateTimeType, DateTimeType,
byteArrayType, ByteArrayType,
charArrayType, CharArrayType,
otherType, OtherType,
ILegacySerializableType LegacySerializableType
} }
} }

View File

@ -34,11 +34,11 @@ namespace osu.Game.IO.Legacy
{ {
if (str == null) if (str == null)
{ {
Write((byte)ObjType.nullType); Write((byte)ObjType.NullType);
} }
else else
{ {
Write((byte)ObjType.stringType); Write((byte)ObjType.StringType);
base.Write(str); base.Write(str);
} }
} }
@ -125,94 +125,94 @@ namespace osu.Game.IO.Legacy
{ {
if (obj == null) if (obj == null)
{ {
Write((byte)ObjType.nullType); Write((byte)ObjType.NullType);
} }
else else
{ {
switch (obj) switch (obj)
{ {
case bool boolObj: case bool boolObj:
Write((byte)ObjType.boolType); Write((byte)ObjType.BoolType);
Write(boolObj); Write(boolObj);
break; break;
case byte byteObj: case byte byteObj:
Write((byte)ObjType.byteType); Write((byte)ObjType.ByteType);
Write(byteObj); Write(byteObj);
break; break;
case ushort ushortObj: case ushort ushortObj:
Write((byte)ObjType.uint16Type); Write((byte)ObjType.UInt16Type);
Write(ushortObj); Write(ushortObj);
break; break;
case uint uintObj: case uint uintObj:
Write((byte)ObjType.uint32Type); Write((byte)ObjType.UInt32Type);
Write(uintObj); Write(uintObj);
break; break;
case ulong ulongObj: case ulong ulongObj:
Write((byte)ObjType.uint64Type); Write((byte)ObjType.UInt64Type);
Write(ulongObj); Write(ulongObj);
break; break;
case sbyte sbyteObj: case sbyte sbyteObj:
Write((byte)ObjType.sbyteType); Write((byte)ObjType.SByteType);
Write(sbyteObj); Write(sbyteObj);
break; break;
case short shortObj: case short shortObj:
Write((byte)ObjType.int16Type); Write((byte)ObjType.Int16Type);
Write(shortObj); Write(shortObj);
break; break;
case int intObj: case int intObj:
Write((byte)ObjType.int32Type); Write((byte)ObjType.Int32Type);
Write(intObj); Write(intObj);
break; break;
case long longObj: case long longObj:
Write((byte)ObjType.int64Type); Write((byte)ObjType.Int64Type);
Write(longObj); Write(longObj);
break; break;
case char charObj: case char charObj:
Write((byte)ObjType.charType); Write((byte)ObjType.CharType);
base.Write(charObj); base.Write(charObj);
break; break;
case string stringObj: case string stringObj:
Write((byte)ObjType.stringType); Write((byte)ObjType.StringType);
base.Write(stringObj); base.Write(stringObj);
break; break;
case float floatObj: case float floatObj:
Write((byte)ObjType.singleType); Write((byte)ObjType.SingleType);
Write(floatObj); Write(floatObj);
break; break;
case double doubleObj: case double doubleObj:
Write((byte)ObjType.doubleType); Write((byte)ObjType.DoubleType);
Write(doubleObj); Write(doubleObj);
break; break;
case decimal decimalObj: case decimal decimalObj:
Write((byte)ObjType.decimalType); Write((byte)ObjType.DecimalType);
Write(decimalObj); Write(decimalObj);
break; break;
case DateTime dateTimeObj: case DateTime dateTimeObj:
Write((byte)ObjType.dateTimeType); Write((byte)ObjType.DateTimeType);
Write(dateTimeObj); Write(dateTimeObj);
break; break;
case byte[] byteArray: case byte[] byteArray:
Write((byte)ObjType.byteArrayType); Write((byte)ObjType.ByteArrayType);
base.Write(byteArray); base.Write(byteArray);
break; break;
case char[] charArray: case char[] charArray:
Write((byte)ObjType.charArrayType); Write((byte)ObjType.CharArrayType);
base.Write(charArray); base.Write(charArray);
break; break;