From 28614b922fb77149a54da1a87bebfbc98736f296 Mon Sep 17 00:00:00 2001
From: ModMaker101 <119018978+ModMaker101@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:08:36 -0400
Subject: 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
---
 Minecraft.Client/PS3/Network/SonyVoiceChat.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'Minecraft.Client/PS3/Network/SonyVoiceChat.cpp')

diff --git a/Minecraft.Client/PS3/Network/SonyVoiceChat.cpp b/Minecraft.Client/PS3/Network/SonyVoiceChat.cpp
index 41c52bed..7a4d95aa 100644
--- a/Minecraft.Client/PS3/Network/SonyVoiceChat.cpp
+++ b/Minecraft.Client/PS3/Network/SonyVoiceChat.cpp
@@ -49,7 +49,7 @@ void SonyVoiceChat::init( SQRNetworkManager_PS3* pNetMan )
 
 	sm_pNetworkManager = pNetMan;
 	setState(AVC_STATE_CHAT_INIT);
-	ProfileManager.GetChatAndContentRestrictions(0,false,&sm_isChatRestricted,NULL,NULL);
+	ProfileManager.GetChatAndContentRestrictions(0,false,&sm_isChatRestricted,nullptr,nullptr);
 }
 
 void SonyVoiceChat::shutdown()
@@ -225,11 +225,11 @@ void SonyVoiceChat::eventcb( CellSysutilAvc2EventId event_id, CellSysutilAvc2Eve
 		{ CELL_AVC2_EVENT_LEAVE_FAILED,                     eventcb_leave },
 		{ CELL_AVC2_EVENT_UNLOAD_SUCCEEDED,                 eventcb_unload },
 		{ CELL_AVC2_EVENT_UNLOAD_FAILED,                    eventcb_unload },
-		{ CELL_AVC2_EVENT_SYSTEM_NEW_MEMBER_JOINED,         NULL },
-		{ CELL_AVC2_EVENT_SYSTEM_MEMBER_LEFT,               NULL },
-		{ CELL_AVC2_EVENT_SYSTEM_SESSION_ESTABLISHED,       NULL },
-		{ CELL_AVC2_EVENT_SYSTEM_SESSION_CANNOT_ESTABLISHED,NULL },
-		{ CELL_AVC2_EVENT_SYSTEM_SESSION_DISCONNECTED,      NULL },
+		{ CELL_AVC2_EVENT_SYSTEM_NEW_MEMBER_JOINED,         nullptr },
+		{ CELL_AVC2_EVENT_SYSTEM_MEMBER_LEFT,               nullptr },
+		{ CELL_AVC2_EVENT_SYSTEM_SESSION_ESTABLISHED,       nullptr },
+		{ CELL_AVC2_EVENT_SYSTEM_SESSION_CANNOT_ESTABLISHED,nullptr },
+		{ CELL_AVC2_EVENT_SYSTEM_SESSION_DISCONNECTED,      nullptr },
 		{ CELL_AVC2_EVENT_SYSTEM_VOICE_DETECTED,            eventcb_voiceDetected },
 
 	};
@@ -258,7 +258,7 @@ int SonyVoiceChat::load()
 	ret = cellSysutilAvc2LoadAsync( sm_pNetworkManager->m_matchingContext,
 		SYS_MEMORY_CONTAINER_ID_INVALID,
 		eventcb,
-		NULL,
+		nullptr,
 		&g_chat_avc2param );
 	if( ret != CELL_OK )
 	{
-- 
cgit v1.2.3