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

Fix ascii2text encoding #1648

Merged
merged 7 commits into from
Feb 18, 2024
Merged

Fix ascii2text encoding #1648

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
5b228c1
ascii2text encoding
amylizzle Feb 2, 2024
f2ce028
Merge branch 'master' into fix-ascii2text
amylizzle Feb 9, 2024
e630eda
Merge branch 'master' into fix-ascii2text
amylizzle Feb 9, 2024
c02ed0a
test things
amylizzle Feb 18, 2024
907bf91
oops
amylizzle Feb 18, 2024
dc9629a
Update OpenDreamRuntime/Procs/Native/DreamProcNativeRoot.cs
amylizzle Feb 18, 2024
4a88396
rename test
amylizzle Feb 18, 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
29 changes: 29 additions & 0 deletions Content.Tests/DMProject/Tests/Builtins/text2ascii2text.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/proc/RunTest()
ASSERT(text2ascii_char("abcdéfg",6) == 102) //102 is f
ASSERT(ascii2text(text2ascii("a")) == "a")
var/list/values = list(
"©" = 0x00A9,
"®" = 0x00AE,
"‼" = 0x203C,
"⁉" = 0x2049,
"⃣" = 0x20E3,
"™" = 0x2122,
"ℹ" = 0x2139,
"⌚" = 0x231A,
"⌛" = 0x231B,
"⌨" = 0x2328,
"⏏" = 0x23CF,
"Ⓜ" = 0x24C2,
"▪" = 0x25AA,
"▫" = 0x25AB,
"▶" = 0x25B6,
"◀" = 0x25C0,
"⤴" = 0x2934,
"⤵" = 0x2935,
"〰" = 0x3030,
"〽" = 0x303D,
"㊗" = 0x3297,
"㊙" = 0x3299,
)
for(var/v in values)
ASSERT(ascii2text(values[v]) == v)
2 changes: 0 additions & 2 deletions Content.Tests/DMProject/Tests/Builtins/text2ascii_char.dm
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion OpenDreamRuntime/Procs/Native/DreamProcNativeRoot.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public static DreamValue NativeProc_ascii2text(NativeProc.Bundle bundle, DreamOb
if (!ascii.TryGetValueAsInteger(out int asciiValue))
throw new Exception($"{ascii} is not a number");

return new DreamValue(Convert.ToChar(asciiValue).ToString());
return new DreamValue(char.ConvertFromUtf32(asciiValue));
}

[DreamProc("block")]
Expand Down
Loading