From c1955fd208dc88b17213cbd569feaf75155eff5f Mon Sep 17 00:00:00 2001 From: Sally Knight Date: Mon, 16 Mar 2026 17:55:35 +0300 Subject: [PATCH] chore: also add Java GUI conditionals against the intro autoskip unnecessary code that isn't used in any UI-ful case --- Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp | 6 +++--- Minecraft.Client/Platform/Common/UI/UIScene_Intro.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp index ce3b01c1a..f38e12e9e 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp @@ -2,7 +2,7 @@ #include "UI.h" #include "UIScene_Intro.h" -#ifndef _ENABLEIGGY +#if !defined _ENABLEIGGY || !defined ENABLE_JAVA_GUIS static int s_introTickCount = 0; #endif @@ -12,7 +12,7 @@ UIScene_Intro::UIScene_Intro(int iPad, void *initData, UILayer *parentLayer) : U initialiseMovie(); m_bIgnoreNavigate = false; m_bAnimationEnded = false; -#ifndef _ENABLEIGGY +#if !defined _ENABLEIGGY || !defined ENABLE_JAVA_GUIS s_introTickCount = 0; #endif @@ -171,7 +171,7 @@ void UIScene_Intro::handleGainFocus(bool navBack) } } -#ifndef _ENABLEIGGY +#if !defined _ENABLEIGGY || !defined ENABLE_JAVA_GUIS void UIScene_Intro::tick() { // Call base tick first (processes Iggy ticking) diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_Intro.h b/Minecraft.Client/Platform/Common/UI/UIScene_Intro.h index 45da2ed2d..28e9479cf 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_Intro.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_Intro.h @@ -49,7 +49,7 @@ public: virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased); #endif -#ifndef _ENABLEIGGY +#if !defined _ENABLEIGGY || !defined ENABLE_JAVA_GUIS virtual void tick(); #endif };