First pass renaming sreen and widgets.

12 files changed, 21 insertions, 21 deletions

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 f59b3b2..cb9ca59 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 2112927..5f16ef7 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/tcp_server.c b/src/base/tcp_server.c
index b781fb5..de5ac39 100644
--- a/src/base/tcp_server.c
+++ b/src/base/tcp_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/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 a469a3a..fc65d19 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