summaryrefslogtreecommitdiff
path: root/src/screen
diff options
context:
space:
mode:
Diffstat (limited to 'src/screen')
-rw-r--r--src/screen/Makefile31
-rw-r--r--src/screen/screen_analyze.c22
-rw-r--r--src/screen/screen_analyze.h2
-rw-r--r--src/screen/screen_browser.c36
-rw-r--r--src/screen/screen_choiceArena.c28
-rw-r--r--src/screen/screen_choiceArena.h2
-rw-r--r--src/screen/screen_credits.c24
-rw-r--r--src/screen/screen_gameType.c32
-rw-r--r--src/screen/screen_gameType.h2
-rw-r--r--src/screen/screen_mainMenu.c28
-rw-r--r--src/screen/screen_mainMenu.h2
-rw-r--r--src/screen/screen_setting.c44
-rw-r--r--src/screen/screen_setting.h2
-rw-r--r--src/screen/screen_table.c26
-rw-r--r--src/screen/screen_world.c64
-rw-r--r--src/screen/screen_world.h8
16 files changed, 161 insertions, 192 deletions
diff --git a/src/screen/Makefile b/src/screen/Makefile
deleted file mode 100644
index 32fb758..0000000
--- a/src/screen/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-
-all: screen_analyze.o screen_browser.o screen_credits.o screen_gameType.o screen_choiceArena.o screen_mainMenu.o screen_setting.o screen_table.o screen_world.o
-
-screen_analyze.o: screen_analyze.c screen_analyze.h
- $(CC) $(CFLAGS) -o screen_analyze.o -c screen_analyze.c
-
-screen_browser.o: screen_browser.c screen_browser.h
- $(CC) $(CFLAGS) -o screen_browser.o -c screen_browser.c
-
-screen_credits.o: screen_credits.c screen_credits.h
- $(CC) $(CFLAGS) -o screen_credits.o -c screen_credits.c
-
-screen_gameType.o: screen_gameType.c screen_gameType.h
- $(CC) $(CFLAGS) -o screen_gameType.o -c screen_gameType.c
-
-screen_mainMenu.o: screen_mainMenu.c screen_mainMenu.h
- $(CC) $(CFLAGS) -o screen_mainMenu.o -c screen_mainMenu.c
-
-screen_setting.o: screen_setting.c screen_setting.h
- $(CC) $(CFLAGS) -o screen_setting.o -c screen_setting.c
-
-screen_table.o: screen_table.c screen_table.h
- $(CC) $(CFLAGS) -o screen_table.o -c screen_table.c
-
-screen_world.o: screen_world.c screen_world.h
- $(CC) $(CFLAGS) -o screen_world.o -c screen_world.c
-
-clean:
- rm -rf *.o
-
-
diff --git a/src/screen/screen_analyze.c b/src/screen/screen_analyze.c
index c1b8258..9299c7b 100644
--- a/src/screen/screen_analyze.c
+++ b/src/screen/screen_analyze.c
@@ -3,23 +3,23 @@
#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/image.h"
+#include "interface.h"
+#include "screen.h"
+#include "image.h"
#ifndef NO_SOUND
-#include "audio/music.h"
+#include "music.h"
#endif
-#include "screen/screen_mainMenu.h"
-#include "screen/screen_analyze.h"
+#include "screen_mainMenu.h"
+#include "screen_analyze.h"
-#include "widget/widget_label.h"
-#include "widget/widget_button.h"
-#include "widget/widget_image.h"
+#include "widget_label.h"
+#include "widget_button.h"
+#include "widget_image.h"
static widget_image_t *image_backgorund;
diff --git a/src/screen/screen_analyze.h b/src/screen/screen_analyze.h
index b6a9875..7404da6 100644
--- a/src/screen/screen_analyze.h
+++ b/src/screen/screen_analyze.h
@@ -3,7 +3,7 @@
#define SCREEN_ANALYZE_H
-#include "base/main.h"
+#include "main.h"
typedef struct analyze_struct
{
diff --git a/src/screen/screen_browser.c b/src/screen/screen_browser.c
index 5d99cf7..531047c 100644
--- a/src/screen/screen_browser.c
+++ b/src/screen/screen_browser.c
@@ -3,16 +3,16 @@
#include <stdlib.h>
#include <assert.h>
-#include "base/main.h"
-#include "base/list.h"
-#include "base/textFile.h"
-#include "base/homeDirector.h"
-#include "base/net_multiplayer.h"
+#include "main.h"
+#include "list.h"
+#include "textFile.h"
+#include "homeDirector.h"
+#include "net_multiplayer.h"
-#include "client/language.h"
-#include "client/interface.h"
-#include "client/screen.h"
-#include "client/image.h"
+#include "language.h"
+#include "interface.h"
+#include "screen.h"
+#include "image.h"
#ifdef SUPPORT_NET_UNIX_UDP
#include <sys/socket.h>
@@ -25,23 +25,23 @@
#include <fcntl.h>
#include <errno.h>
-#include "net_unix/udp.h"
-#include "net_unix/dns.h"
+#include "udp.h"
+#include "dns.h"
extern int errno;
#endif
#ifndef NO_SOUND
-#include "audio/music.h"
+#include "music.h"
#endif
-#include "screen/screen_gameType.h"
-#include "screen/screen_browser.h"
+#include "screen_gameType.h"
+#include "screen_browser.h"
-#include "widget/widget_image.h"
-#include "widget/widget_label.h"
-#include "widget/widget_button.h"
-#include "widget/widget_select.h"
+#include "widget_image.h"
+#include "widget_label.h"
+#include "widget_button.h"
+#include "widget_select.h"
#define SERVER_TIMEOUT 200
diff --git a/src/screen/screen_choiceArena.c b/src/screen/screen_choiceArena.c
index 629f1ba..cd61c9c 100644
--- a/src/screen/screen_choiceArena.c
+++ b/src/screen/screen_choiceArena.c
@@ -2,26 +2,26 @@
#include <stdio.h>
#include <assert.h>
-#include "base/main.h"
-#include "base/list.h"
-#include "base/arenaFile.h"
+#include "main.h"
+#include "list.h"
+#include "arenaFile.h"
-#include "client/language.h"
-#include "client/interface.h"
-#include "client/screen.h"
-#include "client/image.h"
+#include "language.h"
+#include "interface.h"
+#include "screen.h"
+#include "image.h"
#ifndef NO_SOUND
-#include "audio/music.h"
+#include "music.h"
#endif
-#include "screen/screen_mainMenu.h"
-#include "screen/screen_choiceArena.h"
+#include "screen_mainMenu.h"
+#include "screen_choiceArena.h"
-#include "widget/widget_label.h"
-#include "widget/widget_button.h"
-#include "widget/widget_image.h"
-#include "widget/widget_buttonimage.h"
+#include "widget_label.h"
+#include "widget_button.h"
+#include "widget_image.h"
+#include "widget_buttonimage.h"
static widget_image_t *image_backgorund;
diff --git a/src/screen/screen_choiceArena.h b/src/screen/screen_choiceArena.h
index 0437aa1..73a8197 100644
--- a/src/screen/screen_choiceArena.h
+++ b/src/screen/screen_choiceArena.h
@@ -3,7 +3,7 @@
#define SCREEN_CHOICE_ARENA
-#include "base/main.h"
+#include "main.h"
#define SCREENSHOT_ARENA_WIDTH 160
#define SCREENSHOT_ARENA_HEIGHT 107
diff --git a/src/screen/screen_credits.c b/src/screen/screen_credits.c
index 3f6cf84..6104efb 100644
--- a/src/screen/screen_credits.c
+++ b/src/screen/screen_credits.c
@@ -2,24 +2,24 @@
#include <stdio.h>
#include <assert.h>
-#include "base/main.h"
-#include "base/list.h"
-#include "base/textFile.h"
+#include "main.h"
+#include "list.h"
+#include "textFile.h"
-#include "client/language.h"
-#include "client/interface.h"
-#include "client/screen.h"
-#include "client/image.h"
+#include "language.h"
+#include "interface.h"
+#include "screen.h"
+#include "image.h"
#ifndef NO_SOUND
-#include "audio/music.h"
+#include "music.h"
#endif
-#include "screen/screen_credits.h"
+#include "screen_credits.h"
-#include "widget/widget_image.h"
-#include "widget/widget_label.h"
-#include "widget/widget_button.h"
+#include "widget_image.h"
+#include "widget_label.h"
+#include "widget_button.h"
static widget_image_t *image_backgorund;
static widget_button_t *button_back;
diff --git a/src/screen/screen_gameType.c b/src/screen/screen_gameType.c
index d54d63a..e512b28 100644
--- a/src/screen/screen_gameType.c
+++ b/src/screen/screen_gameType.c
@@ -3,28 +3,28 @@
#include <stdlib.h>
#include <assert.h>
-#include "base/main.h"
-#include "base/list.h"
-#include "base/net_multiplayer.h"
-#include "base/tux.h"
+#include "main.h"
+#include "list.h"
+#include "net_multiplayer.h"
+#include "tux.h"
-#include "client/language.h"
-#include "client/interface.h"
-#include "client/screen.h"
-#include "client/image.h"
+#include "language.h"
+#include "interface.h"
+#include "screen.h"
+#include "image.h"
#ifndef NO_SOUND
-#include "audio/music.h"
+#include "music.h"
#endif
-#include "screen/screen_gameType.h"
-#include "screen/screen_setting.h"
+#include "screen_gameType.h"
+#include "screen_setting.h"
-#include "widget/widget_label.h"
-#include "widget/widget_button.h"
-#include "widget/widget_image.h"
-#include "widget/widget_textfield.h"
-#include "widget/widget_check.h"
+#include "widget_label.h"
+#include "widget_button.h"
+#include "widget_image.h"
+#include "widget_textfield.h"
+#include "widget_check.h"
static widget_image_t *image_backgorund;
diff --git a/src/screen/screen_gameType.h b/src/screen/screen_gameType.h
index 02e2338..1d9b734 100644
--- a/src/screen/screen_gameType.h
+++ b/src/screen/screen_gameType.h
@@ -3,7 +3,7 @@
#define SCREEN_GAME_TYPE
-#include "base/main.h"
+#include "main.h"
extern void drawScreenGameType();
extern void eventScreenGameType();
diff --git a/src/screen/screen_mainMenu.c b/src/screen/screen_mainMenu.c
index bd3886f..024d3bd 100644
--- a/src/screen/screen_mainMenu.c
+++ b/src/screen/screen_mainMenu.c
@@ -2,26 +2,26 @@
#include <stdio.h>
#include <assert.h>
-#include "base/main.h"
+#include "main.h"
-#include "client/game.h"
-#include "client/interface.h"
-#include "client/language.h"
-#include "client/screen.h"
-#include "client/image.h"
+#include "game.h"
+#include "interface.h"
+#include "language.h"
+#include "screen.h"
+#include "image.h"
#ifndef NO_SOUND
-#include "audio/music.h"
+#include "music.h"
#endif
-#include "screen/screen_mainMenu.h"
-#include "screen/screen_setting.h"
+#include "screen_mainMenu.h"
+#include "screen_setting.h"
-#include "widget/widget_label.h"
-#include "widget/widget_button.h"
-#include "widget/widget_textfield.h"
-#include "widget/widget_check.h"
-#include "widget/widget_image.h"
+#include "widget_label.h"
+#include "widget_button.h"
+#include "widget_textfield.h"
+#include "widget_check.h"
+#include "widget_image.h"
static widget_image_t *image_backgorund;
diff --git a/src/screen/screen_mainMenu.h b/src/screen/screen_mainMenu.h
index c04e65f..909e541 100644
--- a/src/screen/screen_mainMenu.h
+++ b/src/screen/screen_mainMenu.h
@@ -3,7 +3,7 @@
#define SCREEN_MIAN_MENU_H
-#include "base/main.h"
+#include "main.h"
extern void startScreenMainMenu();
extern void drawScreenMainMenu();
diff --git a/src/screen/screen_setting.c b/src/screen/screen_setting.c
index 5a7fb29..5dd7fc1 100644
--- a/src/screen/screen_setting.c
+++ b/src/screen/screen_setting.c
@@ -3,33 +3,33 @@
#include <stdlib.h>
#include <assert.h>
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/textFile.h"
-#include "base/director.h"
-#include "base/homeDirector.h"
-
-#include "client/configFile.h"
-#include "client/language.h"
-#include "client/interface.h"
-#include "client/screen.h"
-#include "client/image.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+#include "textFile.h"
+#include "director.h"
+#include "homeDirector.h"
+
+#include "configFile.h"
+#include "language.h"
+#include "interface.h"
+#include "screen.h"
+#include "image.h"
#ifndef NO_SOUND
-#include "audio/music.h"
-#include "audio/sound.h"
+#include "music.h"
+#include "sound.h"
#endif
-#include "screen/screen_mainMenu.h"
-#include "screen/screen_setting.h"
+#include "screen_mainMenu.h"
+#include "screen_setting.h"
-#include "widget/widget_label.h"
-#include "widget/widget_button.h"
-#include "widget/widget_image.h"
-#include "widget/widget_textfield.h"
-#include "widget/widget_check.h"
-#include "widget/widget_select.h"
+#include "widget_label.h"
+#include "widget_button.h"
+#include "widget_image.h"
+#include "widget_textfield.h"
+#include "widget_check.h"
+#include "widget_select.h"
static widget_image_t *image_backgorund;
diff --git a/src/screen/screen_setting.h b/src/screen/screen_setting.h
index b9631f8..744e768 100644
--- a/src/screen/screen_setting.h
+++ b/src/screen/screen_setting.h
@@ -3,7 +3,7 @@
#define SCREEN_SETTING
-#include "base/main.h"
+#include "main.h"
extern void initScreenSetting();
extern void drawScreenSetting();
diff --git a/src/screen/screen_table.c b/src/screen/screen_table.c
index df1b7d5..498dc7a 100644
--- a/src/screen/screen_table.c
+++ b/src/screen/screen_table.c
@@ -3,25 +3,25 @@
#include <stdlib.h>
#include <assert.h>
-#include "base/main.h"
-#include "base/list.h"
-#include "base/textFile.h"
-#include "base/homeDirector.h"
+#include "main.h"
+#include "list.h"
+#include "textFile.h"
+#include "homeDirector.h"
-#include "client/language.h"
-#include "client/interface.h"
-#include "client/screen.h"
-#include "client/image.h"
+#include "language.h"
+#include "interface.h"
+#include "screen.h"
+#include "image.h"
#ifndef NO_SOUND
-#include "audio/music.h"
+#include "music.h"
#endif
-#include "screen/screen_table.h"
+#include "screen_table.h"
-#include "widget/widget_image.h"
-#include "widget/widget_label.h"
-#include "widget/widget_button.h"
+#include "widget_image.h"
+#include "widget_label.h"
+#include "widget_button.h"
static widget_image_t *image_backgorund;
static widget_button_t *button_back;
diff --git a/src/screen/screen_world.c b/src/screen/screen_world.c
index 91820ff..10e9623 100644
--- a/src/screen/screen_world.c
+++ b/src/screen/screen_world.c
@@ -2,42 +2,42 @@
#include <stdio.h>
#include <assert.h>
-#include "base/main.h"
-#include "base/list.h"
-#include "base/tux.h"
-#include "base/item.h"
-#include "base/shot.h"
-#include "base/gun.h"
-#include "base/myTimer.h"
-#include "base/net_multiplayer.h"
-#include "base/arena.h"
-#include "base/arenaFile.h"
-#include "base/proto.h"
-#include "base/modules.h"
-#include "base/idManager.h"
-
-#include "client/interface.h"
-#include "client/keytable.h"
-#include "client/layer.h"
-#include "client/image.h"
-//#include "client/heightScore.h"
-#include "client/term.h"
-#include "client/font.h"
-#include "client/panel.h"
-#include "client/radar.h"
+#include "main.h"
+#include "list.h"
+#include "tux.h"
+#include "item.h"
+#include "shot.h"
+#include "gun.h"
+#include "myTimer.h"
+#include "net_multiplayer.h"
+#include "arena.h"
+#include "arenaFile.h"
+#include "proto.h"
+#include "modules.h"
+#include "idManager.h"
+
+#include "interface.h"
+#include "keytable.h"
+#include "layer.h"
+#include "image.h"
+//#include "heightScore.h"
+#include "term.h"
+#include "font.h"
+#include "panel.h"
+#include "radar.h"
#ifndef NO_SOUND
-#include "audio/music.h"
-#include "audio/sound.h"
+#include "music.h"
+#include "sound.h"
#endif
-#include "client/screen.h"
-#include "screen/screen_world.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.h"
+#include "screen_world.h"
+#include "screen_analyze.h"
+#include "screen_setting.h"
+#include "screen_gameType.h"
+#include "screen_choiceArena.h"
+#include "screen_table.h"
static arena_t *arena;
diff --git a/src/screen/screen_world.h b/src/screen/screen_world.h
index 270d144..0ba4b41 100644
--- a/src/screen/screen_world.h
+++ b/src/screen/screen_world.h
@@ -3,10 +3,10 @@
#define SCREEN_WORLD_H
-#include "base/main.h"
-#include "base/myTimer.h"
-#include "base/tux.h"
-#include "base/arena.h"
+#include "main.h"
+#include "myTimer.h"
+#include "tux.h"
+#include "arena.h"
#define TIMER_END_ARENA 5000
#define WORLD_COUNT_ROUND_UNLIMITED -1
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 12:08:53 +0000