diff --git a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp index dd6318e6..daf78083 100644 --- a/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp +++ b/Minecraft.Client/Common/UI/UIScene_SkinSelectMenu.cpp @@ -1127,15 +1127,6 @@ void UIScene_SkinSelectMenu::handlePackIndexChanged() updatePackDisplay(); } -std::wstring fakeWideToRealWide(const wchar_t* original) -{ - const char* name = reinterpret_cast(original); - int len = MultiByteToWideChar(CP_UTF8, 0, name, -1, nullptr, 0); - std::wstring wName(len, 0); - MultiByteToWideChar(CP_UTF8, 0, name, -1, &wName[0], len); - return wName.c_str(); -} - void UIScene_SkinSelectMenu::updatePackDisplay() { m_currentPackCount = app.m_dlcManager.getPackCount(DLCManager::e_DLCType_Skin) + SKIN_SELECT_MAX_DEFAULTS; @@ -1143,18 +1134,16 @@ 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); - // Fix the incorrect string type on title to display correctly - setCentreLabel(fakeWideToRealWide(thisPack->getName().c_str())); - //setCentreLabel(thisPack->getName().c_str()); + setCentreLabel(thisPack->getName().c_str()); } else { switch(m_packIndex) { - case SKIN_SELECT_PACK_DEFAULT: + case SKIN_SELECT_PACK_DEFAULT: setCentreLabel(app.GetString(IDS_NO_SKIN_PACK)); break; - case SKIN_SELECT_PACK_FAVORITES: + case SKIN_SELECT_PACK_FAVORITES: setCentreLabel(app.GetString(IDS_FAVORITES_SKIN_PACK)); break; } @@ -1164,18 +1153,16 @@ 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); - // Fix the incorrect string type on title to display correctly - setRightLabel(fakeWideToRealWide(thisPack->getName().c_str())); - //setRightLabel(thisPack->getName().c_str()); + setRightLabel(thisPack->getName().c_str()); } else { switch(nextPackIndex) { - case SKIN_SELECT_PACK_DEFAULT: + case SKIN_SELECT_PACK_DEFAULT: setRightLabel(app.GetString(IDS_NO_SKIN_PACK)); break; - case SKIN_SELECT_PACK_FAVORITES: + case SKIN_SELECT_PACK_FAVORITES: setRightLabel(app.GetString(IDS_FAVORITES_SKIN_PACK)); break; } @@ -1185,18 +1172,16 @@ 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); - // Fix the incorrect string type on title to display correctly - setLeftLabel(fakeWideToRealWide(thisPack->getName().c_str())); - //setLeftLabel(thisPack->getName().c_str()); + setLeftLabel(thisPack->getName().c_str()); } else { switch(previousPackIndex) { - case SKIN_SELECT_PACK_DEFAULT: + case SKIN_SELECT_PACK_DEFAULT: setLeftLabel(app.GetString(IDS_NO_SKIN_PACK)); break; - case SKIN_SELECT_PACK_FAVORITES: + case SKIN_SELECT_PACK_FAVORITES: setLeftLabel(app.GetString(IDS_FAVORITES_SKIN_PACK)); break; }