From 11af297f22bc751f6c9be1d8592645f74eef8c10 Mon Sep 17 00:00:00 2001 From: Waterdish Date: Fri, 3 Nov 2023 20:17:12 -0700 Subject: [PATCH] Change libultraship branch to next --- app/jni/src/libultraship | 2 +- app/jni/src/soh/soh/SohMenuBar.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/jni/src/libultraship b/app/jni/src/libultraship index dfded1e..ba7ba84 160000 --- a/app/jni/src/libultraship +++ b/app/jni/src/libultraship @@ -1 +1 @@ -Subproject commit dfded1e97cb97e4f95bdfff57998a5b091393640 +Subproject commit ba7ba84477cea405cd5b304f4001f2a2d61d1de2 diff --git a/app/jni/src/soh/soh/SohMenuBar.cpp b/app/jni/src/soh/soh/SohMenuBar.cpp index ec663c6..033e423 100644 --- a/app/jni/src/soh/soh/SohMenuBar.cpp +++ b/app/jni/src/soh/soh/SohMenuBar.cpp @@ -128,7 +128,7 @@ void DrawMenuBarIcon() { void DrawShipMenu() { if (ImGui::BeginMenu("Ship")) { if (ImGui::MenuItem("Hide Menu Bar", -#if !defined(__SWITCH__) && !defined(__WIIU__) +#if !defined(__SWITCH__) && !defined(__WIIU__) && !defined(__ANDROID__) "F1" #else "[-]" @@ -146,7 +146,7 @@ void DrawShipMenu() { if (ImGui::MenuItem("Reset", #ifdef __APPLE__ "Command-R" -#elif !defined(__SWITCH__) && !defined(__WIIU__) +#elif !defined(__SWITCH__) && !defined(__WIIU__) && !defined(__ANDROID__) "Ctrl+R" #else "" @@ -154,7 +154,7 @@ void DrawShipMenu() { )) { std::reinterpret_pointer_cast(LUS::Context::GetInstance()->GetWindow()->GetGui()->GetGuiWindow("Console"))->Dispatch("reset"); } -#if !defined(__SWITCH__) && !defined(__WIIU__) +#if !defined(__SWITCH__) && !defined(__WIIU__) && !defined(__ANDROID__) UIWidgets::Spacer(0); if (ImGui::MenuItem("Open App Files Folder")) { std::string filesPath = LUS::Context::GetInstance()->GetAppDirectoryPath();