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

Project modernization (#630)

Browse Source 
* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.Client/Common/UI/UIScene_SettingsMenu.cpp
View File

@@ -8,7 +8,7 @@ UIScene_SettingsMenu::UIScene_SettingsMenu(int iPad, void *initData, UILayer *pa
// Setup all the Iggy references we need for this scene
initialiseMovie();
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
m_buttons[BUTTON_ALL_OPTIONS].init(IDS_OPTIONS,BUTTON_ALL_OPTIONS);
m_buttons[BUTTON_ALL_AUDIO].init(IDS_AUDIO,BUTTON_ALL_AUDIO);
@@ -51,7 +51,7 @@ wstring UIScene_SettingsMenu::getMoviePath()
void UIScene_SettingsMenu::handleReload()
{
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
if(ProfileManager.GetPrimaryPad()!=m_iPad)
{
removeControl( &m_buttons[BUTTON_ALL_AUDIO], bNotInGame);
@@ -68,7 +68,7 @@ void UIScene_SettingsMenu::updateTooltips()
void UIScene_SettingsMenu::updateComponents()
{
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
if(bNotInGame)
{
m_parentLayer->showComponent(m_iPad,eUIComponent_Panorama,true);
@@ -119,7 +119,7 @@ void UIScene_SettingsMenu::handlePress(F64 controlId, F64 childId)
//CD - Added for audio
ui.PlayUISFX(eSFX_Press);
switch((int)controlId)
switch(static_cast<int>(controlId))
{
case BUTTON_ALL_OPTIONS:
ui.NavigateToScene(m_iPad, eUIScene_SettingsOptionsMenu);
@@ -151,7 +151,7 @@ void UIScene_SettingsMenu::handlePress(F64 controlId, F64 childId)
int UIScene_SettingsMenu::ResetDefaultsDialogReturned(void *pParam,int iPad,C4JStorage::EMessageResult result)
{
UIScene_SettingsMenu* pClass = (UIScene_SettingsMenu*)pParam;
UIScene_SettingsMenu* pClass = static_cast<UIScene_SettingsMenu *>(pParam);
// results switched for this dialog
if(result==C4JStorage::EMessage_ResultDecline)