Fix division type coalescing

OpenDreamProject · Dec 31, 2023 · 1adb41e · 1adb41e
1 parent 186d10d
commit 1adb41e
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/OpenDreamRuntime/Procs/DMOpcodeHandlers.cs b/OpenDreamRuntime/Procs/DMOpcodeHandlers.cs
@@ -2468,16 +2468,9 @@ private static DreamValue MultiplyValues(DreamValue first, DreamValue second) {
         }
 
         private static DreamValue DivideValues(DreamValue first, DreamValue second) {
-            if (first.IsNull) {
-                return new(0);
-            } else if (first.TryGetValueAsFloat(out var firstFloat) && second.TryGetValueAsFloat(out var secondFloat)) {
-                if (secondFloat == 0) {
-                    throw new Exception("Division by zero");
-                }
-                return new(firstFloat / secondFloat);
-            } else {
-                throw new Exception("Invalid divide operation on " + first + " and " + second);
-            }
+            var lhand = first.UnsafeGetValueAsFloat(); // Coalesce objects to 0.
+            var rhand = second.TryGetValueAsFloat(out var rhandMaybe) ? rhandMaybe : 1;
+            return new(lhand / rhand);
         }
 
         private static DreamValue BitXorValues(DreamObjectTree objectTree, DreamValue first, DreamValue second) {