bump lus (#4793)

HarbourMasters · Jan 3, 2025 · 822d938 · 822d938
1 parent f5b5690
commit 822d938
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/libultraship b/libultraship
diff --git a/soh/soh/ResourceManagerHelpers.cpp b/soh/soh/ResourceManagerHelpers.cpp
@@ -117,11 +117,11 @@ extern "C" uint32_t ResourceMgr_IsGameMasterQuest() {
 }
 
 extern "C" void ResourceMgr_LoadDirectory(const char* resName) {
-    Ship::Context::GetInstance()->GetResourceManager()->LoadDirectory(resName);
+    Ship::Context::GetInstance()->GetResourceManager()->LoadResources(resName);
 }
 
 extern "C" void ResourceMgr_DirtyDirectory(const char* resName) {
-    Ship::Context::GetInstance()->GetResourceManager()->DirtyDirectory(resName);
+    Ship::Context::GetInstance()->GetResourceManager()->DirtyResources(resName);
 }
 
 extern "C" void ResourceMgr_UnloadResource(const char* resName) {
+31 −1		src/controller/controldeck/ControlDeck.cpp
+3 −0		src/controller/controldeck/ControlDeck.h
+10 −0		src/controller/controldevice/controller/Controller.cpp
+1 −0		src/controller/controldevice/controller/Controller.h
+47 −7		src/controller/controldevice/controller/ControllerButton.cpp
+3 −1		src/controller/controldevice/controller/ControllerButton.h
+49 −8		src/controller/controldevice/controller/ControllerStick.cpp
+3 −1		src/controller/controldevice/controller/ControllerStick.h
+1 −1		src/controller/controldevice/controller/mapping/ControllerAxisDirectionMapping.cpp
+1 −1		src/controller/controldevice/controller/mapping/ControllerAxisDirectionMapping.h
+1 −1		src/controller/controldevice/controller/mapping/ControllerButtonMapping.cpp
+1 −1		src/controller/controldevice/controller/mapping/ControllerButtonMapping.h
+2 −1		src/controller/controldevice/controller/mapping/ControllerMapping.h
+52 −0		src/controller/controldevice/controller/mapping/factories/AxisDirectionMappingFactory.cpp
+3 −0		src/controller/controldevice/controller/mapping/factories/AxisDirectionMappingFactory.h
+33 −0		src/controller/controldevice/controller/mapping/factories/ButtonMappingFactory.cpp
+3 −0		src/controller/controldevice/controller/mapping/factories/ButtonMappingFactory.h
+1 −1		src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToAxisDirectionMapping.cpp
+1 −1		src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToAxisDirectionMapping.h
+1 −1		src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToButtonMapping.cpp
+1 −1		src/controller/controldevice/controller/mapping/keyboard/KeyboardKeyToButtonMapping.h
+25 −0		src/controller/controldevice/controller/mapping/keyboard/KeyboardScancodes.h
+35 −0		src/controller/controldevice/controller/mapping/mouse/MouseButtonToAnyMapping.cpp
+20 −0		src/controller/controldevice/controller/mapping/mouse/MouseButtonToAnyMapping.h
+49 −0		src/controller/controldevice/controller/mapping/mouse/MouseButtonToAxisDirectionMapping.cpp
+17 −0		src/controller/controldevice/controller/mapping/mouse/MouseButtonToAxisDirectionMapping.h
+51 −0		src/controller/controldevice/controller/mapping/mouse/MouseButtonToButtonMapping.cpp
+17 −0		src/controller/controldevice/controller/mapping/mouse/MouseButtonToButtonMapping.h
+26 −0		src/controller/controldevice/controller/mapping/mouse/MouseWheelToAnyMapping.cpp
+18 −0		src/controller/controldevice/controller/mapping/mouse/MouseWheelToAnyMapping.h
+56 −0		src/controller/controldevice/controller/mapping/mouse/MouseWheelToAxisDirectionMapping.cpp
+18 −0		src/controller/controldevice/controller/mapping/mouse/MouseWheelToAxisDirectionMapping.h
+53 −0		src/controller/controldevice/controller/mapping/mouse/MouseWheelToButtonMapping.cpp
+17 −0		src/controller/controldevice/controller/mapping/mouse/MouseWheelToButtonMapping.h
+102 −0		src/controller/controldevice/controller/mapping/mouse/WheelHandler.cpp
+36 −0		src/controller/controldevice/controller/mapping/mouse/WheelHandler.h
+1 −1		src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToAnyMapping.cpp
+1 −1		src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToAxisDirectionMapping.cpp
+1 −1		src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToAxisDirectionMapping.h
+1 −1		src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.cpp
+1 −1		src/controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h
+1 −1		src/controller/controldevice/controller/mapping/sdl/SDLButtonToAxisDirectionMapping.cpp
+1 −1		src/controller/controldevice/controller/mapping/sdl/SDLButtonToAxisDirectionMapping.h
+1 −1		src/controller/controldevice/controller/mapping/sdl/SDLButtonToButtonMapping.cpp
+1 −1		src/controller/controldevice/controller/mapping/sdl/SDLButtonToButtonMapping.h
+1 −0		src/controller/deviceindex/ShipDeviceIndex.h
+22 −4		src/graphic/Fast3D/Fast3dWindow.cpp
+3 −0		src/graphic/Fast3D/Fast3dWindow.h
+75 −21		src/graphic/Fast3D/gfx_dxgi.cpp
+0 −1		src/graphic/Fast3D/gfx_opengl.cpp
+29 −3		src/graphic/Fast3D/gfx_sdl2.cpp
+1 −0		src/graphic/Fast3D/gfx_window_manager_api.h
+4 −4		src/public/bridge/resourcebridge.cpp
+59 −41		src/resource/ResourceManager.cpp
+39 −22		src/resource/ResourceManager.h
+33 −2		src/resource/archive/ArchiveManager.cpp
+4 −1		src/resource/archive/ArchiveManager.h
+2 −3		src/utils/glob.c
+1 −2		src/window/Window.h
+13 −0		src/window/gui/GameOverlay.cpp
+1 −0		src/window/gui/GameOverlay.h
+52 −8		src/window/gui/Gui.cpp
+4 −0		src/window/gui/Gui.h
+66 −2		src/window/gui/InputEditorWindow.cpp
+1 −0		src/window/gui/InputEditorWindow.h
+1 −1		src/window/gui/resource/Font.cpp