aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/PS3/Network/SonyVoiceChat.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.Client/PS3/Network/SonyVoiceChat.cpp')
-rw-r--r--Minecraft.Client/PS3/Network/SonyVoiceChat.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Minecraft.Client/PS3/Network/SonyVoiceChat.cpp b/Minecraft.Client/PS3/Network/SonyVoiceChat.cpp
index 7a4d95aa..41c52bed 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,nullptr,nullptr);
+ ProfileManager.GetChatAndContentRestrictions(0,false,&sm_isChatRestricted,NULL,NULL);
}
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, 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_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_VOICE_DETECTED, eventcb_voiceDetected },
};
@@ -258,7 +258,7 @@ int SonyVoiceChat::load()
ret = cellSysutilAvc2LoadAsync( sm_pNetworkManager->m_matchingContext,
SYS_MEMORY_CONTAINER_ID_INVALID,
eventcb,
- nullptr,
+ NULL,
&g_chat_avc2param );
if( ret != CELL_OK )
{