diff --git a/DMCompiler/DMStandard/_Standard.dm b/DMCompiler/DMStandard/_Standard.dm index 76c6d1264d..989d852101 100644 --- a/DMCompiler/DMStandard/_Standard.dm +++ b/DMCompiler/DMStandard/_Standard.dm @@ -81,9 +81,9 @@ proc/rgb(R, G, B, A, space) as text|null proc/rgb2num(color, space = COLORSPACE_RGB) as /list proc/roll(ndice = 1, sides) as num proc/round(A, B) as num -proc/sign(A) as num proc/sha1(input) as text|null proc/shutdown(Addr,Natural = 0) +proc/sign(A) as num proc/sleep(Delay) proc/sorttext(T1, T2) as num proc/sorttextEx(T1, T2) as num diff --git a/OpenDreamRuntime/Procs/Native/DreamProcNative.cs b/OpenDreamRuntime/Procs/Native/DreamProcNative.cs index 8cb5fbb235..e3792662dd 100644 --- a/OpenDreamRuntime/Procs/Native/DreamProcNative.cs +++ b/OpenDreamRuntime/Procs/Native/DreamProcNative.cs @@ -82,9 +82,9 @@ public static void SetupNativeProcs(DreamObjectTree objectTree) { objectTree.SetGlobalNativeProc(DreamProcNativeRoot.NativeProc_rgb2num); objectTree.SetGlobalNativeProc(DreamProcNativeRoot.NativeProc_roll); objectTree.SetGlobalNativeProc(DreamProcNativeRoot.NativeProc_round); - objectTree.SetGlobalNativeProc(DreamProcNativeRoot.NativeProc_sign); objectTree.SetGlobalNativeProc(DreamProcNativeRoot.NativeProc_sha1); objectTree.SetGlobalNativeProc(DreamProcNativeRoot.NativeProc_shutdown); + objectTree.SetGlobalNativeProc(DreamProcNativeRoot.NativeProc_sign); objectTree.SetGlobalNativeProc(DreamProcNativeRoot.NativeProc_sleep); objectTree.SetGlobalNativeProc(DreamProcNativeRoot.NativeProc_sorttext); objectTree.SetGlobalNativeProc(DreamProcNativeRoot.NativeProc_sorttextEx); diff --git a/OpenDreamRuntime/Procs/Native/DreamProcNativeRoot.cs b/OpenDreamRuntime/Procs/Native/DreamProcNativeRoot.cs index 6fd58fbafe..a0b8f585ee 100644 --- a/OpenDreamRuntime/Procs/Native/DreamProcNativeRoot.cs +++ b/OpenDreamRuntime/Procs/Native/DreamProcNativeRoot.cs @@ -2380,22 +2380,6 @@ public static DreamValue NativeProc_roll(NativeProc.Bundle bundle, DreamObject? return new DreamValue(total); } - [DreamProc("sign")] - [DreamProcParameter("A", Type = DreamValueTypeFlag.Float)] - public static DreamValue NativeProc_sign(NativeProc.Bundle bundle, DreamObject? src, DreamObject? usr) { - if (bundle.Arguments.Length != 1) throw new Exception($"expected 1 argument (found {bundle.Arguments.Length})"); - DreamValue arg = bundle.GetArgument(0, "A"); - - // Any non-num returns 0 - if (!arg.TryGetValueAsFloat(out var value)) return new DreamValue(0); - - return value switch { - 0 => new DreamValue(0), - < 0 => new DreamValue(-1), - _ => new DreamValue(1) - }; - } - [DreamProc("sha1")] [DreamProcParameter("T", Type = DreamValueTypeFlag.String | DreamValueTypeFlag.DreamResource)] public static DreamValue NativeProc_sha1(NativeProc.Bundle bundle, DreamObject? src, DreamObject? usr) { @@ -2441,6 +2425,22 @@ public static DreamValue NativeProc_shutdown(NativeProc.Bundle bundle, DreamObje return DreamValue.Null; } + [DreamProc("sign")] + [DreamProcParameter("A", Type = DreamValueTypeFlag.Float)] + public static DreamValue NativeProc_sign(NativeProc.Bundle bundle, DreamObject? src, DreamObject? usr) { + if (bundle.Arguments.Length != 1) throw new Exception($"expected 1 argument (found {bundle.Arguments.Length})"); + DreamValue arg = bundle.GetArgument(0, "A"); + + // Any non-num returns 0 + if (!arg.TryGetValueAsFloat(out var value)) return new DreamValue(0); + + return value switch { + 0 => new DreamValue(0), + < 0 => new DreamValue(-1), + _ => new DreamValue(1) + }; + } + [DreamProc("sleep")] [DreamProcParameter("Delay", Type = DreamValueTypeFlag.Float)] public static async Task NativeProc_sleep(AsyncNativeProc.State state) {