fix: incorrect conditionals

This commit is contained in:
Sally Knight 2026-03-16 18:16:21 +03:00
parent c1955fd208
commit b947bc5c6c
3 changed files with 5 additions and 5 deletions

View file

@ -2,7 +2,7 @@
#include "UI.h" #include "UI.h"
#include "UIScene_Intro.h" #include "UIScene_Intro.h"
#if !defined _ENABLEIGGY || !defined ENABLE_JAVA_GUIS #if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS)
static int s_introTickCount = 0; static int s_introTickCount = 0;
#endif #endif
@ -12,7 +12,7 @@ UIScene_Intro::UIScene_Intro(int iPad, void *initData, UILayer *parentLayer) : U
initialiseMovie(); initialiseMovie();
m_bIgnoreNavigate = false; m_bIgnoreNavigate = false;
m_bAnimationEnded = false; m_bAnimationEnded = false;
#if !defined _ENABLEIGGY || !defined ENABLE_JAVA_GUIS #if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS)
s_introTickCount = 0; s_introTickCount = 0;
#endif #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() void UIScene_Intro::tick()
{ {
// Call base tick first (processes Iggy ticking) // Call base tick first (processes Iggy ticking)

View file

@ -49,7 +49,7 @@ public:
virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased); virtual void handleTouchInput(unsigned int iPad, S32 x, S32 y, int iId, bool bPressed, bool bRepeat, bool bReleased);
#endif #endif
#if !defined _ENABLEIGGY || !defined ENABLE_JAVA_GUIS #if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS)
virtual void tick(); virtual void tick();
#endif #endif
}; };

View file

@ -1806,7 +1806,7 @@ void UIScene_MainMenu::tick()
{ {
UIScene::tick(); UIScene::tick();
#if !defined _ENABLEIGGY || !defined ENABLE_JAVA_GUIS #if !defined(_ENABLEIGGY) && !defined(ENABLE_JAVA_GUIS)
{ {
static int s_mainMenuTickCount = 0; static int s_mainMenuTickCount = 0;
s_mainMenuTickCount++; s_mainMenuTickCount++;