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

exclude UIScene_InGameSaveManagementMenu, include fixes

Browse source
This commit is contained in:
Tropical 2026-03-22 14:00:25 -05:00
parent b0feb8ae57
commit 855597d1bc
6 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.Client/Platform/Common/UI/UIControl_MinecraftHorse.cpp
View file

@ -1,5 +1,5 @@
#include "../../stdafx.h" #include "../../stdafx.h"
#include "../../Minecraft.h" #include "../../Minecraft.Client/Minecraft.h"
#include "../../Minecraft.Client/UI/ScreenSizeCalculator.h" #include "../../Minecraft.Client/UI/ScreenSizeCalculator.h"
#include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h" #include "../../Minecraft.Client/Rendering/EntityRenderers/EntityRenderDispatcher.h"

2
Minecraft.Client/Platform/Common/UI/UIScene_BeaconMenu.cpp
View file

@ -2,7 +2,7 @@
#include "UI.h" #include "UI.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" #include "../../../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"
#include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h" #include "../../../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
#include "../../Minecraft.h" #include "../../../../Minecraft.Client/Minecraft.h"
#include "UIScene_BeaconMenu.h" #include "UIScene_BeaconMenu.h"
UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void* _initData, UIScene_BeaconMenu::UIScene_BeaconMenu(int iPad, void* _initData,

8
Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp
View file

@ -297,15 +297,15 @@ void UIScene_InGameSaveManagementMenu::tick() {
#ifdef __PS3 #ifdef __PS3
size_t srcmax, dstmax; size_t srcmax, dstmax;
#else #else
std::uint32_t srcmax, dstmax; uint32_t srcmax, dstmax;
std::uint32_t srclen, dstlen; uint32_t srclen, dstlen;
#endif #endif
srcmax = MAX_SAVEFILENAME_LENGTH; srcmax = MAX_SAVEFILENAME_LENGTH;
dstmax = MAX_SAVEFILENAME_LENGTH; dstmax = MAX_SAVEFILENAME_LENGTH;
#if defined(__PS3__) #if defined(__PS3__)
L10nResult lres = UTF8stoUTF16s( L10nResult lres = UTF8stoUTF16s(
(std::uint8_t*)m_saveDetails[m_iRequestingThumbnailId] (uint8_t*)m_saveDetails[m_iRequestingThumbnailId]
.UTF8SaveFilename, .UTF8SaveFilename,
&srcmax, u16Message, &dstmax); &srcmax, u16Message, &dstmax);
#else #else
@ -314,7 +314,7 @@ void UIScene_InGameSaveManagementMenu::tick() {
sceCesUtf8StrToUtf16Str( sceCesUtf8StrToUtf16Str(
&context, &context,
(std::uint8_t*)m_saveDetails[m_iRequestingThumbnailId] (uint8_t*)m_saveDetails[m_iRequestingThumbnailId]
.UTF8SaveFilename, .UTF8SaveFilename,
srcmax, &srclen, u16Message, dstmax, &dstlen); srcmax, &srclen, u16Message, dstmax, &dstlen);
#endif #endif

16
Minecraft.Client/Platform/Common/UI/UIScene_QuadrantSignin.cpp
View file

@ -203,6 +203,14 @@ void UIScene_QuadrantSignin::checkAllPrivilegesCallback(LPVOID lpParam,
} }
#endif #endif
namespace {
int AvatarReturnedThunk(void* lpParam, std::uint8_t* thumbnailData,
unsigned int thumbnailBytes) {
return UIScene_QuadrantSignin::AvatarReturned(lpParam, thumbnailData,
thumbnailBytes);
}
} // namespace
void UIScene_QuadrantSignin::updateState() { void UIScene_QuadrantSignin::updateState() {
for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) { for (unsigned int i = 0; i < XUSER_MAX_COUNT; ++i) {
if (ProfileManager.IsSignedIn(i) && InputManager.IsPadConnected(i)) { if (ProfileManager.IsSignedIn(i) && InputManager.IsPadConnected(i)) {
@ -244,14 +252,6 @@ void UIScene_QuadrantSignin::updateState() {
} }
} }
namespace {
int AvatarReturnedThunk(void* lpParam, std::uint8_t* thumbnailData,
unsigned int thumbnailBytes) {
return UIScene_QuadrantSignin::AvatarReturned(lpParam, thumbnailData,
thumbnailBytes);
}
} // namespace
void UIScene_QuadrantSignin::setControllerState(int iPad, void UIScene_QuadrantSignin::setControllerState(int iPad,
EControllerStatus state) { EControllerStatus state) {
if (m_controllerStatus[iPad] != state) { if (m_controllerStatus[iPad] != state) {

1
Minecraft.Client/Platform/Common/UI/UIScene_TradingMenu.cpp
View file

@ -1,5 +1,6 @@
#include "../../Minecraft.World/Platform/stdafx.h" #include "../../Minecraft.World/Platform/stdafx.h"
#include "UI.h" #include "UI.h"
#include "../../Minecraft.World/Util/HtmlString.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h" #include "../../Minecraft.World/Headers/net.minecraft.world.inventory.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.item.trading.h" #include "../../Minecraft.World/Headers/net.minecraft.world.item.trading.h"
#include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h" #include "../../Minecraft.World/Headers/net.minecraft.world.level.tile.entity.h"

1
Minecraft.Client/meson.build
View file

@ -32,6 +32,7 @@ exclude_platform_common_sources = [
# we use system zlib instead, since this one is old as hell and isn't configured for linux correctly # we use system zlib instead, since this one is old as hell and isn't configured for linux correctly
' ! -path "*/zlib/*"', ' ! -path "*/zlib/*"',
' ! -name "SonyLeaderboardManager.cpp"', ' ! -name "SonyLeaderboardManager.cpp"',
' ! -name "UIScene_InGameSaveManagementMenu.cpp"'
] ]
# all sources in in ./Platform/Common # all sources in in ./Platform/Common