Initial OS support.

yvt · Nov 6, 2013 · aa62a02 · aa62a02
1 parent 3b98a64
commit aa62a02
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 3 deletions.
diff --git a/Sources/Client/NetClient.cpp b/Sources/Client/NetClient.cpp
@@ -83,7 +83,11 @@ namespace spades {
 			PacketTypeWeaponReload = 28,	// C2S2P
 			PacketTypeChangeTeam = 29,		// C2S2P
 			PacketTypeChangeWeapon = 30,	// C2S2P
-
+			PacketTypeHandShakeInit = 31,	// S2C
+			PacketTypeHandShakeReturn = 32, // C2S
+			PacketTypeVersionGet = 33,		// S2C
+			PacketTypeVersionSend = 34, 	// C2S
+
 		};
 		class NetPacketReader {
 			std::vector<char> data;
@@ -1427,6 +1431,12 @@ namespace spades {
 					//p->SetWeaponType(wType);
 				}
 					break;
+				case PacketTypeHandShakeInit:
+					SendHandShakeValid(reader.ReadInt());
+					break;
+				case PacketTypeVersionGet:
+					SendVersion();
+					break;
 				default:
 					printf("WARNING: dropped packet %d\n", (int)reader.GetType());
 					reader.DumpDebug();
@@ -1682,7 +1692,27 @@ namespace spades {
 			wri.Write((uint8_t)GetLocalPlayer()->GetId());
 			wri.Write((uint8_t)team);
 			enet_peer_send(peer, 0, wri.CreatePacket());
-
+		}
+
+
+		void NetClient::SendHandShakeValid(int challenge) {
+			SPADES_MARK_FUNCTION();
+			NetPacketWriter wri(PacketTypeHandShakeReturn);
+			wri.Write((uint32_t)challenge);
+			SPLog("Sending hand shake back.");
+			enet_peer_send(peer, 0, wri.CreatePacket());
+		}
+
+		void NetClient::SendVersion() {
+			SPADES_MARK_FUNCTION();
+			NetPacketWriter wri(PacketTypeVersionSend);
+			wri.Write((uint8_t)'o');
+			wri.Write((uint8_t)OpenSpades_VERSION_MAJOR);
+			wri.Write((uint8_t)OpenSpades_VERSION_MINOR);
+			wri.Write((uint8_t)OpenSpades_VERSION_REVISION);
+			wri.Write(VersionInfo::GetVersionInfo());
+			SPLog("Sending version back.");
+			enet_peer_send(peer, 0, wri.CreatePacket());
 		}
 
 		void NetClient::MapLoaded() {

diff --git a/Sources/Client/NetClient.h b/Sources/Client/NetClient.h
@@ -23,8 +23,10 @@
 
 #include <string>
 #include <vector>
+#include <OpenSpades.h>
 #include <Core/ServerAddress.h>
 #include <Core/Math.h>
+#include <Core/VersionInfo.h>
 #include "PhysicsConstants.h"
 #include "Player.h"
 
@@ -128,7 +130,8 @@ namespace spades {
 			void SendChat(std::string, bool global);
 			void SendWeaponChange(WeaponType);
 			void SendTeamChange(int team);
-
+			void SendHandShakeValid(int challenge);
+			void SendVersion();
 		};
 	}
 }
diff --git a/Sources/Core/VersionInfo.cpp b/Sources/Core/VersionInfo.cpp
@@ -0,0 +1,14 @@
+#include "VersionInfo.h"
+
+std::string VersionInfo::GetVersionInfo()
+{
+	#if defined __linux__
+	return std::string("Linux");
+	#elif TARGET_OS_MAC
+	return std::string("Mac OS X");
+	#elif defined _WIN32 || defined _WIN64
+	return std::string("Windows");
+	#else
+	return std::string("Unknown OS");
+	#endif
+}
diff --git a/Sources/Core/VersionInfo.h b/Sources/Core/VersionInfo.h
@@ -0,0 +1,7 @@
+#include <string>
+
+class VersionInfo
+{
+public:
+	static std::string GetVersionInfo();
+};