Game-Decompilation/2ship2harkinian
1
0
Fork 0
mirror of https://github.com/HarbourMasters/2ship2harkinian.git synced 2024-10-06 18:53:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump LUS and use nlohmann json from package manager (#254)

Browse Source
This commit is contained in:
Archez 2024-05-02 21:31:59 -04:00 committed by Garrett Cox
parent 727c87293c
commit 6fca358aa2
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/apt-deps.txt vendored
View File

@ -1 +1 @@
libsdl2-dev libsdl2-net-dev libpng-dev libglew-dev ninja-build libzip-dev zipcmp zipmerge ziptool
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

2
.gitmodules vendored
View File

@ -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

2
CMakeLists.txt
View File

@ -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()
################################################################################

2
OTRExporter

@ -1 +1 @@
Subproject commit 67feb47d9d3281585a1981412e4f24451941e0b2
Subproject commit 031782dd74d03da31879178664eb9dcbec50584d

2
libultraship

@ -1 +1 @@
Subproject commit 96684915df17ebd1c9b0030907887691fcf2feb0
Subproject commit 1d70eb42b1678acd2c30a97bfc11fc1c1e733ccc

6
mm/2s2h/BenPort.cpp
View File

@ -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);