Renaming of screen files.

39 files changed, 74 insertions, 74 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e5a5464..3e9bf09 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -56,12 +56,12 @@ SET ( SRC_client
 	${WORKDIR}/client/pauza	${WORKDIR}/client/saveDialog
 	${WORKDIR}/client/hotKey
 
-	${WORKDIR}/screen/screen_choiceArena
-	${WORKDIR}/screen/screen_settingKeys	${WORKDIR}/screen/screen_table
-	${WORKDIR}/screen/screen_setting	${WORKDIR}/screen/screen_credits
-	${WORKDIR}/screen/screen_world	${WORKDIR}/screen/screen_analyze
-	${WORKDIR}/screen/screen_mainMenu	${WORKDIR}/screen/screen_browser
-	${WORKDIR}/screen/screen_gameType	${WORKDIR}/screen/screen_downArena
+	${WORKDIR}/screen/choiceArena
+	${WORKDIR}/screen/settingKeys	${WORKDIR}/screen/table
+	${WORKDIR}/screen/setting	${WORKDIR}/screen/credits
+	${WORKDIR}/screen/world	${WORKDIR}/screen/analyze
+	${WORKDIR}/screen/mainMenu	${WORKDIR}/screen/browser
+	${WORKDIR}/screen/gameType	${WORKDIR}/screen/downArena
 
 	${WORKDIR}/widget/widget_check	${WORKDIR}/widget/widget_button
 	${WORKDIR}/widget/widget_textfield	${WORKDIR}/widget/widget_label
diff --git a/src/base/arena.c b/src/base/arena.c
index 4658e08..effbff4 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -14,8 +14,8 @@
 
 #ifndef PUBLIC_SERVER
 #    include "hotKey.h"
-#    include "screen_world.h"
-#    include "screen_setting.h"
+#    include "world.h"
+#    include "setting.h"
 #    include "layer.h"
 #endif
 
diff --git a/src/base/gun.c b/src/base/gun.c
index 27f88bd..d357349 100644
--- a/src/base/gun.c
+++ b/src/base/gun.c
@@ -19,7 +19,7 @@
 #endif
 #ifndef PUBLIC_SERVER
 #    include "interface.h"
-#    include "screen_world.h"
+#    include "world.h"
 #endif
 #ifdef PUBLIC_SERVER
 #    include "publicServer.h"
diff --git a/src/base/item.c b/src/base/item.c
index 822d6b4..75074bc 100644
--- a/src/base/item.c
+++ b/src/base/item.c
@@ -19,8 +19,8 @@
 #    include "radar.h"
 #    include "layer.h"
 
-#    include "screen_world.h"
-#    include "screen_setting.h"
+#    include "world.h"
+#    include "setting.h"
 
 #    ifndef NO_SOUND
 #        include "sound.h"
diff --git a/src/base/net_multiplayer.c b/src/base/net_multiplayer.c
index 198abe7..d21f81d 100644
--- a/src/base/net_multiplayer.c
+++ b/src/base/net_multiplayer.c
@@ -15,8 +15,8 @@
 #include "udp.h"
 
 #ifndef PUBLIC_SERVER
-#    include "screen_setting.h"
-#    include "screen_choiceArena.h"
+#    include "setting.h"
+#    include "choiceArena.h"
 
 #    include "screen.h"
 #    include "client.h"
diff --git a/src/base/proto.c b/src/base/proto.c
index 606dd33..f927dfa 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -21,11 +21,11 @@
 #include "serverSendMsg.h"
 
 #ifndef PUBLIC_SERVER
-#    include "screen_world.h"
-#    include "screen_setting.h"
-#    include "screen_choiceArena.h"
-#    include "screen_analyze.h"
-#    include "screen_downArena.h"
+#    include "world.h"
+#    include "setting.h"
+#    include "choiceArena.h"
+#    include "analyze.h"
+#    include "downArena.h"
 #    include "client.h"
 #    include "term.h"
 #    include "radar.h"
diff --git a/src/base/proto.h b/src/base/proto.h
index 590317b..8cd7568 100644
--- a/src/base/proto.h
+++ b/src/base/proto.h
@@ -18,9 +18,9 @@
 #    include "net_multiplayer.h"
 
 #    ifndef PUBLIC_SERVER
-#        include "screen_world.h"
-#        include "screen_setting.h"
-#        include "screen_choiceArena.h"
+#        include "world.h"
+#        include "setting.h"
+#        include "choiceArena.h"
 #        include "client.h"
 #    endif
 
diff --git a/src/base/server.c b/src/base/server.c
index 6471b46..49a1c79 100644
--- a/src/base/server.c
+++ b/src/base/server.c
@@ -33,7 +33,7 @@
 #include "downServer.h"
 
 #ifndef PUBLIC_SERVER
-#    include "screen_world.h"
+#    include "world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
diff --git a/src/base/serverSendMsg.c b/src/base/serverSendMsg.c
index e7d1c09..e38975f 100644
--- a/src/base/serverSendMsg.c
+++ b/src/base/serverSendMsg.c
@@ -11,7 +11,7 @@
 #include "serverSendMsg.h"
 
 #ifndef PUBLIC_SERVER
-#    include "screen_world.h"
+#    include "world.h"
 #endif
 
 static void addMsgClient(client_t * p, char *msg, int type, int id)
diff --git a/src/base/shot.c b/src/base/shot.c
index 977ccb4..306527b 100644
--- a/src/base/shot.c
+++ b/src/base/shot.c
@@ -14,7 +14,7 @@
 #ifndef PUBLIC_SERVER
 #    include "image.h"
 #    include "layer.h"
-#    include "screen_world.h"
+#    include "world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
diff --git a/src/base/tux.c b/src/base/tux.c
index 746679d..5bb2305 100644
--- a/src/base/tux.c
+++ b/src/base/tux.c
@@ -28,7 +28,7 @@
 #        include "sound.h"
 #    endif
 
-#    include "screen_world.h"
+#    include "world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
diff --git a/src/base/udp_server.c b/src/base/udp_server.c
index 0e211f3..b61cfef 100644
--- a/src/base/udp_server.c
+++ b/src/base/udp_server.c
@@ -30,7 +30,7 @@
 #include "index.h"
 
 #ifndef PUBLIC_SERVER
-#    include "screen_world.h"
+#    include "world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
diff --git a/src/client/chat.c b/src/client/chat.c
index 6ca9ec9..b446b08 100644
--- a/src/client/chat.c
+++ b/src/client/chat.c
@@ -11,7 +11,7 @@
 #include "serverSendMsg.h"
 
 #include "net_multiplayer.h"
-#include "screen_world.h"
+#include "world.h"
 #include "proto.h"
 #include "interface.h"
 #include "chat.h"
diff --git a/src/client/client.c b/src/client/client.c
index 74d6b0a..5aa995b 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -23,8 +23,8 @@
 
 #include "client.h"
 
-#include "screen_analyze.h"
-#include "screen_world.h"
+#include "analyze.h"
+#include "world.h"
 #include "buffer.h"
 
 #include "udp.h"
diff --git a/src/client/game.c b/src/client/game.c
index e96805b..87676d5 100644
--- a/src/client/game.c
+++ b/src/client/game.c
@@ -20,7 +20,7 @@
 #include "interface.h"
 #include "screen.h"
 #include "font.h"
-#include "screen_settingKeys.h"
+#include "settingKeys.h"
 #include "panel.h"
 #include "radar.h"
 
@@ -30,17 +30,17 @@
 #    include "music.h"
 #endif
 
-#include "screen_world.h"
-#include "screen_mainMenu.h"
-#include "screen_analyze.h"
-#include "screen_setting.h"
-#include "screen_settingKeys.h"
-#include "screen_gameType.h"
-#include "screen_downArena.h"
-#include "screen_choiceArena.h"
-#include "screen_table.h"
-#include "screen_credits.h"
-#include "screen_browser.h"
+#include "world.h"
+#include "mainMenu.h"
+#include "analyze.h"
+#include "setting.h"
+#include "settingKeys.h"
+#include "gameType.h"
+#include "downArena.h"
+#include "choiceArena.h"
+#include "table.h"
+#include "credits.h"
+#include "browser.h"
 
 static void initGame()
 {
diff --git a/src/client/layer.c b/src/client/layer.c
index 983a9c8..c50be65 100644
--- a/src/client/layer.c
+++ b/src/client/layer.c
@@ -10,7 +10,7 @@
 #include "layer.h"
 #include "image.h"
 
-#include "screen_world.h"
+#include "world.h"
 
 static list_t *listLayer;
 
diff --git a/src/client/saveLoad.c b/src/client/saveLoad.c
index b5dbdf2..0448a4f 100644
--- a/src/client/saveLoad.c
+++ b/src/client/saveLoad.c
@@ -16,8 +16,8 @@
 
 #include "saveLoad.h"
 
-#include "screen_choiceArena.h"
-#include "screen_world.h"
+#include "choiceArena.h"
+#include "world.h"
 
 static void action_saveTux(space_t * space, tux_t * tux, textFile_t * textFile)
 {
diff --git a/src/screen/screen_analyze.c b/src/screen/analyze.c
index b249f81..2153e52 100644
--- a/src/screen/screen_analyze.c
+++ b/src/screen/analyze.c
@@ -15,8 +15,8 @@
 #    include "music.h"
 #endif
 
-#include "screen_mainMenu.h"
-#include "screen_analyze.h"
+#include "mainMenu.h"
+#include "analyze.h"
 
 #include "widget.h"
 #include "widget_label.h"
diff --git a/src/screen/screen_analyze.h b/src/screen/analyze.h
index 8f975b4..8f975b4 100644
--- a/src/screen/screen_analyze.h
+++ b/src/screen/analyze.h
diff --git a/src/screen/screen_browser.c b/src/screen/browser.c
index f09ca18..91b3350 100644
--- a/src/screen/screen_browser.c
+++ b/src/screen/browser.c
@@ -39,8 +39,8 @@ extern int errno;
 #    include "music.h"
 #endif
 
-#include "screen_gameType.h"
-#include "screen_browser.h"
+#include "gameType.h"
+#include "browser.h"
 
 #include "widget.h"
 #include "widget_image.h"
diff --git a/src/screen/screen_browser.h b/src/screen/browser.h
index e810e58..e810e58 100644
--- a/src/screen/screen_browser.h
+++ b/src/screen/browser.h
diff --git a/src/screen/screen_choiceArena.c b/src/screen/choiceArena.c
index a1b725b..bf60c46 100644
--- a/src/screen/screen_choiceArena.c
+++ b/src/screen/choiceArena.c
@@ -15,8 +15,8 @@
 #    include "music.h"
 #endif
 
-#include "screen_mainMenu.h"
-#include "screen_choiceArena.h"
+#include "mainMenu.h"
+#include "choiceArena.h"
 
 #include "widget.h"
 #include "widget_label.h"
diff --git a/src/screen/screen_choiceArena.h b/src/screen/choiceArena.h
index dbe12de..dbe12de 100644
--- a/src/screen/screen_choiceArena.h
+++ b/src/screen/choiceArena.h
diff --git a/src/screen/screen_credits.c b/src/screen/credits.c
index a3ed787..93745c2 100644
--- a/src/screen/screen_credits.c
+++ b/src/screen/credits.c
@@ -15,7 +15,7 @@
 #    include "music.h"
 #endif
 
-#include "screen_credits.h"
+#include "credits.h"
 
 #include "widget.h"
 #include "widget_image.h"
diff --git a/src/screen/screen_credits.h b/src/screen/credits.h
index 37c25f3..37c25f3 100644
--- a/src/screen/screen_credits.h
+++ b/src/screen/credits.h
diff --git a/src/screen/screen_downArena.c b/src/screen/downArena.c
index d26621b..3328046 100644
--- a/src/screen/screen_downArena.c
+++ b/src/screen/downArena.c
@@ -24,9 +24,9 @@
 #include "widget_label.h"
 #include "widget_button.h"
 
-#include "screen_setting.h"
-#include "screen_downArena.h"
-#include "screen_gameType.h"
+#include "setting.h"
+#include "downArena.h"
+#include "gameType.h"
 
 static sock_udp_t *sock_server_udp;
 static sock_tcp_t *sock_server_tcp;
diff --git a/src/screen/screen_downArena.h b/src/screen/downArena.h
index d9f25d7..d9f25d7 100644
--- a/src/screen/screen_downArena.h
+++ b/src/screen/downArena.h
diff --git a/src/screen/screen_gameType.c b/src/screen/gameType.c
index 1ef8461..a8f0b2a 100644
--- a/src/screen/screen_gameType.c
+++ b/src/screen/gameType.c
@@ -19,8 +19,8 @@
 #    include "music.h"
 #endif
 
-#include "screen_gameType.h"
-#include "screen_setting.h"
+#include "gameType.h"
+#include "setting.h"
 
 #include "widget.h"
 #include "widget_label.h"
diff --git a/src/screen/screen_gameType.h b/src/screen/gameType.h
index 2c836fc..2c836fc 100644
--- a/src/screen/screen_gameType.h
+++ b/src/screen/gameType.h
diff --git a/src/screen/screen_mainMenu.c b/src/screen/mainMenu.c
index 84d57b8..56ebd4c 100644
--- a/src/screen/screen_mainMenu.c
+++ b/src/screen/mainMenu.c
@@ -14,8 +14,8 @@
 #    include "music.h"
 #endif
 
-#include "screen_mainMenu.h"
-#include "screen_setting.h"
+#include "mainMenu.h"
+#include "setting.h"
 
 #include "widget.h"
 #include "widget_label.h"
diff --git a/src/screen/screen_mainMenu.h b/src/screen/mainMenu.h
index ecb369b..ecb369b 100644
--- a/src/screen/screen_mainMenu.h
+++ b/src/screen/mainMenu.h
diff --git a/src/screen/screen_setting.c b/src/screen/setting.c
index b52a9db..9fab21f 100644
--- a/src/screen/screen_setting.c
+++ b/src/screen/setting.c
@@ -22,11 +22,11 @@
 #    include "sound.h"
 #endif
 
-#include "screen_mainMenu.h"
-#include "screen_setting.h"
-#include "screen_settingKeys.h"
-#include "screen_settingKeys.h"
-#include "screen_choiceArena.h"
+#include "mainMenu.h"
+#include "setting.h"
+#include "settingKeys.h"
+#include "settingKeys.h"
+#include "choiceArena.h"
 
 #include "widget.h"
 #include "widget_label.h"
diff --git a/src/screen/screen_setting.h b/src/screen/setting.h
index 9521cca..9521cca 100644
--- a/src/screen/screen_setting.h
+++ b/src/screen/setting.h
diff --git a/src/screen/screen_settingKeys.c b/src/screen/settingKeys.c
index 35215cf..7813a69 100644
--- a/src/screen/screen_settingKeys.c
+++ b/src/screen/settingKeys.c
@@ -21,9 +21,9 @@
 #    include "sound.h"

 #endif							/* 

  */

-#include "screen_mainMenu.h"

-#include "screen_setting.h"

-#include "screen_settingKeys.h"

+#include "mainMenu.h"

+#include "setting.h"

+#include "settingKeys.h"

 	

 #include "widget.h"

 #include "widget_button.h"

diff --git a/src/screen/screen_settingKeys.h b/src/screen/settingKeys.h
index c90006e..c90006e 100644
--- a/src/screen/screen_settingKeys.h
+++ b/src/screen/settingKeys.h
diff --git a/src/screen/screen_table.c b/src/screen/table.c
index b49de93..5abb3c9 100644
--- a/src/screen/screen_table.c
+++ b/src/screen/table.c
@@ -17,7 +17,7 @@
 #    include "music.h"
 #endif
 
-#include "screen_table.h"
+#include "table.h"
 
 #include "widget_image.h"
 #include "widget_label.h"
diff --git a/src/screen/screen_table.h b/src/screen/table.h
index a91b233..a91b233 100644
--- a/src/screen/screen_table.h
+++ b/src/screen/table.h
diff --git a/src/screen/screen_world.c b/src/screen/world.c
index 8f2f6d2..5fa3ecd 100644
--- a/src/screen/screen_world.c
+++ b/src/screen/world.c
@@ -37,13 +37,13 @@
 #endif
 
 #include "screen.h"
-#include "screen_world.h"
-#include "screen_analyze.h"
-#include "screen_setting.h"
-#include "screen_gameType.h"
-#include "screen_settingKeys.h"
-#include "screen_choiceArena.h"
-#include "screen_table.h"
+#include "world.h"
+#include "analyze.h"
+#include "setting.h"
+#include "gameType.h"
+#include "settingKeys.h"
+#include "choiceArena.h"
+#include "table.h"
 
 
 static arena_t *arena;
diff --git a/src/screen/screen_world.h b/src/screen/world.h
index 67935f7..67935f7 100644
--- a/src/screen/screen_world.h
+++ b/src/screen/world.h