LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-03 18:45:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #71 from 4jcraft/refactor/no-std-wildcard

Browse Source 
refactor: remove `using namespace std`
This commit is contained in:
Tropical
2026-03-08 10:09:33 -05:00
committed by GitHub
parent a508412246 06ca3c6b78
commit 43a28fc490
1972 changed files with 11580 additions and 11580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Minecraft.Client/Build/Common/UI/UIScene_SkinSelectMenu.cpp
View File

@@ -143,7 +143,7 @@ void UIScene_SkinSelectMenu::updateComponents()
m_parentLayer->showComponent(m_iPad,eUIComponent_Logo,false);
}
wstring UIScene_SkinSelectMenu::getMoviePath()
std::wstring UIScene_SkinSelectMenu::getMoviePath()
{
if(app.GetLocalPlayerCount() > 1)
{
@@ -746,8 +746,8 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
{
BOOL showPrevious = FALSE, showNext = FALSE;
DWORD previousIndex = 0, nextIndex = 0;
wstring skinName = L"";
wstring skinOrigin = L"";
std::wstring skinName = L"";
std::wstring skinOrigin = L"";
bool bSkinIsFree=false;
bool bLicensed=false;
DLCSkinFile *skinFile=NULL;
@@ -872,7 +872,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
{
// add the boxes to the humanoid model, but only if we've not done this already
vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
std::vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
if(pAdditionalModelParts==NULL)
{
pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),m_vAdditionalSkinBoxes);
@@ -892,9 +892,9 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
nextIndex = getNextSkinIndex(m_skinIndex);
previousIndex = getPreviousSkinIndex(m_skinIndex);
wstring otherSkinPath = L"";
wstring otherCapePath = L"";
vector<SKIN_BOX *> *othervAdditionalSkinBoxes=NULL;
std::wstring otherSkinPath = L"";
std::wstring otherCapePath = L"";
std::vector<SKIN_BOX *> *othervAdditionalSkinBoxes=NULL;
wchar_t chars[256];
// turn off all displays
@@ -986,7 +986,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
}
if(othervAdditionalSkinBoxes && othervAdditionalSkinBoxes->size()!=0)
{
vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
std::vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
if(pAdditionalModelParts==NULL)
{
pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
@@ -1057,7 +1057,7 @@ void UIScene_SkinSelectMenu::handleSkinIndexChanged()
}
if(othervAdditionalSkinBoxes && othervAdditionalSkinBoxes->size()!=0)
{
vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
std::vector<ModelPart *> *pAdditionalModelParts = app.GetAdditionalModelParts(skinFile->getSkinID());
if(pAdditionalModelParts==NULL)
{
pAdditionalModelParts = app.SetAdditionalSkinBoxes(skinFile->getSkinID(),othervAdditionalSkinBoxes);
@@ -1358,7 +1358,7 @@ void UIScene_SkinSelectMenu::setCharacterLocked(bool locked)
IggyResult out = IggyPlayerCallMethodRS ( getMovie() , &result, IggyPlayerRootPath( getMovie() ), m_funcSetCharacterLocked , 1 , value );
}
void UIScene_SkinSelectMenu::setLeftLabel(const wstring &label)
void UIScene_SkinSelectMenu::setLeftLabel(const std::wstring &label)
{
if(label.compare(m_leftLabel) != 0)
{
@@ -1377,7 +1377,7 @@ void UIScene_SkinSelectMenu::setLeftLabel(const wstring &label)
}
}
void UIScene_SkinSelectMenu::setCentreLabel(const wstring &label)
void UIScene_SkinSelectMenu::setCentreLabel(const std::wstring &label)
{
if(label.compare(m_centreLabel) != 0)
{
@@ -1396,7 +1396,7 @@ void UIScene_SkinSelectMenu::setCentreLabel(const wstring &label)
}
}
void UIScene_SkinSelectMenu::setRightLabel(const wstring &label)
void UIScene_SkinSelectMenu::setRightLabel(const std::wstring &label)
{
if(label.compare(m_rightLabel) != 0)
{
@@ -1664,7 +1664,7 @@ int UIScene_SkinSelectMenu::UnlockSkinReturned(void *pParam,int iPad,C4JStorage:
// need to get info on the pack to see if the user has already downloaded it
// retrieve the store name for the skin pack
wstring wStrPackName=pScene->m_currentPack->getName();
std::wstring wStrPackName=pScene->m_currentPack->getName();
const char *pchPackName=wstringtofilename(wStrPackName);
SONYDLC *pSONYDLCInfo=app.GetSONYDLCInfo((char *)pchPackName);