Merge pull request #221 from TwilitRealm/26-04-04-config

Config system v1

src/dusk/config.cpp

@@ -0,0 +1,222 @@
+#include "dusk/config.hpp"
+#include "fmt/format.h"
+#include "nlohmann/json.hpp"
+#include "absl/container/flat_hash_map.h"
+
+#include "aurora/lib/logging.hpp"
+#include "dusk/io.hpp"
+
+#include <limits>
+#include <string>
+
+#include "dusk/dusk.h"
+
+using namespace dusk::config;
+
+constexpr auto ConfigFileName = "config.json";
+
+using json = nlohmann::json;
+
+aurora::Module DuskConfigLog("dusk::config");
+
+static absl::flat_hash_map<std::string_view, ConfigVarBase*> RegisteredConfigVars;
+static bool RegistrationDone;
+
+static std::string GetConfigJsonPath() {
+    return fmt::format("{}{}", configPath, ConfigFileName);
+}
+
+ConfigVarBase::ConfigVarBase(const char* name, const ConfigImplBase* impl) : name(name), registered(false), layer(ConfigVarLayer::Default), impl(impl) {
+}
+
+const char* ConfigVarBase::getName() const noexcept {
+    return name;
+}
+
+const ConfigImplBase* ConfigVarBase::getImpl() const noexcept {
+    return impl;
+}
+
+template<ConfigValue T>
+void ConfigImpl<T>::loadFromJson(ConfigVar<T>& cVar, const json& jsonValue) {
+    cVar.setValue(jsonValue.get<T>(), false);
+}
+
+template<ConfigValue T>
+nlohmann::json ConfigImpl<T>::dumpToJson(const ConfigVar<T>& cVar) {
+    return cVar.getValue();
+}
+
+template<ConfigValue T> requires std::is_integral_v<T> && std::is_signed_v<T>
+static void loadFromArgImpl(ConfigVar<T>& cVar, const std::string_view stringValue) {
+    const std::string str(stringValue);
+    const auto result = std::stoll(str);
+    if (result >= std::numeric_limits<T>::min() && result <= std::numeric_limits<T>::max()) {
+        cVar.setOverrideValue(result);
+    } else {
+        throw std::out_of_range("Value is too large");
+    }
+}
+
+template<ConfigValue T> requires std::is_integral_v<T> && std::is_unsigned_v<T>
+static void loadFromArgImpl(ConfigVar<T>& cVar, const std::string_view stringValue) {
+    const std::string str(stringValue);
+    const auto result = std::stoull(str);
+    if (result <= std::numeric_limits<T>::max()) {
+        cVar.setOverrideValue(result);
+    } else {
+        throw std::out_of_range("Value is too large");
+    }
+}
+
+static void loadFromArgImpl(ConfigVar<f32>& cVar, const std::string_view stringValue) {
+    const std::string str(stringValue);
+    const auto result = std::stof(str);
+    cVar.setOverrideValue(result);
+}
+
+static void loadFromArgImpl(ConfigVar<f64>& cVar, const std::string_view stringValue) {
+    const std::string str(stringValue);
+    const auto result = std::stod(str);
+    cVar.setOverrideValue(result);
+}
+
+static void loadFromArgImpl(ConfigVar<std::string>& cVar, const std::string_view stringValue) {
+    cVar.setOverrideValue(std::string(stringValue));
+}
+
+template<ConfigValue T>
+void ConfigImpl<T>::loadFromArg(ConfigVar<T>& cVar, const std::string_view stringValue) {
+    loadFromArgImpl(cVar, stringValue);
+}
+
+template<>
+void ConfigImpl<bool>::loadFromArg(ConfigVar<bool>& cVar, const std::string_view stringValue) {
+    if (stringValue == "1" || stringValue == "TRUE" || stringValue == "true" || stringValue == "True") {
+        cVar.setOverrideValue(true);
+    } else if (stringValue == "0" || stringValue == "FALSE" || stringValue == "false" || stringValue == "False") {
+        cVar.setOverrideValue(false);
+    } else {
+        throw InvalidConfigError("Value cannot be parsed as boolean");
+    }
+}
+
+// My IDE is convinced this namespace is necessary. It shouldn't be AFAICT?
+namespace dusk::config {
+    template class ConfigImpl<bool>;
+    template class ConfigImpl<s8>;
+    template class ConfigImpl<u8>;
+    template class ConfigImpl<s16>;
+    template class ConfigImpl<u16>;
+    template class ConfigImpl<s32>;
+    template class ConfigImpl<u32>;
+    template class ConfigImpl<s64>;
+    template class ConfigImpl<u64>;
+    template class ConfigImpl<f32>;
+    template class ConfigImpl<f64>;
+    template class ConfigImpl<std::string>;
+}
+
+void dusk::config::Register(ConfigVarBase& configVar) {
+    const auto& name = configVar.getName();
+    if (RegistrationDone) {
+        DuskConfigLog.fatal("Tried to register CVar {} after registrations closed!", name);
+    }
+
+    if (RegisteredConfigVars.contains(name)) {
+        DuskConfigLog.fatal("Tried to register CVar {} twice!", name);
+    }
+
+    RegisteredConfigVars[name] = &configVar;
+    configVar.markRegistered();
+}
+
+void ConfigVarBase::markRegistered() {
+    if (registered)
+        abort();
+
+    registered = true;
+}
+
+void dusk::config::FinishRegistration() {
+    RegistrationDone = true;
+}
+
+void dusk::config::LoadFromUserPreferences() {
+    const auto configJsonPath = GetConfigJsonPath();
+    if (configJsonPath.empty()) {
+        return;
+    }
+    LoadFromFileName(configJsonPath.c_str());
+}
+
+static void LoadFromPath(const char* path) {
+    auto data = dusk::io::FileStream::ReadAllBytes(path);
+
+    json j = json::parse(data);
+    if (!j.is_object()) {
+        DuskConfigLog.error("Config JSON is not an object!");
+        return;
+    }
+
+    for (const auto& el : j.items()) {
+        const auto& key = el.key();
+        auto configVar = RegisteredConfigVars.find(key);
+        if (configVar == RegisteredConfigVars.end()) {
+            DuskConfigLog.error("Unknown key '{}' found in config!", key);
+            continue;
+        }
+
+        try {
+            configVar->second->getImpl()->loadFromJson(*configVar->second, el.value());
+        } catch (std::exception& e) {
+            DuskConfigLog.error("Failed to load key '{}' from config: {}", key, e.what());
+        }
+    }
+}
+
+void dusk::config::LoadFromFileName(const char* path) {
+    if (!RegistrationDone) {
+        DuskConfigLog.fatal("Registration not finished yet!");
+    }
+
+    DuskConfigLog.info("Loading config from '{}'", path);
+
+    try {
+        LoadFromPath(path);
+    } catch (const std::system_error& e) {
+        if (e.code() == std::errc::no_such_file_or_directory) {
+            DuskConfigLog.info("Config file did not exist, staying with defaults");
+        } else {
+            DuskConfigLog.error("Failed to load from config! {}", e.what());
+        }
+    }
+}
+
+void dusk::config::Save() {
+    const auto configJsonPath = GetConfigJsonPath();
+    if (configJsonPath.empty()) {
+        return;
+    }
+
+    DuskConfigLog.info("Saving config to '{}'", configJsonPath);
+
+    json j;
+
+    for (const auto& pair : RegisteredConfigVars) {
+        if (pair.second->getLayer() == ConfigVarLayer::Value) {
+            j[pair.first] = pair.second->getImpl()->dumpToJson(*pair.second);
+        }
+    }
+
+    io::FileStream::WriteAllText(configJsonPath.c_str(), j.dump(4));
+}
+
+ConfigVarBase* dusk::config::GetConfigVar(std::string_view name) {
+    const auto configVar = RegisteredConfigVars.find(name);
+    if (configVar != RegisteredConfigVars.end()) {
+        return configVar->second;
+    }
+
+    return nullptr;
+}

src/dusk/imgui/ImGuiConfig.hpp

@@ -0,0 +1,41 @@
+#ifndef DUSK_IMGUICONFIG_HPP
+#define DUSK_IMGUICONFIG_HPP
+
+#include "dusk/config.hpp"
+#include "imgui.h"
+
+namespace dusk::config {
+    inline void ImGuiCheckbox(const char* title, ConfigVar<bool>& var) {
+        bool copy = var.getValue();
+        if (ImGui::Checkbox(title, &copy)) {
+            var.setValue(copy);
+            Save();
+        }
+    }
+
+    static void ImGuiSliderFloat(const char* label, ConfigVar<float>& var, float v_min, float v_max, const char* format = "%.3f", ImGuiSliderFlags flags = 0) {
+        float val = var;
+        if (ImGui::SliderFloat(label, &val, v_min, v_max, format, flags)) {
+            var.setValue(val);
+            Save();
+        }
+    }
+
+    static void ImGuiSliderInt(const char* label, ConfigVar<int>& var, int v_min, int v_max, const char* format = "%d", ImGuiSliderFlags flags = 0) {
+        int val = var;
+        if (ImGui::SliderInt(label, &val, v_min, v_max, format, flags)) {
+            var.setValue(val);
+            Save();
+        }
+    }
+
+    static void ImGuiMenuItem(const char* label, const char* shortcut, ConfigVar<bool>& p_selected, bool enabled = true) {
+        bool copy = p_selected.getValue();
+        if (ImGui::MenuItem(label, shortcut, &copy, enabled)) {
+            p_selected.setValue(copy);
+            Save();
+        }
+    }
+}
+
+#endif  // DUSK_IMGUICONFIG_HPP

src/dusk/imgui/ImGuiConsole.cpp

@@ -13,6 +13,7 @@
 #include "ImGuiConsole.hpp"
 
 #include "JSystem/JUtility/JUTGamePad.h"
+#include "dusk/config.hpp"
 #include "dusk/settings.h"
 
 #if _WIN32
@@ -192,8 +193,7 @@ namespace dusk {
         }
 
         if (ImGui::IsKeyPressed(ImGuiKey_F11)) {
-            getSettings().video.enableFullscreen = !getSettings().video.enableFullscreen;
-            VISetWindowFullscreen(getSettings().video.enableFullscreen);
+            ImGuiMenuGame::ToggleFullscreen();
         }
 
         if (CheckMenuViewToggle(ImGuiKey_F1, m_isHidden)) {

src/dusk/imgui/ImGuiMenuEnhancements.cpp

@@ -1,7 +1,7 @@
 #include "imgui.h"
 
 #include "ImGuiMenuEnhancements.hpp"
-
+#include "ImGuiConfig.hpp"
 #include "dusk/settings.h"
 
 namespace dusk {
@@ -10,45 +10,45 @@ namespace dusk {
     void ImGuiMenuEnhancements::draw() {
         if (ImGui::BeginMenu("Enhancements")) {
             if (ImGui::BeginMenu("Quality of Life")) {
-                ImGui::Checkbox("Quick Transform (R+Y)", &getSettings().game.enableQuickTransform);
+                config::ImGuiCheckbox("Quick Transform (R+Y)", getSettings().game.enableQuickTransform);
 
-                ImGui::Checkbox("Bigger Wallets", &getSettings().game.biggerWallets);
+                config::ImGuiCheckbox("Bigger Wallets", getSettings().game.biggerWallets);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Wallet sizes are like in the HD version (500, 1000, 2000)");
                 }
 
-                ImGui::Checkbox("No Rupee Returns", &getSettings().game.noReturnRupees);
+                config::ImGuiCheckbox("No Rupee Returns", getSettings().game.noReturnRupees);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Always collect Rupees even if your Wallet is too full");
                 }
 
-                ImGui::Checkbox("Disable Rupee Cutscenes", &getSettings().game.disableRupeeCutscenes);
+                config::ImGuiCheckbox("Disable Rupee Cutscenes", getSettings().game.disableRupeeCutscenes);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Rupees won't play cutscenes after you've collected them the first time");
                 }
 
-                ImGui::Checkbox("No Sword Recoil", &getSettings().game.noSwordRecoil);
+                config::ImGuiCheckbox("No Sword Recoil", getSettings().game.noSwordRecoil);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Link won't recoil when his sword hits walls");
                 }
 
-                ImGui::Checkbox("Faster Climbing", &getSettings().game.fastClimbing);
+                config::ImGuiCheckbox("Faster Climbing", getSettings().game.fastClimbing);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Quicker climbing on ladders and vines like the HD version");
                 }
 
-                ImGui::Checkbox("No Climbing Miss Animation", &getSettings().game.noMissClimbing);
+                config::ImGuiCheckbox("No Climbing Miss Animation", getSettings().game.noMissClimbing);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Prevents Link from playing a struggle animation\n"
                                       "when using the Clawshot on vines at a weird angle");
                 }
 
-                ImGui::Checkbox("Faster Tears of Light", &getSettings().game.fastTears);
+                config::ImGuiCheckbox("Faster Tears of Light", getSettings().game.fastTears);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Tears of Light dropped by Shadow Insects pop out faster like the HD version");
                 }
 
-                ImGui::Checkbox("Hide TV Settings Screen", &getSettings().game.hideTvSettingsScreen);
+                config::ImGuiCheckbox("Hide TV Settings Screen", getSettings().game.hideTvSettingsScreen);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Hides the TV calibration screen shown when loading a save");
                 }
@@ -57,20 +57,20 @@ namespace dusk {
             }
 
             if (ImGui::BeginMenu("Preferences")) {
-                ImGui::Checkbox("Mirror Mode", &getSettings().game.enableMirrorMode);
+                config::ImGuiCheckbox("Mirror Mode", getSettings().game.enableMirrorMode);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Mirrors the world, matching the Wii version of the game");
                 }
 
-                ImGui::Checkbox("Invert Camera X Axis", &getSettings().game.invertCameraXAxis);
+                config::ImGuiCheckbox("Invert Camera X Axis", getSettings().game.invertCameraXAxis);
 
                 ImGui::EndMenu();
             }
 
             if (ImGui::BeginMenu("Graphics")) {
-                ImGui::Checkbox("Native Bloom", &getSettings().game.enableBloom);
+                config::ImGuiCheckbox("Native Bloom", getSettings().game.enableBloom);
 
-                ImGui::Checkbox("Water Projection Offset", &getSettings().game.useWaterProjectionOffset);
+                config::ImGuiCheckbox("Water Projection Offset", getSettings().game.useWaterProjectionOffset);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Adds GC-specific -0.01 transS offset\n"
                                       "that causes ~6px ghost artifacts in water reflections");
@@ -80,12 +80,12 @@ namespace dusk {
             }
 
             if (ImGui::BeginMenu("Audio")) {
-                ImGui::Checkbox("No Low HP Sound", &getSettings().game.noLowHpSound);
+                config::ImGuiCheckbox("No Low HP Sound", getSettings().game.noLowHpSound);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Disable the beeping sound when having low health");
                 }
 
-                ImGui::Checkbox("Non-Stop Midna's Lament", &getSettings().game.midnasLamentNonStop);
+                config::ImGuiCheckbox("Non-Stop Midna's Lament", getSettings().game.midnasLamentNonStop);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Prevents enemy music while Midna's Lament is playing");
                 }
@@ -94,9 +94,9 @@ namespace dusk {
             }
 
             if (ImGui::BeginMenu("Cheats")) {
-                ImGui::Checkbox("Fast Iron Boots", &getSettings().game.enableFastIronBoots);
+                config::ImGuiCheckbox("Fast Iron Boots", getSettings().game.enableFastIronBoots);
 
-                ImGui::Checkbox("Can Transform Anywhere", &getSettings().game.canTransformAnywhere);
+                config::ImGuiCheckbox("Can Transform Anywhere", getSettings().game.canTransformAnywhere);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Allows you to transform even if NPCs are looking");
                 }
@@ -105,9 +105,9 @@ namespace dusk {
             }
 
             if (ImGui::BeginMenu("Difficulty")) {
-                ImGui::SliderInt("Damage Multiplier", &getSettings().game.damageMultiplier, 1, 8, "x%d");
+                config::ImGuiSliderInt("Damage Multiplier", getSettings().game.damageMultiplier, 1, 8, "x%d");
 
-                ImGui::Checkbox("Instant Death", &getSettings().game.instantDeath);
+                config::ImGuiCheckbox("Instant Death", getSettings().game.instantDeath);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Any hit will instantly kill you");
                 }
@@ -116,7 +116,7 @@ namespace dusk {
             }
 
             if (ImGui::BeginMenu("Technical")) {
-                ImGui::Checkbox("Restore Wii 1.0 Glitches", &getSettings().game.restoreWiiGlitches);
+                config::ImGuiCheckbox("Restore Wii 1.0 Glitches", getSettings().game.restoreWiiGlitches);
                 if (ImGui::IsItemHovered()) {
                     ImGui::SetTooltip("Restores patched glitches from Wii USA 1.0,\n"
                                       "the first released version");

src/dusk/imgui/ImGuiMenuGame.cpp

@@ -3,6 +3,7 @@
 
 #include "ImGuiConsole.hpp"
 #include "ImGuiMenuGame.hpp"
+#include "ImGuiConfig.hpp"
 #include <imgui_internal.h>
 
 #include "JSystem/JUtility/JUTGamePad.h"
@@ -13,6 +14,12 @@
 #include "m_Do/m_Do_controller_pad.h"
 
 namespace dusk {
+    void ImGuiMenuGame::ToggleFullscreen() {
+        getSettings().video.enableFullscreen.setValue(!getSettings().video.enableFullscreen);
+        VISetWindowFullscreen(getSettings().video.enableFullscreen);
+        config::Save();
+    }
+
     ImGuiMenuGame::ImGuiMenuGame() {}
 
     void ImGuiMenuGame::draw() {
@@ -25,8 +32,7 @@ namespace dusk {
 
             if (ImGui::BeginMenu("Graphics")) {
                 if (ImGui::MenuItem("Toggle Fullscreen", hotkeys::TOGGLE_FULLSCREEN)) {
-                    getSettings().video.enableFullscreen = !getSettings().video.enableFullscreen;
-                    VISetWindowFullscreen(getSettings().video.enableFullscreen);
+                    ToggleFullscreen();
                 }
 
                 ImGui::EndMenu();
@@ -34,9 +40,8 @@ namespace dusk {
 
             if (ImGui::BeginMenu("Audio")) {
                 ImGui::Text("Master Volume");
-                ImGui::SliderInt("##masterVolume", &getSettings().audio.masterVolume, 0, 100);
-                ImGui::Checkbox("Enable Reverb", &getSettings().audio.enableReverb);
-
+                config::ImGuiSliderInt("##masterVolume", getSettings().audio.masterVolume, 0, 100);
+                config::ImGuiCheckbox("Enable Reverb", getSettings().audio.enableReverb);
                 /*
                 // TODO: Implement additional settings
                 ImGui::Text("Main Music Volume");

src/dusk/imgui/ImGuiMenuGame.hpp

@@ -16,6 +16,8 @@ namespace dusk {
         void windowInputViewer();
         void windowControllerConfig();
 
+        static void ToggleFullscreen();
+
     private:
         struct {
             int m_selectedPort = 0;

src/dusk/imgui/ImGuiMenuTools.cpp

@@ -7,10 +7,11 @@
 #include "ImGuiConsole.hpp"
 #include "ImGuiMenuTools.hpp"
 
-#include "m_Do/m_Do_main.h"
-#include "d/d_com_inf_game.h"
+#include "ImGuiConfig.hpp"
 #include "d/actor/d_a_alink.h"
 #include "d/actor/d_a_horse.h"
+#include "d/d_com_inf_game.h"
+#include "m_Do/m_Do_main.h"
 
 namespace dusk {
     ImGuiMenuTools::ImGuiMenuTools() {}
@@ -50,7 +51,7 @@ namespace dusk {
             ImGui::MenuItem("Audio Debug", hotkeys::SHOW_AUDIO_DEBUG, &m_showAudioDebug);
             ImGui::MenuItem("OSReport Force", nullptr, &OSReportReallyForceEnable);
             ImGui::Separator();
-            ImGui::MenuItem("Enable Turbo Key", hotkeys::TURBO, &getSettings().game.enableTurboKeybind);
+            config::ImGuiMenuItem("Enable Turbo Key", hotkeys::TURBO, getSettings().game.enableTurboKeybind);
             ImGui::EndMenu();
         }
 

src/dusk/io.cpp

@@ -0,0 +1,147 @@
+#include "dusk/io.hpp"
+#include <cstdio>
+#include <filesystem>
+
+using namespace dusk::io;
+
+#if _WIN32
+#define MODE_TYPE wchar_t
+#define MODE(val) L##val
+#define ftell(file) _ftelli64(file)
+#define fseek(a, b, c) _fseeki64(a, b, c)
+#else
+#define MODE_TYPE char
+#if _MSVC_VER
+#define MODE(val) ##val
+#else
+#define MODE(val) val
+#endif
+#endif
+
+static FILE* ThrowIfNotOpen(const FileStream& file) {
+    if (!file.GetFileHandle()) {
+        throw std::runtime_error("Invalid file handle!");
+    }
+
+    return static_cast<FILE*>(file.GetFileHandle());
+}
+
+[[noreturn]] static void ThrowForError(int code) {
+    throw std::system_error(std::make_error_code(static_cast<std::errc>(code)));
+}
+
+static FILE* OpenCore(const std::filesystem::path& path, const MODE_TYPE* mode) {
+    FILE* file;
+
+    int err;
+#if _WIN32
+    static_assert(std::is_same_v<std::filesystem::path::value_type, wchar_t>);
+    err = _wfopen_s(&file, path.c_str(), mode);
+#else
+    errno = 0;
+    static_assert(std::is_same_v<std::filesystem::path::value_type, char>);
+    file = fopen(path.c_str(), mode);
+    err = errno;
+#endif
+
+    if (!file) {
+        ThrowForError(err);
+    }
+
+    return file;
+}
+
+static FILE* OpenCore(const char* path, const MODE_TYPE* mode) {
+    return OpenCore(reinterpret_cast<const char8_t*>(path), mode);
+}
+
+FileStream::FileStream() noexcept : file(nullptr) {
+}
+
+FileStream::FileStream(void* file) : file(file) {
+    if (!file) {
+        CRASH("Invalid file handle");
+    }
+}
+
+FileStream::FileStream(FileStream&& other) noexcept {
+    file = other.file;
+    other.file = nullptr;
+}
+
+FileStream::~FileStream() {
+    if (file)
+        fclose(static_cast<FILE*>(file));
+}
+
+FileStream FileStream::OpenRead(const char* utf8Path) {
+    return FileStream(OpenCore(utf8Path, MODE("rb")));
+}
+
+FileStream FileStream::Create(const char* utf8Path) {
+    return FileStream(OpenCore(utf8Path, MODE("wb")));
+}
+
+std::vector<u8> FileStream::ReadFull() {
+    const auto fileHandle = ThrowIfNotOpen(*this);
+
+    std::vector<u8> result;
+
+    const auto startPos = ftell(fileHandle);
+    if (startPos == -1) {
+        ThrowForError(errno);
+    }
+
+    auto seekRes = fseek(fileHandle, 0, SEEK_END);
+    if (seekRes != 0) {
+        ThrowForError(errno);
+    }
+
+    const auto endPos = ftell(fileHandle);
+    if (endPos == -1) {
+        ThrowForError(errno);
+    }
+
+    seekRes = fseek(fileHandle, startPos, SEEK_SET);
+    if (seekRes != 0) {
+        ThrowForError(errno);
+    }
+
+    result.resize(endPos - startPos);
+
+    if (result.empty()) {
+        return result;
+    }
+
+    auto ret = fread(result.data(), 1, result.size(), fileHandle);
+    if (ret < result.size()) {
+        int err = errno;
+        // Error or EOF
+        if (feof(fileHandle)) {
+            result.resize(ret);
+        } else {
+            ThrowForError(err);
+        }
+    }
+
+    return result;
+}
+
+std::vector<u8> FileStream::ReadAllBytes(const char* utf8Path) {
+    auto handle = OpenRead(utf8Path);
+    return std::move(handle.ReadFull());
+}
+
+void FileStream::Write(const char* data, size_t dataLen) {
+    FILE* fileHandle = ThrowIfNotOpen(*this);
+
+    const auto ret = fwrite(data, 1, dataLen, fileHandle);
+    if (ret < dataLen) {
+        ThrowForError(errno);
+    }
+}
+
+void FileStream::WriteAllText(const char* utf8Path, const std::string_view text) {
+    auto handle = Create(utf8Path);
+    handle.Write(text.data(), text.size());
+}

src/dusk/settings.cpp

@@ -1,68 +1,100 @@
 #include "dusk/settings.h"
+#include "dusk/config.hpp"
 
 namespace dusk {
 
 UserSettings g_userSettings = {
-    // Program settings
-
-    // Video
     .video = {
-        .enableFullscreen = false,
+        .enableFullscreen {"video.enableFullscreen", false},
     },
 
-    // Audio
     .audio = {
-        .masterVolume = 80,
-        .mainMusicVolume = 100,
-        .subMusicVolume = 100,
-        .soundEffectsVolume = 100,
-        .fanfareVolume = 100,
-        .enableReverb = true
+        .masterVolume {"audio.masterVolume", 80},
+        .mainMusicVolume {"audio.mainMusicVolume", 100},
+        .subMusicVolume {"audio.subMusicVolume", 100},
+        .soundEffectsVolume {"audio.soundEffectsVolume", 100},
+        .fanfareVolume {"audio.fanfareVolume", 100},
+        .enableReverb {"audio.enableReverb", true},
     },
 
-    // Game settings
     .game = {
         // Quality of Life
-        .enableQuickTransform = false,
-        .hideTvSettingsScreen = false,
-        .biggerWallets = false,
-        .noReturnRupees = false,
-        .disableRupeeCutscenes = false,
-        .noSwordRecoil = false,
-        .damageMultiplier = 1,
-        .instantDeath = false,
-        .fastClimbing = false,
-        .noMissClimbing = false,
-        .fastTears = false,
+        .enableQuickTransform {"game.enableQuickTransform", false},
+        .hideTvSettingsScreen {"game.hideTvSettingsScreen", false},
+        .biggerWallets {"game.biggerWallets", false},
+        .noReturnRupees {"game.noReturnRupees", false},
+        .disableRupeeCutscenes {"game.disableRupeeCutscenes", false},
+        .noSwordRecoil {"game.noSwordRecoil", false},
+        .damageMultiplier {"game.damageMultiplier", 1},
+        .instantDeath {"game.instantDeath", false},
+        .fastClimbing {"game.fastClimbing", false},
+        .noMissClimbing {"game.noMissClimbing", false},
+        .fastTears {"game.fastTears", false},
 
         // Preferences
-        .enableMirrorMode = false,
-        .invertCameraXAxis = false,
+        .enableMirrorMode {"game.enableMirrorMode", false},
+        .invertCameraXAxis {"game.invertCameraXAxis", false},
 
         // Graphics
-        .enableBloom = true,
-        .useWaterProjectionOffset = false,
+        .enableBloom {"game.enableBloom", true},
+        .useWaterProjectionOffset {"game.useWaterProjectionOffset", false},
 
         // Audio
-        .noLowHpSound = false,
-        .midnasLamentNonStop = false,
+        .noLowHpSound {"game.noLowHpSound", false},
+        .midnasLamentNonStop {"game.midnasLamentNonStop", false},
 
         // Cheats
-        .enableFastIronBoots = false,
-        .canTransformAnywhere = false,
+        .enableFastIronBoots {"game.enableFastIronBoots", false},
+        .canTransformAnywhere {"game.canTransformAnywhere", false},
 
         // Technical
-        .restoreWiiGlitches = false,
+        .restoreWiiGlitches {"game.restoreWiiGlitches", false},
 
         // Controls
-        .enableTurboKeybind = true,
-    }
+        .enableTurboKeybind {"game.enableTurboKeybind", true},
+    },
 };
 
 UserSettings& getSettings() {
     return g_userSettings;
 }
 
+void registerSettings() {
+    // Video
+    Register(g_userSettings.video.enableFullscreen);
+
+    // Audio
+    Register(g_userSettings.audio.masterVolume);
+    Register(g_userSettings.audio.mainMusicVolume);
+    Register(g_userSettings.audio.subMusicVolume);
+    Register(g_userSettings.audio.soundEffectsVolume);
+    Register(g_userSettings.audio.fanfareVolume);
+    Register(g_userSettings.audio.enableReverb);
+
+    // Game
+    Register(g_userSettings.game.enableQuickTransform);
+    Register(g_userSettings.game.hideTvSettingsScreen);
+    Register(g_userSettings.game.biggerWallets);
+    Register(g_userSettings.game.noReturnRupees);
+    Register(g_userSettings.game.disableRupeeCutscenes);
+    Register(g_userSettings.game.noSwordRecoil);
+    Register(g_userSettings.game.damageMultiplier);
+    Register(g_userSettings.game.instantDeath);
+    Register(g_userSettings.game.fastClimbing);
+    Register(g_userSettings.game.fastTears);
+    Register(g_userSettings.game.enableMirrorMode);
+    Register(g_userSettings.game.invertCameraXAxis);
+    Register(g_userSettings.game.enableBloom);
+    Register(g_userSettings.game.useWaterProjectionOffset);
+    Register(g_userSettings.game.enableFastIronBoots);
+    Register(g_userSettings.game.canTransformAnywhere);
+    Register(g_userSettings.game.restoreWiiGlitches);
+    Register(g_userSettings.game.noMissClimbing);
+    Register(g_userSettings.game.noLowHpSound);
+    Register(g_userSettings.game.midnasLamentNonStop);
+    Register(g_userSettings.game.enableTurboKeybind);
+}
+
 // Transient settings
 
 static TransientSettings g_transientSettings = {

src/m_Do/m_Do_main.cpp

@@ -44,11 +44,12 @@
 #include <chrono>
 #include <thread>
 #include "SSystem/SComponent/c_API.h"
+#include "dusk/app_info.hpp"
 #include "dusk/dusk.h"
-#include "dusk/logging.h"
-#include "dusk/time.h"
-#include "dusk/main.h"
 #include "dusk/imgui/ImGuiEngine.hpp"
+#include "dusk/logging.h"
+#include "dusk/main.h"
+#include "dusk/time.h"
 
 #include <aurora/aurora.h>
 #include <aurora/event.h>
@@ -56,7 +57,9 @@
 #include <aurora/dvd.h>
 #include <dolphin/dvd.h>
 
+#include "SDL3/SDL_filesystem.h"
 #include "cxxopts.hpp"
+#include "dusk/config.hpp"
 
 // --- GLOBALS ---
 s8 mDoMain::developmentMode = -1;
@@ -107,6 +110,7 @@ s32 LOAD_COPYDATE(void*) {
 }
 
 AuroraInfo auroraInfo;
+const char* configPath;
 
 void main01(void) {
     OS_REPORT("\x1b[m");
@@ -233,10 +237,51 @@ static void aurora_imgui_init_callback(const AuroraWindowSize* size) {
     dusk::ImGuiEngine_Initialize(size->scale);
 }
 
+static void ApplyCVarOverrides(const cxxopts::OptionValue& option) {
+    if (option.count() == 0) {
+        return;
+    }
+
+    const auto& cVars = option.as<std::vector<std::string>>();
+    for (const auto& cvarArg : cVars) {
+        const auto sep = cvarArg.find('=');
+        if (sep == std::string::npos) {
+            DuskLog.fatal("--cvar argument has no '=': '{}'", cvarArg);
+            continue;
+        }
+
+        const auto name = std::string_view(cvarArg).substr(0, sep);
+        const auto value = std::string_view(cvarArg).substr(sep + 1);
+
+        const auto cVar = dusk::config::GetConfigVar(name);
+        if (!cVar) {
+            DuskLog.fatal("Unknown --cvar name: '{}'", name);
+        }
+
+        try {
+            cVar->getImpl()->loadFromArg(*cVar, value);
+        } catch (const std::exception& e) {
+            DuskLog.fatal("Unable to parse: '{}': {}", value, e.what());
+        }
+    }
+}
+
+static const char* CalculateConfigPath() {
+    const auto result = SDL_GetPrefPath(dusk::OrgName, dusk::AppName);
+    if (!result) {
+        DuskLog.fatal("Unable to get PrefPath: {}", SDL_GetError());
+    }
+
+    return result;
+}
+
 // =========================================================================
 // PC ENTRY POINT
 // =========================================================================
 int game_main(int argc, char* argv[]) {
+    dusk::registerSettings();
+    dusk::config::FinishRegistration();
+
     cxxopts::ParseResult parsed_arg_options;
 
     try {
@@ -246,7 +291,8 @@ int game_main(int argc, char* argv[]) {
             ("l,log-level", "Log level from " + std::to_string(AuroraLogLevel::LOG_DEBUG) + " to " + std::to_string(AuroraLogLevel::LOG_FATAL), cxxopts::value<uint8_t>()->default_value("0"))
             ("h,help", "Print usage")
             ("dvd", "Path to DVD image file", cxxopts::value<std::string>()->default_value("game.iso"))
-            ("backend", "Graphics API backend to use (auto, d3d11, d3d12, metal, vulkan, opengl, opengles, webgpu, null)", cxxopts::value<std::string>()->default_value("auto"));
+            ("backend", "Graphics API backend to use (auto, d3d11, d3d12, metal, vulkan, opengl, opengles, webgpu, null)", cxxopts::value<std::string>()->default_value("auto"))
+            ("cvar", "Override configuration variables without modifying config", cxxopts::value<std::vector<std::string>>());
 
         arg_options.parse_positional({"dvd"});
         arg_options.positional_help("<dvd-image>");
@@ -265,8 +311,14 @@ int game_main(int argc, char* argv[]) {
         exit(1);
     }
 
+    configPath = CalculateConfigPath();
+
+    dusk::config::LoadFromUserPreferences();
+    ApplyCVarOverrides(parsed_arg_options["cvar"]);
+
     AuroraConfig config{};
-    config.appName = "Dusk";
+    config.appName = dusk::AppName;
+    config.configPath = configPath;
     config.windowPosX = -1;
     config.windowPosY = -1;
     config.windowWidth = 608 * 2;