diff --git a/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp b/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp index c0021eec3..833b9f4ee 100644 --- a/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp +++ b/Minecraft.Client/Platform/Common/DLC/DLCManager.cpp @@ -372,16 +372,14 @@ unsigned int DLCManager::checkForCorruptDLCAndAlert( swprintf(wchFormat, 132, L"%ls\n\n%%ls", firstCorruptPack->getName().c_str()); - C4JStorage::EMessageResult result = ui.RequestMessageBox( + C4JStorage::EMessageResult result = ui.RequestErrorMessage( IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC, uiIDA, 1, - ProfileManager.GetPrimaryPad(), NULL, NULL, - app.GetStringTable(), wchFormat); + ProfileManager.GetPrimaryPad(), NULL, NULL, wchFormat); } else { - C4JStorage::EMessageResult result = ui.RequestMessageBox( + C4JStorage::EMessageResult result = ui.RequestErrorMessage( IDS_CORRUPT_DLC_TITLE, IDS_CORRUPT_DLC_MULTIPLE, uiIDA, 1, - ProfileManager.GetPrimaryPad(), NULL, NULL, - app.GetStringTable()); + ProfileManager.GetPrimaryPad()); } } diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.h b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.h index deb5d31b3..ba04e9f9f 100644 --- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.h +++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.h @@ -118,9 +118,6 @@ private: static int TrophyDialogReturned(void* pParam, int iPad, C4JStorage::EMessageResult result); static int LoadDataComplete(void* pParam); - static int LoadSaveDataThumbnailReturned(void* lpParam, - std::uint8_t* pbThumbnail, - unsigned int thumbnailBytes); static int CheckResetNetherReturned(void* pParam, int iPad, C4JStorage::EMessageResult result); static int DeleteSaveDialogReturned(void* pParam, int iPad, @@ -136,5 +133,10 @@ private: #endif 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); };