Renaming of screen files.

22 files changed, 30 insertions, 30 deletions

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