equal
deleted
inserted
replaced
1 #ifndef NETWORKCLIENT_HH |
1 #ifndef NETWORKCLIENT_HH |
2 #define NETWORKCLIENT_HH |
2 #define NETWORKCLIENT_HH |
3 |
3 |
4 #include "../GameState.hh" |
4 #include "../GameState.hh" |
5 #include "Network.hh" |
|
6 #include "Session.hh" |
5 #include "Session.hh" |
7 #include "Object.hh" |
6 #include "Object.hh" |
8 |
7 |
9 // forward-declare |
8 // forward-declare |
10 class NetworkClientLocalPlayer; |
9 class NetworkClientLocalPlayer; |
11 class NetworkClientRemotePlayer; |
10 class NetworkClientRemotePlayer; |
12 |
11 |
13 class NetworkClient : public NetworkCore { |
12 class NetworkClient { |
14 friend class NetworkClientLocalPlayer; |
13 friend class NetworkClientLocalPlayer; |
15 friend class NetworkClientRemotePlayer; |
14 friend class NetworkClientRemotePlayer; |
16 |
15 |
17 private: |
16 protected: |
|
17 GameState &state; |
|
18 CL_SlotContainer slots; |
|
19 |
18 NetworkSession netsession; |
20 NetworkSession netsession; |
19 NetworkNode *server; |
21 NetworkNode *server; |
20 |
22 |
21 NetworkObject_ClientController netobjs; |
23 NetworkObject_ClientController netobjs; |
22 |
24 |