aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Xbox/Xbox_UIController.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.Client/Xbox/Xbox_UIController.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* 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 * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.Client/Xbox/Xbox_UIController.cpp')
-rw-r--r--Minecraft.Client/Xbox/Xbox_UIController.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.Client/Xbox/Xbox_UIController.cpp b/Minecraft.Client/Xbox/Xbox_UIController.cpp
index 51d91ca4..669b037a 100644
--- a/Minecraft.Client/Xbox/Xbox_UIController.cpp
+++ b/Minecraft.Client/Xbox/Xbox_UIController.cpp
@@ -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);
} \ No newline at end of file