Bump lus and fixed PatchGfx (HarbourMasters#4125)

* Bump lus and fixed PatchGfx * Bump libultraship to main
KiritoDv · May 6, 2024 · f3b9482 · f3b9482
1 parent 438dede
commit f3b9482
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/libultraship b/libultraship
diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp
@@ -1791,7 +1791,7 @@ extern "C" void ResourceMgr_PatchGfxCopyCommandByName(const char* path, const ch
     }
 
     Gfx* destinationGfx = (Gfx*)&res->Instructions[destinationIndex];
-    Gfx sourceGfx = res->Instructions[sourceIndex];
+    Gfx sourceGfx = *(Gfx*)&res->Instructions[sourceIndex];
 
     if (!originalGfx.contains(path) || !originalGfx[path].contains(patchName)) {
         originalGfx[path][patchName] = {
+28 −0		cmake/dependencies/common.cmake
+0 −30		extern/CMakeLists.txt
+0 −21		extern/libgfxd/LICENSE
+0 −26		extern/libgfxd/Makefile
+0 −478		extern/libgfxd/README.md
+0 −3,838		extern/libgfxd/gbi.h
+0 −863		extern/libgfxd/gfxd.c
+0 −387		extern/libgfxd/gfxd.h
+0 −125		extern/libgfxd/priv.h
+0 −54		extern/libgfxd/uc.c
+0 −1,814		extern/libgfxd/uc_argfn.c
+0 −485		extern/libgfxd/uc_argtbl.c
+0 −4		extern/libgfxd/uc_f3d.c
+0 −5		extern/libgfxd/uc_f3db.c
+0 −4		extern/libgfxd/uc_f3dex.c
+0 −4		extern/libgfxd/uc_f3dex2.c
+0 −5		extern/libgfxd/uc_f3dexb.c
+0 −2,507		extern/libgfxd/uc_macrofn.c
+0 −1,397		extern/libgfxd/uc_macrotbl.c
+2 −2		include/libultraship/libultra/gbi.h
+1 −1		include/libultraship/libultra/gs2dex.h
+1 −1		include/libultraship/libultra/internal.h
+7 −1		include/libultraship/libultra/types.h
+3 −1		src/controller/deviceindex/ShipDeviceIndexMappingManager.cpp
+5 −5		src/debug/GfxDebugger.cpp
+8 −10		src/debug/GfxDebugger.h
+152 −0		src/graphic/Fast3D/f3dex.h
+149 −0		src/graphic/Fast3D/f3dex2.h
+4 −3		src/graphic/Fast3D/gfx_direct3d11.cpp
+12 −6		src/graphic/Fast3D/gfx_dxgi.cpp
+0 −1		src/graphic/Fast3D/gfx_metal.cpp
+0 −1		src/graphic/Fast3D/gfx_opengl.cpp
+437 −341		src/graphic/Fast3D/gfx_pc.cpp
+27 −11		src/graphic/Fast3D/gfx_pc.h
+6 −5		src/graphic/Fast3D/gfx_sdl2.cpp
+1,333 −0		src/graphic/Fast3D/lus_gbi.h
+2 −0		src/public/bridge/gfxbridge.h
+1 −1		src/public/bridge/gfxdebuggerbridge.cpp
+2 −1		src/resource/factory/ArrayFactory.cpp
+106 −101		src/resource/factory/DisplayListFactory.cpp
+1 −1		src/resource/factory/DisplayListFactory.h
+1 −0		src/resource/factory/VertexFactory.cpp
+2 −2		src/resource/type/Array.cpp
+2 −2		src/resource/type/Array.h
+1 −1		src/resource/type/DisplayList.cpp
+2 −1		src/resource/type/DisplayList.h
+1 −0		src/resource/type/Vertex.cpp
+2 −1		src/resource/type/Vertex.h
+28 −105		src/window/gui/GfxDebuggerWindow.cpp
+4 −3		src/window/gui/GfxDebuggerWindow.h