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/Xbox/Xbox_UIController.cpp
View File

@@ -170,7 +170,7 @@ void ConsoleUIController::HandleDLCInstalled(int iPad)
CustomMessage_DLCInstalled( &xuiMsg );
// The DLC message should only happen in the main menus, so it should go to the default xui scenes
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
if(bNotInGame)
{
@@ -188,7 +188,7 @@ void ConsoleUIController::HandleTMSDLCFileRetrieved(int iPad)
XUIMessage xuiMsg;
CustomMessage_TMS_DLCFileRetrieved( &xuiMsg );
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
if(bNotInGame)
{
@@ -204,7 +204,7 @@ void ConsoleUIController::HandleTMSBanFileRetrieved(int iPad)
{
XUIMessage xuiMsg;
CustomMessage_TMS_BanFileRetrieved( &xuiMsg );
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
if(bNotInGame)
{
@@ -319,7 +319,7 @@ C4JStorage::EMessageResult ConsoleUIController::RequestMessageBox(UINT uiTitle,
return StorageManager.RequestMessageBox(uiTitle, uiText, uiOptionA, uiOptionC, dwPad, Func, lpParam, pStringTable, pwchFormatString, dwFocusButton);
}
C4JStorage::EMessageResult ConsoleUIController::RequestUGCMessageBox(UINT title/* = -1 */, UINT message/* = -1 */, int iPad/* = -1*/, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)/* = NULL*/, LPVOID lpParam/* = NULL*/)
C4JStorage::EMessageResult ConsoleUIController::RequestUGCMessageBox(UINT title/* = -1 */, UINT message/* = -1 */, int iPad/* = -1*/, int( *Func)(LPVOID,int,const C4JStorage::EMessageResult)/* = nullptr*/, LPVOID lpParam/* = nullptr*/)
{
// Default title / messages
if (title == -1)
@@ -337,5 +337,5 @@ C4JStorage::EMessageResult ConsoleUIController::RequestUGCMessageBox(UINT title/
UINT uiIDA[1];
uiIDA[0]=IDS_CONFIRM_OK;
return ui.RequestMessageBox(title, message, uiIDA, 1, iPad, Func, lpParam, app.GetStringTable(), NULL, 0, false);
return ui.RequestMessageBox(title, message, uiIDA, 1, iPad, Func, lpParam, app.GetStringTable(), nullptr, 0, false);
}