Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unit test some world vars against bad const folding, fix world.system_type #2096

Merged
merged 7 commits into from
Nov 16, 2024
Merged

Unit test some world vars against bad const folding, fix world.system_type #2096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5fa823b
Unit test that `world.opendream_topic_port` is a number
Nov 16, 2024
58ed891
test `world.system_type`
Nov 16, 2024
edf6f53
Rename world_topic_port.dm to world_opendream_topic_port.dm
ike709 Nov 16, 2024
ccba5e4
Update Content.Tests/DMProject/Tests/Builtins/world_system_type.dm
ike709 Nov 16, 2024
4cb8cee
fix system_type not being a string
Nov 16, 2024
fdbffb5
Merge branch 'master' into worldtopic
ike709 Nov 16, 2024
8c4b650
Merge branch 'master' into worldtopic
wixoaGit Nov 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Content.Tests/DMProject/Tests/Builtins/world_opendream_topic_port.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

/proc/RunTest()
ASSERT(isnum(world.opendream_topic_port))
3 changes: 3 additions & 0 deletions Content.Tests/DMProject/Tests/Builtins/world_system_type.dm
View file
Open in desktop
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))
4 changes: 2 additions & 2 deletions DMCompiler/DMStandard/Defines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions OpenDreamRuntime/Objects/Types/DreamObjectWorld.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading