From 4937b92b1ee8c42dc4bd2c0f23829bf3663770ef Mon Sep 17 00:00:00 2001 From: Sally Knight Date: Mon, 16 Mar 2026 18:34:06 +0300 Subject: [PATCH] fix: still skip intro scene in java gui so that the cursor isn't grabbed --- 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 4e9af013b..ce3b01c1a 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" -#if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS) +#ifndef _ENABLEIGGY 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; -#if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS) +#ifndef _ENABLEIGGY s_introTickCount = 0; #endif @@ -171,7 +171,7 @@ void UIScene_Intro::handleGainFocus(bool navBack) } } -#if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS) +#ifndef _ENABLEIGGY 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 f180077c7..45da2ed2d 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 -#if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS) +#ifndef _ENABLEIGGY virtual void tick(); #endif };