2.7 Mary Nightly 6 January 2022

Author: serpentiem

.gitignore

@@ -13,26 +13,43 @@
 !Mary/*
 !Scripts
 !Scripts/*.js
+
 !ThirdParty
 !ThirdParty/*
+
 !ThirdParty/ImGui
 !ThirdParty/ImGui/*.cpp
 !ThirdParty/ImGui/*.h
 !ThirdParty/ImGui/LICENSE.txt
+
 !ThirdParty/libzip
 !ThirdParty/libzip/*.c
 !ThirdParty/libzip/*.h
 !ThirdParty/libzip/AUTHORS
 !ThirdParty/libzip/LICENSE
+
+!ThirdParty/rapidjson
+!ThirdParty/rapidjson/error
+!ThirdParty/rapidjson/error/*.h
+!ThirdParty/rapidjson/internal
+!ThirdParty/rapidjson/internal/*.h
+!ThirdParty/rapidjson/msinttypes
+!ThirdParty/rapidjson/msinttypes/*.h
+!ThirdParty/rapidjson/*.h
+!ThirdParty/rapidjson/license.txt
+
 !ThirdParty/stb
 !ThirdParty/stb/*.h
 !ThirdParty/stb/LICENSE
+
 !ThirdParty/zlib
 !ThirdParty/zlib/*.c
 !ThirdParty/zlib/*.h
 !ThirdParty/zlib/README
+
 !/.gitattributes
 !/.gitignore
+!/ConfigFunctions.h
 !/core.js
 !/ddmk.js
 !/dinput8.cpp
@@ -42,5 +59,4 @@
 !/LICENSE.txt
 !/README.md
 !/run.js
-!/welcome.png
 prep_*

ConfigFunctions.h

@@ -0,0 +1,142 @@
+#ifdef NO_SAVE
+void SaveConfigFunction()
+#else
+export void SaveConfig()
+#endif
+{
+	#ifndef NO_SAVE
+	LogFunction();
+	#endif
+
+	using namespace rapidjson;
+	using namespace JSON;
+
+
+
+	ToJSON(queuedConfig);
+
+
+
+	StringBuffer stringBuffer;
+	PrettyWriter<StringBuffer> prettyWriter(stringBuffer);
+
+	root.Accept(prettyWriter);
+
+
+
+	auto name = stringBuffer.GetString();
+	auto size = strlen(name);
+
+	if
+	(
+		!SaveFile
+		(
+			location,
+			name,
+			size
+		)
+	)
+	{
+		Log("SaveFile failed.");
+	}
+}
+
+
+
+#ifdef NO_LOAD
+void LoadConfigFunction()
+#else
+export void LoadConfig()
+#endif
+{
+	#ifndef NO_LOAD
+	LogFunction();
+	#endif
+
+	using namespace rapidjson;
+	using namespace JSON;
+
+
+
+	auto file = LoadFile(location);
+	if (!file)
+	{
+		Log("LoadFile failed.");
+
+		CreateMembers(defaultConfig);
+
+		SaveConfig();
+
+		return;
+	}
+
+
+
+	auto name = const_cast<const char *>(reinterpret_cast<char *>(file));
+
+	if (root.Parse(name).HasParseError())
+	{
+		Log("Parse failed.");
+
+		return;
+	}
+
+
+
+	CreateMembers(defaultConfig);
+
+	// At this point all file members have been applied. Extra or obsolete file members can exist.
+	// If members were missing in the file they were created and have their default values.
+
+
+
+	// The actual configs are still untouched though.
+	// Let's update them!
+
+	ToConfig(queuedConfig);
+
+	CopyMemory
+	(
+		&activeConfig,
+		&queuedConfig,
+		sizeof(activeConfig)
+	);
+
+
+
+	SaveConfig();
+
+	// SaveConfig here in case new members were created.
+	// This way we don't have to rely on a later SaveConfig to update the file.
+}
+
+
+
+#ifdef NO_INIT
+void InitConfigFunction()
+#else
+export void InitConfig()
+#endif
+{
+	#ifndef NO_INIT
+	LogFunction();
+	#endif
+
+	using namespace rapidjson;
+	using namespace JSON;
+
+	CreateDirectoryA(directoryName, 0);
+
+	snprintf
+	(
+		location,
+		sizeof(location),
+		"%s/%s",
+		directoryName,
+		fileName
+	);
+
+	root.SetObject();
+
+	g_allocator = &root.GetAllocator();
+}