alex/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into dec-2014

Browse Source 
# Conflicts:
#	.gitignore
#	Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
#	Minecraft.Client/LevelRenderer.h
This commit is contained in:
Loki Rautio
2026-03-01 13:39:01 -06:00
parent 1cb1fb5fce 9382049029
commit 7cdcbeadd4
4 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -413,9 +413,12 @@ Minecraft.Client/Windows64/GameHDD/
# Intermediate build files (per-project) # Intermediate build files (per-project)
Minecraft.Client/x64/ Minecraft.Client/x64/
Minecraft.Client/Debug/ Minecraft.Client/Debug/
Minecraft.Client/x64_Debug/
Minecraft.Client/Release/ Minecraft.Client/Release/
Minecraft.Client/x64_Release/
Minecraft.World/x64/ Minecraft.World/x64/
Minecraft.World/x64_Debug/
Minecraft.World/Debug/ Minecraft.World/Debug/
Minecraft.World/x64_Debug/
Minecraft.World/Release/ Minecraft.World/Release/
Minecraft.World/x64_Release Minecraft.World/x64_Release/

28
Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp
View File

@@ -1127,6 +1127,15 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged()
updatePackDisplay(); updatePackDisplay();
} }
std::wstring fakeWideToRealWide(const wchar_t* original)
{
const char* name = reinterpret_cast<const char*>(original);
int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
std::wstring wName(len, 0);
MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
return wName.c_str();
}
void UIScene_SkinSelectMenu::updatePackDisplay() void UIScene_SkinSelectMenu::updatePackDisplay()
{ {
m_currentPackCount = app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin) + SKIN_SELECT_MAX_DEFAULTS; m_currentPackCount = app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin) + SKIN_SELECT_MAX_DEFAULTS;
@@ -1135,12 +1144,7 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
{ {
DLCPack *thisPack = app.m_dlcManager.getPack(m_packIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin); DLCPack *thisPack = app.m_dlcManager.getPack(m_packIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
// Fix the incorrect string type on title to display correctly // Fix the incorrect string type on title to display correctly
setCentreLabel(fakeWideToRealWide(thisPack->getName().c_str()));
const char* name = reinterpret_cast<const char*>(thisPack->getName().c_str());
int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
std::wstring wName(len, 0);
MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
setCentreLabel(wName.c_str());
//setCentreLabel(thisPack->getName().c_str()); //setCentreLabel(thisPack->getName().c_str());
} }
else else
@@ -1161,11 +1165,7 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
{ {
DLCPack *thisPack = app.m_dlcManager.getPack(nextPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin); DLCPack *thisPack = app.m_dlcManager.getPack(nextPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
// Fix the incorrect string type on title to display correctly // Fix the incorrect string type on title to display correctly
const char* name = reinterpret_cast<const char*>(thisPack->getName().c_str()); setRightLabel(fakeWideToRealWide(thisPack->getName().c_str()));
int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
std::wstring wName(len, 0);
MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
setRightLabel(wName.c_str());
//setRightLabel(thisPack->getName().c_str()); //setRightLabel(thisPack->getName().c_str());
} }
else else
@@ -1186,11 +1186,7 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
{ {
DLCPack *thisPack = app.m_dlcManager.getPack(previousPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin); DLCPack *thisPack = app.m_dlcManager.getPack(previousPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
// Fix the incorrect string type on title to display correctly // Fix the incorrect string type on title to display correctly
const char* name = reinterpret_cast<const char*>(thisPack->getName().c_str()); setLeftLabel(fakeWideToRealWide(thisPack->getName().c_str()));
int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
std::wstring wName(len, 0);
MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len);
setLeftLabel(wName.c_str());
//setLeftLabel(thisPack->getName().c_str()); //setLeftLabel(thisPack->getName().c_str());
} }
else else

4
Minecraft.Client/LevelRenderer.h
View File

@@ -52,8 +52,8 @@ public:
static const int CHUNK_SIZE = 16; static const int CHUNK_SIZE = 16;
#endif #endif
static const int CHUNK_Y_COUNT = Level::maxBuildHeight / CHUNK_SIZE; static const int CHUNK_Y_COUNT = Level::maxBuildHeight / CHUNK_SIZE;
#if ( defined _XBOX_ONE || defined _WINDOWS64 ) #if defined _XBOX_ONE
static const int MAX_COMMANDBUFFER_ALLOCATIONS = 512 * 1024 * 1024; // 4J - added static const int MAX_COMMANDBUFFER_ALLOCATIONS = 2047 * 1024 * 1024; // Changed to 2047. 4J had set to 512.
#elif defined __ORBIS__ #elif defined __ORBIS__
static const int MAX_COMMANDBUFFER_ALLOCATIONS = 448 * 1024 * 1024; // 4J - added - hard limit is 512 so giving a lot of headroom here for fragmentation (have seen 16MB lost to fragmentation in multiplayer crash dump before) static const int MAX_COMMANDBUFFER_ALLOCATIONS = 448 * 1024 * 1024; // 4J - added - hard limit is 512 so giving a lot of headroom here for fragmentation (have seen 16MB lost to fragmentation in multiplayer crash dump before)
#elif defined __PS3__ #elif defined __PS3__

BIN
Minecraft.Client/Windows64/GameHDD/20140401093851/saveData.ms
View File

Binary file not shown.