- synced with SVN

BrodyHiggerson · Jul 3, 2018 · 70a86d1 · 70a86d1
1 parent 0a7d29c
commit 70a86d1
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 199 deletions.
diff --git a/DependentExtensions/Swig/SwigInterfaceFiles/arrays_csharp.i b/DependentExtensions/Swig/SwigInterfaceFiles/arrays_csharp.i
diff --git a/Samples/ChatExample/Client/Chat Example Client.cpp b/Samples/ChatExample/Client/Chat Example Client.cpp
@@ -32,11 +32,10 @@
 #include <stdlib.h>
 #include <limits> // used for std::numeric_limits
 #include "slikenet/types.h"
-#ifdef _WIN32
 #include "slikenet/Kbhit.h"
+#ifdef _WIN32
 #include "slikenet/WindowsIncludes.h" // Sleep
 #else
-#include "slikenet/Kbhit.h"
 #include <unistd.h> // usleep
 #endif
 #include "slikenet/Gets.h"

diff --git a/Samples/CommandConsoleClient/main.cpp b/Samples/CommandConsoleClient/main.cpp
@@ -7,7 +7,7 @@
  *  of patent rights can be found in the RakNet Patents.txt file in the same directory.
  *
  *
- *  Modified work: Copyright (c) 2016-2017, SLikeSoft UG (haftungsbeschränkt)
+ *  Modified work: Copyright (c) 2016-2018, SLikeSoft UG (haftungsbeschränkt)
  *
  *  This source code was modified by SLikeSoft. Modifications are licensed under the MIT-style
  *  license found in the license.txt file in the root directory of this source tree.
@@ -21,11 +21,10 @@
 #include <string.h>
 #include <stdlib.h>
 #include <limits> // used for std::numeric_limits
-#ifdef _WIN32
 #include "slikenet/Kbhit.h"
+#ifdef _WIN32
 #include "slikenet/WindowsIncludes.h" // Sleep
 #else
-#include "slikenet/Kbhit.h"
 #include <unistd.h> // usleep
 #include <strings.h>
 #include "slikenet/linux_adapter.h"

diff --git a/Samples/ComprehensivePCGame/ComprehensivePCGame.cpp b/Samples/ComprehensivePCGame/ComprehensivePCGame.cpp
@@ -7,7 +7,7 @@
  *  of patent rights can be found in the RakNet Patents.txt file in the same directory.
  *
  *
- *  Modified work: Copyright (c) 2016-2017, SLikeSoft UG (haftungsbeschränkt)
+ *  Modified work: Copyright (c) 2016-2018, SLikeSoft UG (haftungsbeschränkt)
  *
  *  This source code was modified by SLikeSoft. Modifications are licensed under the MIT-style
  *  license found in the license.txt file in the root directory of this source tree.
@@ -41,7 +41,6 @@
 #include "slikenet/ReadyEvent.h"	
 #include "slikenet/PacketLogger.h"
 #include "slikenet/RPC4Plugin.h"
-#include "slikenet/Kbhit.h"
 #include "slikenet/HTTPConnection2.h"
 #include "slikenet/linux_adapter.h"
 #include "slikenet/osx_adapter.h"

diff --git a/Samples/DroppedConnectionTest/DroppedConnectionTest.cpp b/Samples/DroppedConnectionTest/DroppedConnectionTest.cpp
@@ -17,14 +17,13 @@
 #include "slikenet/Rand.h" // randomMT
 #include "slikenet/MessageIdentifiers.h" // Enumerations
 #include "slikenet/types.h" // SystemAddress
+#include "slikenet/Kbhit.h"
 #include <cstdio>
 using namespace SLNet;
 
 #ifdef _WIN32
-#include "slikenet/Kbhit.h"
 #include "slikenet/WindowsIncludes.h" // Sleep
 #else
-#include "slikenet/Kbhit.h"
 #include <unistd.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

diff --git a/Source/include/slikenet/peer.h b/Source/include/slikenet/peer.h
@@ -7,7 +7,7 @@
  *  of patent rights can be found in the RakNet Patents.txt file in the same directory.
  *
  *
- *  Modified work: Copyright (c) 2017, SLikeSoft UG (haftungsbeschränkt)
+ *  Modified work: Copyright (c) 2017-2018, SLikeSoft UG (haftungsbeschränkt)
  *
  *  This source code was modified by SLikeSoft. Modifications are licensed under the MIT-style
  *  license found in the license.txt file in the root directory of this source tree.
@@ -1028,7 +1028,11 @@ class RAK_DLL_EXPORT RakPeer : public RakPeerInterface, public RNS2EventHandler
 
 	virtual void OnRNS2Recv(RNS2RecvStruct *recvStruct);
 	void FillIPList(void);
-} 
+
+	private:
+		// internal helpers
+		void CloseConnectionInternal2(const AddressOrGUID& systemIdentifier, bool sendDisconnectionNotification, bool performImmediate, unsigned char orderingChannel, PacketPriority disconnectionNotificationPriority, RakNetSocket2& socket);
+}
 // #if defined(SN_TARGET_PSP2)
 // __attribute__((aligned(8)))
 // #endif