psvita networking (Experimental)

Minecraft.Client/PSVita/PSVita_Minecraft.cpp

@@ -3,7 +3,12 @@
 
 #include "stdafx.h"
 
+#ifndef DISABLE_PSN
 #include "Leaderboards\PSVitaLeaderboardManager.h"
+#include "Common\Network\Sony\SQRNetworkManager.h"
+#include "PSVita/Network/PSVita_NPToolkit.h"
+#include "PSVita\Network\SonyVoiceChat_Vita.h"
+#endif
 #include "PSVita\PSVitaExtras\ShutdownManager.h"
 
 //#define HEAPINSPECTOR_PS3	1
@@ -54,12 +59,10 @@
 #include "..\..\Minecraft.World\OldChunkStorage.h"
 //#include "PS3\PS3Extras\EdgeZLib.h"
 #include "..\..\Minecraft.World\C4JThread.h"
-#include "Common\Network\Sony\SQRNetworkManager.h"
 #include "Common\UI\IUIScene_PauseMenu.h"
 #include "Conf.h"
-#include "PSVita/Network/PSVita_NPToolkit.h"
-#include "PSVita\Network\SonyVoiceChat_Vita.h"
 #include "..\..\Minecraft.World\FireworksRecipe.h"
+#include "..\..\Minecraft.Client\Common\Network\NetworkSocketLayer.h"
 
 #include <libsysmodule.h>
 #include <libperf.h>
@@ -376,7 +379,9 @@ void RegisterAwardsWithProfileManager()
 	ProfileManager.RichPresenceInit(4,1);
 
 	//Chris TODO
+#ifndef DISABLE_PSN
 	ProfileManager.SetRichPresenceSettingFn(SQRNetworkManager_Vita::SetRichPresence);
+#endif
 	char *pchRichPresenceString;
 
 	pchRichPresenceString=(char *)AddRichPresenceString(IDS_RICHPRESENCE_GAMESTATE);
@@ -517,7 +522,9 @@ int main()
 	}
 
 	app.InitTime();
+#ifndef DISABLE_PSN
 	PSVitaNPToolkit::init();
+#endif
 
 	// initialise the storage manager with a default save display name, a Minimum save size, and a callback for displaying the saving message
 	StorageManager.Init( 0, L"savegame.dat", "savePackName", FIFTY_ONE_MB, &CConsoleMinecraftApp::DisplaySavingMessage, (LPVOID)&app, NULL);
@@ -759,6 +766,7 @@ int main()
 	// XN_SYS_SIGNINCHANGED notifications. This does mean that we need to have a callback in the
 	// ProfileManager for XN_LIVE_INVITE_ACCEPTED for QNet.
 	g_NetworkManager.Initialise();
+	NetworkSocketLayer::Initialize();
 	g_NetworkManager.SetLocalGame(true);
 
 	// Set the default sound levels
@@ -796,8 +804,9 @@ int main()
 #endif
 	while( true )
 	{
+#ifndef DISABLE_PSN
 		SonyVoiceChat_Vita::tick();
-
+#endif
 		RenderManager.StartFrame();
 #if 0
 		if(pMinecraft->soundEngine->isStreamingWavebankReady() &&
@@ -846,7 +855,9 @@ int main()
 		g_NetworkManager.DoWork();
 		PIXEndNamedEvent();
 
+#ifndef DISABLE_PSN
 		LeaderboardManager::Instance()->Tick();
+#endif
 		// Render game graphics.
 		if(app.GetGameStarted())
 		{