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

Merge branch 'main' into dec-2014

Browse Source
This commit is contained in:
Loki Rautio
2026-03-01 13:18:37 -06:00
parent 49dd522e01 38b442b1e3
commit 630b2a2bdb
10 changed files with 86 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1134,7 +1134,13 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
if(m_packIndex >= SKIN_SELECT_MAX_DEFAULTS)
{
DLCPack *thisPack = app.m_dlcManager.getPack(m_packIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
setCentreLabel(thisPack->getName().c_str());
// Fix the incorrect string type on title to display correctly
const char* name = static_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());
}
else
{
@@ -1153,7 +1159,13 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
if(nextPackIndex >= SKIN_SELECT_MAX_DEFAULTS)
{
DLCPack *thisPack = app.m_dlcManager.getPack(nextPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
setRightLabel(thisPack->getName().c_str());
// Fix the incorrect string type on title to display correctly
const char* name = static_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);
setRightLabel(wName.c_str());
//setRightLabel(thisPack->getName().c_str());
}
else
{
@@ -1172,7 +1184,13 @@ void UIScene_SkinSelectMenu::updatePackDisplay()
if(previousPackIndex >= SKIN_SELECT_MAX_DEFAULTS)
{
DLCPack *thisPack = app.m_dlcManager.getPack(previousPackIndex - SKIN_SELECT_MAX_DEFAULTS, DLCManager::e_DLCType_Skin);
setLeftLabel(thisPack->getName().c_str());
// Fix the incorrect string type on title to display correctly
const char* name = static_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);
setLeftLabel(wName.c_str());
//setLeftLabel(thisPack->getName().c_str());
}
else
{