- precisteny kod sietoveho multiplayera

- moduly si mozu mosielat spravy cez sietovy protokol
- opravy chyb v moduloch
- oprava chyby, v textovych poliach sa zobrazuju znaky, ktore ste nestalcili
- director_t* loadDirector(char *s) vracia NULL ak adresar neexistuje ( predtym sa proces zrutil )



git-svn-id: http://opensvn.csie.org/tuxanci_ng@126 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

1 files changed, 5 insertions, 45 deletions

diff --git a/src/base/server.h b/src/base/server.h
index e6f0b93..0da4969 100644
--- a/src/base/server.h
+++ b/src/base/server.h
@@ -9,24 +9,12 @@
 #include "tux.h"
 #include "myTimer.h"
 #include "protect.h"
+#include "udp.h"
 
 #ifndef PUBLIC_SERVER
 #include "interface.h"
 #endif
 
-
-#ifdef SUPPORT_NET_SDL_UDP
-
-#include "sdl_udp.h"
-
-#endif
-
-#ifdef SUPPORT_NET_UNIX_UDP
-
-#include "udp.h"
-
-#endif
-
 #define SERVER_TIMEOUT		1000
 #define SERVER_TIME_SYNC	1000
 #define SERVER_TIME_PING	1000
@@ -37,13 +25,8 @@
 
 typedef struct client_struct
 {
-#ifdef SUPPORT_NET_UNIX_UDP
 	sock_udp_t *socket_udp;
-#endif
 
-#ifdef SUPPORT_NET_SDL_UDP
-	sock_sdl_udp_t *socket_sdl_udp;
-#endif
 	int status;
 
 	tux_t *tux;
@@ -56,40 +39,17 @@ typedef struct client_struct
 	list_t *listSeesShot;
 } client_t;
 
-#ifdef PUBLIC_SERVER
-extern int initUdpPublicServer(char *ip4, int port4, char *ip6, int port6);
-#endif
-
-#ifdef SUPPORT_NET_UNIX_UDP
-extern int initUdpServer(char *ip, int port, int proto);
-extern int initUdpServerMultiProto(char *ip4, char *ip6, int port4, int port6);
-extern client_t* newUdpClient(sock_udp_t *sock_udp);
-extern int selectServerUdpSocket();
-extern void quitUdpServer();
-#endif
-
-#ifdef SUPPORT_NET_SDL_UDP
-extern int initSdlUdpServer(int port);
-extern client_t* newSdlUdpClient(sock_sdl_udp_t *sock_udp);
-extern void selectServerSdlUdpSocket();
-extern void quitSdlUdpServer();
-#endif
-
-extern void destroyClient(client_t *p);
 
 extern time_t getUpdateServer();
+extern int initUdpServer(char *ip, int port, int proto);
+extern int initUdpPublicServer(char *ip4, int port4, char *ip6, int port6);
 extern list_t* getListServerClient();
 extern int getServerMaxClients();
 extern void setServerMaxClients(int n);
-
 extern void sendClient(client_t *p, char *msg);
 extern void protoSendClient(int type, client_t *client, char *msg, int type2, int id);
-
-extern tux_t *getServerTux();
-extern client_t *getClientFromTux(tux_t *tux);
-extern void eventClientListBuffer();
 extern void sendInfoCreateClient(client_t *client);
 extern void eventServer();
+extern void quitUdpServer();
 
-#endif 
- 
+#endif