Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Minecraft.Client/Common/Media/MainMenu1080.swf
Binary file not shown.
Binary file modified Minecraft.Client/Common/Media/MainMenu480.swf
Binary file not shown.
Binary file modified Minecraft.Client/Common/Media/MainMenu720.swf
Binary file not shown.
Binary file modified Minecraft.Client/Common/Media/MainMenuVita.swf
Binary file not shown.
Binary file modified Minecraft.Client/Common/Media/MediaWindows64.arc
Binary file not shown.
Binary file modified Minecraft.Client/Common/Media/languages.loc
Binary file not shown.
20 changes: 3 additions & 17 deletions Minecraft.Client/Common/UI/UIScene_MainMenu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,6 @@ UIScene_MainMenu::UIScene_MainMenu(int iPad, void *initData, UILayer *parentLaye
m_buttons[(int)eControl_Leaderboards].init(IDS_LEADERBOARDS,eControl_Leaderboards);
m_buttons[(int)eControl_Achievements].init( (UIString)IDS_ACHIEVEMENTS,eControl_Achievements);
m_buttons[(int)eControl_HelpAndOptions].init(IDS_HELP_AND_OPTIONS,eControl_HelpAndOptions);
if(ProfileManager.IsFullVersion())
{
m_bTrialVersion=false;
m_buttons[(int)eControl_UnlockOrDLC].init(IDS_DOWNLOADABLECONTENT,eControl_UnlockOrDLC);
}
else
{
m_bTrialVersion=true;
m_buttons[(int)eControl_UnlockOrDLC].init(IDS_UNLOCK_FULL_GAME,eControl_UnlockOrDLC);
}

#ifndef _DURANGO
m_buttons[(int)eControl_Exit].init(app.GetString(IDS_EXIT_GAME),eControl_Exit);
Expand Down Expand Up @@ -178,12 +168,7 @@ void UIScene_MainMenu::handleGainFocus(bool navBack)
#ifdef _DURANGO
ProfileManager.ClearGameUsers();
#endif

if(navBack && ProfileManager.IsFullVersion())
{
// Replace the Unlock Full Game with Downloadable Content
m_buttons[(int)eControl_UnlockOrDLC].setLabel(IDS_DOWNLOADABLECONTENT);
}


#if TO_BE_IMPLEMENTED
// Fix for #45154 - Frontend: DLC: Content can only be downloaded from the frontend if you have not joined/exited multiplayer
Expand Down Expand Up @@ -2129,7 +2114,8 @@ void UIScene_MainMenu::LoadTrial(void)

void UIScene_MainMenu::handleUnlockFullVersion()
{
m_buttons[(int)eControl_UnlockOrDLC].setLabel(IDS_DOWNLOADABLECONTENT,true);
//m_buttons[(int)eControl_UnlockOrDLC].setLabel(IDS_DOWNLOADABLECONTENT,true);
// function does nothing since the button was removed.
}


Expand Down
4 changes: 0 additions & 4 deletions Minecraft.Client/Windows64Media/loc/stringsGeneric.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5715,10 +5715,6 @@ Press{*CONTROLLER_VK_B*} if you already know about Fireworks.</value>
<value>Cancel</value>
</data>

<data name="IDS_DOWNLOADABLECONTENT">
<value>Minecraft Store</value>
</data>

<data name="IDS_CONFIRM_LEAVE_VIA_INVITE">
<value>Are you sure you want to leave your current game and join the new one? Any unsaved progress will be lost.</value>
</data>
Expand Down
1,699 changes: 849 additions & 850 deletions Minecraft.Client/Windows64Media/strings.h

Large diffs are not rendered by default.