diff options
| -rw-r--r-- | src/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | src/base/arena.c | 4 | ||||
| -rw-r--r-- | src/base/gun.c | 2 | ||||
| -rw-r--r-- | src/base/item.c | 4 | ||||
| -rw-r--r-- | src/base/net_multiplayer.c | 4 | ||||
| -rw-r--r-- | src/base/proto.c | 10 | ||||
| -rw-r--r-- | src/base/proto.h | 6 | ||||
| -rw-r--r-- | src/base/server.c | 2 | ||||
| -rw-r--r-- | src/base/serverSendMsg.c | 2 | ||||
| -rw-r--r-- | src/base/shot.c | 2 | ||||
| -rw-r--r-- | src/base/tcp_server.c | 2 | ||||
| -rw-r--r-- | src/base/tux.c | 2 | ||||
| -rw-r--r-- | src/base/udp_server.c | 2 | ||||
| -rw-r--r-- | src/client/chat.c | 2 | ||||
| -rw-r--r-- | src/client/client.c | 4 | ||||
| -rw-r--r-- | src/client/game.c | 24 | ||||
| -rw-r--r-- | src/client/layer.c | 2 | ||||
| -rw-r--r-- | src/client/saveDialog.c | 8 | ||||
| -rw-r--r-- | src/client/saveLoad.c | 4 | ||||
| -rw-r--r-- | src/screen/analyze.c (renamed from src/screen/screen_analyze.c) | 12 | ||||
| -rw-r--r-- | src/screen/analyze.h (renamed from src/screen/screen_analyze.h) | 0 | ||||
| -rw-r--r-- | src/screen/browser.c (renamed from src/screen/screen_browser.c) | 14 | ||||
| -rw-r--r-- | src/screen/browser.h (renamed from src/screen/screen_browser.h) | 0 | ||||
| -rw-r--r-- | src/screen/choiceArena.c (renamed from src/screen/screen_choiceArena.c) | 14 | ||||
| -rw-r--r-- | src/screen/choiceArena.h (renamed from src/screen/screen_choiceArena.h) | 0 | ||||
| -rw-r--r-- | src/screen/credits.c (renamed from src/screen/screen_credits.c) | 10 | ||||
| -rw-r--r-- | src/screen/credits.h (renamed from src/screen/screen_credits.h) | 0 | ||||
| -rw-r--r-- | src/screen/downArena.c (renamed from src/screen/screen_downArena.c) | 14 | ||||
| -rw-r--r-- | src/screen/downArena.h (renamed from src/screen/screen_downArena.h) | 0 | ||||
| -rw-r--r-- | src/screen/gameType.c (renamed from src/screen/screen_gameType.c) | 20 | ||||
| -rw-r--r-- | src/screen/gameType.h (renamed from src/screen/screen_gameType.h) | 0 | ||||
| -rw-r--r-- | src/screen/mainMenu.c (renamed from src/screen/screen_mainMenu.c) | 16 | ||||
| -rw-r--r-- | src/screen/mainMenu.h (renamed from src/screen/screen_mainMenu.h) | 0 | ||||
| -rw-r--r-- | src/screen/setting.c (renamed from src/screen/screen_setting.c) | 24 | ||||
| -rw-r--r-- | src/screen/setting.h (renamed from src/screen/screen_setting.h) | 0 | ||||
| -rw-r--r-- | src/screen/settingKeys.c (renamed from src/screen/screen_settingKeys.c) | 16 | ||||
| -rw-r--r-- | src/screen/settingKeys.h (renamed from src/screen/screen_settingKeys.h) | 0 | ||||
| -rw-r--r-- | src/screen/table.c (renamed from src/screen/screen_table.c) | 10 | ||||
| -rw-r--r-- | src/screen/table.h (renamed from src/screen/screen_table.h) | 0 | ||||
| -rw-r--r-- | src/screen/world.c (renamed from src/screen/screen_world.c) | 14 | ||||
| -rw-r--r-- | src/screen/world.h (renamed from src/screen/screen_world.h) | 0 | ||||
| -rw-r--r-- | src/widget/button.c (renamed from src/widget/widget_button.c) | 2 | ||||
| -rw-r--r-- | src/widget/button.h (renamed from src/widget/widget_button.h) | 0 | ||||
| -rw-r--r-- | src/widget/buttonimage.c (renamed from src/widget/widget_buttonimage.c) | 2 | ||||
| -rw-r--r-- | src/widget/buttonimage.h (renamed from src/widget/widget_buttonimage.h) | 0 | ||||
| -rw-r--r-- | src/widget/catchkey.c (renamed from src/widget/widget_catchkey.c) | 2 | ||||
| -rw-r--r-- | src/widget/catchkey.h (renamed from src/widget/widget_catchkey.h) | 0 | ||||
| -rw-r--r-- | src/widget/check.c (renamed from src/widget/widget_check.c) | 2 | ||||
| -rw-r--r-- | src/widget/check.h (renamed from src/widget/widget_check.h) | 0 | ||||
| -rw-r--r-- | src/widget/choicegroup.c (renamed from src/widget/widget_choicegroup.c) | 2 | ||||
| -rw-r--r-- | src/widget/choicegroup.h (renamed from src/widget/widget_choicegroup.h) | 0 | ||||
| -rw-r--r-- | src/widget/image.c (renamed from src/widget/widget_image.c) | 2 | ||||
| -rw-r--r-- | src/widget/image.h (renamed from src/widget/widget_image.h) | 2 | ||||
| -rw-r--r-- | src/widget/label.c (renamed from src/widget/widget_label.c) | 2 | ||||
| -rw-r--r-- | src/widget/label.h (renamed from src/widget/widget_label.h) | 0 | ||||
| -rw-r--r-- | src/widget/select.c (renamed from src/widget/widget_select.c) | 2 | ||||
| -rw-r--r-- | src/widget/select.h (renamed from src/widget/widget_select.h) | 0 | ||||
| -rw-r--r-- | src/widget/textfield.c (renamed from src/widget/widget_textfield.c) | 2 | ||||
| -rw-r--r-- | src/widget/textfield.h (renamed from src/widget/widget_textfield.h) | 0 | ||||
| -rw-r--r-- | src/widget/widget.c | 2 |
60 files changed, 147 insertions, 147 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0b9de02..b9f642e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -56,18 +56,18 @@ 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 - ${WORKDIR}/widget/widget_buttonimage ${WORKDIR}/widget/widget_image - ${WORKDIR}/widget/widget_select ${WORKDIR}/widget/widget_catchkey - ${WORKDIR}/widget/widget_choicegroup ${WORKDIR}/widget/widget + ${WORKDIR}/widget/check ${WORKDIR}/widget/button + ${WORKDIR}/widget/textfield ${WORKDIR}/widget/label + ${WORKDIR}/widget/buttonimage ${WORKDIR}/widget/image + ${WORKDIR}/widget/select ${WORKDIR}/widget/catchkey + ${WORKDIR}/widget/choicegroup ${WORKDIR}/widget/widget ) SET ( SRC_audio 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 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 e92a238..1902be6 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/saveDialog.c b/src/client/saveDialog.c index 1c832e7..d8cfa29 100644 --- a/src/client/saveDialog.c +++ b/src/client/saveDialog.c @@ -17,9 +17,9 @@ #include "hotKey.h" #include "widget.h" -#include "widget_label.h" -#include "widget_button.h" -#include "widget_textfield.h" +#include "label.h" +#include "button.h" +#include "textfield.h" static image_t *g_background; static bool_t activeSaveDialog; @@ -64,7 +64,7 @@ void initSaveDialog() { activeSaveDialog = FALSE; - g_background = getImage(IMAGE_GROUP_BASE, "screen_main"); + g_background = getImage(IMAGE_GROUP_BASE, "main"); widgetLabelMsg = newWidgetLabel("name", SAVE_DIALOG_LOCATIN_X + 20, SAVE_DIALOG_LOCATIN_Y + 20, 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..516f7b9 100644 --- a/src/screen/screen_analyze.c +++ b/src/screen/analyze.c @@ -15,13 +15,13 @@ # 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" -#include "widget_button.h" -#include "widget_image.h" +#include "label.h" +#include "button.h" +#include "image.h" static widget_t *image_backgorund; @@ -156,7 +156,7 @@ void initScreenAnalyze() { image_t *image; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); + image = getImage(IMAGE_GROUP_BASE, "main"); image_backgorund = newWidgetImage(0, 0, image); listWidgetLabelName = newList(); 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..f6aa702 100644 --- a/src/screen/screen_browser.c +++ b/src/screen/browser.c @@ -39,14 +39,14 @@ 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" -#include "widget_label.h" -#include "widget_button.h" -#include "widget_select.h" +#include "image.h" +#include "label.h" +#include "button.h" +#include "select.h" #define SERVER_TIMEOUT 200 @@ -681,7 +681,7 @@ void initScreenBrowser() { image_t *image; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); + image = getImage(IMAGE_GROUP_BASE, "main"); image_backgorund = newWidgetImage(0, 0, image); button_back = 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 7bc6ce4..e73eea6 100644 --- a/src/screen/screen_choiceArena.c +++ b/src/screen/choiceArena.c @@ -15,14 +15,14 @@ # 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" -#include "widget_button.h" -#include "widget_image.h" -#include "widget_buttonimage.h" +#include "label.h" +#include "button.h" +#include "image.h" +#include "buttonimage.h" static widget_t *image_backgorund; @@ -143,7 +143,7 @@ void initScreenChoiceArena() image_t *image; int i; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); + image = getImage(IMAGE_GROUP_BASE, "main"); image_backgorund = newWidgetImage(0, 0, image); button_back = newWidgetButton(_("back"), 100, WINDOW_SIZE_Y - 100, eventWidget); 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..b78aec0 100644 --- a/src/screen/screen_credits.c +++ b/src/screen/credits.c @@ -15,12 +15,12 @@ # include "music.h" #endif -#include "screen_credits.h" +#include "credits.h" #include "widget.h" -#include "widget_image.h" -#include "widget_label.h" -#include "widget_button.h" +#include "image.h" +#include "label.h" +#include "button.h" static widget_t *image_backgorund; static widget_t *button_back; @@ -105,7 +105,7 @@ void initScreenCredits() image_t *image; int i; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); + image = getImage(IMAGE_GROUP_BASE, "main"); image_backgorund = newWidgetImage(0, 0, image); button_back = newWidgetButton(_("back"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 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 94b2387..899d59f 100644 --- a/src/screen/screen_downArena.c +++ b/src/screen/downArena.c @@ -20,13 +20,13 @@ #include "tcp.h" #include "widget.h" -#include "widget_image.h" -#include "widget_label.h" -#include "widget_button.h" +#include "image.h" +#include "label.h" +#include "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; @@ -369,7 +369,7 @@ void initScreenDownArena() { image_t *image; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); + image = getImage(IMAGE_GROUP_BASE, "main"); image_backgorund = newWidgetImage(0, 0, image); button_back = 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..c71e7ef 100644 --- a/src/screen/screen_gameType.c +++ b/src/screen/gameType.c @@ -19,17 +19,17 @@ # 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" -#include "widget_button.h" -#include "widget_image.h" -#include "widget_textfield.h" -#include "widget_choicegroup.h" -#include "widget_check.h" -#include "widget_select.h" +#include "label.h" +#include "button.h" +#include "image.h" +#include "textfield.h" +#include "choicegroup.h" +#include "check.h" +#include "select.h" static widget_t *image_backgorund; @@ -217,7 +217,7 @@ void initScreenGameType() { image_t *image; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); + image = getImage(IMAGE_GROUP_BASE, "main"); image_backgorund = newWidgetImage(0, 0, image); button_back = newWidgetButton(_("back"), 100, WINDOW_SIZE_Y - 100, eventWidget); 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..2209d8e 100644 --- a/src/screen/screen_mainMenu.c +++ b/src/screen/mainMenu.c @@ -14,15 +14,15 @@ # 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" -#include "widget_button.h" -#include "widget_textfield.h" -#include "widget_check.h" -#include "widget_image.h" +#include "label.h" +#include "button.h" +#include "textfield.h" +#include "check.h" +#include "image.h" static widget_t *image_backgorund; @@ -103,7 +103,7 @@ void initScreenMainMenu() image_t *image; image = - addImageData("screen_main.png", IMAGE_NO_ALPHA, "screen_main", + addImageData("main.png", IMAGE_NO_ALPHA, "main", IMAGE_GROUP_BASE); image_backgorund = newWidgetImage(0, 0, image); 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..67e8ac9 100644 --- a/src/screen/screen_setting.c +++ b/src/screen/setting.c @@ -22,19 +22,19 @@ # 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" -#include "widget_button.h" -#include "widget_image.h" -#include "widget_textfield.h" -#include "widget_check.h" -#include "widget_select.h" +#include "label.h" +#include "button.h" +#include "image.h" +#include "textfield.h" +#include "check.h" +#include "select.h" static widget_t *image_backgorund; @@ -332,7 +332,7 @@ void initScreenSetting() image_t *image; int i; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); + image = getImage(IMAGE_GROUP_BASE, "main"); image_backgorund = newWidgetImage(0, 0, image); button_back = newWidgetButton(_("back"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget); 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..ccd89f4 100644 --- a/src/screen/screen_settingKeys.c +++ b/src/screen/settingKeys.c @@ -21,15 +21,15 @@ # 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"
-#include "widget_image.h"
-#include "widget_catchkey.h"
-#include "widget_label.h"
+#include "button.h"
+#include "image.h"
+#include "catchkey.h"
+#include "label.h"
static int keytable[KEY_LENGTH];
@@ -383,7 +383,7 @@ image_t * image; initKeyTable();
-image = getImage(IMAGE_GROUP_BASE, "screen_main");
+image = getImage(IMAGE_GROUP_BASE, "main");
image_backgorund = newWidgetImage(0, 0, image);
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..c9c005f 100644 --- a/src/screen/screen_table.c +++ b/src/screen/table.c @@ -17,11 +17,11 @@ # include "music.h" #endif -#include "screen_table.h" +#include "table.h" -#include "widget_image.h" -#include "widget_label.h" -#include "widget_button.h" +#include "image.h" +#include "label.h" +#include "button.h" static widget_t *image_backgorund; static widget_t *button_back; @@ -198,7 +198,7 @@ void initScreenTable() { image_t *image; - image = addImageData("screen_table.png", IMAGE_NO_ALPHA, "screen_table", IMAGE_GROUP_BASE); + image = addImageData("table.png", IMAGE_NO_ALPHA, "table", IMAGE_GROUP_BASE); image_backgorund = newWidgetImage(0, 0, image); button_back = newWidgetButton(_("back"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 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 diff --git a/src/widget/widget_button.c b/src/widget/button.c index c2afcad..e2db211 100644 --- a/src/widget/widget_button.c +++ b/src/widget/button.c @@ -9,7 +9,7 @@ #include "font.h" #include "widget.h" -#include "widget_button.h" +#include "button.h" widget_t *newWidgetButton(char *text, int x, int y, void (*fce_event) (void *)) { diff --git a/src/widget/widget_button.h b/src/widget/button.h index ac238be..ac238be 100644 --- a/src/widget/widget_button.h +++ b/src/widget/button.h diff --git a/src/widget/widget_buttonimage.c b/src/widget/buttonimage.c index dd20e62..1859ef0 100644 --- a/src/widget/widget_buttonimage.c +++ b/src/widget/buttonimage.c @@ -8,7 +8,7 @@ #include "image.h" #include "widget.h" -#include "widget_buttonimage.h" +#include "buttonimage.h" widget_t *newWidgetButtonimage(image_t * image, int x, int y, void (*fce_event) (void *)) { diff --git a/src/widget/widget_buttonimage.h b/src/widget/buttonimage.h index 5a0ab7c..5a0ab7c 100644 --- a/src/widget/widget_buttonimage.h +++ b/src/widget/buttonimage.h diff --git a/src/widget/widget_catchkey.c b/src/widget/catchkey.c index b213890..ecfb993 100644 --- a/src/widget/widget_catchkey.c +++ b/src/widget/catchkey.c @@ -7,7 +7,7 @@ #include "font.h" #include "widget.h" -#include "widget_catchkey.h" +#include "catchkey.h" widget_t *newWidgetCatchkey(int key, int x, int y, void *event) { diff --git a/src/widget/widget_catchkey.h b/src/widget/catchkey.h index 106bc92..106bc92 100644 --- a/src/widget/widget_catchkey.h +++ b/src/widget/catchkey.h diff --git a/src/widget/widget_check.c b/src/widget/check.c index e574211..7ef4b8b 100644 --- a/src/widget/widget_check.c +++ b/src/widget/check.c @@ -7,7 +7,7 @@ #include "image.h" #include "widget.h" -#include "widget_check.h" +#include "check.h" widget_t *newWidgetCheck(int x, int y, bool_t status, void (*fce_event) (void *)) { diff --git a/src/widget/widget_check.h b/src/widget/check.h index 007e82c..007e82c 100644 --- a/src/widget/widget_check.h +++ b/src/widget/check.h diff --git a/src/widget/widget_choicegroup.c b/src/widget/choicegroup.c index 1045f81..0eb562a 100644 --- a/src/widget/widget_choicegroup.c +++ b/src/widget/choicegroup.c @@ -7,7 +7,7 @@ #include "image.h" #include "widget.h" -#include "widget_choicegroup.h" +#include "choicegroup.h" widget_t *newWidgetChoicegroup(int x, int y, bool_t status, list_t * list, void (*fce_event) (void *)) { diff --git a/src/widget/widget_choicegroup.h b/src/widget/choicegroup.h index a892d74..a892d74 100644 --- a/src/widget/widget_choicegroup.h +++ b/src/widget/choicegroup.h diff --git a/src/widget/widget_image.c b/src/widget/image.c index ad49f9e..2c9702f 100644 --- a/src/widget/widget_image.c +++ b/src/widget/image.c @@ -9,7 +9,7 @@ #include "font.h" #include "widget.h" -#include "widget_image.h" +#include "image.h" widget_t *newWidgetImage(int x, int y, image_t * image) { diff --git a/src/widget/widget_image.h b/src/widget/image.h index 081fbda..61bf89a 100644 --- a/src/widget/widget_image.h +++ b/src/widget/image.h @@ -8,7 +8,7 @@ # include "widget.h" typedef struct widget_image { - image_t *image; + image_t *widget_image; } widget_image_t; extern widget_t *newWidgetImage(int x, int y, image_t * image); diff --git a/src/widget/widget_label.c b/src/widget/label.c index e3c907c..a2d0a48 100644 --- a/src/widget/widget_label.c +++ b/src/widget/label.c @@ -5,7 +5,7 @@ #include "main.h" #include "interface.h" #include "font.h" -#include "widget_label.h" +#include "label.h" #include "widget.h" widget_t *newWidgetLabel(char *text, int x, int y, int bind) diff --git a/src/widget/widget_label.h b/src/widget/label.h index 743db7e..743db7e 100644 --- a/src/widget/widget_label.h +++ b/src/widget/label.h diff --git a/src/widget/widget_select.c b/src/widget/select.c index f53e583..5e290e2 100644 --- a/src/widget/widget_select.c +++ b/src/widget/select.c @@ -7,7 +7,7 @@ #include "font.h" #include "widget.h" -#include "widget_select.h" +#include "select.h" widget_t *newWidgetSelect(int x, int y, void (*fce_event) (void *)) { diff --git a/src/widget/widget_select.h b/src/widget/select.h index 9d772cc..9d772cc 100644 --- a/src/widget/widget_select.h +++ b/src/widget/select.h diff --git a/src/widget/widget_textfield.c b/src/widget/textfield.c index 6a8824a..edc74a8 100644 --- a/src/widget/widget_textfield.c +++ b/src/widget/textfield.c @@ -8,7 +8,7 @@ #include "image.h" #include "widget.h" -#include "widget_textfield.h" +#include "textfield.h" //#define ZZEEXX86_READKEY diff --git a/src/widget/widget_textfield.h b/src/widget/textfield.h index 7991deb..7991deb 100644 --- a/src/widget/widget_textfield.h +++ b/src/widget/textfield.h diff --git a/src/widget/widget.c b/src/widget/widget.c index b72a463..f33e643 100644 --- a/src/widget/widget.c +++ b/src/widget/widget.c @@ -5,7 +5,7 @@ #include "main.h" #include "widget.h" -#include "widget_label.h" +#include "label.h" widget_t *newWidget(int type, int x, int y, int w, int h, void *private_data) { |