LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-31 04:16:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: collapse common app and ui console branches

Browse Source
This commit is contained in:
MatthewBeshay
2026-03-26 18:49:24 +11:00
parent ad5da38321
commit 6ef7d05f7e
148 changed files with 1389 additions and 1489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Minecraft.Client/Platform/Common/Tutorial/Tutorial.cpp
View File

@@ -378,7 +378,7 @@ Tutorial::Tutorial(int iPad, bool isFullTutorial /*= false*/) : m_iPad(iPad) {
m_CurrentState = e_Tutorial_State_Gameplay;
m_hasStateChanged = false;
#ifdef _XBOX
#if 0
m_hTutorialScene = NULL;
#endif
@@ -1956,8 +1956,8 @@ Tutorial::~Tutorial() {
}
void Tutorial::debugResetPlayerSavedProgress(int iPad) {
#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \
defined __PSVITA__)
#if (0 || 0 || 0 || \
0)
GAME_SETTINGS* pGameSettings =
(GAME_SETTINGS*)StorageManager.GetGameDefinedProfileData(iPad);
#else
@@ -1987,8 +1987,8 @@ void Tutorial::setCompleted(int completableId) {
if (completableIndex >= 0 &&
completableIndex < TUTORIAL_PROFILE_STORAGE_BITS) {
// Set the bit for this position
#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \
defined __PSVITA__)
#if (0 || 0 || 0 || \
0)
GAME_SETTINGS* pGameSettings =
(GAME_SETTINGS*)StorageManager.GetGameDefinedProfileData(m_iPad);
#else
@@ -2022,8 +2022,8 @@ bool Tutorial::getCompleted(int completableId) {
completableIndex < TUTORIAL_PROFILE_STORAGE_BITS) {
// Read the bit for this position
// Retrieve the data pointer from the profile
#if (defined __PS3__ || defined __ORBIS__ || defined _DURANGO || \
defined __PSVITA__)
#if (0 || 0 || 0 || \
0)
GAME_SETTINGS* pGameSettings =
(GAME_SETTINGS*)StorageManager.GetGameDefinedProfileData(m_iPad);
#else
@@ -2147,7 +2147,7 @@ void Tutorial::tick() {
}
if (!hasRequestedUI) {
#ifdef _XBOX
#if 0
m_bSceneIsSplitscreen = app.GetLocalPlayerCount() > 1;
if (m_bSceneIsSplitscreen) {
app.NavigateToScene(m_iPad, eUIComponent_TutorialPopup, (void*)this,
@@ -2163,7 +2163,7 @@ void Tutorial::tick() {
} else {
// if we've changed mode, we may need to change scene
if (m_bSceneIsSplitscreen != (app.GetLocalPlayerCount() > 1)) {
#ifdef _XBOX
#if 0
app.TutorialSceneNavigateBack(m_iPad);
m_bSceneIsSplitscreen = app.GetLocalPlayerCount() > 1;
if (m_bSceneIsSplitscreen) {
@@ -2979,7 +2979,7 @@ void Tutorial::addMessage(
new TutorialMessage(messageId, limitRepeats, numRepeats);
}
#ifdef _XBOX
#if 0
void Tutorial::changeTutorialState(eTutorial_State newState,
CXuiScene* scene /*= NULL*/)
#else
@@ -2990,7 +2990,7 @@ void Tutorial::changeTutorialState(eTutorial_State newState,
if (newState == m_CurrentState) {
// If clearing the scene, make sure that the tutorial popup has its
// reference to this scene removed
#ifndef _XBOX
#if 1
if (scene == NULL) {
ui.RemoveInteractSceneReference(m_iPad, m_UIScene);
}
@@ -3037,7 +3037,7 @@ void Tutorial::changeTutorialState(eTutorial_State newState,
// If clearing the scene, make sure that the tutorial popup has its
// reference to this scene removed
#ifndef _XBOX
#if 1
if (scene == NULL) {
ui.RemoveInteractSceneReference(m_iPad, m_UIScene);
}