diff --git a/Minecraft.Client/Common/Media/MediaWindows64.arc b/Minecraft.Client/Common/Media/MediaWindows64.arc index fd5c7c7c..f0780eba 100644 Binary files a/Minecraft.Client/Common/Media/MediaWindows64.arc and b/Minecraft.Client/Common/Media/MediaWindows64.arc differ diff --git a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp index 989a318b..642af9a2 100644 --- a/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp @@ -41,10 +41,7 @@ UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void *initData, UILayer *pa m_checkboxViewBob.init(app.GetString(IDS_VIEW_BOBBING),eControl_ViewBob,(app.GetGameSettings(m_iPad,eGameSetting_ViewBob)!=0)); m_checkboxSplitscreen.init(app.GetString(IDS_CHECKBOX_VERTICAL_SPLIT_SCREEN),eControl_Splitscreen,(app.GetGameSettings(m_iPad,eGameSetting_SplitScreenVertical)!=0)); - //m_checkboxVisbileOnMaps.init(app.GetString(IDS_VISIBLE_ON_MAPS),eControl_VisibleOnMaps,(app.GetGameSettings(m_iPad,eGameSetting_VisibleOnMaps)!=0)); - - //str1k3r - temporarily remove the visible on maps checkbox - removeControl(&m_checkboxVisbileOnMaps, true); + m_checkboxVisbileOnMaps.init(app.GetString(IDS_NULL),eControl_VisibleOnMaps,(app.GetGameSettings(m_iPad,eGameSetting_ViewBob)!=0)); //IDS_VISIBLE_ON_MAPS, eGameSetting_VisibleOnMaps unsigned char ucValue = app.GetGameSettings(m_iPad,eGameSetting_Difficulty); @@ -103,11 +100,11 @@ wstring UIScene_SettingsMenu::getMoviePath() { if(app.GetLocalPlayerCount() > 1) { - return L"SettingsGraphicsMenuSplit"; //L"SettingsMenuSplit"; + return L"SettingsMenuSplit"; } else { - return L"SettingsGraphicsMenu"; //L"SettingsMenuSplit"; + return L"SettingsMenu"; } } diff --git a/Minecraft.Client/Extrax64Stubs.cpp b/Minecraft.Client/Extrax64Stubs.cpp index 6fdb4215..28bb406a 100644 --- a/Minecraft.Client/Extrax64Stubs.cpp +++ b/Minecraft.Client/Extrax64Stubs.cpp @@ -452,8 +452,8 @@ void C_4JProfile::SetTrialTextStringTable(CXuiStringTable *pStringTable,int i void C_4JProfile::SetTrialAwardText(eAwardType AwardType,int iTitle,int iText) {} int C_4JProfile::GetLockedProfile() { return 0; } void C_4JProfile::SetLockedProfile(int iProf) {} -bool C_4JProfile::IsSignedIn(int iQuadrant) { return ( iQuadrant == 0); } -bool C_4JProfile::IsSignedInLive(int iProf) { return true; } +bool C_4JProfile::IsSignedIn(int iQuadrant) { return InputManager.IsPadConnected(iQuadrant); } +bool C_4JProfile::IsSignedInLive(int iProf) { return InputManager.IsPadConnected(iProf); } bool C_4JProfile::IsGuest(int iQuadrant) { return false; } UINT C_4JProfile::RequestSignInUI(bool bFromInvite,bool bLocalGame,bool bNoGuestsAllowed,bool bMultiplayerSignIn,bool bAddUser, int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant) { return 0; } UINT C_4JProfile::DisplayOfflineProfile(int( *Func)(LPVOID,const bool, const int iPad),LPVOID lpParam,int iQuadrant) { return 0; }