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

Remove Win32 wide char aliases from world load menus

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-11 00:05:47 +11:00
parent 124b3becb6
commit 6b149fdc38
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,8 +60,8 @@ UIScene_CreateWorldMenu::UIScene_CreateWorldMenu(int iPad, void *initData, UILay
m_labelTexturePackName.init(L""); m_labelTexturePackName.init(L"");
m_labelTexturePackDescription.init(L""); m_labelTexturePackDescription.init(L"");
WCHAR TempString[256]; wchar_t TempString[256];
swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)])); swprintf(TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)]));
m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty)); m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty));
m_MoreOptionsParams.bGenerateOptions = true; m_MoreOptionsParams.bGenerateOptions = true;
@ -628,7 +628,7 @@ void UIScene_CreateWorldMenu::StartSharedLaunchFlow()
void UIScene_CreateWorldMenu::handleSliderMove(F64 sliderId, F64 currentValue) void UIScene_CreateWorldMenu::handleSliderMove(F64 sliderId, F64 currentValue)
{ {
WCHAR TempString[256]; wchar_t TempString[256];
int value = (int)currentValue; int value = (int)currentValue;
switch((int)sliderId) switch((int)sliderId)
{ {
@ -636,7 +636,7 @@ void UIScene_CreateWorldMenu::handleSliderMove(F64 sliderId, F64 currentValue)
m_sliderDifficulty.handleSliderMove(value); m_sliderDifficulty.handleSliderMove(value);
app.SetGameSettings(m_iPad,eGameSetting_Difficulty,value); app.SetGameSettings(m_iPad,eGameSetting_Difficulty,value);
swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value])); swprintf(TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value]));
m_sliderDifficulty.setLabel(TempString); m_sliderDifficulty.setLabel(TempString);
break; break;
} }

12
Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp
View file

@ -75,8 +75,8 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
m_labelTexturePackDescription.init(L""); m_labelTexturePackDescription.init(L"");
m_CurrentDifficulty=app.GetGameSettings(m_iPad,eGameSetting_Difficulty); m_CurrentDifficulty=app.GetGameSettings(m_iPad,eGameSetting_Difficulty);
WCHAR TempString[256]; wchar_t TempString[256];
swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)])); swprintf(TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[app.GetGameSettings(m_iPad,eGameSetting_Difficulty)]));
m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty)); m_sliderDifficulty.init(TempString,eControl_Difficulty,0,3,app.GetGameSettings(m_iPad,eGameSetting_Difficulty));
m_MoreOptionsParams.bGenerateOptions = false; m_MoreOptionsParams.bGenerateOptions = false;
@ -439,8 +439,8 @@ void UIScene_LoadMenu::tick()
if(szSeed[0]!=0) if(szSeed[0]!=0)
{ {
WCHAR TempString[256]; wchar_t TempString[256];
swprintf( (WCHAR *)TempString, 256, L"%ls: %hs", app.GetString( IDS_SEED ),szSeed); swprintf(TempString, 256, L"%ls: %hs", app.GetString( IDS_SEED ),szSeed);
m_labelSeed.setLabel(TempString); m_labelSeed.setLabel(TempString);
} }
else else
@ -844,7 +844,7 @@ void UIScene_LoadMenu::StartSharedLaunchFlow()
void UIScene_LoadMenu::handleSliderMove(F64 sliderId, F64 currentValue) void UIScene_LoadMenu::handleSliderMove(F64 sliderId, F64 currentValue)
{ {
WCHAR TempString[256]; wchar_t TempString[256];
int value = (int)currentValue; int value = (int)currentValue;
switch((int)sliderId) switch((int)sliderId)
{ {
@ -852,7 +852,7 @@ void UIScene_LoadMenu::handleSliderMove(F64 sliderId, F64 currentValue)
m_sliderDifficulty.handleSliderMove(value); m_sliderDifficulty.handleSliderMove(value);
app.SetGameSettings(m_iPad,eGameSetting_Difficulty,value); app.SetGameSettings(m_iPad,eGameSetting_Difficulty,value);
swprintf( (WCHAR *)TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value])); swprintf(TempString, 256, L"%ls: %ls", app.GetString( IDS_SLIDER_DIFFICULTY ),app.GetString(m_iDifficultyTitleSettingA[value]));
m_sliderDifficulty.setLabel(TempString); m_sliderDifficulty.setLabel(TempString);
break; break;
} }