--- a/src/network/core/tcp.h	Thu Feb 01 23:39:48 2007 +0000
+++ b/src/network/core/tcp.h	Thu Feb 01 23:50:15 2007 +0000
@@ -84,6 +84,9 @@
 /** Base socket handler for all TCP sockets */
 class NetworkTCPSocketHandler : public NetworkSocketHandler {
 /* TODO: rewrite into a proper class */
+private:
+	Packet *packet_queue;     ///< Packets that are awaiting delivery
+	Packet *packet_recv;      ///< Partially received packet
 public:
 	uint16 index;             ///< Client index
 	uint32 last_frame;        ///< Last frame we have executed
@@ -93,20 +96,18 @@
 	ClientStatus status;      ///< Status of this client
 	bool writable;            ///< Can we write to this socket?
 
-	Packet *packet_queue;     ///< Packets that are awaiting delivery
-	Packet *packet_recv;      ///< Partially received packet
-
 	CommandPacket *command_queue; ///< The command-queue awaiting delivery
 
 	NetworkRecvStatus CloseConnection();
 	void Initialize();
-};
-
+	void Destroy();
 
+	void Send_Packet(Packet *packet);
+	bool Send_Packets();
+	bool IsPacketQueueEmpty();
 
-void NetworkSend_Packet(Packet *packet, NetworkTCPSocketHandler *cs);
-Packet *NetworkRecv_Packet(NetworkTCPSocketHandler *cs, NetworkRecvStatus *status);
-bool NetworkSend_Packets(NetworkTCPSocketHandler *cs);
+	Packet *Recv_Packet(NetworkRecvStatus *status);
+};
 
 #endif /* ENABLE_NETWORK */