From b947bc5c6cfe5a049d142d5245778079deb6b839 Mon Sep 17 00:00:00 2001 From: Sally Knight Date: Mon, 16 Mar 2026 18:16:21 +0300 Subject: [PATCH] fix: incorrect conditionals --- Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp | 6 +++--- Minecraft.Client/Platform/Common/UI/UIScene_Intro.h | 2 +- Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_Intro.cpp index f38e12e9e..4e9af013b 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 +#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; -#if !defined _ENABLEIGGY || !defined ENABLE_JAVA_GUIS +#if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS) s_introTickCount = 0; #endif @@ -171,7 +171,7 @@ void UIScene_Intro::handleGainFocus(bool navBack) } } -#if !defined _ENABLEIGGY || !defined ENABLE_JAVA_GUIS +#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 28e9479cf..f180077c7 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 +#if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS) virtual void tick(); #endif }; diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp index eb4eb23f6..42570b990 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp +++ b/Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp @@ -1806,7 +1806,7 @@ void UIScene_MainMenu::tick() { UIScene::tick(); -#if !defined _ENABLEIGGY || !defined ENABLE_JAVA_GUIS +#if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS) { static int s_mainMenuTickCount = 0; s_mainMenuTickCount++;