fix modulus

amylizzle · Apr 22, 2024 · 7611815 · 7611815
1 parent 1fe1013
commit 7611815
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Content.Tests/DMProject/Tests/Math/modulus.dm b/Content.Tests/DMProject/Tests/Math/modulus.dm
@@ -0,0 +1,7 @@
+/proc/RunTest()
+	ASSERT(10 % 5 == 0)
+	ASSERT(20 % 60 == 20)
+	ASSERT(30.8 % 30 == 0)
+	ASSERT(30.1 % 30 == 0)
+	ASSERT(5 % 2.5 == 1)
+	ASSERT(60 % 62.5 == 60)
diff --git a/OpenDreamRuntime/Procs/DMOpcodeHandlers.cs b/OpenDreamRuntime/Procs/DMOpcodeHandlers.cs
@@ -2612,9 +2612,9 @@ private static DreamValue BitXorValues(DreamObjectTree objectTree, DreamValue fi
         }
 
         private static DreamValue ModulusValues(DreamValue first, DreamValue second) {
-            if (first.TryGetValueAsFloat(out var firstFloat) || first.IsNull) {
-                if (second.TryGetValueAsFloat(out var secondFloat)) {
-                    return new DreamValue(firstFloat % secondFloat);
+            if (first.TryGetValueAsInteger(out var firstInt) || first.IsNull) {
+                if (second.TryGetValueAsInteger(out var secondInt)) {
+                    return new DreamValue(firstInt % secondInt);
                 }
             }