feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>

1 files changed, 21 insertions, 2 deletions

diff --git a/Minecraft.Client/PSVita/Network/PSVita_NPToolkit.cpp b/Minecraft.Client/PSVita/Network/PSVita_NPToolkit.cpp
index fb859761..1c5c45e3 100644
--- a/Minecraft.Client/PSVita/Network/PSVita_NPToolkit.cpp
+++ b/Minecraft.Client/PSVita/Network/PSVita_NPToolkit.cpp
@@ -102,7 +102,16 @@ void PSVitaNPToolkit::coreCallback( const sce::Toolkit::NP::Event& event )
 		break;
 	case sce::Toolkit::NP::Event::loggedIn:		///< An event from the NetCtl service generated when a connection to the PSN has been established.
  		app.DebugPrintf("Received core callback: PSN sign in \n");
-		ProfileManager.SetNetworkStatus(true, true);
+		SceNetCtlInfo info;
+		sceNetCtlInetGetInfo(SCE_NET_CTL_INFO_DEVICE, &info);
+		if(info.device == SCE_NET_CTL_DEVICE_PHONE) // 3G connection, we're not going to allow this
+		{
+			ProfileManager.SetNetworkStatus(false, true);
+		}
+		else
+		{
+			ProfileManager.SetNetworkStatus(true, true);
+		}
 		break;
 	case sce::Toolkit::NP::Event::loggedOut:	///< An event from the NetCtl service generated when a connection to the PSN has been lost.
  		app.DebugPrintf("Received core callback: PSN sign out \n");
@@ -350,7 +359,17 @@ static void npStateCallback(SceNpServiceState state, int retCode, void *userdata
 		ProfileManager.SetNetworkStatus(false, true);
 		break;
 	case SCE_NP_SERVICE_STATE_ONLINE:
-		ProfileManager.SetNetworkStatus(true, true);
+		SceNetCtlInfo info;
+		sceNetCtlInetGetInfo(SCE_NET_CTL_INFO_DEVICE, &info);
+		if(info.device == SCE_NET_CTL_DEVICE_PHONE) // 3G connection, we're not going to allow this
+		{
+			app.DebugPrintf("Online with 3G connection!!\n");
+			ProfileManager.SetNetworkStatus(false, true);
+		}
+		else
+		{
+			ProfileManager.SetNetworkStatus(true, true);
+		}
 		break;
 	default:
 		break;