Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 14 insertions, 0 deletions

diff --git a/Minecraft.World/StringHelpers.cpp b/Minecraft.World/StringHelpers.cpp
index f305c185..6985c88f 100644
--- a/Minecraft.World/StringHelpers.cpp
+++ b/Minecraft.World/StringHelpers.cpp
@@ -68,6 +68,20 @@ const char *wstringtofilename(const wstring& name)
 	return buf;
 }
 
+const char *wstringtochararray(const wstring& name)
+{
+	static char buf[256];
+	assert(name.length()<256);
+	for(unsigned int i = 0; i < name.length(); i++ )
+	{
+		wchar_t c = name[i];
+		assert(c<128);	// Will we have to do any conversion of non-ASCII characters in filenames?
+		buf[i] = (char)c;
+	}
+	buf[name.length()] = 0;
+	return buf;
+}
+
 wstring filenametowstring(const char *name)
 {
 	return convStringToWstring(name);