From 53e0b639727edfc36977f4124fe881fa95bbc526 Mon Sep 17 00:00:00 2001
From: Random06457 <28494085+Random06457@users.noreply.github.com>
Date: Tue, 3 May 2022 10:49:41 +0900
Subject: [PATCH] fix Windows build

---
 libultraship/Makefile                                   | 4 ++--
 libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp | 2 +-
 libultraship/libultraship/ResourceMgr.cpp               | 2 +-
 libultraship/libultraship/SohImGuiImpl.cpp              | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libultraship/Makefile b/libultraship/Makefile
index de375d374..d6789db0b 100644
--- a/libultraship/Makefile
+++ b/libultraship/Makefile
@@ -18,8 +18,8 @@ WARN := -Wall -Wextra -Werror \
 	-Wno-narrowing \
 	-Wno-missing-field-initializers
 
-CXXFLAGS := $(WARN) -std=c++20 -D_GNU_SOURCE -DENABLE_OPENGL -m32
-CFLAGS := $(WARN) -std=c99 -D_GNU_SOURCE -DENABLE_OPENGL -m32
+CXXFLAGS := $(WARN) -std=c++20 -D_GNU_SOURCE -DENABLE_OPENGL -DSPDLOG_ACTIVE_LEVEL=0 -m32
+CFLAGS := $(WARN) -std=c99 -D_GNU_SOURCE -DENABLE_OPENGL -DSPDLOG_ACTIVE_LEVEL=0 -m32
 CPPFLAGS := -MMD
 
 ifneq ($(DEBUG),0)
diff --git a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp
index a3f818820..2be69ac22 100644
--- a/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp
+++ b/libultraship/libultraship/Lib/Fast3D/gfx_direct3d11.cpp
@@ -986,7 +986,7 @@ std::map<std::pair<float, float>, uint16_t> gfx_d3d11_get_pixel_depth(int fb_id,
 } // namespace
 
 ImTextureID gfx_d3d11_get_texture_by_id(int id) {
-    return impl.backend == Backend::DX11 ? d3d.textures[id].resource_view.Get() : reinterpret_cast<ImTextureID>(id);
+    return d3d.textures[id].resource_view.Get();
 }
 
 struct GfxRenderingAPI gfx_direct3d11_api = {
diff --git a/libultraship/libultraship/ResourceMgr.cpp b/libultraship/libultraship/ResourceMgr.cpp
index 85dec9886..fb510de0a 100644
--- a/libultraship/libultraship/ResourceMgr.cpp
+++ b/libultraship/libultraship/ResourceMgr.cpp
@@ -146,7 +146,7 @@ namespace Ship {
 						ToLoad->resource = Res;
 						ResourceCache[Res->file->path] = Res;
 
-						SPDLOG_DEBUG("Loaded Resource {} on ResourceMgr thread", ToLoad->File->path);
+						SPDLOG_DEBUG("Loaded Resource {} on ResourceMgr thread", ToLoad->file->path);
 
 						// Disabled for now because it can cause random crashes
 						//FileCache[Res->File->path] = nullptr;
diff --git a/libultraship/libultraship/SohImGuiImpl.cpp b/libultraship/libultraship/SohImGuiImpl.cpp
index c1c74a091..1db217815 100644
--- a/libultraship/libultraship/SohImGuiImpl.cpp
+++ b/libultraship/libultraship/SohImGuiImpl.cpp
@@ -613,7 +613,7 @@ namespace SohImGui {
                 EnhancementCheckbox("Enable 3D Dropped items", "gNewDrops");
                 EnhancementCheckbox("Dynamic Wallet Icon", "gDynamicWalletIcon");
                 EnhancementCheckbox("Always show dungeon entrances", "gAlwaysShowDungeonMinimapIcon");
-                
+
                 if (ImGui::BeginMenu("Fixes")) {
                     EnhancementCheckbox("Fix L&R Pause menu", "gUniformLR");
                     EnhancementCheckbox("Fix Dungeon entrances", "gFixDungeonMinimapIcon");
@@ -895,8 +895,11 @@ namespace SohImGui {
 
     ImTextureID GetTextureByID(int id) {
 #ifdef ENABLE_DX11
+    if (impl.backend == Backend::DX11)
+    {
         ImTextureID gfx_d3d11_get_texture_by_id(int id);
         return gfx_d3d11_get_texture_by_id(id);
+    }
 #else
         return reinterpret_cast<ImTextureID>(id);
 #endif