From c1eb0a897019993f16b9f0603b51b136a1ea7bcc Mon Sep 17 00:00:00 2001
From: Archez <Archez@users.noreply.github.com>
Date: Tue, 13 Feb 2024 20:55:33 -0500
Subject: [PATCH] Bump latest LUS and Fix ship menu bar icon (#3935)

* fix ship menu bar icon

* update cmake in wiiu/switch

* different cmake install

* wrong arch
---
 .github/workflows/generate-builds.yml | 6 ++++++
 libultraship                          | 2 +-
 soh/soh/SohMenuBar.cpp                | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/generate-builds.yml b/.github/workflows/generate-builds.yml
index 6f7134282..582022dbd 100644
--- a/.github/workflows/generate-builds.yml
+++ b/.github/workflows/generate-builds.yml
@@ -221,6 +221,9 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y ninja-build
+        sudo apt-get remove -y cmake
+        wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
+        sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
     - name: Fix dubious ownership error
       if: ${{ vars.LINUX_RUNNER }}
       run: git config --global --add safe.directory '*'
@@ -264,6 +267,9 @@ jobs:
       run: |
         sudo apt-get update
         sudo apt-get install -y ninja-build
+        sudo apt-get remove -y cmake
+        wget https://github.com/Kitware/CMake/releases/download/v3.28.3/cmake-3.28.3-linux-x86_64.sh -O /tmp/cmake.sh
+        sudo sh /tmp/cmake.sh --prefix=/usr/local/ --exclude-subdir
     - uses: actions/checkout@v3
       with:
         submodules: true
diff --git a/libultraship b/libultraship
index 825bd1275..d5a39635a 160000
--- a/libultraship
+++ b/libultraship
@@ -1 +1 @@
-Subproject commit 825bd1275bc26a8532f07a887db5141cd635df13
+Subproject commit d5a39635a118f814613c0fdd1601f80c809a742d
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
index f8dc26ad4..858c12da7 100644
--- a/soh/soh/SohMenuBar.cpp
+++ b/soh/soh/SohMenuBar.cpp
@@ -111,11 +111,11 @@ namespace SohGui {
 void DrawMenuBarIcon() {
     static bool gameIconLoaded = false;
     if (!gameIconLoaded) {
-        LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTexture("Game_Icon", "textures/icons/gIcon.png");
+        LUS::Context::GetInstance()->GetWindow()->GetGui()->LoadTextureFromRawImage("Game_Icon", "textures/icons/gIcon.png");
         gameIconLoaded = true;
     }
 
-    if (LUS::Context::GetInstance()->GetWindow()->GetGui()->GetTextureByName("Game_Icon")) {
+    if (LUS::Context::GetInstance()->GetWindow()->GetGui()->HasTextureByName("Game_Icon")) {
 #ifdef __SWITCH__
         ImVec2 iconSize = ImVec2(20.0f, 20.0f);
         float posScale = 1.0f;