Unit test some world vars against bad const folding, fix `world.sys…

…tem_type` (#2096) Co-authored-by: ike709 <[email protected]> Co-authored-by: wixoa <[email protected]>
OpenDreamProject · Nov 16, 2024 · 9e1a9e6 · 9e1a9e6
1 parent 970b6a9
commit 9e1a9e6
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/Content.Tests/DMProject/Tests/Builtins/world_opendream_topic_port.dm b/Content.Tests/DMProject/Tests/Builtins/world_opendream_topic_port.dm
@@ -0,0 +1,3 @@
+
+/proc/RunTest()
+	ASSERT(isnum(world.opendream_topic_port))
diff --git a/Content.Tests/DMProject/Tests/Builtins/world_system_type.dm b/Content.Tests/DMProject/Tests/Builtins/world_system_type.dm
@@ -0,0 +1,3 @@
+
+/proc/RunTest()
+	ASSERT(istext(world.system_type) && length(world.system_type))
diff --git a/DMCompiler/DMStandard/Defines.dm b/DMCompiler/DMStandard/Defines.dm
@@ -60,8 +60,8 @@
 #define SYNC_STEPS 3
 
 //world.system_type
-#define UNIX 0
-#define MS_WINDOWS 1
+#define UNIX "UNIX"
+#define MS_WINDOWS "MS_WINDOWS"
 
 //Icon blending functions
 #define ICON_ADD 0

diff --git a/OpenDreamRuntime/Objects/Types/DreamObjectWorld.cs b/OpenDreamRuntime/Objects/Types/DreamObjectWorld.cs
@@ -214,9 +214,9 @@ protected override bool TryGetVar(string varName, out DreamValue value) {
             case "system_type":
                 //system_type value should match the defines in Defines.dm
                 if (Environment.OSVersion.Platform is PlatformID.Unix or PlatformID.MacOSX or PlatformID.Other)
-                    value = new DreamValue(0);
+                    value = new DreamValue("UNIX");
                 else
-                    value = new DreamValue(1); //Windows
+                    value = new DreamValue("MS_WINDOWS"); //Windows
 
                 return true;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@

		/proc/RunTest()
		ASSERT(isnum(world.opendream_topic_port))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@

		/proc/RunTest()
		ASSERT(istext(world.system_type) && length(world.system_type))