Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 15 insertions, 1 deletions

diff --git a/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h b/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h
index c93368d8..e3f15aca 100644
--- a/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h
+++ b/Minecraft.Client/Common/Network/Sony/SQRNetworkManager.h
@@ -11,6 +11,9 @@
 #include <queue>
 
 #include <unordered_map>
+#if defined __PSVITA__
+#include "..\..\Minecraft.Client\PSVita\4JLibs\inc\4J_Profile.h"
+#endif
 
 class SQRNetworkPlayer;
 class ISQRNetworkManagerListener;
@@ -30,7 +33,9 @@ public:
 protected:
 	friend class SQRNetworkPlayer;
 	friend class SonyVoiceChat;
-
+#ifdef __PSVITA__
+	friend class HelloSyncInfo;
+#endif
 
 	static const int MAX_FRIENDS = 100;
 #ifdef __PS3__
@@ -231,6 +236,8 @@ protected:
 	std::queue<StateChangeInfo>						m_stateChangeQueue;
 	CRITICAL_SECTION								m_csStateChangeQueue;
 	CRITICAL_SECTION								m_csMatching;
+	CRITICAL_SECTION								m_csAckQueue;
+	std::queue<int>									m_queuedAckRequests;
 
 	typedef enum
 	{
@@ -295,6 +302,13 @@ public:
 
 	static void							SafeToRespondToGameBootInvite();
 
+	int									GetOutstandingAckCount(SQRNetworkPlayer *pSonyPlayer);
+	int									GetSendQueueSizeBytes();
+	int									GetSendQueueSizeMessages();
+	void								RequestWriteAck(int smallId);
+	void								TickWriteAcks();
+
+
 };