From 1e7c5c8b92dbe29668649577a361f11ea8dddd6b Mon Sep 17 00:00:00 2001
From: Nicholas Hastings <nshastings@gmail.com>
Date: Wed, 29 Jun 2016 14:57:54 -0400
Subject: [PATCH] Fix compilation errors with ns_address.

Move to after netadr_t decl.
Add steamclientpublic.h for CSteamID.
---
 public/tier1/netadr.h | 51 ++++++++++++++++++++++---------------------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/public/tier1/netadr.h b/public/tier1/netadr.h
index e16e9f62..5dc867fb 100644
--- a/public/tier1/netadr.h
+++ b/public/tier1/netadr.h
@@ -13,33 +13,9 @@
 #endif
 
 #include "tier0/platform.h"
+#include <steam/steamclientpublic.h>
 #undef SetPort
 
-enum ENSAddressType
-{
-	kAddressDirect,
-	kAddressP2P,
-	kAddressProxiedGameServer,
-	kAddressProxiedClient,
-
-	kAddressMax
-};
-
-class ns_address
-{
-public:
-	const netadr_t &GetAddress() const { return m_Address; }
-	const CSteamID& GetSteamID() const { return m_ID; }
-	const uint16 GetRemotePort() const { return m_nRemotePort; }
-	ENSAddressType GetAddressType() const { return m_AddressType; }
-private:
-	netadr_t m_Address;
-	CSteamID m_ID;
-	uint16 m_nRemotePort;
-	int m_Unknown;
-	ENSAddressType m_AddressType;
-};
-
 typedef enum
 { 
 	NA_NULL = 0,
@@ -95,4 +71,29 @@ public:	// members are public to avoid to much changes
 	unsigned short	port;
 } netadr_t;
 
+enum ENSAddressType
+{
+	kAddressDirect,
+	kAddressP2P,
+	kAddressProxiedGameServer,
+	kAddressProxiedClient,
+
+	kAddressMax
+};
+
+class ns_address
+{
+public:
+	const netadr_t &GetAddress() const { return m_Address; }
+	const CSteamID& GetSteamID() const { return m_ID; }
+	const uint16 GetRemotePort() const { return m_nRemotePort; }
+	ENSAddressType GetAddressType() const { return m_AddressType; }
+private:
+	netadr_t m_Address;
+	CSteamID m_ID;
+	uint16 m_nRemotePort;
+	int m_Unknown;
+	ENSAddressType m_AddressType;
+};
+
 #endif // NETADR_H