diff -r e21cfda0edde -r 785d220fc6b7 src/proto2/NetworkClient.hh
--- a/src/proto2/NetworkClient.hh	Tue Nov 18 22:58:50 2008 +0000
+++ b/src/proto2/NetworkClient.hh	Thu Nov 20 19:25:56 2008 +0000
@@ -3,6 +3,8 @@
 
 #include "Network.hh"
 #include "GameState.hh"
+#include "NetworkSession.hh"
+#include "NetworkObject.hh"
 
 // forward-declare
 class NetworkClientLocalPlayer;
@@ -13,17 +15,20 @@
     friend class NetworkClientRemotePlayer;
 
     private:
-        CL_NetComputer server;
+        NetworkSession netsession;
+        NetworkNode *server;
+
+        NetworkObject_ClientController netobjs;
         
     public:
-        NetworkClient (GameState &state, const CL_IPAddress &connect_to);
+        NetworkClient (GameState &state, const NetworkAddress &connect_to);
 
     private:
-        void on_create_object (CL_NetObject_Client &obj, int msg_type, CL_NetPacket &pkt);
+        void on_create (NetworkObject_Client *obj, NetworkMessageID msg_id, NetworkPacket &pkt);
 
-        void on_server_hello (CL_NetObject_Client &obj, CL_NetPacket &pkt);
-        void on_player_info (CL_NetObject_Client &obj, CL_NetPacket &pkt);
-        void on_player_join (CL_NetObject_Client &obj, CL_NetPacket &pkt);
+        void on_server_hello (NetworkObject_Client *obj, NetworkPacket &pkt);
+        void on_player_info (NetworkObject_Client *obj, NetworkPacket &pkt);
+        void on_player_join (NetworkObject_Client *obj, NetworkPacket &pkt);
     
     public:
         void player_quit (NetworkClientRemotePlayer *player);
@@ -34,16 +39,16 @@
         NetworkClient &client;
 
         CL_SlotContainer slots;
-
-        CL_NetObject_Client obj;
+        
+        NetworkObject_Client *obj;
 
     public:
-        NetworkClientLocalPlayer (NetworkClient &client, CL_NetObject_Client &obj, Vector initial_position);
+        NetworkClientLocalPlayer (NetworkClient &client, NetworkObject_Client *obj, Vector position);
         
         virtual void applyForce (Vector force, uint16_t dt);
     
     private:
-        void on_position (CL_NetPacket &pkt);
+        void on_position (NetworkPacket &pkt);
 };
 
 class NetworkClientRemotePlayer : public RemotePlayer {
@@ -52,15 +57,15 @@
         
         CL_SlotContainer slots;
 
-        CL_NetObject_Client obj;
+        NetworkObject_Client *obj;
 
     public:
-        NetworkClientRemotePlayer (NetworkClient &client, CL_NetObject_Client &obj, Vector initial_position);
+        NetworkClientRemotePlayer (NetworkClient &client, NetworkObject_Client *obj, Vector position);
     
     private:
-        void on_position (CL_NetPacket &pkt);
+        void on_position (NetworkPacket &pkt);
 
-        void on_quit (CL_NetPacket &pkt);
+        void on_quit (NetworkPacket &pkt);
 };
 
 #endif