From 6fca358aa2a919f3680de7d01ec2cac487c98f62 Mon Sep 17 00:00:00 2001
From: Archez <Archez@users.noreply.github.com>
Date: Thu, 2 May 2024 21:31:59 -0400
Subject: [PATCH] Bump LUS and use nlohmann json from package manager (#254)

---
 .github/workflows/apt-deps.txt | 2 +-
 .gitmodules                    | 2 +-
 CMakeLists.txt                 | 2 +-
 OTRExporter                    | 2 +-
 libultraship                   | 2 +-
 mm/2s2h/BenPort.cpp            | 6 ++++++
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/apt-deps.txt b/.github/workflows/apt-deps.txt
index a6593e4de..3b7da0f19 100644
--- a/.github/workflows/apt-deps.txt
+++ b/.github/workflows/apt-deps.txt
@@ -1 +1 @@
-libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev ninja-build libzip-dev zipcmp zipmerge ziptool 
\ No newline at end of file
+libusb-dev libusb-1.0-0-dev libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev ninja-build
diff --git a/.gitmodules b/.gitmodules
index 7f3c9787e..30036f3bf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "libultraship"]
 	path = libultraship
-	url = https://github.com/louist103/libultraship.git
+	url = https://github.com/kenix3/libultraship.git
 [submodule "OTRExporter"]
 	path = OTRExporter
 	url = https://github.com/louist103/OTRExporter.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6b3dfea9..9a4aadbec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ elseif ("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
 	set(VCPKG_TARGET_TRIPLET x64-windows-static)
 endif()
 vcpkg_bootstrap()
-vcpkg_install_packages(zlib bzip2 libpng sdl2 sdl2-net glew glfw3 libzip)
+vcpkg_install_packages(zlib bzip2 libzip libpng sdl2 sdl2-net glew glfw3 nlohmann-json)
 endif()
 
 ################################################################################
diff --git a/OTRExporter b/OTRExporter
index 67feb47d9..031782dd7 160000
--- a/OTRExporter
+++ b/OTRExporter
@@ -1 +1 @@
-Subproject commit 67feb47d9d3281585a1981412e4f24451941e0b2
+Subproject commit 031782dd74d03da31879178664eb9dcbec50584d
diff --git a/libultraship b/libultraship
index 96684915d..1d70eb42b 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 96684915df17ebd1c9b0030907887691fcf2feb0
+Subproject commit 1d70eb42b1678acd2c30a97bfc11fc1c1e733ccc
diff --git a/mm/2s2h/BenPort.cpp b/mm/2s2h/BenPort.cpp
index ff4bd4db3..65d4cb19f 100644
--- a/mm/2s2h/BenPort.cpp
+++ b/mm/2s2h/BenPort.cpp
@@ -136,6 +136,12 @@ OTRGlobals::OTRGlobals() {
     LUS::Context::GetInstance()->GetLogger()->set_pattern("[%H:%M:%S.%e] [%s:%#] [%l] %v");
 
     //context = LUS::Context::CreateUninitializedInstance("Ship of Harkinian", appShortName, "shipofharkinian.json");
+
+    auto overlay = context->GetInstance()->GetWindow()->GetGui()->GetGameOverlay();
+    overlay->LoadFont("Press Start 2P", "fonts/PressStart2P-Regular.ttf", 12.0f);
+    overlay->LoadFont("Fipps", "fonts/Fipps-Regular.otf", 32.0f);
+    overlay->SetCurrentFont(CVarGetString(CVAR_GAME_OVERLAY_FONT, "Press Start 2P"));
+
     auto loader = context->GetResourceManager()->GetResourceLoader();
     loader->RegisterResourceFactory(std::make_shared<SOH::ResourceFactoryBinaryAnimationV0>(), RESOURCE_FORMAT_BINARY,
                                     "Animation", static_cast<uint32_t>(SOH::ResourceType::SOH_Animation), 0);