Skip to content

Commit bd891b6

Browse files
committed
Fix more ulong to int conversions
1 parent 8191dc8 commit bd891b6

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

com.unity.netcode.gameobjects/Tests/Editor/Serialization/BaseFastBufferReaderWriterTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public void BaseTypeTest(Type testType, WriteType writeType)
269269
else if (testType == typeof(SceneHandle))
270270
{
271271
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
272-
SceneHandle handle = SceneHandle.FromRawData(random.Next());
272+
SceneHandle handle = SceneHandle.FromRawData((ulong)random.Next());
273273
#else
274274
SceneHandle handle = random.Next();
275275
#endif
@@ -631,7 +631,7 @@ void RunTypeTestLocal<T>(T[] val, WriteType wt) where T : unmanaged
631631
{
632632

633633
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
634-
SceneHandle[] testArray = new[]{SceneHandle.FromRawData(random.Next()), SceneHandle.FromRawData(random.Next()), SceneHandle.FromRawData(random.Next())};
634+
SceneHandle[] testArray = new[]{SceneHandle.FromRawData((ulong)random.Next()), SceneHandle.FromRawData((ulong)random.Next()), SceneHandle.FromRawData((ulong)random.Next())};
635635
#else
636636
SceneHandle[] testArray = new[] { (SceneHandle)random.Next(), (SceneHandle)random.Next(), (SceneHandle)random.Next() };
637637
#endif
@@ -997,7 +997,7 @@ void RunTypeTestLocal<T>(NativeArray<T> val, WriteType wt) where T : unmanaged
997997
{
998998

999999
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
1000-
SceneHandle[] testArray = new[]{SceneHandle.FromRawData(random.Next()), SceneHandle.FromRawData(random.Next()), SceneHandle.FromRawData(random.Next())};
1000+
SceneHandle[] testArray = new[]{SceneHandle.FromRawData((ulong)random.Next()), SceneHandle.FromRawData((ulong)random.Next()), SceneHandle.FromRawData((ulong)random.Next())};
10011001
#else
10021002
SceneHandle[] testArray = new[] { (SceneHandle)random.Next(), (SceneHandle)random.Next(), (SceneHandle)random.Next() };
10031003
#endif
@@ -1367,7 +1367,7 @@ void RunTypeTestLocal<T>(NativeArray<T> val, WriteType wt) where T : unmanaged
13671367
else if (testType == typeof(SceneHandle))
13681368
{
13691369
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
1370-
SceneHandle[] testArray = new[]{SceneHandle.FromRawData(random.Next()), SceneHandle.FromRawData(random.Next()), SceneHandle.FromRawData(random.Next())};
1370+
SceneHandle[] testArray = new[]{SceneHandle.FromRawData((ulong)random.Next()), SceneHandle.FromRawData((ulong)random.Next()), SceneHandle.FromRawData((ulong)random.Next())};
13711371
#else
13721372
SceneHandle[] testArray = new[] { (SceneHandle)random.Next(), (SceneHandle)random.Next(), (SceneHandle)random.Next() };
13731373
#endif

com.unity.netcode.gameobjects/Tests/Editor/Serialization/BytePackerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ public void TestPackingBasicTypes(
844844
else if (testType == typeof(SceneHandle))
845845
{
846846
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
847-
SceneHandle v = SceneHandle.FromRawData(random.Next());
847+
SceneHandle v = SceneHandle.FromRawData((ulong)random.Next());
848848
#else
849849
SceneHandle v = random.Next();
850850
#endif

testproject/Assets/Tests/Runtime/NetworkSceneManager/SceneEventDataTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ public IEnumerator FastReaderAllocationTest()
5555
SceneHash = XXHash.Hash32("SomeRandomSceneName"),
5656
SceneEventProgressId = Guid.NewGuid(),
5757
LoadSceneMode = LoadSceneMode.Single,
58+
#if SCENE_MANAGEMENT_SCENE_HANDLE_NO_INT_CONVERSION
59+
SceneHandle = SceneHandle.FromRawData(32768)
60+
#else
5861
SceneHandle = 32768
62+
#endif
5963
};
6064

6165
sceneEventData.Serialize(fastBufferWriter);

0 commit comments

Comments
 (0)