aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.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/Common/XUI/XUI_HelpHowToPlay.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/Common/XUI/XUI_HelpHowToPlay.cpp')
-rw-r--r--Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
index 5c750d03..cd9e962d 100644
--- a/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
+++ b/Minecraft.Client/Common/XUI/XUI_HelpHowToPlay.cpp
@@ -39,12 +39,12 @@ static SHowToPlayPageDef gs_aPageDefs[ eHowToPlay_NumPages ] =
HRESULT CScene_HowToPlay::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
{
// Extract pad and required page from init data. We just put the data into the pointer rather than using it as an address.
- size_t uiInitData = ( size_t )( pInitData->pvInitData );
+ size_t uiInitData = static_cast<size_t>(pInitData->pvInitData);
- m_iPad = ( int )( ( short )( uiInitData & 0xFFFF ) );
- EHowToPlayPage eStartPage = ( EHowToPlayPage )( ( uiInitData >> 16 ) & 0xFFF ); // Ignores MSB which is set to 1!
+ m_iPad = static_cast<int>((short)(uiInitData & 0xFFFF));
+ EHowToPlayPage eStartPage = static_cast<EHowToPlayPage>((uiInitData >> 16) & 0xFFF); // Ignores MSB which is set to 1!
- TelemetryManager->RecordMenuShown(m_iPad, eUIScene_HowToPlay, (ETelemetry_HowToPlay_SubMenuId)eStartPage);
+ TelemetryManager->RecordMenuShown(m_iPad, eUIScene_HowToPlay, static_cast<ETelemetry_HowToPlay_SubMenuId>(eStartPage));
MapChildControls();
@@ -116,10 +116,10 @@ HRESULT CScene_HowToPlay::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled
case VK_PAD_A:
{
// Next page
- int iNextPage = ( int )( m_eCurrPage ) + 1;
+ int iNextPage = static_cast<int>(m_eCurrPage) + 1;
if ( iNextPage != eHowToPlay_NumPages )
{
- StartPage( ( EHowToPlayPage )( iNextPage ) );
+ StartPage( static_cast<EHowToPlayPage>(iNextPage) );
CXuiSceneBase::PlayUISFX(eSFX_Press);
}
rfHandled = TRUE;
@@ -128,10 +128,10 @@ HRESULT CScene_HowToPlay::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHandled
case VK_PAD_X:
{
// Next page
- int iPrevPage = ( int )( m_eCurrPage ) - 1;
+ int iPrevPage = static_cast<int>(m_eCurrPage) - 1;
if ( iPrevPage >= 0 )
{
- StartPage( ( EHowToPlayPage )( iPrevPage ) );
+ StartPage( static_cast<EHowToPlayPage>(iPrevPage) );
CXuiSceneBase::PlayUISFX(eSFX_Press);
}
rfHandled = TRUE;
@@ -146,7 +146,7 @@ void CScene_HowToPlay::StartPage( EHowToPlayPage ePage )
{
int iBaseSceneUser;
// if we're not in the game, we need to use basescene 0
- if(Minecraft::GetInstance()->level==NULL)
+ if(Minecraft::GetInstance()->level==nullptr)
{
iBaseSceneUser=DEFAULT_XUI_MENU_USER;
}