24 files changed, 113 insertions, 151 deletions
diff --git a/src/client/Makefile b/src/client/Makefile
deleted file mode 100644
index f8fee47..0000000
--- a/src/client/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-all: client.o configFile.o font.o game.o image.o interface.o keytable.o language.o layer.o panel.o radar.o screen.o term.o
-
-client.o: client.c client.h
-	$(CC) $(CFLAGS) -o client.o -c client.c
-
-configFile.o: configFile.c configFile.h
-	$(CC) $(CFLAGS) -o configFile.o -c configFile.c
-
-font.o: font.c font.h
-	$(CC) $(CFLAGS) -o font.o -c font.c
-
-game.o: game.c game.h
-	$(CC) $(CFLAGS) -o game.o -c game.c
-
-image.o: image.c image.h
-	$(CC) $(CFLAGS) -o image.o -c image.c
-
-interface.o: interface.c interface.h
-	$(CC) $(CFLAGS) -o interface.o -c interface.c
-
-layer.o: layer.c layer.h
-	$(CC) $(CFLAGS) -o layer.o -c layer.c
-
-panel.o: panel.c panel.h
-	$(CC) $(CFLAGS) -o panel.o -c panel.c
-
-radar.o: radar.c radar.h
-	$(CC) $(CFLAGS) -o radar.o -c radar.c
-screen.o: screen.c screen.h
-	$(CC) $(CFLAGS) -o screen.o -c screen.c
-
-term.o: term.c term.h
-	$(CC) $(CFLAGS) -o term.o -c term.c
-
-clean:
-	rm -rf *.o
diff --git a/src/client/client.c b/src/client/client.c
index 2ed5e0a..26df8dc 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -10,26 +10,26 @@
 #include <sys/socket.h>
 #include <sys/select.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/proto.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+#include "proto.h"
 
-#include "client/client.h"
-#include "client/language.h"
+#include "client.h"
+#include "language.h"
 
-#include "screen/screen_analyze.h"
-#include "screen/screen_world.h"
+#include "screen_analyze.h"
+#include "screen_world.h"
 
 static int protocolType;
 
 #ifdef SUPPORT_NET_UNIX_UDP
-#include "net_unix/udp.h"
+#include "udp.h"
 static sock_udp_t *sock_server_udp;
 #endif
 
 #ifdef SUPPORT_NET_SDL_UDP
-#include "net_sdl/sdl_udp.h"
+#include "sdl_udp.h"
 static sock_sdl_udp_t *sock_server_sdl_udp;
 #endif
 
diff --git a/src/client/client.h b/src/client/client.h
index 639f924..cd8c4c4 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -3,7 +3,7 @@
 
 #define MY_CLIENT
 
-#include "base/main.h"
+#include "main.h"
 
 #if defined SUPPORT_NET_UNIX_UDP || defined SUPPORT_NET_SDL_UDP
 
diff --git a/src/client/configFile.c b/src/client/configFile.c
index acf7a1f..1c19e3f 100644
--- a/src/client/configFile.c
+++ b/src/client/configFile.c
@@ -4,8 +4,8 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "client/configFile.h"
+#include "main.h"
+#include "configFile.h"
 
 int isYesOrNO(char *s)
 {
diff --git a/src/client/configFile.h b/src/client/configFile.h
index 67898e9..f68a381 100644
--- a/src/client/configFile.h
+++ b/src/client/configFile.h
@@ -3,8 +3,8 @@
 
 #define CONFIGFILE_H
 
-#include "base/main.h"
-#include "base/textFile.h"
+#include "main.h"
+#include "textFile.h"
 
 extern int isYesOrNO(char *s);
 extern char* getYesOrNo(int n);
diff --git a/src/client/font.c b/src/client/font.c
index 91d15bb..3b1267a 100755
--- a/src/client/font.c
+++ b/src/client/font.c
@@ -1,7 +1,7 @@
 
-#include "base/main.h" 
-#include "client/interface.h" 
-#include "client/font.h"
+#include "main.h" 
+#include "interface.h" 
+#include "font.h"
 
 static TTF_Font *g_font;
 static int fontSize;
diff --git a/src/client/font.h b/src/client/font.h
index 50b1494..f938b3b 100755
--- a/src/client/font.h
+++ b/src/client/font.h
@@ -5,7 +5,7 @@
 
 #include <SDL_ttf.h>
 #include <assert.h>
-#include "base/main.h"
+#include "main.h"
 
 #define COLOR_WHITE	255, 255, 255
 #define COLOR_BLACK	0, 0, 0
diff --git a/src/client/game.c b/src/client/game.c
index 66da14e..e70fdae 100644
--- a/src/client/game.c
+++ b/src/client/game.c
@@ -8,36 +8,36 @@
 #include <assert.h>
 #include <sys/stat.h>
 
-#include "base/main.h"
-#include "base/tux.h"
-#include "base/homeDirector.h"
-#include "base/item.h"
-#include "base/shot.h"
-#include "base/arenaFile.h"
-
-#include "client/image.h"
-#include "client/layer.h"
-#include "client/interface.h"
-#include "client/screen.h"
-#include "client/font.h"
-#include "client/keytable.h"
-#include "client/language.h"
-#include "client/panel.h"
-#include "client/radar.h"
-
-#include "audio/audio.h"
-#include "audio/sound.h"
-#include "audio/music.h"
-
-#include "screen/screen_world.h"
-#include "screen/screen_mainMenu.h"
-#include "screen/screen_analyze.h"
-#include "screen/screen_setting.h"
-#include "screen/screen_gameType.h"
-#include "screen/screen_choiceArena.h"
-#include "screen/screen_table.h"
-#include "screen/screen_credits.h"
-#include "screen/screen_browser.h"
+#include "main.h"
+#include "tux.h"
+#include "homeDirector.h"
+#include "item.h"
+#include "shot.h"
+#include "arenaFile.h"
+
+#include "image.h"
+#include "layer.h"
+#include "interface.h"
+#include "screen.h"
+#include "font.h"
+#include "keytable.h"
+#include "language.h"
+#include "panel.h"
+#include "radar.h"
+
+#include "audio.h"
+#include "sound.h"
+#include "music.h"
+
+#include "screen_world.h"
+#include "screen_mainMenu.h"
+#include "screen_analyze.h"
+#include "screen_setting.h"
+#include "screen_gameType.h"
+#include "screen_choiceArena.h"
+#include "screen_table.h"
+#include "screen_credits.h"
+#include "screen_browser.h"
 
 static void initGame()
 {
diff --git a/src/client/image.c b/src/client/image.c
index 98b2b8b..d582193 100755
--- a/src/client/image.c
+++ b/src/client/image.c
@@ -3,12 +3,12 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/storage.h"
+#include "main.h"
+#include "list.h"
+#include "storage.h"
 
-#include "client/interface.h"
-#include "client/image.h"
+#include "interface.h"
+#include "image.h"
 
 static list_t *listStorage;
 
diff --git a/src/client/image.h b/src/client/image.h
index 5de6345..be3826d 100755
--- a/src/client/image.h
+++ b/src/client/image.h
@@ -3,8 +3,8 @@
 
 #define IMAGE_H
 
-#include "client/image.h"
-#include "client/interface.h"
+#include "image.h"
+#include "interface.h"
 
 #define IMAGE_NO_ALPHA	0
 #define IMAGE_ALPHA	1
diff --git a/src/client/interface.c b/src/client/interface.c
index 570e3fd..5b4b6b4 100755
--- a/src/client/interface.c
+++ b/src/client/interface.c
@@ -1,11 +1,11 @@
 
 #include <stdlib.h>
 
-#include "base/main.h"
-#include "base/myTimer.h"
+#include "main.h"
+#include "myTimer.h"
 
-#include "client/interface.h"
-#include "client/screen.h"
+#include "interface.h"
+#include "screen.h"
 
 //povrch okna
 static SDL_Surface *screen;
diff --git a/src/client/interface.h b/src/client/interface.h
index 5804676..c0311ee 100755
--- a/src/client/interface.h
+++ b/src/client/interface.h
@@ -10,7 +10,7 @@
 #include <SDL.h>
 #include <SDL_image.h>
 #include <SDL_thread.h>
-#include "base/main.h"
+#include "main.h"
 
 /*
 #include <SDL_net.h>
diff --git a/src/client/keytable.c b/src/client/keytable.c
index 67811a7..8eaee59 100644
--- a/src/client/keytable.c
+++ b/src/client/keytable.c
@@ -4,13 +4,13 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/homeDirector.h"
-#include "base/textFile.h"
+#include "main.h"
+#include "list.h"
+#include "homeDirector.h"
+#include "textFile.h"
 
-#include "client/keytable.h"
-#include "client/configFile.h"
+#include "keytable.h"
+#include "configFile.h"
 
 static textFile_t *keytableFile;
 static textFile_t *keycontrolFile;
diff --git a/src/client/language.c b/src/client/language.c
index 5444253..6200e92 100644
--- a/src/client/language.c
+++ b/src/client/language.c
@@ -4,13 +4,13 @@
 #include <string.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/homeDirector.h"
-#include "base/textFile.h"
+#include "main.h"
+#include "list.h"
+#include "homeDirector.h"
+#include "textFile.h"
 
-#include "client/configFile.h"
-#include "client/language.h"
+#include "configFile.h"
+#include "language.h"
 
 static textFile_t *languageFile;
 static char fontFile[STR_FILE_NAME_SIZE];
diff --git a/src/client/layer.c b/src/client/layer.c
index 707184b..d4fcb7b 100755
--- a/src/client/layer.c
+++ b/src/client/layer.c
@@ -2,15 +2,15 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
 
-#include "client/interface.h"
-#include "client/layer.h"
-#include "client/image.h"
+#include "interface.h"
+#include "layer.h"
+#include "image.h"
 
-#include "screen/screen_world.h"
+#include "screen_world.h"
 
 static list_t *listLayer;
 
diff --git a/src/client/layer.h b/src/client/layer.h
index 3564ef8..04a4617 100755
--- a/src/client/layer.h
+++ b/src/client/layer.h
@@ -3,7 +3,7 @@
 
 #define MY_LAYER_H
 
-#include "base/main.h"
+#include "main.h"
 
 typedef struct layer_str
 {
diff --git a/src/client/panel.c b/src/client/panel.c
index af9cccb..3338544 100644
--- a/src/client/panel.c
+++ b/src/client/panel.c
@@ -2,14 +2,14 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
-
-#include "client/interface.h"
-#include "client/image.h"
-#include "client/panel.h"
-#include "client/font.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+
+#include "interface.h"
+#include "image.h"
+#include "panel.h"
+#include "font.h"
 
 static SDL_Surface *g_panel;
 static SDL_Surface *g_shot;
diff --git a/src/client/panel.h b/src/client/panel.h
index 144ea02..4935c75 100644
--- a/src/client/panel.h
+++ b/src/client/panel.h
@@ -3,8 +3,8 @@
 
 #define PANEL_H
 
-#include "base/main.h"
-#include "base/list.h"
+#include "main.h"
+#include "list.h"
 
 #define PANEL_SCORE_LOCATION_X ( WINDOW_SIZE_X / 2 - w / 2 )
 #define PANEL_SCORE_LOCATION_Y ( WINDOW_SIZE_Y - 40 )
diff --git a/src/client/radar.c b/src/client/radar.c
index 45f80a4..789fb45 100644
--- a/src/client/radar.c
+++ b/src/client/radar.c
@@ -2,14 +2,14 @@
 #include <stdio.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/arena.h"
-
-#include "client/interface.h"
-#include "client/image.h"
-#include "client/radar.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+#include "arena.h"
+
+#include "interface.h"
+#include "image.h"
+#include "radar.h"
 
 static SDL_Surface *g_radar;
 static list_t *listRadar;
diff --git a/src/client/radar.h b/src/client/radar.h
index 989856a..8dd9d88 100644
--- a/src/client/radar.h
+++ b/src/client/radar.h
@@ -3,7 +3,7 @@
 
 #define RADAR_H
 
-#include "base/arena.h"
+#include "arena.h"
 
 #define RADAR_LOCATION_X (WINDOW_SIZE_X-110)
 #define RADAR_LOCATION_Y (10)
diff --git a/src/client/screen.c b/src/client/screen.c
index 730476e..8a3c29c 100644
--- a/src/client/screen.c
+++ b/src/client/screen.c
@@ -2,12 +2,12 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
+#include "main.h"
+#include "list.h"
 
-#include "client/interface.h"
-#include "client/screen.h"
-#include "client/layer.h"
+#include "interface.h"
+#include "screen.h"
+#include "layer.h"
 
 static screen_t *currentScreen;
 static list_t *listScreen;
diff --git a/src/client/screen.h b/src/client/screen.h
index 8049147..b0d1593 100644
--- a/src/client/screen.h
+++ b/src/client/screen.h
@@ -3,7 +3,7 @@
 
 #define SCREEN_H
 
-#include "base/main.h"
+#include "main.h"
 
 typedef struct screen_struct
 {
diff --git a/src/client/term.c b/src/client/term.c
index 3357f0b..fc1824d 100644
--- a/src/client/term.c
+++ b/src/client/term.c
@@ -2,13 +2,13 @@
 #include <stdlib.h>
 #include <assert.h>
 
-#include "base/main.h"
-#include "base/list.h"
-#include "base/myTimer.h"
+#include "main.h"
+#include "list.h"
+#include "myTimer.h"
 
-#include "client/interface.h"
-#include "client/term.h"
-#include "client/font.h"
+#include "interface.h"
+#include "term.h"
+#include "font.h"
 
 typedef struct struct_term_t
 {
diff --git a/src/client/term.h b/src/client/term.h
index 548fda6..b48a2b7 100644
--- a/src/client/term.h
+++ b/src/client/term.h
@@ -3,7 +3,7 @@
 
 #define TERM_H
 
-#include "base/main.h"
+#include "main.h"
 
 #define TERM_MAX_LINES		10
 #define TERM_DEL_TEXT_TIMEOUT	2000