- moznost nastavit si klavesy na ovladanie v ~/.tuxanci-ng/keycontrol.conf

- moznost prekladat texty do roznych jazykov, defult jazyk je EN, nastavenie je v ~/.tuxanci-ng/lang.conf
- moznost nastavit server pomocou konfiguraku ./server.conf
- uptime v sekudach a samorestartovaci casocvac tam este _NIE_ _JE_



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

8 files changed, 70 insertions, 26 deletions

diff --git a/include/keytable.h b/include/keytable.h
new file mode 100644
index 0000000..80ca258
--- /dev/null
+++ b/include/keytable.h
@@ -0,0 +1,27 @@
+
+#ifndef KEYTABLE_H
+
+#define KEYTABLE_H
+
+#define KEY_LENGTH	12
+
+#define KEY_TUX_RIGHT_MOVE_UP		0
+#define KEY_TUX_RIGHT_MOVE_RIGHT	1
+#define KEY_TUX_RIGHT_MOVE_LEFT		2
+#define KEY_TUX_RIGHT_MOVE_DOWN		3
+#define KEY_TUX_RIGHT_SHOOT		4
+#define KEY_TUX_RIGHT_SWITCH_WEAPON	5
+#define KEY_TUX_LEFT_MOVE_UP		6
+#define KEY_TUX_LEFT_MOVE_RIGHT		7
+#define KEY_TUX_LEFT_MOVE_LEFT		8
+#define KEY_TUX_LEFT_MOVE_DOWN		9
+#define KEY_TUX_LEFT_SHOOT		10
+#define KEY_TUX_LEFT_SWITCH_WEAPON	11
+
+extern void initKeyTable();
+extern int getKey(int n);
+extern void quitKeyTable();
+
+#endif
+
+
diff --git a/include/language.h b/include/language.h
new file mode 100644
index 0000000..03f13e7
--- /dev/null
+++ b/include/language.h
@@ -0,0 +1,10 @@
+
+#ifndef LANGUAGE_H
+
+#define LANGUAGE_H
+
+extern void initLanguage();
+extern char* getMyText(char *key);
+extern void quitLanguage();
+
+#endif
diff --git a/include/myTimer.h b/include/myTimer.h
index 21738bb..97c2f65 100644
--- a/include/myTimer.h
+++ b/include/myTimer.h
@@ -4,20 +4,27 @@
 #define MY_TIME_H
 
 #include "main.h"
+#include "list.h"
 
 #define my_time_t unsigned int
 
+#define TIMER_ONE	0
+#define TIMER_PERIODIC	1
+
 typedef struct my_timer_struct
 {
 	unsigned int id;
 	void (*fce)(void *p);
 	void *arg;
+	int type;
+	my_time_t createTime;
 	my_time_t time;
 } my_timer_t;
 
 extern list_t* newTimer();
+extern void restartTimer();
 extern my_time_t getMyTime();
-extern int addTimer(list_t *listTimer, void (*fce)(void *p), void *arg, my_time_t my_time);
+extern int addTaskToTimer(list_t *listTimer, int type, void (*fce)(void *p), void *arg, my_time_t my_time);
 extern void eventTimer(list_t *listTimer);
 extern void delTimer(list_t *listTimer, int id);
 extern void destroyTimer(list_t *listTimer);
diff --git a/include/proto.h b/include/proto.h
index e083c6c..bd5b2c0 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -75,12 +75,12 @@ extern void proto_send_shot_server(int type, client_t *client, shot_t *p);
 extern void proto_recv_shot_client(char *msg);
 extern void proto_send_ping_client();
 extern void proto_recv_ping_server(client_t *client, char *msg);
-extern void proto_send_end_client();
-extern void proto_recv_end_server(client_t *client, char *msg);
 extern void proto_send_ping_server(int type, client_t *client);
 extern void proto_recv_ping_client(char *msg);
 extern void proto_send_end_server(int type, client_t *client);
 extern void proto_recv_end_client(char *msg);
+extern void proto_send_end_client();
+extern void proto_recv_end_server(client_t *client, char *msg);
 
 #endif
 
diff --git a/include/screen_world.h b/include/screen_world.h
index c9a46e6..955e0fc 100644
--- a/include/screen_world.h
+++ b/include/screen_world.h
@@ -4,15 +4,18 @@
 #define SCREEN_WORLD_H
 
 #include "main.h"
+#include "myTimer.h"
 #include "tux.h"
 #include "arena.h"
 
 #define TIMER_END_ARENA 5000
 #define WORLD_COUNT_ROUND_UNLIMITED	-1
+#define LAG_SERVER_UNKNOWN		-1
 
 extern bool_t isScreenWorldInicialized();
 extern void initWorld();
 extern void setWorldArena(int id);
+extern void setLagServer(my_time_t lag);
 extern void countRoundInc();
 extern void setWorldEnd();
 extern void setMaxCountRound(int n);
diff --git a/include/server.h b/include/server.h
index 066c170..bf7a1e9 100644
--- a/include/server.h
+++ b/include/server.h
@@ -12,39 +12,29 @@
 #include "interface.h"
 #endif
 
-#ifdef SUPPORT_NET_UNIX_TCP
-#include "tcp.h"
+
+#ifdef SUPPORT_NET_SDL_UDP
+
+#include "sdl_udp.h"
+
 #endif
 
 #ifdef SUPPORT_NET_UNIX_UDP
 
 #include "udp.h"
 
-#define SERVER_TIMEOUT		5000
-#define SERVER_TIME_SYNC	1000
-#define SERVER_MAX_CLIENTS	100
-
 #endif
 
-#ifdef SUPPORT_NET_SDL_UDP
-
-#include "sdl_udp.h"
-
 #define SERVER_TIMEOUT		5000
 #define SERVER_TIME_SYNC	1000
+#define SERVER_TIME_PING	1000
 #define SERVER_MAX_CLIENTS	100
 
-#endif
-
 
 #define SERVER_INDEX_ROOT_TUX	0
 
 typedef struct client_struct
 {
-#ifdef SUPPORT_NET_UNIX_TCP
-	sock_tcp_t *socket_tcp;
-#endif
-
 #ifdef SUPPORT_NET_UNIX_UDP
 	sock_udp_t *socket_udp;
 	my_time_t lastPing;
@@ -59,12 +49,6 @@ typedef struct client_struct
 	buffer_t *buffer;
 } client_t;
 
-#ifdef SUPPORT_NET_UNIX_TCP
-extern int initTcpServer(int port);
-extern client_t* newTcpClient(sock_tcp_t *sock_tcp);
-extern void selectServerTcpSocket();
-extern void quitTcpServer();
-#endif
 
 #ifdef SUPPORT_NET_UNIX_UDP
 extern int initUdpServer(char *ip, int port);
@@ -91,7 +75,7 @@ extern void sendAllClientBut(char *msg, client_t *p);
 extern void sendAllClient(char *msg);
 extern void eventClientListBuffer();
 extern void sendInfoCreateClient(client_t *client);
-extern void eventPeriodicSyncClient();
+extern void eventServer();
 
 #endif 
  
diff --git a/include/serverConfigFile.h b/include/serverConfigFile.h
new file mode 100644
index 0000000..d016807
--- /dev/null
+++ b/include/serverConfigFile.h
@@ -0,0 +1,11 @@
+
+
+#ifndef SERVER_CONFIG_FILE_H
+
+#define SERVER_CONFIG_FILE_H
+
+extern void initServerConfigFile();
+extern char* getServerConfigFileValue(char *env, char *s);
+extern void quitServerConfigFile();
+
+#endif
diff --git a/include/tux.h b/include/tux.h
index 3cb6699..8767afa 100644
--- a/include/tux.h
+++ b/include/tux.h
@@ -12,6 +12,8 @@
 #define TUX_MAX_ANIMATION_FRAME 10
 #define TUX_KEY 1
 
+#define TUX_LOCATE_UNKNOWN -1
+
 #define TUX_MAX_PICKUP	50
 #define TUX_MAX_BONUS	500