mirror of
https://github.com/4jcraft/4jcraft.git
synced 2026-06-02 08:32:59 +00:00
fix: incorrect conditionals
This commit is contained in:
parent
c1955fd208
commit
b947bc5c6c
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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++;
|
||||
|
|
|
|||
Loading…
Reference in a new issue