diff options
| author | oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-22 20:25:47 +0000 |
|---|---|---|
| committer | oroborus <oroborus@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> | 2008-08-22 20:25:47 +0000 |
| commit | 9c72004fada0af13e4c9b4682c733056a777dc59 (patch) | |
| tree | 6b045d347efb643512e61acef01c0c4e054b96fa /src/base | |
| parent | 37dc1c5480ea219c624ac2740506208f23296ede (diff) | |
- oprava warningov :)
git-svn-id: http://opensvn.csie.org/tuxanci_ng@242 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/proto.h | 1 | ||||
| -rw-r--r-- | src/base/server.h | 15 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/base/proto.h b/src/base/proto.h index 689011b..9e2b666 100644 --- a/src/base/proto.h +++ b/src/base/proto.h @@ -15,7 +15,6 @@ #include "arenaFile.h" #include "myTimer.h" #include "server.h" -#include "proto.h" #include "net_multiplayer.h" #ifndef PUBLIC_SERVER diff --git a/src/base/server.h b/src/base/server.h index f843fea..a730876 100644 --- a/src/base/server.h +++ b/src/base/server.h @@ -9,6 +9,12 @@ #include "tux.h" #include "myTimer.h" #include "protect.h" +#include "buffer.h" + +#ifndef PUBLIC_SERVER +#include "interface.h" +#endif + #ifdef SUPPORT_UDP #include "udp.h" #endif @@ -16,18 +22,12 @@ #ifdef SUPPORT_TCP #include "tcp.h" #endif -#include "buffer.h" - -#ifndef PUBLIC_SERVER -#include "interface.h" -#endif #define SERVER_TIMEOUT 1000 #define SERVER_TIME_SYNC 1000 #define SERVER_TIME_PING 1000 #define SERVER_MAX_CLIENTS 100 - #define SERVER_INDEX_ROOT_TUX 0 #define CLIENT_TYPE_UDP 1 @@ -36,12 +36,15 @@ typedef struct client_struct { int type; + #ifdef SUPPORT_UDP sock_udp_t *socket_udp; #endif + #ifdef SUPPORT_TCP sock_tcp_t *socket_tcp; #endif + buffer_t *recvBuffer; buffer_t *sendBuffer; |