backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

make LoadSaveDataThumbnailReturned public again, fix bad DLCManager merge

Browse source
This commit is contained in:
Tropical 2026-03-22 14:15:08 -05:00
parent 2ab1f9fef0
commit ad9a28bcb7
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Minecraft.Client/Platform/Common/DLC/DLCManager.cpp
View file

@ -372,16 +372,14 @@ unsigned int DLCManager::checkForCorruptDLCAndAlert(
swprintf(wchFormat, 132, L"%ls\n\n%%ls", swprintf(wchFormat, 132, L"%ls\n\n%%ls",
firstCorruptPack->getName().c_str()); firstCorruptPack->getName().c_str());
C4JStorage::EMessageResult result = ui.RequestMessageBox( C4JStorage::EMessageResult result = ui.RequestErrorMessage(
IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC, uiIDA, 1, IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC, uiIDA, 1,
ProfileManager.GetPrimaryPad(), NULL, NULL, ProfileManager.GetPrimaryPad(), NULL, NULL, wchFormat);
app.GetStringTable(), wchFormat);
} else { } else {
C4JStorage::EMessageResult result = ui.RequestMessageBox( C4JStorage::EMessageResult result = ui.RequestErrorMessage(
IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC_MULTIPLE, uiIDA, 1, IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC_MULTIPLE, uiIDA, 1,
ProfileManager.GetPrimaryPad(), NULL, NULL, ProfileManager.GetPrimaryPad());
app.GetStringTable());
} }
} }

8
Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.h
View file

@ -118,9 +118,6 @@ private:
static int TrophyDialogReturned(void* pParam, int iPad, static int TrophyDialogReturned(void* pParam, int iPad,
C4JStorage::EMessageResult result); C4JStorage::EMessageResult result);
static int LoadDataComplete(void* pParam); static int LoadDataComplete(void* pParam);
static int LoadSaveDataThumbnailReturned(void* lpParam,
std::uint8_t* pbThumbnail,
unsigned int thumbnailBytes);
static int CheckResetNetherReturned(void* pParam, int iPad, static int CheckResetNetherReturned(void* pParam, int iPad,
C4JStorage::EMessageResult result); C4JStorage::EMessageResult result);
static int DeleteSaveDialogReturned(void* pParam, int iPad, static int DeleteSaveDialogReturned(void* pParam, int iPad,
@ -136,5 +133,10 @@ private:
#endif #endif
public: public:
// 4jcraft: made public for the thunk system we have for thumbnail loading, probably a FIXME for
// when this gets cleaned up
static int LoadSaveDataThumbnailReturned(void* lpParam,
std::uint8_t* pbThumbnail,
unsigned int thumbnailBytes);
static int StartGame_SignInReturned(void* pParam, bool, int); static int StartGame_SignInReturned(void* pParam, bool, int);
}; };