LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-26 08:25:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #215 from 4jcraft/dev

Browse Source 
just merging all of the dev branch stuff into the java gui branch
This commit is contained in:
Tropical
2026-03-13 12:11:37 -05:00
committed by GitHub
parent 2fd1a136df 44ade1f2b2
commit 177ed6d176
342 changed files with 4066 additions and 3340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Minecraft.Client/Platform/Common/UI/UIScene_MainMenu.cpp
View File

@@ -281,7 +281,7 @@ void UIScene_MainMenu::handlePress(F64 controlId, F64 childId)
{
int primaryPad = ProfileManager.GetPrimaryPad();
int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
int (*signInReturnedFunc) (void *,const bool, const int iPad) = NULL;
switch((int)controlId)
{
@@ -1042,7 +1042,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_PlayGame(void *
UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
int (*signInReturnedFunc) (void *,const bool, const int iPad) = NULL;
// 4J-PB - Check if there is a patch for the game
pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad());
@@ -1131,7 +1131,7 @@ void UIScene_MainMenu::RefreshChatAndContentRestrictionsReturned_Leaderboards(vo
UIScene_MainMenu* pClass = (UIScene_MainMenu*)pParam;
int (*signInReturnedFunc) (LPVOID,const bool, const int iPad) = NULL;
int (*signInReturnedFunc) (void *,const bool, const int iPad) = NULL;
// 4J-PB - Check if there is a patch for the game
pClass->m_errorCode = ProfileManager.getNPAvailability(ProfileManager.GetPrimaryPad());
@@ -2021,7 +2021,7 @@ void UIScene_MainMenu::LoadTrial(void)
LoadingInputParams *loadingParams = new LoadingInputParams();
loadingParams->func = &CGameNetworkManager::RunNetworkGameThreadProc;
loadingParams->lpParam = (LPVOID)param;
loadingParams->lpParam = param;
UIFullscreenProgressCompletionData *completionData = new UIFullscreenProgressCompletionData();
completionData->bShowBackground=TRUE;