diff options
Diffstat (limited to 'src/screen')
| -rw-r--r-- | src/screen/analyze.c | 98 | ||||
| -rw-r--r-- | src/screen/analyze.h | 20 | ||||
| -rw-r--r-- | src/screen/browser.c | 130 | ||||
| -rw-r--r-- | src/screen/browser.h | 12 | ||||
| -rw-r--r-- | src/screen/choiceArena.c | 108 | ||||
| -rw-r--r-- | src/screen/choiceArena.h | 12 | ||||
| -rw-r--r-- | src/screen/credits.c | 60 | ||||
| -rw-r--r-- | src/screen/credits.h | 12 | ||||
| -rw-r--r-- | src/screen/downArena.c | 122 | ||||
| -rw-r--r-- | src/screen/downArena.h | 12 | ||||
| -rw-r--r-- | src/screen/gameType.c | 240 | ||||
| -rw-r--r-- | src/screen/gameType.h | 22 | ||||
| -rw-r--r-- | src/screen/mainMenu.c | 84 | ||||
| -rw-r--r-- | src/screen/mainMenu.h | 12 | ||||
| -rw-r--r-- | src/screen/setting.c | 362 | ||||
| -rw-r--r-- | src/screen/setting.h | 20 | ||||
| -rw-r--r-- | src/screen/settingKeys.c | 292 | ||||
| -rw-r--r-- | src/screen/settingKeys.h | 14 | ||||
| -rw-r--r-- | src/screen/table.c | 96 | ||||
| -rw-r--r-- | src/screen/table.h | 14 | ||||
| -rw-r--r-- | src/screen/world.c | 342 | ||||
| -rw-r--r-- | src/screen/world.h | 26 |
22 files changed, 1055 insertions, 1055 deletions
diff --git a/src/screen/analyze.c b/src/screen/analyze.c index 2153e52..306c7bd 100644 --- a/src/screen/analyze.c +++ b/src/screen/analyze.c @@ -51,50 +51,50 @@ static void destroyAnalyze(analyze_t * p) static void hotkey_escape() { - setScreen("mainMenu"); + screen_set("mainMenu"); } -void startScreenAnalyze() +void analyze_start() { #ifndef NO_SOUND - playMusic("menu", MUSIC_GROUP_BASE); + music_play("menu", MUSIC_GROUP_BASE); #endif - registerHotKey(SDLK_ESCAPE, hotkey_escape); + hotKey_register(SDLK_ESCAPE, hotkey_escape); } -void drawScreenAnalyze() +void analyze_draw() { widget_t *this; int i; - drawWidgetImage(image_backgorund); + wid_image_draw(image_backgorund); for (i = 0; i < listWidgetLabelName->count; i++) { this = (widget_t *) (listWidgetLabelName->list[i]); - drawWidgetLabel(this); + label_draw(this); } for (i = 0; i < listWidgetLabelScore->count; i++) { this = (widget_t *) (listWidgetLabelScore->list[i]); - drawWidgetLabel(this); + label_draw(this); } - drawWidgetLabel(widgetLabelMsg); - drawWidgetButton(button_ok); + label_draw(widgetLabelMsg); + button_draw(button_ok); } -void eventScreenAnalyze() +void analyze_event() { - eventWidgetButton(button_ok); + button_event(button_ok); } -void stopScreenAnalyze() +void analyze_stop() { - destroyWidgetLabel(widgetLabelMsg); - widgetLabelMsg = newWidgetLabel("", WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); + label_destroy(widgetLabelMsg); + widgetLabelMsg = label_new("", WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); - unregisterHotKey(SDLK_ESCAPE); + unhotKey_register(SDLK_ESCAPE); } static void eventWidget(void *p) @@ -104,33 +104,33 @@ static void eventWidget(void *p) button = (widget_t *) (p); if (button == button_ok) { - setScreen("mainMenu"); + screen_set("mainMenu"); } } -void restartAnalyze() +void analyze_restart() { - destroyListItem(listWidgetLabelName, destroyWidgetLabel); - destroyListItem(listWidgetLabelScore, destroyWidgetLabel); - destroyListItem(listAnalyze, destroyAnalyze); + list_destroy_item(listWidgetLabelName, label_destroy); + list_destroy_item(listWidgetLabelScore, label_destroy); + list_destroy_item(listAnalyze, destroyAnalyze); - listWidgetLabelName = newList(); - listWidgetLabelScore = newList(); - listAnalyze = newList(); + listWidgetLabelName = list_new(); + listWidgetLabelScore = list_new(); + listAnalyze = list_new(); } -void addAnalyze(char *name, int score) +void analyze_add(char *name, int score) { - addList(listAnalyze, newAnalyze(name, score)); + list_add(listAnalyze, newAnalyze(name, score)); } -void setMsgToAnalyze(char *msg) +void analyze_set_msg(char *msg) { - destroyWidgetLabel(widgetLabelMsg); - widgetLabelMsg = newWidgetLabel(msg, WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); + label_destroy(widgetLabelMsg); + widgetLabelMsg = label_new(msg, WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); } -void endAnalyze() +void analyze_end() { int i; @@ -140,46 +140,46 @@ void endAnalyze() this = (analyze_t *) (listAnalyze->list[i]); - addList(listWidgetLabelName, newWidgetLabel(this->name, 100, + list_add(listWidgetLabelName, label_new(this->name, 100, 200 + 20 * i, WIDGET_LABEL_LEFT)); str = getString(this->score); - addList(listWidgetLabelScore, newWidgetLabel(str, WINDOW_SIZE_X - 100, + list_add(listWidgetLabelScore, label_new(str, WINDOW_SIZE_X - 100, 200 + 20 * i, WIDGET_LABEL_RIGHT)); free(str); } } -void initScreenAnalyze() +void analyze_init() { image_t *image; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); - image_backgorund = newWidgetImage(0, 0, image); + image = image_get(IMAGE_GROUP_BASE, "screen_main"); + image_backgorund = wid_image_new(0, 0, image); - listWidgetLabelName = newList(); - listWidgetLabelScore = newList(); - listAnalyze = newList(); + listWidgetLabelName = list_new(); + listWidgetLabelScore = list_new(); + listAnalyze = list_new(); - button_ok = newWidgetButton("OK", WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, + button_ok = button_new("OK", WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, WINDOW_SIZE_Y - 100, eventWidget); - registerScreen( newScreen("analyze", startScreenAnalyze, eventScreenAnalyze, - drawScreenAnalyze, stopScreenAnalyze)); + screen_register( screen_new("analyze", analyze_start, analyze_event, + analyze_draw, analyze_stop)); - widgetLabelMsg = newWidgetLabel("", WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); + widgetLabelMsg = label_new("", WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); } -void quitScreenAnalyze() +void analyze_quit() { - destroyWidgetImage(image_backgorund); + wid_image_destroy(image_backgorund); - destroyListItem(listWidgetLabelName, destroyWidgetLabel); - destroyListItem(listWidgetLabelScore, destroyWidgetLabel); - destroyListItem(listAnalyze, destroyAnalyze); + list_destroy_item(listWidgetLabelName, label_destroy); + list_destroy_item(listWidgetLabelScore, label_destroy); + list_destroy_item(listAnalyze, destroyAnalyze); - destroyWidgetButton(button_ok); - destroyWidgetLabel(widgetLabelMsg); + button_destroy(button_ok); + label_destroy(widgetLabelMsg); } diff --git a/src/screen/analyze.h b/src/screen/analyze.h index 8f975b4..683f26e 100644 --- a/src/screen/analyze.h +++ b/src/screen/analyze.h @@ -10,15 +10,15 @@ typedef struct analyze_struct { int score; } analyze_t; -extern void startScreenAnalyze(); -extern void drawScreenAnalyze(); -extern void eventScreenAnalyze(); -extern void stopScreenAnalyze(); -extern void restartAnalyze(); -extern void addAnalyze(char *name, int score); -extern void setMsgToAnalyze(char *msg); -extern void endAnalyze(); -extern void initScreenAnalyze(); -extern void quitScreenAnalyze(); +extern void analyze_start(); +extern void analyze_draw(); +extern void analyze_event(); +extern void analyze_stop(); +extern void analyze_restart(); +extern void analyze_add(char *name, int score); +extern void analyze_set_msg(char *msg); +extern void analyze_end(); +extern void analyze_init(); +extern void analyze_quit(); #endif diff --git a/src/screen/browser.c b/src/screen/browser.c index d9bf61e..9e4db3a 100644 --- a/src/screen/browser.c +++ b/src/screen/browser.c @@ -74,57 +74,57 @@ static server_t *server_getcurr(); static void hotkey_escape() { - setScreen("gameType"); + screen_set("gameType"); } -void startScreenBrowser() +void browser_start() { #ifndef NO_SOUND - playMusic("menu", MUSIC_GROUP_BASE); + music_play("menu", MUSIC_GROUP_BASE); #endif - registerHotKey(SDLK_ESCAPE, hotkey_escape); + hotKey_register(SDLK_ESCAPE, hotkey_escape); LoadServers(); } -void drawScreenBrowser() +void browser_draw() { - drawWidgetImage(image_backgorund); + wid_image_draw(image_backgorund); - drawWidgetLabel(label_server); - drawWidgetLabel(label_version); - drawWidgetLabel(label_address); - drawWidgetLabel(label_arena); - drawWidgetLabel(label_players); - drawWidgetLabel(label_ping); + label_draw(label_server); + label_draw(label_version); + label_draw(label_address); + label_draw(label_arena); + label_draw(label_players); + label_draw(label_ping); - drawWidgetSelect(select_server); + select_draw(select_server); - drawWidgetButton(button_play); - drawWidgetButton(button_back); - drawWidgetButton(button_refresh); + button_draw(button_play); + button_draw(button_back); + button_draw(button_refresh); } -void eventScreenBrowser() +void browser_event() { - eventWidgetSelect(select_server); + select_event(select_server); - eventWidgetButton(button_play); - eventWidgetButton(button_back); - eventWidgetButton(button_refresh); + button_event(button_play); + button_event(button_back); + button_event(button_refresh); } -void stopScreenBrowser() +void browser_stop() { unsigned i = 0; server_t *server; - //destroyListItem(select_server->list, free); - //select_server->list = newList(); - removeAllFromWidgetSelect(select_server); + //list_destroy_item(select_server->list, free); + //select_server->list = list_new(); + select_remove_all(select_server); - unregisterHotKey(SDLK_ESCAPE); + unhotKey_register(SDLK_ESCAPE); while (1) { i = 0; @@ -175,14 +175,14 @@ static void eventWidget(void *p) char *address = (char *) inet_ntoa(srv); setSettingGameType(NET_GAME_TYPE_CLIENT); - setSettingIP(address); - setSettingPort(server->port); + gameType_set_ip(address); + gameType_set_port(server->port); - setScreen("world"); + screen_set("world"); } if (button == button_back) { - setScreen("gameType"); + screen_set("gameType"); } if (button == button_refresh) { @@ -197,7 +197,7 @@ server_t *server_getcurr() for (server = server_list.next; server != &server_list; server = server->next) { - if (i == getWidgetSelectIndex(select_server)) + if (i == select_get_index(select_server)) return server; i++; @@ -437,7 +437,7 @@ static int LoadServers() struct sockaddr_in server; char *master_server_ip; - master_server_ip = getIPFormDNS(NET_MASTER_SERVER_DOMAIN); + master_server_ip = gns_resolv(NET_MASTER_SERVER_DOMAIN); //printf("master_server_ip = %s\n", master_server_ip); @@ -590,7 +590,7 @@ static int LoadServers() memcpy(list + 83, buf, strlen(buf)); } - addToWidgetSelect(select_server, list); + select_add(select_server, list); // add into list ctx->next = &server_list; @@ -610,10 +610,10 @@ static int LoadServers() static int RefreshServers() { /* - destroyListItem(select_server->list, free); - select_server->list = newList(); + list_destroy_item(select_server->list, free); + select_server->list = list_new(); */ - removeAllFromWidgetSelect(select_server); + select_remove_all(select_server); struct in_addr srv; @@ -672,60 +672,60 @@ static int RefreshServers() memcpy(list + 83, buf, strlen(buf)); } - addToWidgetSelect(select_server, list); + select_add(select_server, list); } return 1; } -void initScreenBrowser() +void browser_init() { image_t *image; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); - image_backgorund = newWidgetImage(0, 0, image); + image = image_get(IMAGE_GROUP_BASE, "screen_main"); + image_backgorund = wid_image_new(0, 0, image); button_back = - newWidgetButton(_("back"), 100, WINDOW_SIZE_Y - 100, eventWidget); + button_new(_("back"), 100, WINDOW_SIZE_Y - 100, eventWidget); button_play = - newWidgetButton(_("Play"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, + button_new(_("Play"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget); button_refresh = - newWidgetButton(_("Refresh"), WINDOW_SIZE_X / 2 - 50, + button_new(_("Refresh"), WINDOW_SIZE_X / 2 - 50, WINDOW_SIZE_Y - 100, eventWidget); - label_server = newWidgetLabel(_("server"), 120, 145, WIDGET_LABEL_LEFT); - label_version = newWidgetLabel(_("version"), 290, 145, WIDGET_LABEL_LEFT); - label_address = newWidgetLabel(_("IP"), 400, 145, WIDGET_LABEL_LEFT); - label_arena = newWidgetLabel(_("arena"), 550, 145, WIDGET_LABEL_LEFT); - label_players = newWidgetLabel(_("clients"), 645, 145, WIDGET_LABEL_LEFT); - label_ping = newWidgetLabel(_("ping"), 720, 145, WIDGET_LABEL_LEFT); + label_server = label_new(_("server"), 120, 145, WIDGET_LABEL_LEFT); + label_version = label_new(_("version"), 290, 145, WIDGET_LABEL_LEFT); + label_address = label_new(_("IP"), 400, 145, WIDGET_LABEL_LEFT); + label_arena = label_new(_("arena"), 550, 145, WIDGET_LABEL_LEFT); + label_players = label_new(_("clients"), 645, 145, WIDGET_LABEL_LEFT); + label_ping = label_new(_("ping"), 720, 145, WIDGET_LABEL_LEFT); - select_server = newWidgetSelect(50, label_server->y + 40, eventWidget); + select_server = select_new(50, label_server->y + 40, eventWidget); - registerScreen(newScreen - ("browser", startScreenBrowser, eventScreenBrowser, - drawScreenBrowser, stopScreenBrowser)); + screen_register(screen_new + ("browser", browser_start, browser_event, + browser_draw, browser_stop)); server_list.next = &server_list; server_list.prev = &server_list; } -void quitScreenBrowser() +void browser_quit() { - destroyWidgetImage(image_backgorund); + wid_image_destroy(image_backgorund); - destroyWidgetButton(button_play); - destroyWidgetButton(button_back); - destroyWidgetButton(button_refresh); + button_destroy(button_play); + button_destroy(button_back); + button_destroy(button_refresh); - destroyWidgetLabel(label_server); - destroyWidgetLabel(label_version); - destroyWidgetLabel(label_address); - destroyWidgetLabel(label_arena); - destroyWidgetLabel(label_players); - destroyWidgetLabel(label_ping); + label_destroy(label_server); + label_destroy(label_version); + label_destroy(label_address); + label_destroy(label_arena); + label_destroy(label_players); + label_destroy(label_ping); - destroyWidgetSelect(select_server); + select_destroy(select_server); } diff --git a/src/screen/browser.h b/src/screen/browser.h index e810e58..eb22a05 100644 --- a/src/screen/browser.h +++ b/src/screen/browser.h @@ -23,11 +23,11 @@ typedef struct server_context { } server_t; -extern void startScreenBrowser(); -extern void drawScreenBrowser(); -extern void eventScreenBrowser(); -extern void stopScreenBrowser(); -extern void initScreenBrowser(); -extern void quitScreenBrowser(); +extern void browser_start(); +extern void browser_draw(); +extern void browser_event(); +extern void browser_stop(); +extern void browser_init(); +extern void browser_quit(); #endif diff --git a/src/screen/choiceArena.c b/src/screen/choiceArena.c index bf60c46..9e0d72a 100644 --- a/src/screen/choiceArena.c +++ b/src/screen/choiceArena.c @@ -47,54 +47,54 @@ static arenaFile_t *currentArena; static void hotkey_escape() { - setScreen("gameType"); + screen_set("gameType"); } -void startScreenChoiceArena() +void screen_startChoiceArena() { #ifndef NO_SOUND - playMusic("menu", MUSIC_GROUP_BASE); + music_play("menu", MUSIC_GROUP_BASE); #endif - registerHotKey(SDLK_ESCAPE, hotkey_escape); + hotKey_register(SDLK_ESCAPE, hotkey_escape); } -void drawScreenChoiceArena() +void choiceArena_draw() { int i; - drawWidgetImage(image_backgorund); + wid_image_draw(image_backgorund); - drawWidgetButton(button_play); - drawWidgetButton(button_back); - if (show_map_buttons.next) { drawWidgetButton(button_next); } - if (show_map_buttons.prev) { drawWidgetButton(button_prev); } + button_draw(button_play); + button_draw(button_back); + if (show_map_buttons.next) { button_draw(button_next); } + if (show_map_buttons.prev) { button_draw(button_prev); } for (i = show_map_buttons.min ; i < show_map_buttons.max; i++) { - drawWidgetButtonimage((widget_t*)listAllWidgetButtonimage->list[i]); + buttonImage_draw((widget_t*)listAllWidgetButtonimage->list[i]); } } -void eventScreenChoiceArena() +void choiceArena_event() { int i; - eventWidgetButton(button_play); - eventWidgetButton(button_back); - if (show_map_buttons.next) { eventWidgetButton(button_next); } - if (show_map_buttons.prev) { eventWidgetButton(button_prev); } + button_event(button_play); + button_event(button_back); + if (show_map_buttons.next) { button_event(button_next); } + if (show_map_buttons.prev) { button_event(button_prev); } for (i = show_map_buttons.min ; i < show_map_buttons.max; i++) { - eventWidgetButtonimage((widget_t*)listAllWidgetButtonimage->list[i]); + buttonImage_event((widget_t*)listAllWidgetButtonimage->list[i]); } } void stopScreenChoiceArena() { - unregisterHotKey(SDLK_ESCAPE); + unhotKey_register(SDLK_ESCAPE); } -static void eventWidgetButtonImage(void *p) +static void button_eventImage(void *p) { widget_t *buttonimage; int i; @@ -107,30 +107,30 @@ static void eventWidgetButtonImage(void *p) this = (widget_t *) (listAllWidgetButtonimage->list[i]); if (buttonimage == this) { - setWidgetButtonimageActive(this, TRUE); - currentArena = getArenaFile(i); + buttonImage_set_active(this, TRUE); + currentArena = arenaFile_get(i); } else { - setWidgetButtonimageActive(this, FALSE); + buttonImage_set_active(this, FALSE); } } } -arenaFile_t *getChoiceArena() +arenaFile_t *choiceArena_get() { return currentArena; } -void setChoiceArena(arenaFile_t * arenaFile) +void choiceArena_set(arenaFile_t * arenaFile) { widget_t *widget_buttonimage; int id; - id = getArenaFileID(arenaFile); + id = arenaFile_get_id(arenaFile); currentArena = arenaFile; if (id >= 0) { widget_buttonimage = (widget_t *) listAllWidgetButtonimage->list[id]; - setWidgetButtonimageActive(widget_buttonimage, TRUE); + buttonImage_set_active(widget_buttonimage, TRUE); } } @@ -141,11 +141,11 @@ static void eventWidget(void *p) button = (widget_t *) (p); if (button == button_play) { - setScreen("world"); + screen_set("world"); } if (button == button_back) { - setScreen("gameType"); + screen_set("gameType"); } if (button == button_next) { if (show_map_buttons.next) { @@ -168,42 +168,42 @@ static void eventWidget(void *p) static void activateHandledMapButtonGroup(void) { int min = handled_map_button_group * 6; min = min < 0 ? 0 : min; - min = min <= getArenaCount() ? min : getArenaCount(); - int max = min+6 <= getArenaCount() ? min+6 : getArenaCount(); + min = min <= arenaFile_get_count() ? min : arenaFile_get_count(); + int max = min+6 <= arenaFile_get_count() ? min+6 : arenaFile_get_count(); if (min) { show_map_buttons.prev = 1; } else { show_map_buttons.prev = 0; } - if (max < getArenaCount()) { show_map_buttons.next = 1; } + if (max < arenaFile_get_count()) { show_map_buttons.next = 1; } else { show_map_buttons.next = 0; } show_map_buttons.min = min; show_map_buttons.max = max; } -void initScreenChoiceArena() +void choiceArena_init() { image_t *image; int i; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); - image_backgorund = newWidgetImage(0, 0, image); + image = image_get(IMAGE_GROUP_BASE, "screen_main"); + image_backgorund = wid_image_new(0, 0, image); - button_back = newWidgetButton(_("back"), 100, WINDOW_SIZE_Y - 100, eventWidget); - button_play = newWidgetButton(_("play"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget); + button_back = button_new(_("back"), 100, WINDOW_SIZE_Y - 100, eventWidget); + button_play = button_new(_("play"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget); - button_prev = newWidgetButton(_("prev maps"), 250, WINDOW_SIZE_Y - 100, eventWidget); - button_next = newWidgetButton(_("next maps"), WINDOW_SIZE_X-350, WINDOW_SIZE_Y - 100, eventWidget); + button_prev = button_new(_("prev maps"), 250, WINDOW_SIZE_Y - 100, eventWidget); + button_next = button_new(_("next maps"), WINDOW_SIZE_X-350, WINDOW_SIZE_Y - 100, eventWidget); - listAllWidgetButtonimage = newList(); + listAllWidgetButtonimage = list_new(); currentArena = NULL; - for (i = 0; i < getArenaCount(); i++) { + for (i = 0; i < arenaFile_get_count(); i++) { widget_t *widget_buttonimage; arenaFile_t *arenaFile; int x, y; - arenaFile = getArenaFile(i); - //image = addImageData(getArenaImage(i), IMAGE_NO_ALPHA, "none", IMAGE_GROUP_BASE); - image = loadImageFromArena(arenaFile, getArenaImage(arenaFile), + arenaFile = arenaFile_get(i); + //image = image_add(arenaFile_get_image(i), IMAGE_NO_ALPHA, "none", IMAGE_GROUP_BASE); + image = arenaFile_load_image(arenaFile, arenaFile_get_image(arenaFile), IMAGE_GROUP_BASE, "none", IMAGE_NO_ALPHA); // only 6 map buttons can be shown at once; @@ -214,32 +214,32 @@ void initScreenChoiceArena() x = 100 + 200 * (pos - 3 * (pos / 3)); y = 150 + 200 * (pos / 3); - widget_buttonimage = newWidgetButtonimage(image, x, y, eventWidgetButtonImage); + widget_buttonimage = buttonImage_new(image, x, y, button_eventImage); /* if( i == choiceArenaId ) { widget_buttonimage->active = 1; } */ - addList(listAllWidgetButtonimage, widget_buttonimage); + list_add(listAllWidgetButtonimage, widget_buttonimage); handled_map_button_group = 0; activateHandledMapButtonGroup(); } - registerScreen( newScreen("chiceArena", startScreenChoiceArena, - eventScreenChoiceArena, drawScreenChoiceArena, + screen_register( screen_new("chiceArena", screen_startChoiceArena, + choiceArena_event, choiceArena_draw, stopScreenChoiceArena)); } -void quitScreenChoiceArena() +void choiceArena_quit() { - destroyWidgetImage(image_backgorund); + wid_image_destroy(image_backgorund); - destroyWidgetButton(button_play); - destroyWidgetButton(button_back); + button_destroy(button_play); + button_destroy(button_back); - destroyWidgetButton(button_next); - destroyWidgetButton(button_prev); + button_destroy(button_next); + button_destroy(button_prev); - destroyListItem(listAllWidgetButtonimage, destroyWidgetButtonimage); + list_destroy_item(listAllWidgetButtonimage, buttonImage_destroy); } diff --git a/src/screen/choiceArena.h b/src/screen/choiceArena.h index dbe12de..163ab60 100644 --- a/src/screen/choiceArena.h +++ b/src/screen/choiceArena.h @@ -9,11 +9,11 @@ # define SCREENSHOT_ARENA_WIDTH 160 # define SCREENSHOT_ARENA_HEIGHT 107 -extern void drawScreenChoiceArena(); -extern void eventScreenChoiceArena(); -extern arenaFile_t *getChoiceArena(); -extern void setChoiceArena(arenaFile_t * arenaFile); -extern void initScreenChoiceArena(); -extern void quitScreenChoiceArena(); +extern void choiceArena_draw(); +extern void choiceArena_event(); +extern arenaFile_t *choiceArena_get(); +extern void choiceArena_set(arenaFile_t * arenaFile); +extern void choiceArena_init(); +extern void choiceArena_quit(); #endif diff --git a/src/screen/credits.c b/src/screen/credits.c index 93745c2..c9521b1 100644 --- a/src/screen/credits.c +++ b/src/screen/credits.c @@ -31,26 +31,26 @@ static int creditExists; static void hotkey_escape() { - setScreen("mainMenu"); + screen_set("mainMenu"); } -void startScreenCredits() +void scredits_start() { #ifndef NO_SOUND - playMusic("menu", MUSIC_GROUP_BASE); + music_play("menu", MUSIC_GROUP_BASE); #endif offset = 0; - registerHotKey(SDLK_ESCAPE, hotkey_escape); + hotKey_register(SDLK_ESCAPE, hotkey_escape); } -void drawScreenCredits() +void scredits_draw() { int i; - drawWidgetImage(image_backgorund); + wid_image_draw(image_backgorund); - drawWidgetButton(button_back); + button_draw(button_back); for (i = 0; i < listWidgetLabel->count; i++) { int z; @@ -63,7 +63,7 @@ void drawScreenCredits() this->y += offset; if (this->y > SCREEN_CREDITS_OFFSET_MIN && this->y < SCREEN_CREDITS_OFFSET_MAX) { - drawWidgetLabel(this); + label_draw(this); } this->y = z; @@ -71,9 +71,9 @@ void drawScreenCredits() } -void eventScreenCredits() +void scredits_event() { - eventWidgetButton(button_back); + button_event(button_back); offset -= SCREEN_CREDITS_OFFSET_SPEED; @@ -84,9 +84,9 @@ void eventScreenCredits() //printf("offset = %d\n", offset); } -void stopScreenCredits() +void scredits_stop() { - unregisterHotKey(SDLK_ESCAPE); + unhotKey_register(SDLK_ESCAPE); } static void eventWidget(void *p) @@ -96,26 +96,26 @@ static void eventWidget(void *p) button = (widget_t *) (p); if (button == button_back) { - setScreen("mainMenu"); + screen_set("mainMenu"); } } -void initScreenCredits() +void scredits_init() { image_t *image; int i; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); - image_backgorund = newWidgetImage(0, 0, image); + image = image_get(IMAGE_GROUP_BASE, "screen_main"); + image_backgorund = wid_image_new(0, 0, image); - button_back = newWidgetButton(_("back"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, + button_back = button_new(_("back"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, WINDOW_SIZE_Y - 80, eventWidget); - listWidgetLabel = newList(); + listWidgetLabel = list_new(); if (tryExistFile(PATH_DOC SCREEN_CREDITS_FILE) == 0) { creditExists = 1; - textFile = loadTextFile(PATH_DOC SCREEN_CREDITS_FILE); + textFile = textFile_load(PATH_DOC SCREEN_CREDITS_FILE); for (i = 0; i < textFile->text->count; i++) { widget_t *label; @@ -123,11 +123,11 @@ void initScreenCredits() line = (char *) textFile->text->list[i]; - label = newWidgetLabel(line, WINDOW_SIZE_X / 2 - WINDOW_SIZE_X / 4, + label = label_new(line, WINDOW_SIZE_X / 2 - WINDOW_SIZE_X / 4, (WINDOW_SIZE_Y - 100) + i * 20, WIDGET_LABEL_LEFT); - addList(listWidgetLabel, label); + list_add(listWidgetLabel, label); } } else { for (i = 0; i < 5; i++) { @@ -138,26 +138,26 @@ void initScreenCredits() sprintf(line, _("Credit file not found... %s/%s"), PATH_DOC, SCREEN_CREDITS_FILE); - label = newWidgetLabel(line, WINDOW_SIZE_X / 2, + label = label_new(line, WINDOW_SIZE_X / 2, (WINDOW_SIZE_Y - 100) + i * 20, WIDGET_LABEL_CENTER); - addList(listWidgetLabel, label); + list_add(listWidgetLabel, label); } } - registerScreen(newScreen ("credits", startScreenCredits, eventScreenCredits, - drawScreenCredits, stopScreenCredits)); + screen_register(screen_new ("credits", scredits_start, scredits_event, + scredits_draw, scredits_stop)); } -void quitScreenCredits() +void scredits_quit() { - destroyWidgetImage(image_backgorund); + wid_image_destroy(image_backgorund); - destroyWidgetButton(button_back); - destroyListItem(listWidgetLabel, destroyWidgetLabel); + button_destroy(button_back); + list_destroy_item(listWidgetLabel, label_destroy); if (creditExists) { - destroyTextFile(textFile); + textFile_destroy(textFile); } } diff --git a/src/screen/credits.h b/src/screen/credits.h index 37c25f3..0b05312 100644 --- a/src/screen/credits.h +++ b/src/screen/credits.h @@ -10,11 +10,11 @@ # define SCREEN_CREDITS_OFFSET_RESTART -1000 # define SCREEN_CREDITS_OFFSET_SPEED 2 -extern void startScreenCredits(); -extern void drawScreenCredits(); -extern void eventScreenCredits(); -extern void stopScreenCredits(); -extern void initScreenCredits(); -extern void quitScreenCredits(); +extern void scredits_start(); +extern void scredits_draw(); +extern void scredits_event(); +extern void scredits_stop(); +extern void scredits_init(); +extern void scredits_quit(); #endif diff --git a/src/screen/downArena.c b/src/screen/downArena.c index 3328046..7752513 100644 --- a/src/screen/downArena.c +++ b/src/screen/downArena.c @@ -53,8 +53,8 @@ static int countSendMsg; static void setStatusString(char *s) { printf("status -> %s\n", s); - destroyWidgetLabel(label_status); - label_status = newWidgetLabel(s, WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); + label_destroy(label_status); + label_status = label_new(s, WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); } static void connectToDownServer() @@ -62,38 +62,38 @@ static void connectToDownServer() char status[STR_SIZE]; char msg[STR_PROTO_SIZE]; - sock_server_tcp = connectTcpSocket(getSettingIP(), getSettingPort()); + sock_server_tcp = sock_tcp_connect(publicServer_get_settingIP(), publicServer_get_settingPort()); if( sock_server_tcp == NULL ) { - sprintf(status, "I do not connect to %s %d TCP down server", getSettingIP(), getSettingPort()); + sprintf(status, "I do not connect to %s %d TCP down server", publicServer_get_settingIP(), publicServer_get_settingPort()); setStatusString(status); return; } - setTcpSockNonBlock(sock_server_tcp); + sock_tcp_set_non_block(sock_server_tcp); - recvBuffer = newBuffer(DOWN_ARENA_BUFFER_SIZE); - sendBuffer = newBuffer(DOWN_ARENA_BUFFER_SIZE); + recvBuffer = buffer_new(DOWN_ARENA_BUFFER_SIZE); + sendBuffer = buffer_new(DOWN_ARENA_BUFFER_SIZE); status_tcp_socket = DOWN_SERVER_STATUS_OK; file = NULL; countSendMsg = 0; - timeSendMsg = getMyTime(); + timeSendMsg = timer_get_current_time(); sprintf(msg, "GETARENA %s\n", arenaNetName); - addBuffer(sendBuffer, msg, strlen(msg)); + buffer_append(sendBuffer, msg, strlen(msg)); - sprintf(status, "Connect to %s %d TCP down server", getSettingIP(), getSettingPort()); + sprintf(status, "Connect to %s %d TCP down server", publicServer_get_settingIP(), publicServer_get_settingPort()); setStatusString(status); } static void closeConnectFromDownServer() { - closeTcpSocket(sock_server_tcp); - destroyBuffer(recvBuffer); - destroyBuffer(sendBuffer); + sock_tcp_close(sock_server_tcp); + buffer_destroy(recvBuffer); + buffer_destroy(sendBuffer); sock_server_tcp = NULL; recvBuffer = NULL; sendBuffer = NULL; @@ -106,52 +106,52 @@ static void sendStatusToGameServer() if( countSendMsg > DOWN_ARENA_MAX_SEND_MSG_STATUS ) { char status[STR_SIZE]; - sprintf(status, "Game server %s %d is down", getSettingIP(), getSettingPort()); + sprintf(status, "Game server %s %d is down", publicServer_get_settingIP(), publicServer_get_settingPort()); setStatusString(status); return; } - timeSendMsg = getMyTime(); + timeSendMsg = timer_get_current_time(); countSendMsg++; printf("countSendMsg = %d\n", countSendMsg++); - if( writeUdpSocket(sock_server_udp, sock_server_udp, msg, strlen(msg)) < 0 ) + if( sock_udp_write(sock_server_udp, sock_server_udp, msg, strlen(msg)) < 0 ) { char status[STR_SIZE]; - sprintf(status, "I do not send message to %s %d UDP game server", getSettingIP(), getSettingPort()); + sprintf(status, "I do not send message to %s %d UDP game server", publicServer_get_settingIP(), publicServer_get_settingPort()); setStatusString(status); } } -void startScreenDownArena() +void downArena_start() { char status[STR_SIZE]; strcpy(str_status, "none"); memset(arenaNetName, 0, STR_SIZE); - sock_server_udp = connectUdpSocket(getSettingIP(), getSettingPort()); + sock_server_udp = sock_udp_connect(publicServer_get_settingIP(), publicServer_get_settingPort()); if (sock_server_udp == NULL) { - sprintf(status, "I do not connect to %s %d UDP game server", getSettingIP(), getSettingPort()); + sprintf(status, "I do not connect to %s %d UDP game server", publicServer_get_settingIP(), publicServer_get_settingPort()); setStatusString(status); return; } - setUdpSockNonBlock(sock_server_udp); + sock_udp_set_non_block(sock_server_udp); - sprintf(status, "Connect to %s %d UDP game server", getSettingIP(), getSettingPort()); + sprintf(status, "Connect to %s %d UDP game server", publicServer_get_settingIP(), publicServer_get_settingPort()); setStatusString(status); sendStatusToGameServer(); } -void drawScreenDownArena() +void downArena_draw() { - drawWidgetImage(image_backgorund); - drawWidgetLabel(label_status); - drawWidgetButton(button_back); + wid_image_draw(image_backgorund); + label_draw(label_status); + button_draw(button_back); } static void proto_ok(char *line) @@ -160,7 +160,7 @@ static void proto_ok(char *line) fileSize = atoi(line + 3); fileOffset = 0; - sprintf(path, "%s/%s.zip", getHomeDirector(), arenaNetName); + sprintf(path, "%s/%s.zip", homeDirector_get(), arenaNetName); //printf("path = %s\n", path); file = fopen(path, "wb"); } @@ -191,9 +191,9 @@ static int downArenaFile() void *data; int len; - len = getBufferSize(recvBuffer); - data = getBufferData(recvBuffer); - cutBuffer(recvBuffer, len); + len = buffer_get_size(recvBuffer); + data = buffer_get_data(recvBuffer); + buffer_cut(recvBuffer, len); fwrite(data, len, 1, file); fileOffset += len; @@ -212,14 +212,14 @@ static int eventRecvBuffer() memset(buffer, 0, STR_PROTO_SIZE); - ret = readTcpSocket(sock_server_tcp, buffer, STR_PROTO_SIZE - 1); - //if (ret <= 0) printf("readTcpSocket = %d\n", ret); + ret = sock_tcp_read(sock_server_tcp, buffer, STR_PROTO_SIZE - 1); + //if (ret <= 0) printf("sock_tcp_read = %d\n", ret); if (ret < 0) { return -1; } - if (addBuffer(recvBuffer, buffer, ret) < 0) { + if (buffer_append(recvBuffer, buffer, ret) < 0) { char status[STR_SIZE]; sprintf(status, "Error -- recv buffer is full"); setStatusString(status); @@ -227,7 +227,7 @@ static int eventRecvBuffer() return -1; } - if (file == NULL && getBufferLine(recvBuffer, line, STR_PROTO_SIZE) >= 0) { + if (file == NULL && buffer_get_line(recvBuffer, line, STR_PROTO_SIZE) >= 0) { eventProto(line); return ret; } @@ -245,21 +245,21 @@ static int eventSendBuffer() int len; int res; - len = getBufferSize(sendBuffer); + len = buffer_get_size(sendBuffer); if (len == 0) { return -1; } - data = getBufferData(sendBuffer); + data = buffer_get_data(sendBuffer); - res = writeTcpSocket(sock_server_tcp, data, len); + res = sock_tcp_write(sock_server_tcp, data, len); if (res < 0) { return -1; } - cutBuffer(sendBuffer, res); + buffer_cut(sendBuffer, res); return res; } @@ -277,12 +277,12 @@ static void readArenaFromStatus() offset_end = strstr(offset_begin, "\n"); if (offset_end != NULL) { - closeUdpSocket(sock_server_udp); + sock_udp_close(sock_server_udp); sock_server_udp = NULL; strncpy(arenaNetName, offset_begin, offset_end - offset_begin); - if (getArenaFileFormNetName(arenaNetName) != NULL) { - setScreen("world"); + if (arenaFile_get_file_format_net_name(arenaNetName) != NULL) { + screen_set("world"); return; } @@ -295,19 +295,19 @@ static void readArenaFromStatus() static void eventStatus() { - if( getMyTime() - timeSendMsg > DOWN_ARENA_MAX_TIEMOUT_LIMIT ) + if( timer_get_current_time() - timeSendMsg > DOWN_ARENA_MAX_TIEMOUT_LIMIT ) { sendStatusToGameServer(); } - if( readUdpSocket(sock_server_udp, sock_server_udp, str_status, STR_PROTO_SIZE - 1) > 0 ) + if( sock_udp_read(sock_server_udp, sock_server_udp, str_status, STR_PROTO_SIZE - 1) > 0 ) { //printf("str_status = %s\n", str_status); readArenaFromStatus(); } } -void eventScreenDownArena() +void downArena_event() { int i; @@ -331,14 +331,14 @@ void eventScreenDownArena() fclose(file); file = NULL; closeConnectFromDownServer(); - loadArenaFile(path); - setScreen("world"); + arenaFile_load(path); + screen_set("world"); } - eventWidgetButton(button_back); + button_event(button_back); } -void stopScreenDownArena() +void downArena_stop() { if (file != NULL) { unlink(path); @@ -349,7 +349,7 @@ void stopScreenDownArena() } if (sock_server_udp != NULL) { - closeUdpSocket(sock_server_udp); + sock_udp_close(sock_server_udp); } } @@ -361,31 +361,31 @@ static void eventWidget(void *p) button = (widget_t *) (p); if (button == button_back) { - setScreen("mainMenu"); + screen_set("mainMenu"); } } -void initScreenDownArena() +void downArena_init() { image_t *image; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); - image_backgorund = newWidgetImage(0, 0, image); + image = image_get(IMAGE_GROUP_BASE, "screen_main"); + image_backgorund = wid_image_new(0, 0, image); button_back = - newWidgetButton(_("back"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, + button_new(_("back"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, WINDOW_SIZE_Y - 80, eventWidget); label_status = - newWidgetLabel("none", WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); + label_new("none", WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER); - registerScreen( newScreen("downArena", startScreenDownArena, eventScreenDownArena, - drawScreenDownArena, stopScreenDownArena)); + screen_register( screen_new("downArena", downArena_start, downArena_event, + downArena_draw, downArena_stop)); } -void quitScreenDownArena() +void downArena_quit() { - destroyWidgetImage(image_backgorund); - destroyWidgetButton(button_back); - destroyWidgetLabel(label_status); + wid_image_destroy(image_backgorund); + button_destroy(button_back); + label_destroy(label_status); } diff --git a/src/screen/downArena.h b/src/screen/downArena.h index d9f25d7..2ce5f07 100644 --- a/src/screen/downArena.h +++ b/src/screen/downArena.h @@ -12,11 +12,11 @@ # define DOWN_ARENA_MAX_TIEMOUT_LIMIT 500 # define DOWN_ARENA_COUNT_READ_SOCKET 100 -extern void startScreenDownArena(); -extern void drawScreenDownArena(); -extern void eventScreenDownArena(); -extern void stopScreenDownArena(); -extern void initScreenDownArena(); -extern void quitScreenDownArena(); +extern void downArena_start(); +extern void downArena_draw(); +extern void downArena_event(); +extern void downArena_stop(); +extern void downArena_init(); +extern void downArena_quit(); #endif diff --git a/src/screen/gameType.c b/src/screen/gameType.c index a8f0b2a..f143a2b 100644 --- a/src/screen/gameType.c +++ b/src/screen/gameType.c @@ -62,9 +62,9 @@ static void loadSession(widget_t * p) director_t *director; int i; - director = loadDirector(getHomeDirector()); + director = director_load(homeDirector_get()); - removeAllFromWidgetSelect(p); + select_remove_all(p); if (director == NULL) { return; @@ -76,79 +76,79 @@ static void loadSession(widget_t * p) line = director->list->list[i]; if (strstr(line, ".sav") != NULL) { - addToWidgetSelect(p, line); + select_add(p, line); } } - destroyDirector(director); + director_destroy(director); } static void hotkey_escape() { - setScreen("mainMenu"); + screen_set("mainMenu"); } -void startScreenGameType() +void screen_startGameType() { #ifndef NO_SOUND - playMusic("menu", MUSIC_GROUP_BASE); + music_play("menu", MUSIC_GROUP_BASE); #endif - setWidgetChoiceStatus(check_none, TRUE); - setWidgetChoiceStatus(check_server, FALSE); - setWidgetChoiceStatus(check_client, FALSE); - setWidgetChoiceStatus(check_load_session, FALSE); + choiceGroup_set_status(check_none, TRUE); + choiceGroup_set_status(check_server, FALSE); + choiceGroup_set_status(check_client, FALSE); + choiceGroup_set_status(check_load_session, FALSE); loadSession(selectSession); - registerHotKey(SDLK_ESCAPE, hotkey_escape); + hotKey_register(SDLK_ESCAPE, hotkey_escape); } -void drawScreenGameType() +void gameType_draw() { int i; - drawWidgetImage(image_backgorund); + wid_image_draw(image_backgorund); for (i = 0; i < listChoiceGroup->count; i++) { widget_t *this; this = (widget_t *) listChoiceGroup->list[i]; - drawWidgetChoicegroup(this); + choiceGroup_draw(this); } - drawWidgetLabel(label_none); - drawWidgetLabel(label_server); - drawWidgetLabel(label_client); - drawWidgetLabel(label_load_session); + label_draw(label_none); + label_draw(label_server); + label_draw(label_client); + label_draw(label_load_session); - if (getWidgetChoiceStatus(check_server) == TRUE || getWidgetChoiceStatus(check_client) == TRUE) { - drawWidgetLabel(label_port); - drawWidgetTextfield(textfield_port); - drawWidgetLabel(label_ip); - drawWidgetTextfield(textfield_ip); + if (choiceGroup_get_status(check_server) == TRUE || choiceGroup_get_status(check_client) == TRUE) { + label_draw(label_port); + textField_draw(textfield_port); + label_draw(label_ip); + textField_draw(textfield_ip); } - if (getWidgetChoiceStatus(check_load_session) == TRUE) { - drawWidgetLabel(label_session); - drawWidgetSelect(selectSession); + if (choiceGroup_get_status(check_load_session) == TRUE) { + label_draw(label_session); + select_draw(selectSession); } #if 0 if (check_server->status == TRUE) { - setSettingIP(getParamElse("--ip", "127.0.0.1")); - setSettingPort(atoi(getParamElse("--port", "2200"))); + gameType_set_ip(getParamElse("--ip", "127.0.0.1")); + gameType_set_port(atoi(getParamElse("--port", "2200"))); } #endif - if (getWidgetChoiceStatus(check_client) == TRUE) - drawWidgetButton(button_browser); + if (choiceGroup_get_status(check_client) == TRUE) + button_draw(button_browser); - drawWidgetButton(button_back); - drawWidgetButton(button_play); + button_draw(button_back); + button_draw(button_play); } -void eventScreenGameType() +void gameType_event() { int i; @@ -156,28 +156,28 @@ void eventScreenGameType() widget_t *this; this = (widget_t *) listChoiceGroup->list[i]; - eventWidgetChoicegroup(this); + choiceGroup_event(this); } - if (getWidgetChoiceStatus(check_server) == TRUE || getWidgetChoiceStatus(check_client) == TRUE) { - eventWidgetTextfield(textfield_ip); - eventWidgetTextfield(textfield_port); + if (choiceGroup_get_status(check_server) == TRUE || choiceGroup_get_status(check_client) == TRUE) { + textField_event(textfield_ip); + textField_event(textfield_port); } - if (getWidgetChoiceStatus(check_load_session) == TRUE) { - eventWidgetSelect(selectSession); + if (choiceGroup_get_status(check_load_session) == TRUE) { + select_event(selectSession); } - eventWidgetButton(button_back); - eventWidgetButton(button_play); + button_event(button_back); + button_event(button_play); - if (getWidgetChoiceStatus(check_client) == TRUE) - eventWidgetButton(button_browser); + if (choiceGroup_get_status(check_client) == TRUE) + button_event(button_browser); } void stopScreenGameType() { - unregisterHotKey(SDLK_ESCAPE); + unhotKey_register(SDLK_ESCAPE); } static void eventWidget(void *p) @@ -187,110 +187,110 @@ static void eventWidget(void *p) button = (widget_t *) (p); if (button == button_back) { - setScreen("mainMenu"); + screen_set("mainMenu"); } if (button == button_play) { char *str; - str = getGemeTypeLoadSession(); + str = gameType_load_session(); if (str != NULL) { - setScreen("world"); + screen_set("world"); return; } - if (getSettingGameType() == NET_GAME_TYPE_CLIENT) { - setScreen("downArena"); - //setScreen("world"); + if (publicServer_get_settingGameType() == NET_GAME_TYPE_CLIENT) { + screen_set("downArena"); + //screen_set("world"); } else { - setScreen("chiceArena"); + screen_set("chiceArena"); } } if (button == button_browser) { - setScreen("browser"); + screen_set("browser"); } } -void initScreenGameType() +void gameType_init() { image_t *image; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); - image_backgorund = newWidgetImage(0, 0, image); + image = image_get(IMAGE_GROUP_BASE, "screen_main"); + image_backgorund = wid_image_new(0, 0, image); - button_back = newWidgetButton(_("back"), 100, WINDOW_SIZE_Y - 100, eventWidget); - button_play = newWidgetButton(_("play"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget); - button_browser = newWidgetButton(_("browser"), 300, 345, eventWidget); + button_back = button_new(_("back"), 100, WINDOW_SIZE_Y - 100, eventWidget); + button_play = button_new(_("play"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget); + button_browser = button_new(_("browser"), 300, 345, eventWidget); - listChoiceGroup = newList(); - check_none = newWidgetChoicegroup(100, 150, FALSE, listChoiceGroup, eventWidget); - check_server = newWidgetChoicegroup(100, 200, FALSE, listChoiceGroup, eventWidget); - check_client = newWidgetChoicegroup(100, 250, FALSE, listChoiceGroup, eventWidget); - check_load_session = newWidgetChoicegroup(100, 300, FALSE, listChoiceGroup, eventWidget); + listChoiceGroup = list_new(); + check_none = choiceGroup_new(100, 150, FALSE, listChoiceGroup, eventWidget); + check_server = choiceGroup_new(100, 200, FALSE, listChoiceGroup, eventWidget); + check_client = choiceGroup_new(100, 250, FALSE, listChoiceGroup, eventWidget); + check_load_session = choiceGroup_new(100, 300, FALSE, listChoiceGroup, eventWidget); if (isParamFlag("--server")) { - setWidgetChoiceStatus(check_server, TRUE); + choiceGroup_set_status(check_server, TRUE); } else if (isParamFlag("--client")) { - setWidgetChoiceStatus(check_client, TRUE); + choiceGroup_set_status(check_client, TRUE); } else { - setWidgetChoiceStatus(check_none, TRUE); + choiceGroup_set_status(check_none, TRUE); } - label_none = newWidgetLabel(_("Local game"), 130, 145, WIDGET_LABEL_LEFT); - label_server = newWidgetLabel(_("Set up a server"), 130, 195, WIDGET_LABEL_LEFT); - label_client = newWidgetLabel(_("Network game"), 130, 245, WIDGET_LABEL_LEFT); - label_load_session = newWidgetLabel("load session", 130, 295, WIDGET_LABEL_LEFT); + label_none = label_new(_("Local game"), 130, 145, WIDGET_LABEL_LEFT); + label_server = label_new(_("Set up a server"), 130, 195, WIDGET_LABEL_LEFT); + label_client = label_new(_("Network game"), 130, 245, WIDGET_LABEL_LEFT); + label_load_session = label_new("load session", 130, 295, WIDGET_LABEL_LEFT); - label_ip = newWidgetLabel(_("IP"), 300, 145, WIDGET_LABEL_LEFT); - label_port = newWidgetLabel(_("port"), 300, 245, WIDGET_LABEL_LEFT); - label_session = newWidgetLabel("load session :", 300, 145, WIDGET_LABEL_LEFT); + label_ip = label_new(_("IP"), 300, 145, WIDGET_LABEL_LEFT); + label_port = label_new(_("port"), 300, 245, WIDGET_LABEL_LEFT); + label_session = label_new("load session :", 300, 145, WIDGET_LABEL_LEFT); - textfield_ip = newWidgetTextfield(getParamElse("--ip", "127.0.0.1"), + textfield_ip = textField_new(getParamElse("--ip", "127.0.0.1"), WIDGET_TEXTFIELD_FILTER_IP_OR_DOMAIN, 300, 180); - textfield_port = newWidgetTextfield(getParamElse("--port", "6800"), + textfield_port = textField_new(getParamElse("--port", "6800"), WIDGET_TEXTFIELD_FILTER_NUM, 300, 280); - selectSession = newWidgetSelect(300, 185, eventWidget); + selectSession = select_new(300, 185, eventWidget); - registerScreen( newScreen("gameType", startScreenGameType, eventScreenGameType, - drawScreenGameType, stopScreenGameType)); + screen_register( screen_new("gameType", screen_startGameType, gameType_event, + gameType_draw, stopScreenGameType)); } int setSettingGameType(int status) { if (status == NET_GAME_TYPE_NONE) { - setWidgetChoiceStatus(check_none, TRUE); + choiceGroup_set_status(check_none, TRUE); return 0; } if (status == NET_GAME_TYPE_SERVER) { - setWidgetChoiceStatus(check_server, TRUE); + choiceGroup_set_status(check_server, TRUE); return 0; } if (status == NET_GAME_TYPE_CLIENT) { - setWidgetChoiceStatus(check_client, TRUE); + choiceGroup_set_status(check_client, TRUE); return 0; } return -1; } -int getSettingGameType() +int publicServer_get_settingGameType() { - if (getWidgetChoiceStatus(check_none) == TRUE || getWidgetChoiceStatus(check_load_session) == TRUE) { + if (choiceGroup_get_status(check_none) == TRUE || choiceGroup_get_status(check_load_session) == TRUE) { return NET_GAME_TYPE_NONE; } - if (getWidgetChoiceStatus(check_server) == TRUE) { + if (choiceGroup_get_status(check_server) == TRUE) { return NET_GAME_TYPE_SERVER; } - if (getWidgetChoiceStatus(check_client) == TRUE) { + if (choiceGroup_get_status(check_client) == TRUE) { return NET_GAME_TYPE_CLIENT; } @@ -299,52 +299,52 @@ int getSettingGameType() return -1; } -char *getGemeTypeLoadSession() +char *gameType_load_session() { - if (getWidgetChoiceStatus(check_load_session) == TRUE) { - return getWidgetSelectItem(selectSession); + if (choiceGroup_get_status(check_load_session) == TRUE) { + return select_get_item(selectSession); } return NULL; } -int setSettingIP(char *address) +int gameType_set_ip(char *address) { char str[STR_SIZE]; strcpy(str, address); - setWidgetTextFiledText(textfield_ip, str); + textField_set_text(textfield_ip, str); return 1; } -char *getSettingIP() +char *publicServer_get_settingIP() { - return getTextFromWidgetTextfield(textfield_ip); + return textField_get_text(textfield_ip); } -int setSettingPort(int port) +int gameType_set_port(int port) { char str[STR_SIZE]; sprintf(str, "%d", port); - setWidgetTextFiledText(textfield_port, str); + textField_set_text(textfield_port, str); return 0; } -int getSettingPort() +int publicServer_get_settingPort() { - return atoi(getTextFromWidgetTextfield(textfield_port)); + return atoi(textField_get_text(textfield_port)); } -int getSettingProto() +int publicServer_get_settingProto() { - if (strstr(getTextFromWidgetTextfield(textfield_ip), ".") != NULL) { + if (strstr(textField_get_text(textfield_ip), ".") != NULL) { return PROTO_UDPv4; } - if (strstr(getTextFromWidgetTextfield(textfield_ip), ":") != NULL) { + if (strstr(textField_get_text(textfield_ip), ":") != NULL) { return PROTO_UDPv6; } @@ -353,32 +353,32 @@ int getSettingProto() return -1; } -void quitScreenGameType() +void gameType_quit() { - destroyWidgetImage(image_backgorund); + wid_image_destroy(image_backgorund); - destroyWidgetLabel(label_none); - destroyWidgetLabel(label_server); - destroyWidgetLabel(label_client); - destroyWidgetLabel(label_load_session); + label_destroy(label_none); + label_destroy(label_server); + label_destroy(label_client); + label_destroy(label_load_session); - destroyWidgetLabel(label_ip); - destroyWidgetLabel(label_port); - destroyWidgetLabel(label_session); + label_destroy(label_ip); + label_destroy(label_port); + label_destroy(label_session); - destroyWidgetTextfield(textfield_ip); - destroyWidgetTextfield(textfield_port); + textField_destroy(textfield_ip); + textField_destroy(textfield_port); - destroyWidgetSelect(selectSession); + select_destroy(selectSession); - destroyWidgetButton(button_back); - destroyWidgetButton(button_play); - destroyWidgetButton(button_browser); + button_destroy(button_back); + button_destroy(button_play); + button_destroy(button_browser); - destroyWidgetChoicegroup(check_none); - destroyWidgetChoicegroup(check_server); - destroyWidgetChoicegroup(check_client); - destroyWidgetChoicegroup(check_load_session); + choiceGroup_destroy(check_none); + choiceGroup_destroy(check_server); + choiceGroup_destroy(check_client); + choiceGroup_destroy(check_load_session); - destroyList(listChoiceGroup); + list_destroy(listChoiceGroup); } diff --git a/src/screen/gameType.h b/src/screen/gameType.h index 2c836fc..a2b4457 100644 --- a/src/screen/gameType.h +++ b/src/screen/gameType.h @@ -5,17 +5,17 @@ # include "main.h" -extern void drawScreenGameType(); -extern void eventScreenGameType(); -extern void initScreenGameType(); +extern void gameType_draw(); +extern void gameType_event(); +extern void gameType_init(); extern int setSettingGameType(int status); -extern int getSettingGameType(); -extern char *getGemeTypeLoadSession(); -extern int setSettingIP(char *address); -extern char *getSettingIP(); -extern int setSettingPort(int port); -extern int getSettingPort(); -extern int getSettingProto(); -extern void quitScreenGameType(); +extern int publicServer_get_settingGameType(); +extern char *gameType_load_session(); +extern int gameType_set_ip(char *address); +extern char *publicServer_get_settingIP(); +extern int gameType_set_port(int port); +extern int publicServer_get_settingPort(); +extern int publicServer_get_settingProto(); +extern void gameType_quit(); #endif diff --git a/src/screen/mainMenu.c b/src/screen/mainMenu.c index 56ebd4c..d9df377 100644 --- a/src/screen/mainMenu.c +++ b/src/screen/mainMenu.c @@ -34,41 +34,41 @@ static widget_t *button_end; static void hotkey_escape() { - quitGame(); + game_quit(); } -void startScreenMainMenu() +void mainMenu_start() { #ifndef NO_SOUND - playMusic("menu", MUSIC_GROUP_BASE); + music_play("menu", MUSIC_GROUP_BASE); #endif - registerHotKey(SDLK_ESCAPE, hotkey_escape); + hotKey_register(SDLK_ESCAPE, hotkey_escape); } -void drawScreenMainMenu() +void mainMenu_draw() { - drawWidgetImage(image_backgorund); + wid_image_draw(image_backgorund); - drawWidgetButton(button_play); - drawWidgetButton(button_setting); - drawWidgetButton(button_table); - drawWidgetButton(button_credits); - drawWidgetButton(button_end); + button_draw(button_play); + button_draw(button_setting); + button_draw(button_table); + button_draw(button_credits); + button_draw(button_end); } -void eventScreenMainMenu() +void mainMenu_event() { - eventWidgetButton(button_play); - eventWidgetButton(button_setting); - eventWidgetButton(button_table); - eventWidgetButton(button_credits); - eventWidgetButton(button_end); + button_event(button_play); + button_event(button_setting); + button_event(button_table); + button_event(button_credits); + button_event(button_end); } -void stopScreenMainMenu() +void mainMenu_stop() { - unregisterHotKey(SDLK_ESCAPE); + unhotKey_register(SDLK_ESCAPE); } static void eventWidget(void *p) @@ -78,56 +78,56 @@ static void eventWidget(void *p) button = (widget_t *) (p); if (button == button_play) { - setScreen("gameType"); + screen_set("gameType"); } if (button == button_setting) { - setScreen("setting"); + screen_set("setting"); } if (button == button_table) { - setScreen("table"); + screen_set("table"); } if (button == button_credits) { - setScreen("credits"); + screen_set("credits"); } if (button == button_end) { - quitGame(); + game_quit(); } } -void initScreenMainMenu() +void mainMenu_init() { image_t *image; image = - addImageData("screen_main.png", IMAGE_NO_ALPHA, "screen_main", + image_add("screen_main.png", IMAGE_NO_ALPHA, "screen_main", IMAGE_GROUP_BASE); - image_backgorund = newWidgetImage(0, 0, image); + image_backgorund = wid_image_new(0, 0, image); - button_play = newWidgetButton(_("Start game"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 200, eventWidget); - button_setting = newWidgetButton(_("Settings"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 250, eventWidget); - button_table = newWidgetButton(_("Highscore"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 300, eventWidget); - button_credits = newWidgetButton(_("Credits"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 350, eventWidget); - button_end = newWidgetButton(_("Quit game"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 400, eventWidget); + button_play = button_new(_("Start game"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 200, eventWidget); + button_setting = button_new(_("Settings"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 250, eventWidget); + button_table = button_new(_("Highscore"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 300, eventWidget); + button_credits = button_new(_("Credits"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 350, eventWidget); + button_end = button_new(_("Quit game"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, 400, eventWidget); #ifndef NO_SOUND - addMusic("menu.ogg", "menu", MUSIC_GROUP_BASE); + music_add("menu.ogg", "menu", MUSIC_GROUP_BASE); #endif - registerScreen( newScreen("mainMenu", startScreenMainMenu, eventScreenMainMenu, - drawScreenMainMenu, stopScreenMainMenu)); + screen_register( screen_new("mainMenu", mainMenu_start, mainMenu_event, + mainMenu_draw, mainMenu_stop)); } -void quitScreenMainMenu() +void mainMenu_quit() { - destroyWidgetImage(image_backgorund); + wid_image_destroy(image_backgorund); - destroyWidgetButton(button_play); - destroyWidgetButton(button_setting); - destroyWidgetButton(button_table); - destroyWidgetButton(button_credits); - destroyWidgetButton(button_end); + button_destroy(button_play); + button_destroy(button_setting); + button_destroy(button_table); + button_destroy(button_credits); + button_destroy(button_end); } diff --git a/src/screen/mainMenu.h b/src/screen/mainMenu.h index ecb369b..84048a1 100644 --- a/src/screen/mainMenu.h +++ b/src/screen/mainMenu.h @@ -5,11 +5,11 @@ # include "main.h" -extern void startScreenMainMenu(); -extern void drawScreenMainMenu(); -extern void eventScreenMainMenu(); -extern void stopScreenMainMenu(); -extern void initScreenMainMenu(); -extern void quitScreenMainMenu(); +extern void mainMenu_start(); +extern void mainMenu_draw(); +extern void mainMenu_event(); +extern void mainMenu_stop(); +extern void mainMenu_init(); +extern void mainMenu_quit(); #endif diff --git a/src/screen/setting.c b/src/screen/setting.c index 1895ec2..d5c5c1a 100644 --- a/src/screen/setting.c +++ b/src/screen/setting.c @@ -81,107 +81,107 @@ static textFile_t *configFile; static void hotkey_escape() { - setScreen("mainMenu"); + screen_set("mainMenu"); } -void startScreenSetting() +void screen_startSetting() { #ifndef NO_SOUND - playMusic("menu", MUSIC_GROUP_BASE); + music_play("menu", MUSIC_GROUP_BASE); #endif - registerHotKey(SDLK_ESCAPE, hotkey_escape); + hotKey_register(SDLK_ESCAPE, hotkey_escape); } -void drawScreenSetting() +void setting_draw() { int i; - drawWidgetImage(image_backgorund); + wid_image_draw(image_backgorund); - drawWidgetLabel(label_count_round); - drawWidgetLabel(label_name_player1); - drawWidgetLabel(label_ai); + label_draw(label_count_round); + label_draw(label_name_player1); + label_draw(label_ai); #ifndef NO_SOUND - drawWidgetLabel(label_music); - drawWidgetLabel(label_sound); + label_draw(label_music); + label_draw(label_sound); #endif - drawWidgetTextfield(textfield_count_cound); - drawWidgetTextfield(textfield_name_player1); + textField_draw(textfield_count_cound); + textField_draw(textfield_name_player1); - if (getWidgetCheckStatus(check_ai) == FALSE) { - drawWidgetLabel(label_name_player2); - drawWidgetTextfield(textfield_name_player2); + if (check_get_status(check_ai) == FALSE) { + label_draw(label_name_player2); + textField_draw(textfield_name_player2); } - drawWidgetImage(image_gun_dual_revolver); - drawWidgetImage(image_gun_scatter); - drawWidgetImage(image_gun_tommy); - drawWidgetImage(image_gun_lasser); - drawWidgetImage(image_gun_mine); - drawWidgetImage(image_gun_bombball); + wid_image_draw(image_gun_dual_revolver); + wid_image_draw(image_gun_scatter); + wid_image_draw(image_gun_tommy); + wid_image_draw(image_gun_lasser); + wid_image_draw(image_gun_mine); + wid_image_draw(image_gun_bombball); - drawWidgetImage(image_bonus_speed); - drawWidgetImage(image_bonus_shot); - drawWidgetImage(image_bonus_teleport); - drawWidgetImage(image_bonus_ghost); - drawWidgetImage(image_bonus_4x); - drawWidgetImage(image_bonus_hidden); + wid_image_draw(image_bonus_speed); + wid_image_draw(image_bonus_shot); + wid_image_draw(image_bonus_teleport); + wid_image_draw(image_bonus_ghost); + wid_image_draw(image_bonus_4x); + wid_image_draw(image_bonus_hidden); #ifndef NO_SOUND - drawWidgetCheck(check_music); - drawWidgetCheck(check_sound); + check_draw(check_music); + check_draw(check_sound); #endif for (i = GUN_DUAL_SIMPLE; i <= GUN_BOMBBALL; i++) { - drawWidgetCheck(check[i]); + check_draw(check[i]); } for (i = BONUS_SPEED; i <= BONUS_HIDDEN; i++) { - drawWidgetCheck(check[i]); + check_draw(check[i]); } - drawWidgetCheck(check_ai); + check_draw(check_ai); - drawWidgetButton(button_back); - drawWidgetButton(button_keys); + button_draw(button_back); + button_draw(button_keys); } -void eventScreenSetting() +void setting_event() { int i; - eventWidgetTextfield(textfield_count_cound); - eventWidgetTextfield(textfield_name_player1); + textField_event(textfield_count_cound); + textField_event(textfield_name_player1); - if (getWidgetCheckStatus(check_ai) == FALSE) { - eventWidgetTextfield(textfield_name_player2); + if (check_get_status(check_ai) == FALSE) { + textField_event(textfield_name_player2); } #ifndef NO_SOUND - eventWidgetCheck(check_music); - eventWidgetCheck(check_sound); + check_event(check_music); + check_event(check_sound); #endif for (i = GUN_DUAL_SIMPLE; i <= GUN_BOMBBALL; i++) { - eventWidgetCheck(check[i]); + check_event(check[i]); } for (i = BONUS_SPEED; i <= BONUS_HIDDEN; i++) { - eventWidgetCheck(check[i]); + check_event(check[i]); } - eventWidgetCheck(check_ai); + check_event(check_ai); - eventWidgetButton(button_back); - eventWidgetButton(button_keys); + button_event(button_back); + button_event(button_keys); } void stopScreenSetting() { - unregisterHotKey(SDLK_ESCAPE); + unhotKey_register(SDLK_ESCAPE); } static void eventWidget(void *p) @@ -193,20 +193,20 @@ static void eventWidget(void *p) my_check = (widget_t *) (p); if (my_button == button_back) { - setScreen("mainMenu"); + screen_set("mainMenu"); } if (my_button == button_keys) { - setScreen("settingKeys"); + screen_set("settingKeys"); } #ifndef NO_SOUND if (my_check == check_music) { - setMusicActive(getWidgetCheckStatus(check_music)); + music_set_active(check_get_status(check_music)); } if (my_check == check_sound) { - setSoundActive(getWidgetCheckStatus(check_sound)); + sound_set_active(check_get_status(check_sound)); } #endif } @@ -216,15 +216,15 @@ static void initSettingFile() char path[STR_PATH_SIZE]; char val[STR_SIZE]; - sprintf(path, "%s/tuxanci.conf", getHomeDirector()); + sprintf(path, "%s/tuxanci.conf", homeDirector_get()); - configFile = loadTextFile(path); + configFile = textFile_load(path); if (configFile == NULL) { fprintf(stderr, _("I am unable to load: \"%s\"!\n"), path); fprintf(stderr, _("Creating: \"%s\"\n"), path); - configFile = newTextFile(path); + configFile = textFile_new(path); } if (configFile == NULL) { @@ -233,59 +233,59 @@ static void initSettingFile() } loadValueFromConfigFile(configFile, "COUNT_ROUND", val, STR_SIZE, "15"); - setWidgetTextFiledText(textfield_count_cound, val); + textField_set_text(textfield_count_cound, val); loadValueFromConfigFile(configFile, "NAME_PLAYER_RIGHT", val, STR_SIZE, NAME_PLAYER_RIGHT); - setWidgetTextFiledText(textfield_name_player1, val); + textField_set_text(textfield_name_player1, val); loadValueFromConfigFile(configFile, "NAME_PLAYER_LEFT", val, STR_SIZE, NAME_PLAYER_LEFT); - setWidgetTextFiledText(textfield_name_player2, val); + textField_set_text(textfield_name_player2, val); loadValueFromConfigFile(configFile, "GUN_DUAL_SIMPLE", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[GUN_DUAL_SIMPLE], isYesOrNO(val)); + check_set_status(check[GUN_DUAL_SIMPLE], isYesOrNO(val)); loadValueFromConfigFile(configFile, "GUN_SCATTER", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[GUN_SCATTER], isYesOrNO(val)); + check_set_status(check[GUN_SCATTER], isYesOrNO(val)); loadValueFromConfigFile(configFile, "GUN_TOMMY", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[GUN_TOMMY], isYesOrNO(val)); + check_set_status(check[GUN_TOMMY], isYesOrNO(val)); loadValueFromConfigFile(configFile, "GUN_LASSER", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[GUN_LASSER], isYesOrNO(val)); + check_set_status(check[GUN_LASSER], isYesOrNO(val)); loadValueFromConfigFile(configFile, "GUN_MINE", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[GUN_MINE], isYesOrNO(val)); + check_set_status(check[GUN_MINE], isYesOrNO(val)); loadValueFromConfigFile(configFile, "GUN_BOMBBALL", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[GUN_BOMBBALL], isYesOrNO(val)); + check_set_status(check[GUN_BOMBBALL], isYesOrNO(val)); loadValueFromConfigFile(configFile, "BONUS_SPEED", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[BONUS_SPEED], isYesOrNO(val)); + check_set_status(check[BONUS_SPEED], isYesOrNO(val)); loadValueFromConfigFile(configFile, "BONUS_SHOT", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[BONUS_SHOT], isYesOrNO(val)); + check_set_status(check[BONUS_SHOT], isYesOrNO(val)); loadValueFromConfigFile(configFile, "BONUS_TELEPORT", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[BONUS_TELEPORT], isYesOrNO(val)); + check_set_status(check[BONUS_TELEPORT], isYesOrNO(val)); loadValueFromConfigFile(configFile, "BONUS_GHOST", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[BONUS_GHOST], isYesOrNO(val)); + check_set_status(check[BONUS_GHOST], isYesOrNO(val)); loadValueFromConfigFile(configFile, "BONUS_4X", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[BONUS_4X], isYesOrNO(val)); + check_set_status(check[BONUS_4X], isYesOrNO(val)); loadValueFromConfigFile(configFile, "BONUS_HIDDEN", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check[BONUS_HIDDEN], isYesOrNO(val)); + check_set_status(check[BONUS_HIDDEN], isYesOrNO(val)); loadValueFromConfigFile(configFile, "AI", val, STR_SIZE, "NO"); - setWidgetCheckStatus(check_ai, isYesOrNO(val)); + check_set_status(check_ai, isYesOrNO(val)); #ifndef NO_SOUND loadValueFromConfigFile(configFile, "MUSIC", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check_music, isYesOrNO(val)); + check_set_status(check_music, isYesOrNO(val)); loadValueFromConfigFile(configFile, "SOUND", val, STR_SIZE, "YES"); - setWidgetCheckStatus(check_sound, isYesOrNO(val)); + check_set_status(check_sound, isYesOrNO(val)); #endif loadValueFromConfigFile(configFile, "ARENA", val, STR_SIZE, "FAGN"); - setChoiceArena(getArenaFileFormNetName(val)); + choiceArena_set(arenaFile_get_file_format_net_name(val)); - saveTextFile(configFile); + textFile_save(configFile); } static void saveAndDestroyConfigFile() @@ -295,84 +295,84 @@ static void saveAndDestroyConfigFile() return; } - setValueInConfigFile(configFile, "COUNT_ROUND", getTextFromWidgetTextfield(textfield_count_cound)); - setValueInConfigFile(configFile, "NAME_PLAYER_RIGHT", getTextFromWidgetTextfield(textfield_name_player1)); - setValueInConfigFile(configFile, "NAME_PLAYER_LEFT", getTextFromWidgetTextfield(textfield_name_player2)); - setValueInConfigFile(configFile, "GUN_DUAL_SIMPLE", getYesOrNo(getWidgetCheckStatus(check[GUN_DUAL_SIMPLE]))); - setValueInConfigFile(configFile, "GUN_SCATTER", getYesOrNo(getWidgetCheckStatus(check[GUN_SCATTER]))); - setValueInConfigFile(configFile, "GUN_TOMMY", getYesOrNo(getWidgetCheckStatus(check[GUN_TOMMY]))); - setValueInConfigFile(configFile, "GUN_LASSER", getYesOrNo(getWidgetCheckStatus(check[GUN_LASSER]))); - setValueInConfigFile(configFile, "GUN_MINE", getYesOrNo(getWidgetCheckStatus(check[GUN_MINE]))); - setValueInConfigFile(configFile, "GUN_BOMBBALL", getYesOrNo(getWidgetCheckStatus(check[GUN_BOMBBALL]))); - setValueInConfigFile(configFile, "BONUS_SPEED", getYesOrNo(getWidgetCheckStatus(check[BONUS_SPEED]))); - setValueInConfigFile(configFile, "BONUS_SHOT", getYesOrNo(getWidgetCheckStatus(check[BONUS_SHOT]))); - setValueInConfigFile(configFile, "BONUS_TELEPORT", getYesOrNo(getWidgetCheckStatus (check[BONUS_TELEPORT]))); - setValueInConfigFile(configFile, "BONUS_GHOST", getYesOrNo(getWidgetCheckStatus(check[BONUS_GHOST]))); - setValueInConfigFile(configFile, "BONUS_4X", getYesOrNo(getWidgetCheckStatus(check[BONUS_4X]))); - setValueInConfigFile(configFile, "BONUS_HIDDEN", getYesOrNo(getWidgetCheckStatus(check[BONUS_HIDDEN]))); - setValueInConfigFile(configFile, "AI", getYesOrNo(getWidgetCheckStatus(check_ai))); + setValueInConfigFile(configFile, "COUNT_ROUND", textField_get_text(textfield_count_cound)); + setValueInConfigFile(configFile, "NAME_PLAYER_RIGHT", textField_get_text(textfield_name_player1)); + setValueInConfigFile(configFile, "NAME_PLAYER_LEFT", textField_get_text(textfield_name_player2)); + setValueInConfigFile(configFile, "GUN_DUAL_SIMPLE", getYesOrNo(check_get_status(check[GUN_DUAL_SIMPLE]))); + setValueInConfigFile(configFile, "GUN_SCATTER", getYesOrNo(check_get_status(check[GUN_SCATTER]))); + setValueInConfigFile(configFile, "GUN_TOMMY", getYesOrNo(check_get_status(check[GUN_TOMMY]))); + setValueInConfigFile(configFile, "GUN_LASSER", getYesOrNo(check_get_status(check[GUN_LASSER]))); + setValueInConfigFile(configFile, "GUN_MINE", getYesOrNo(check_get_status(check[GUN_MINE]))); + setValueInConfigFile(configFile, "GUN_BOMBBALL", getYesOrNo(check_get_status(check[GUN_BOMBBALL]))); + setValueInConfigFile(configFile, "BONUS_SPEED", getYesOrNo(check_get_status(check[BONUS_SPEED]))); + setValueInConfigFile(configFile, "BONUS_SHOT", getYesOrNo(check_get_status(check[BONUS_SHOT]))); + setValueInConfigFile(configFile, "BONUS_TELEPORT", getYesOrNo(check_get_status (check[BONUS_TELEPORT]))); + setValueInConfigFile(configFile, "BONUS_GHOST", getYesOrNo(check_get_status(check[BONUS_GHOST]))); + setValueInConfigFile(configFile, "BONUS_4X", getYesOrNo(check_get_status(check[BONUS_4X]))); + setValueInConfigFile(configFile, "BONUS_HIDDEN", getYesOrNo(check_get_status(check[BONUS_HIDDEN]))); + setValueInConfigFile(configFile, "AI", getYesOrNo(check_get_status(check_ai))); #ifndef NO_SOUND - setValueInConfigFile(configFile, "MUSIC", getYesOrNo(getWidgetCheckStatus(check_music))); - setValueInConfigFile(configFile, "SOUND", getYesOrNo(getWidgetCheckStatus(check_sound))); + setValueInConfigFile(configFile, "MUSIC", getYesOrNo(check_get_status(check_music))); + setValueInConfigFile(configFile, "SOUND", getYesOrNo(check_get_status(check_sound))); #endif - if( getChoiceArena() != NULL ) + if( choiceArena_get() != NULL ) { - setValueInConfigFile(configFile, "ARENA", getArenaNetName(getChoiceArena())); + setValueInConfigFile(configFile, "ARENA", arenaFile_get_net_name(choiceArena_get())); } //TODO - saveTextFile(configFile); - destroyTextFile(configFile); + textFile_save(configFile); + textFile_destroy(configFile); } -void initScreenSetting() +void setting_init() { image_t *image; int i; - image = getImage(IMAGE_GROUP_BASE, "screen_main"); - image_backgorund = newWidgetImage(0, 0, image); + image = image_get(IMAGE_GROUP_BASE, "screen_main"); + image_backgorund = wid_image_new(0, 0, image); - button_back = newWidgetButton(_("back"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget); + button_back = button_new(_("back"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget); - button_keys = newWidgetButton(_("controls"), WINDOW_SIZE_X - 200, + button_keys = button_new(_("controls"), WINDOW_SIZE_X - 200, button_back->y - WIDGET_BUTTON_HEIGHT - 10, eventWidget); #ifndef NO_SOUND - label_music = newWidgetLabel(_("Music:"), 100, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT); + label_music = label_new(_("Music:"), 100, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT); - check_music = newWidgetCheck(label_music->x + label_music->w + 10, - WINDOW_SIZE_Y - 80, isMusicActive(), eventWidget); - label_sound = newWidgetLabel(_("Sound:"), check_music->x + WIDGET_CHECK_WIDTH + 10, + check_music = check_new(label_music->x + label_music->w + 10, + WINDOW_SIZE_Y - 80, music_is_active(), eventWidget); + label_sound = label_new(_("Sound:"), check_music->x + WIDGET_CHECK_WIDTH + 10, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT); - check_sound = newWidgetCheck(label_sound->x + label_sound->w + 10, - WINDOW_SIZE_Y - 80, isSoundActive(), eventWidget); + check_sound = check_new(label_sound->x + label_sound->w + 10, + WINDOW_SIZE_Y - 80, sound_is_active(), eventWidget); - label_ai = newWidgetLabel(_("AI:"), check_sound->x + WIDGET_CHECK_WIDTH + 10, + label_ai = label_new(_("AI:"), check_sound->x + WIDGET_CHECK_WIDTH + 10, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT); #else - label_ai = newWidgetLabel(_("AI:"), 100, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT); + label_ai = label_new(_("AI:"), 100, WINDOW_SIZE_Y - 85, WIDGET_LABEL_LEFT); #endif - check_ai = newWidgetCheck(label_ai->x + label_ai->w + 10, WINDOW_SIZE_Y - 80, FALSE, eventWidget); + check_ai = check_new(label_ai->x + label_ai->w + 10, WINDOW_SIZE_Y - 80, FALSE, eventWidget); - label_count_round = newWidgetLabel(_("No. of rounds:"), 100, WINDOW_SIZE_Y - 200, WIDGET_LABEL_LEFT); - label_name_player1 = newWidgetLabel(_("Player 1:"), 100, WINDOW_SIZE_Y - 160, WIDGET_LABEL_LEFT); - label_name_player2 = newWidgetLabel(_("Player 2:"), 100, WINDOW_SIZE_Y - 120, WIDGET_LABEL_LEFT); + label_count_round = label_new(_("No. of rounds:"), 100, WINDOW_SIZE_Y - 200, WIDGET_LABEL_LEFT); + label_name_player1 = label_new(_("Player 1:"), 100, WINDOW_SIZE_Y - 160, WIDGET_LABEL_LEFT); + label_name_player2 = label_new(_("Player 2:"), 100, WINDOW_SIZE_Y - 120, WIDGET_LABEL_LEFT); - textfield_count_cound = newWidgetTextfield(getParamElse("--count", "15"), + textfield_count_cound = textField_new(getParamElse("--count", "15"), WIDGET_TEXTFIELD_FILTER_NUM, 110 + label_count_round->w, WINDOW_SIZE_Y - 200); - textfield_name_player1 = newWidgetTextfield(getParamElse("--name1", NAME_PLAYER_RIGHT), + textfield_name_player1 = textField_new(getParamElse("--name1", NAME_PLAYER_RIGHT), WIDGET_TEXTFIELD_FILTER_ALPHANUM, 110 + label_count_round->w, WINDOW_SIZE_Y - 160); - textfield_name_player2 = newWidgetTextfield(getParamElse("--name2", NAME_PLAYER_LEFT), + textfield_name_player2 = textField_new(getParamElse("--name2", NAME_PLAYER_LEFT), WIDGET_TEXTFIELD_FILTER_ALPHANUM, 110 + label_count_round->w, WINDOW_SIZE_Y - 120); @@ -390,7 +390,7 @@ void initScreenSetting() y = 200 + (i - GUN_LASSER) * 50; } - check[i] = newWidgetCheck(x, y, TRUE, NULL); + check[i] = check_new(x, y, TRUE, NULL); } for (i = BONUS_SPEED; i <= BONUS_HIDDEN; i++) { @@ -407,24 +407,24 @@ void initScreenSetting() y = 200 + (i - BONUS_GHOST) * 50; } - check[i] = newWidgetCheck(x, y, TRUE, NULL); + check[i] = check_new(x, y, TRUE, NULL); } - image_gun_dual_revolver = newWidgetImage(110 + WIDGET_CHECK_WIDTH, 200, getImage(IMAGE_GROUP_BASE, "panel_dual")); - image_gun_scatter = newWidgetImage(110 + WIDGET_CHECK_WIDTH, 250, getImage(IMAGE_GROUP_BASE, "panel_scatter")); - image_gun_tommy = newWidgetImage(110 + WIDGET_CHECK_WIDTH, 300, getImage(IMAGE_GROUP_BASE, "panel_tommy")); - image_gun_lasser = newWidgetImage(260 + WIDGET_CHECK_WIDTH, 200,getImage(IMAGE_GROUP_BASE, "panel_lasser")); - image_gun_mine = newWidgetImage(260 + WIDGET_CHECK_WIDTH, 250, getImage(IMAGE_GROUP_BASE, "panel_mine")); - image_gun_bombball = newWidgetImage(260 + WIDGET_CHECK_WIDTH, 300, getImage(IMAGE_GROUP_BASE, "panel_bombball")); - image_bonus_speed = newWidgetImage(430 + WIDGET_CHECK_WIDTH, 200, getImage(IMAGE_GROUP_BASE, "panel_speed"));; - image_bonus_shot = newWidgetImage(430 + WIDGET_CHECK_WIDTH, 250, getImage(IMAGE_GROUP_BASE, "panel_shot"));; - image_bonus_teleport = newWidgetImage(430 + WIDGET_CHECK_WIDTH, 300, getImage(IMAGE_GROUP_BASE, "panel_teleport"));; - image_bonus_ghost = newWidgetImage(580 + WIDGET_CHECK_WIDTH, 200, getImage(IMAGE_GROUP_BASE, "panel_ghost"));; - image_bonus_4x = newWidgetImage(580 + WIDGET_CHECK_WIDTH, 250, getImage(IMAGE_GROUP_BASE, "panel_4x"));; - image_bonus_hidden = newWidgetImage(580 + WIDGET_CHECK_WIDTH, 300, getImage(IMAGE_GROUP_BASE, "panel_hidden"));; - - registerScreen( newScreen("setting", startScreenSetting, eventScreenSetting, - drawScreenSetting, stopScreenSetting)); + image_gun_dual_revolver = wid_image_new(110 + WIDGET_CHECK_WIDTH, 200, image_get(IMAGE_GROUP_BASE, "panel_dual")); + image_gun_scatter = wid_image_new(110 + WIDGET_CHECK_WIDTH, 250, image_get(IMAGE_GROUP_BASE, "panel_scatter")); + image_gun_tommy = wid_image_new(110 + WIDGET_CHECK_WIDTH, 300, image_get(IMAGE_GROUP_BASE, "panel_tommy")); + image_gun_lasser = wid_image_new(260 + WIDGET_CHECK_WIDTH, 200,image_get(IMAGE_GROUP_BASE, "panel_lasser")); + image_gun_mine = wid_image_new(260 + WIDGET_CHECK_WIDTH, 250, image_get(IMAGE_GROUP_BASE, "panel_mine")); + image_gun_bombball = wid_image_new(260 + WIDGET_CHECK_WIDTH, 300, image_get(IMAGE_GROUP_BASE, "panel_bombball")); + image_bonus_speed = wid_image_new(430 + WIDGET_CHECK_WIDTH, 200, image_get(IMAGE_GROUP_BASE, "panel_speed"));; + image_bonus_shot = wid_image_new(430 + WIDGET_CHECK_WIDTH, 250, image_get(IMAGE_GROUP_BASE, "panel_shot"));; + image_bonus_teleport = wid_image_new(430 + WIDGET_CHECK_WIDTH, 300, image_get(IMAGE_GROUP_BASE, "panel_teleport"));; + image_bonus_ghost = wid_image_new(580 + WIDGET_CHECK_WIDTH, 200, image_get(IMAGE_GROUP_BASE, "panel_ghost"));; + image_bonus_4x = wid_image_new(580 + WIDGET_CHECK_WIDTH, 250, image_get(IMAGE_GROUP_BASE, "panel_4x"));; + image_bonus_hidden = wid_image_new(580 + WIDGET_CHECK_WIDTH, 300, image_get(IMAGE_GROUP_BASE, "panel_hidden"));; + + screen_register( screen_new("setting", screen_startSetting, setting_event, + setting_draw, stopScreenSetting)); initSettingFile(); @@ -434,42 +434,42 @@ void initScreenSetting() #endif } -void getSettingNameRight(char *s) +void publicServer_get_settingNameRight(char *s) { - strcpy(s, getTextFromWidgetTextfield(textfield_name_player1)); + strcpy(s, textField_get_text(textfield_name_player1)); } -void getSettingNameLeft(char *s) +void publicServer_get_settingNameLeft(char *s) { - if (getWidgetCheckStatus(check_ai)) { + if (check_get_status(check_ai)) { strcpy(s, NAME_AI); } else { - strcpy(s, getTextFromWidgetTextfield(textfield_name_player2)); + strcpy(s, textField_get_text(textfield_name_player2)); } } -void getSettingCountRound(int *n) +void publicServer_get_settingCountRound(int *n) { - *n = atoi(getTextFromWidgetTextfield(textfield_count_cound)); + *n = atoi(textField_get_text(textfield_count_cound)); } -bool_t isSettingAI() +bool_t setting_is_ai() { - return getWidgetCheckStatus(check_ai); + return check_get_status(check_ai); } -bool_t isSettingAnyItem() +bool_t setting_is_any_item() { int i; for (i = GUN_DUAL_SIMPLE; i <= GUN_BOMBBALL; i++) { - if (getWidgetCheckStatus(check[i]) == TRUE) { + if (check_get_status(check[i]) == TRUE) { return TRUE; } } for (i = BONUS_SPEED; i < BONUS_HIDDEN; i++) { - if (getWidgetCheckStatus(check[i]) == TRUE) { + if (check_get_status(check[i]) == TRUE) { return TRUE; } } @@ -477,62 +477,62 @@ bool_t isSettingAnyItem() return FALSE; } -bool_t isSettingItem(int item) +bool_t setting_is_item(int item) { - return getWidgetCheckStatus(check[item]); + return check_get_status(check[item]); } -void quitScreenSetting() +void setting_quit() { int i; saveAndDestroyConfigFile(); - destroyWidgetImage(image_backgorund); + wid_image_destroy(image_backgorund); - destroyWidgetLabel(label_count_round); - destroyWidgetLabel(label_name_player1); - destroyWidgetLabel(label_ai); + label_destroy(label_count_round); + label_destroy(label_name_player1); + label_destroy(label_ai); #ifndef NO_SOUND - destroyWidgetLabel(label_music); - destroyWidgetLabel(label_sound); + label_destroy(label_music); + label_destroy(label_sound); #endif - destroyWidgetLabel(label_name_player2); - destroyWidgetTextfield(textfield_name_player2); - - destroyWidgetTextfield(textfield_name_player1); - destroyWidgetTextfield(textfield_count_cound); - - destroyWidgetImage(image_gun_dual_revolver); - destroyWidgetImage(image_gun_scatter); - destroyWidgetImage(image_gun_tommy); - destroyWidgetImage(image_gun_lasser); - destroyWidgetImage(image_gun_mine); - destroyWidgetImage(image_gun_bombball); - - destroyWidgetImage(image_bonus_speed); - destroyWidgetImage(image_bonus_shot); - destroyWidgetImage(image_bonus_teleport); - destroyWidgetImage(image_bonus_ghost); - destroyWidgetImage(image_bonus_4x); - destroyWidgetImage(image_bonus_hidden); + label_destroy(label_name_player2); + textField_destroy(textfield_name_player2); + + textField_destroy(textfield_name_player1); + textField_destroy(textfield_count_cound); + + wid_image_destroy(image_gun_dual_revolver); + wid_image_destroy(image_gun_scatter); + wid_image_destroy(image_gun_tommy); + wid_image_destroy(image_gun_lasser); + wid_image_destroy(image_gun_mine); + wid_image_destroy(image_gun_bombball); + + wid_image_destroy(image_bonus_speed); + wid_image_destroy(image_bonus_shot); + wid_image_destroy(image_bonus_teleport); + wid_image_destroy(image_bonus_ghost); + wid_image_destroy(image_bonus_4x); + wid_image_destroy(image_bonus_hidden); #ifndef NO_SOUND - destroyWidgetCheck(check_music); - destroyWidgetCheck(check_sound); + check_destroy(check_music); + check_destroy(check_sound); #endif - destroyWidgetCheck(check_ai); + check_destroy(check_ai); for (i = GUN_DUAL_SIMPLE; i <= GUN_BOMBBALL; i++) { - destroyWidgetCheck(check[i]); + check_destroy(check[i]); } for (i = BONUS_SPEED; i <= BONUS_HIDDEN; i++) { - destroyWidgetCheck(check[i]); + check_destroy(check[i]); } - destroyWidgetButton(button_back); - destroyWidgetButton(button_keys); + button_destroy(button_back); + button_destroy(button_keys); } diff --git a/src/screen/setting.h b/src/screen/setting.h index 9521cca..6c5ec16 100644 --- a/src/screen/setting.h +++ b/src/screen/setting.h @@ -9,14 +9,14 @@ # define NAME_PLAYER_RIGHT "Name1" # define NAME_PLAYER_LEFT "Name2" -extern void initScreenSetting(); -extern void drawScreenSetting(); -extern void eventScreenSetting(); -extern void getSettingNameRight(char *s); -extern void getSettingNameLeft(char *s); -extern void getSettingCountRound(int *n); -extern bool_t isSettingAI(); -extern bool_t isSettingAnyItem(); -extern bool_t isSettingItem(int item); -extern void quitScreenSetting(); +extern void setting_init(); +extern void setting_draw(); +extern void setting_event(); +extern void publicServer_get_settingNameRight(char *s); +extern void publicServer_get_settingNameLeft(char *s); +extern void publicServer_get_settingCountRound(int *n); +extern bool_t setting_is_ai(); +extern bool_t setting_is_any_item(); +extern bool_t setting_is_item(int item); +extern void setting_quit(); #endif diff --git a/src/screen/settingKeys.c b/src/screen/settingKeys.c index 7813a69..2e44339 100644 --- a/src/screen/settingKeys.c +++ b/src/screen/settingKeys.c @@ -77,17 +77,17 @@ static widget_t *tux_left_keyfire_val; static void hotkey_escape()
{
- setScreen("setting");
+ screen_set("setting");
}
-void startScreenSettingKeys()
+void screen_startSettingKeys()
{
#ifndef NO_SOUND
- playMusic("menu", MUSIC_GROUP_BASE);
+ music_play("menu", MUSIC_GROUP_BASE);
#endif
- registerHotKey(SDLK_ESCAPE, hotkey_escape);
+ hotKey_register(SDLK_ESCAPE, hotkey_escape);
}
static void setKeytableFromConfigFile(textFile_t * configFile)
{
@@ -158,7 +158,7 @@ keytable[KEY_TUX_LEFT_SWITCH_WEAPON] = atoi(val); }
void
- initKeyTable()
+ keyTable_init()
{
char path[STR_PATH_SIZE];
@@ -166,9 +166,9 @@ char path[STR_PATH_SIZE]; /*
int i;
*/
- sprintf(path, "%s/keycontrol.conf", getHomeDirector());
+ sprintf(path, "%s/keycontrol.conf", homeDirector_get());
-keycontrolFile = loadTextFile(path);
+keycontrolFile = textFile_load(path);
if (keycontrolFile == NULL) {
@@ -176,7 +176,7 @@ fprintf(stderr, _("I was unable to load file: %s\n"), path); fprintf(stderr, _("I try to create file: %s\n"), path);
-keycontrolFile = newTextFile(path);
+keycontrolFile = textFile_new(path);
}
@@ -198,7 +198,7 @@ setKeytableFromConfigFile(keycontrolFile); */
}
-int getKey(int n)
+int keyTable_get_key(int n)
{
// printf("keytable[n] = %d\n", keytable[n]);
@@ -206,66 +206,66 @@ int getKey(int n) }
-void drawScreenSettingKeys()
+void settingKey_draw()
{
-drawWidgetImage(image_backgorund);
+wid_image_draw(image_backgorund);
-drawWidgetButton(button_back);
+button_draw(button_back);
// key names
- drawWidgetLabel(tux_right);
+ label_draw(tux_right);
-drawWidgetLabel(tux_left);
+label_draw(tux_left);
-drawWidgetLabel(tux_right_keyup);
+label_draw(tux_right_keyup);
-drawWidgetLabel(tux_right_keydown);
+label_draw(tux_right_keydown);
-drawWidgetLabel(tux_right_keyleft);
+label_draw(tux_right_keyleft);
-drawWidgetLabel(tux_right_keyright);
+label_draw(tux_right_keyright);
-drawWidgetLabel(tux_right_keyswitch);
+label_draw(tux_right_keyswitch);
-drawWidgetLabel(tux_right_keyfire);
+label_draw(tux_right_keyfire);
-drawWidgetLabel(tux_left_keyup);
+label_draw(tux_left_keyup);
-drawWidgetLabel(tux_left_keydown);
+label_draw(tux_left_keydown);
-drawWidgetLabel(tux_left_keyleft);
+label_draw(tux_left_keyleft);
-drawWidgetLabel(tux_left_keyright);
+label_draw(tux_left_keyright);
-drawWidgetLabel(tux_left_keyswitch);
+label_draw(tux_left_keyswitch);
-drawWidgetLabel(tux_left_keyfire);
+label_draw(tux_left_keyfire);
// key values
- drawWidgetCatchkey(tux_right_keyup_val);
+ catchKey_draw(tux_right_keyup_val);
-drawWidgetCatchkey(tux_right_keydown_val);
+catchKey_draw(tux_right_keydown_val);
-drawWidgetCatchkey(tux_right_keyleft_val);
+catchKey_draw(tux_right_keyleft_val);
-drawWidgetCatchkey(tux_right_keyright_val);
+catchKey_draw(tux_right_keyright_val);
-drawWidgetCatchkey(tux_right_keyswitch_val);
+catchKey_draw(tux_right_keyswitch_val);
-drawWidgetCatchkey(tux_right_keyfire_val);
+catchKey_draw(tux_right_keyfire_val);
-drawWidgetCatchkey(tux_left_keyup_val);
+catchKey_draw(tux_left_keyup_val);
-drawWidgetCatchkey(tux_left_keydown_val);
+catchKey_draw(tux_left_keydown_val);
-drawWidgetCatchkey(tux_left_keyleft_val);
+catchKey_draw(tux_left_keyleft_val);
-drawWidgetCatchkey(tux_left_keyright_val);
+catchKey_draw(tux_left_keyright_val);
-drawWidgetCatchkey(tux_left_keyswitch_val);
+catchKey_draw(tux_left_keyswitch_val);
-drawWidgetCatchkey(tux_left_keyfire_val);
+catchKey_draw(tux_left_keyfire_val);
}
static void
@@ -273,29 +273,29 @@ static void refreshKeytable()
{
-keytable[6] = getWidgetCatchKey(tux_left_keyup_val);
+keytable[6] = catchKey_get(tux_left_keyup_val);
-keytable[9] = getWidgetCatchKey(tux_left_keydown_val);
+keytable[9] = catchKey_get(tux_left_keydown_val);
-keytable[8] = getWidgetCatchKey(tux_left_keyleft_val);
+keytable[8] = catchKey_get(tux_left_keyleft_val);
-keytable[7] = getWidgetCatchKey(tux_left_keyright_val);
+keytable[7] = catchKey_get(tux_left_keyright_val);
-keytable[10] = getWidgetCatchKey(tux_left_keyfire_val);
+keytable[10] = catchKey_get(tux_left_keyfire_val);
-keytable[11] = getWidgetCatchKey(tux_left_keyswitch_val);
+keytable[11] = catchKey_get(tux_left_keyswitch_val);
-keytable[0] = getWidgetCatchKey(tux_right_keyup_val);
+keytable[0] = catchKey_get(tux_right_keyup_val);
-keytable[3] = getWidgetCatchKey(tux_right_keydown_val);
+keytable[3] = catchKey_get(tux_right_keydown_val);
-keytable[2] = getWidgetCatchKey(tux_right_keyleft_val);
+keytable[2] = catchKey_get(tux_right_keyleft_val);
-keytable[1] = getWidgetCatchKey(tux_right_keyright_val);
+keytable[1] = catchKey_get(tux_right_keyright_val);
-keytable[4] = getWidgetCatchKey(tux_right_keyfire_val);
+keytable[4] = catchKey_get(tux_right_keyfire_val);
-keytable[5] = getWidgetCatchKey(tux_right_keyswitch_val);
+keytable[5] = catchKey_get(tux_right_keyswitch_val);
}
static void eventWidget(void *p)
@@ -312,7 +312,7 @@ catcher = (widget_t *) (p); if (button == button_back)
-setScreen("setting");
+screen_set("setting");
//events on value
if ((catcher == tux_left_keyup_val) ||
@@ -337,253 +337,253 @@ setScreen("setting"); }
-void eventScreenSettingKeys()
+void settingKey_event()
{
-eventWidgetButton(button_back);
+button_event(button_back);
-eventWidgetCatchkey(tux_right_keyup_val);
+catchKey_event(tux_right_keyup_val);
-eventWidgetCatchkey(tux_right_keydown_val);
+catchKey_event(tux_right_keydown_val);
-eventWidgetCatchkey(tux_right_keyleft_val);
+catchKey_event(tux_right_keyleft_val);
-eventWidgetCatchkey(tux_right_keyright_val);
+catchKey_event(tux_right_keyright_val);
-eventWidgetCatchkey(tux_right_keyswitch_val);
+catchKey_event(tux_right_keyswitch_val);
-eventWidgetCatchkey(tux_right_keyfire_val);
+catchKey_event(tux_right_keyfire_val);
-eventWidgetCatchkey(tux_left_keyup_val);
+catchKey_event(tux_left_keyup_val);
-eventWidgetCatchkey(tux_left_keydown_val);
+catchKey_event(tux_left_keydown_val);
-eventWidgetCatchkey(tux_left_keyleft_val);
+catchKey_event(tux_left_keyleft_val);
-eventWidgetCatchkey(tux_left_keyright_val);
+catchKey_event(tux_left_keyright_val);
-eventWidgetCatchkey(tux_left_keyswitch_val);
+catchKey_event(tux_left_keyswitch_val);
-eventWidgetCatchkey(tux_left_keyfire_val);
+catchKey_event(tux_left_keyfire_val);
}
void
stopScreenSettingKeys()
{
- unregisterHotKey(SDLK_ESCAPE);
+ unhotKey_register(SDLK_ESCAPE);
}
void
- initScreenSettingKeys()
+ settingKey_int()
{
image_t * image;
-initKeyTable();
+keyTable_init();
-image = getImage(IMAGE_GROUP_BASE, "screen_main");
+image = image_get(IMAGE_GROUP_BASE, "screen_main");
-image_backgorund = newWidgetImage(0, 0, image);
+image_backgorund = wid_image_new(0, 0, image);
button_back =
- newWidgetButton(_("Back"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100,
+ button_new(_("Back"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100,
eventWidget);
tux_left =
- newWidgetLabel(_("Player 2"), WINDOW_SIZE_X / 4, 150,
+ label_new(_("Player 2"), WINDOW_SIZE_X / 4, 150,
WIDGET_LABEL_CENTER);
tux_left_keyup =
- newWidgetLabel(_("Up"), 50, tux_left->y + 50, WIDGET_LABEL_LEFT);
+ label_new(_("Up"), 50, tux_left->y + 50, WIDGET_LABEL_LEFT);
tux_left_keydown =
- newWidgetLabel(_("Down:"), tux_left_keyup->x, tux_left_keyup->y + 20,
+ label_new(_("Down:"), tux_left_keyup->x, tux_left_keyup->y + 20,
WIDGET_LABEL_LEFT);
tux_left_keyleft =
- newWidgetLabel(_("Left:"), tux_left_keyup->x,
+ label_new(_("Left:"), tux_left_keyup->x,
tux_left_keydown->y + 20, WIDGET_LABEL_LEFT);
tux_left_keyright =
- newWidgetLabel(_("Right:"), tux_left_keyup->x,
+ label_new(_("Right:"), tux_left_keyup->x,
tux_left_keyleft->y + 20, WIDGET_LABEL_LEFT);
tux_left_keyfire =
- newWidgetLabel(_("Fire gun:"), tux_left_keyup->x,
+ label_new(_("Fire gun:"), tux_left_keyup->x,
tux_left_keyright->y + 20, WIDGET_LABEL_LEFT);
tux_left_keyswitch =
- newWidgetLabel(_("Switch gun:"), tux_left_keyup->x,
+ label_new(_("Switch gun:"), tux_left_keyup->x,
tux_left_keyfire->y + 20, WIDGET_LABEL_LEFT);
tux_right =
- newWidgetLabel(_("Player 1"), WINDOW_SIZE_X / 2 + WINDOW_SIZE_X / 4,
+ label_new(_("Player 1"), WINDOW_SIZE_X / 2 + WINDOW_SIZE_X / 4,
tux_left->y, WIDGET_LABEL_CENTER);
tux_right_keyup =
- newWidgetLabel(_("Up:"), WINDOW_SIZE_X / 2 + tux_left_keyup->x,
+ label_new(_("Up:"), WINDOW_SIZE_X / 2 + tux_left_keyup->x,
tux_left->y + 50, WIDGET_LABEL_LEFT);
tux_right_keydown =
- newWidgetLabel(_("Down:"), WINDOW_SIZE_X / 2 + tux_left_keyup->x,
+ label_new(_("Down:"), WINDOW_SIZE_X / 2 + tux_left_keyup->x,
tux_left_keyup->y + 20, WIDGET_LABEL_LEFT);
tux_right_keyleft =
- newWidgetLabel(_("Left:"), WINDOW_SIZE_X / 2 + tux_left_keyup->x,
+ label_new(_("Left:"), WINDOW_SIZE_X / 2 + tux_left_keyup->x,
tux_right_keydown->y + 20, WIDGET_LABEL_LEFT);
tux_right_keyright =
- newWidgetLabel(_("Right:"), WINDOW_SIZE_X / 2 + tux_left_keyup->x,
+ label_new(_("Right:"), WINDOW_SIZE_X / 2 + tux_left_keyup->x,
tux_right_keyleft->y + 20, WIDGET_LABEL_LEFT);
tux_right_keyfire =
- newWidgetLabel(_("Fire gun:"), WINDOW_SIZE_X / 2 + tux_left_keyup->x,
+ label_new(_("Fire gun:"), WINDOW_SIZE_X / 2 + tux_left_keyup->x,
tux_left_keyright->y + 20, WIDGET_LABEL_LEFT);
tux_right_keyswitch =
- newWidgetLabel(_("Switch gun:"),
+ label_new(_("Switch gun:"),
WINDOW_SIZE_X / 2 + tux_left_keyup->x,
tux_left_keyfire->y + 20, WIDGET_LABEL_LEFT);
tux_left_keyup_val =
- newWidgetCatchkey(keytable[6], tux_left_keyup->x + 200,
+ catchKey_new(keytable[6], tux_left_keyup->x + 200,
tux_left->y + 50, eventWidget);
tux_left_keydown_val =
- newWidgetCatchkey(keytable[9], tux_left_keyup_val->x,
+ catchKey_new(keytable[9], tux_left_keyup_val->x,
tux_left_keyup->y + 20, eventWidget);
tux_left_keyleft_val =
- newWidgetCatchkey(keytable[8], tux_left_keyup_val->x,
+ catchKey_new(keytable[8], tux_left_keyup_val->x,
tux_left_keydown->y + 20, eventWidget);
tux_left_keyright_val =
- newWidgetCatchkey(keytable[7], tux_left_keyup_val->x,
+ catchKey_new(keytable[7], tux_left_keyup_val->x,
tux_left_keyleft->y + 20, eventWidget);
tux_left_keyfire_val =
- newWidgetCatchkey(keytable[10], tux_left_keyup_val->x,
+ catchKey_new(keytable[10], tux_left_keyup_val->x,
tux_left_keyright->y + 20, eventWidget);
tux_left_keyswitch_val =
- newWidgetCatchkey(keytable[11], tux_left_keyup_val->x,
+ catchKey_new(keytable[11], tux_left_keyup_val->x,
tux_left_keyfire->y + 20, eventWidget);
tux_right_keyup_val =
- newWidgetCatchkey(keytable[0],
+ catchKey_new(keytable[0],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_left->y + 50, eventWidget);
tux_right_keydown_val =
- newWidgetCatchkey(keytable[3],
+ catchKey_new(keytable[3],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_left_keyup->y + 20, eventWidget);
tux_right_keyleft_val =
- newWidgetCatchkey(keytable[2],
+ catchKey_new(keytable[2],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_right_keydown->y + 20, eventWidget);
tux_right_keyright_val =
- newWidgetCatchkey(keytable[1],
+ catchKey_new(keytable[1],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_right_keyleft->y + 20, eventWidget);
tux_right_keyfire_val =
- newWidgetCatchkey(keytable[4],
+ catchKey_new(keytable[4],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_left_keyright->y + 20, eventWidget);
tux_right_keyswitch_val =
- newWidgetCatchkey(keytable[5],
+ catchKey_new(keytable[5],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_left_keyfire->y + 20, eventWidget);
-registerScreen(newScreen
- ("settingKeys", startScreenSettingKeys,
- eventScreenSettingKeys,
-drawScreenSettingKeys,
+screen_register(screen_new
+ ("settingKeys", screen_startSettingKeys,
+ settingKey_event,
+settingKey_draw,
stopScreenSettingKeys));
}
-void quitKeyTable()
+void keyTable_quit()
{
- destroyTextFile(keycontrolFile);
+ textFile_destroy(keycontrolFile);
}
void saveKeyTable(textFile_t * configFile)
{
char str[STR_SIZE];
- sprintf(str, "%d", getWidgetCatchKey(tux_left_keyup_val));
+ sprintf(str, "%d", catchKey_get(tux_left_keyup_val));
setValueInConfigFile(configFile, "TUX_LEFT_MOVE_UP", str);
- sprintf(str, "%d", getWidgetCatchKey(tux_left_keydown_val));
+ sprintf(str, "%d", catchKey_get(tux_left_keydown_val));
setValueInConfigFile(configFile, "TUX_LEFT_MOVE_DOWN", str);
- sprintf(str, "%d", getWidgetCatchKey(tux_left_keyleft_val));
+ sprintf(str, "%d", catchKey_get(tux_left_keyleft_val));
setValueInConfigFile(configFile, "TUX_LEFT_MOVE_LEFT", str);
- sprintf(str, "%d", getWidgetCatchKey(tux_left_keyright_val));
+ sprintf(str, "%d", catchKey_get(tux_left_keyright_val));
setValueInConfigFile(configFile, "TUX_LEFT_MOVE_RIGHT", str);
- sprintf(str, "%d", getWidgetCatchKey(tux_left_keyfire_val));
+ sprintf(str, "%d", catchKey_get(tux_left_keyfire_val));
setValueInConfigFile(configFile, "TUX_LEFT_SHOOT", str);
- sprintf(str, "%d", getWidgetCatchKey(tux_left_keyswitch_val));
+ sprintf(str, "%d", catchKey_get(tux_left_keyswitch_val));
setValueInConfigFile(configFile, "TUX_LEFT_SWITCH_WEAPON", str);
- sprintf(str, "%d", getWidgetCatchKey(tux_right_keyup_val));
+ sprintf(str, "%d", catchKey_get(tux_right_keyup_val));
setValueInConfigFile(configFile, "TUX_RIGHT_MOVE_UP", str);
- sprintf(str, "%d", getWidgetCatchKey(tux_right_keydown_val));
+ sprintf(str, "%d", catchKey_get(tux_right_keydown_val));
setValueInConfigFile(configFile, "TUX_RIGHT_MOVE_DOWN", str);
- sprintf(str, "%d", getWidgetCatchKey(tux_right_keyleft_val));
+ sprintf(str, "%d", catchKey_get(tux_right_keyleft_val));
setValueInConfigFile(configFile, "TUX_RIGHT_MOVE_LEFT", str);
- sprintf(str, "%d", getWidgetCatchKey(tux_right_keyright_val));
+ sprintf(str, "%d", catchKey_get(tux_right_keyright_val));
setValueInConfigFile(configFile, "TUX_RIGHT_MOVE_RIGHT", str);
- sprintf(str, "%d", getWidgetCatchKey(tux_right_keyfire_val));
+ sprintf(str, "%d", catchKey_get(tux_right_keyfire_val));
setValueInConfigFile(configFile, "TUX_RIGHT_SHOOT", str);
- sprintf(str, "%d", getWidgetCatchKey(tux_right_keyswitch_val));
+ sprintf(str, "%d", catchKey_get(tux_right_keyswitch_val));
setValueInConfigFile(configFile, "TUX_RIGHT_SWITCH_WEAPON", str);
- saveTextFile(configFile);
+ textFile_save(configFile);
}
-void quitScreenSettingKeys()
+void settingKey_quit()
{
saveKeyTable(keycontrolFile);
- quitKeyTable();
+ keyTable_quit();
// key names
- destroyWidgetImage(image_backgorund);
+ wid_image_destroy(image_backgorund);
- destroyWidgetLabel(tux_right);
- destroyWidgetLabel(tux_left);
- destroyWidgetLabel(tux_right_keyup);
- destroyWidgetLabel(tux_right_keydown);
- destroyWidgetLabel(tux_right_keyleft);
- destroyWidgetLabel(tux_right_keyright);
- destroyWidgetLabel(tux_right_keyswitch);
- destroyWidgetLabel(tux_right_keyfire);
- destroyWidgetLabel(tux_left_keyup);
- destroyWidgetLabel(tux_left_keydown);
- destroyWidgetLabel(tux_left_keyright);
- destroyWidgetLabel(tux_left_keyleft);
- destroyWidgetLabel(tux_left_keyswitch);
- destroyWidgetLabel(tux_left_keyfire);
+ label_destroy(tux_right);
+ label_destroy(tux_left);
+ label_destroy(tux_right_keyup);
+ label_destroy(tux_right_keydown);
+ label_destroy(tux_right_keyleft);
+ label_destroy(tux_right_keyright);
+ label_destroy(tux_right_keyswitch);
+ label_destroy(tux_right_keyfire);
+ label_destroy(tux_left_keyup);
+ label_destroy(tux_left_keydown);
+ label_destroy(tux_left_keyright);
+ label_destroy(tux_left_keyleft);
+ label_destroy(tux_left_keyswitch);
+ label_destroy(tux_left_keyfire);
// key values
- destroyWidgetCatchkey(tux_right_keyup_val);
+ catchKey_destroy(tux_right_keyup_val);
- destroyWidgetCatchkey(tux_right_keydown_val);
- destroyWidgetCatchkey(tux_right_keyleft_val);
- destroyWidgetCatchkey(tux_right_keyright_val);
- destroyWidgetCatchkey(tux_right_keyswitch_val);
- destroyWidgetCatchkey(tux_right_keyfire_val);
- destroyWidgetCatchkey(tux_left_keyup_val);
- destroyWidgetCatchkey(tux_left_keydown_val);
- destroyWidgetCatchkey(tux_left_keyleft_val);
- destroyWidgetCatchkey(tux_left_keyright_val);
- destroyWidgetCatchkey(tux_left_keyswitch_val);
- destroyWidgetCatchkey(tux_left_keyfire_val);
- destroyWidgetButton(button_back);
+ catchKey_destroy(tux_right_keydown_val);
+ catchKey_destroy(tux_right_keyleft_val);
+ catchKey_destroy(tux_right_keyright_val);
+ catchKey_destroy(tux_right_keyswitch_val);
+ catchKey_destroy(tux_right_keyfire_val);
+ catchKey_destroy(tux_left_keyup_val);
+ catchKey_destroy(tux_left_keydown_val);
+ catchKey_destroy(tux_left_keyleft_val);
+ catchKey_destroy(tux_left_keyright_val);
+ catchKey_destroy(tux_left_keyswitch_val);
+ catchKey_destroy(tux_left_keyfire_val);
+ button_destroy(button_back);
}
diff --git a/src/screen/settingKeys.h b/src/screen/settingKeys.h index c90006e..a52a4a8 100644 --- a/src/screen/settingKeys.h +++ b/src/screen/settingKeys.h @@ -16,12 +16,12 @@ # define KEY_LENGTH 12
# include "main.h"
-
extern void initScreenSettingKeys(); -
extern void drawScreenSettingKeys(); -
extern void eventScreenSettingKeys(); -
extern void quitScreenSettingKeys(); -
extern void initKeyTable(); -
extern int getKey(int n); -
extern void quitKeyTable(); +
extern void settingKey_int(); +
extern void settingKey_draw(); +
extern void settingKey_event(); +
extern void settingKey_quit(); +
extern void keyTable_init(); +
extern int keyTable_get_key(int n); +
extern void keyTable_quit(); #endif /*
*/ diff --git a/src/screen/table.c b/src/screen/table.c index 5abb3c9..7d5771f 100644 --- a/src/screen/table.c +++ b/src/screen/table.c @@ -34,53 +34,53 @@ static textFile_t *textFile; static void hotkey_escape() { - setScreen("mainMenu"); + screen_set("mainMenu"); } -void startScreenTable() +void table_start() { #ifndef NO_SOUND - playMusic("menu", MUSIC_GROUP_BASE); + music_play("menu", MUSIC_GROUP_BASE); #endif - registerHotKey(SDLK_ESCAPE, hotkey_escape); + hotKey_register(SDLK_ESCAPE, hotkey_escape); } -void drawScreenTable() +void table_draw() { int i; - drawWidgetImage(image_backgorund); + wid_image_draw(image_backgorund); - drawWidgetButton(button_back); + button_draw(button_back); for (i = 0; i < listWidgetLabelNumer->count; i++) { widget_t *this; this = (widget_t *) listWidgetLabelNumer->list[i]; - drawWidgetLabel(this); + label_draw(this); } for (i = 0; i < listWidgetLabelName->count; i++) { widget_t *this; this = (widget_t *) listWidgetLabelName->list[i]; - drawWidgetLabel(this); + label_draw(this); } for (i = 0; i < listWidgetLabelScore->count; i++) { widget_t *this; this = (widget_t *) listWidgetLabelScore->list[i]; - drawWidgetLabel(this); + label_draw(this); } } -void eventScreenTable() +void table_event() { - eventWidgetButton(button_back); + button_event(button_back); } -void stopScreenTable() +void table_stop() { - unregisterHotKey(SDLK_ESCAPE); + unhotKey_register(SDLK_ESCAPE); } static void eventWidget(void *p) @@ -90,7 +90,7 @@ static void eventWidget(void *p) button = (widget_t *) (p); if (button == button_back) { - setScreen("mainMenu"); + screen_set("mainMenu"); } } @@ -107,14 +107,14 @@ static void setWidgetLabel() if (listWidgetLabelNumer != NULL || listWidgetLabelName != NULL || listWidgetLabelScore != NULL) { - destroyListItem(listWidgetLabelNumer, destroyWidgetLabel); - destroyListItem(listWidgetLabelName, destroyWidgetLabel); - destroyListItem(listWidgetLabelScore, destroyWidgetLabel); + list_destroy_item(listWidgetLabelNumer, label_destroy); + list_destroy_item(listWidgetLabelName, label_destroy); + list_destroy_item(listWidgetLabelScore, label_destroy); } - listWidgetLabelNumer = newList(); - listWidgetLabelName = newList(); - listWidgetLabelScore = newList(); + listWidgetLabelNumer = list_new(); + listWidgetLabelName = list_new(); + listWidgetLabelScore = list_new(); for (i = 0; i < SCREEN_TABLE_MAX_PLAYERS; i++) { widget_t *label; @@ -128,14 +128,14 @@ static void setWidgetLabel() sscanf(line, "%s %s", name, score); sprintf(num, "%2d)", i + 1); - label = newWidgetLabel(num, WINDOW_SIZE_X / 2 - 100, 200 + i * 20, WIDGET_LABEL_LEFT); - addList(listWidgetLabelNumer, label); + label = label_new(num, WINDOW_SIZE_X / 2 - 100, 200 + i * 20, WIDGET_LABEL_LEFT); + list_add(listWidgetLabelNumer, label); - label = newWidgetLabel(name, WINDOW_SIZE_X / 2, 200 + i * 20, WIDGET_LABEL_CENTER); - addList(listWidgetLabelName, label); + label = label_new(name, WINDOW_SIZE_X / 2, 200 + i * 20, WIDGET_LABEL_CENTER); + list_add(listWidgetLabelName, label); - label = newWidgetLabel(score, WINDOW_SIZE_X / 2 + 80, 200 + i * 20, WIDGET_LABEL_LEFT); - addList(listWidgetLabelScore, label); + label = label_new(score, WINDOW_SIZE_X / 2 + 80, 200 + i * 20, WIDGET_LABEL_LEFT); + list_add(listWidgetLabelScore, label); } } @@ -144,13 +144,13 @@ static void loadHighscoreFile() char path[STR_PATH_SIZE]; int i; - sprintf(path, "%s/" SCREEN_TABLE_FILE_HIGHSCORE_NAME, getHomeDirector()); - textFile = loadTextFile(path); + sprintf(path, "%s/" SCREEN_TABLE_FILE_HIGHSCORE_NAME, homeDirector_get()); + textFile = textFile_load(path); if (textFile == NULL) { fprintf(stderr, _("I am unable to load: \"%s\"!\n"), path); fprintf(stderr, _("Creating: \"%s\"\n"), path); - textFile = newTextFile(path); + textFile = textFile_new(path); } else { return; } @@ -161,13 +161,13 @@ static void loadHighscoreFile() } for (i = 0; i < SCREEN_TABLE_MAX_PLAYERS; i++) { - addList(textFile->text, strdup("no_name 0")); + list_add(textFile->text, strdup("no_name 0")); } - saveTextFile(textFile); + textFile_save(textFile); } -int addPlayerInHighScore(char *name, int score) +int table_add(char *name, int score) { int i; @@ -183,8 +183,8 @@ int addPlayerInHighScore(char *name, int score) char new[STR_SIZE]; sprintf(new, "%s %d", name, score); - insList(textFile->text, i, strdup(new)); - delListItem(textFile->text, SCREEN_TABLE_MAX_PLAYERS, free); + list_ins(textFile->text, i, strdup(new)); + list_del_item(textFile->text, SCREEN_TABLE_MAX_PLAYERS, free); setWidgetLabel(); return 0; @@ -194,14 +194,14 @@ int addPlayerInHighScore(char *name, int score) return -1; } -void initScreenTable() +void table_init() { image_t *image; - image = addImageData("screen_table.png", IMAGE_NO_ALPHA, "screen_table", IMAGE_GROUP_BASE); - image_backgorund = newWidgetImage(0, 0, image); + image = image_add("screen_table.png", IMAGE_NO_ALPHA, "screen_table", IMAGE_GROUP_BASE); + image_backgorund = wid_image_new(0, 0, image); - button_back = newWidgetButton(_("back"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, + button_back = button_new(_("back"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2, WINDOW_SIZE_Y - 100, eventWidget); loadHighscoreFile(); @@ -210,20 +210,20 @@ void initScreenTable() listWidgetLabelScore = NULL; setWidgetLabel(); - registerScreen(newScreen("table", startScreenTable, eventScreenTable, drawScreenTable, stopScreenTable)); + screen_register(screen_new("table", table_start, table_event, table_draw, table_stop)); } -void quitScreenTable() +void table_quit() { - destroyWidgetImage(image_backgorund); + wid_image_destroy(image_backgorund); - destroyWidgetButton(button_back); - destroyListItem(listWidgetLabelNumer, destroyWidgetLabel); - destroyListItem(listWidgetLabelName, destroyWidgetLabel); - destroyListItem(listWidgetLabelScore, destroyWidgetLabel); + button_destroy(button_back); + list_destroy_item(listWidgetLabelNumer, label_destroy); + list_destroy_item(listWidgetLabelName, label_destroy); + list_destroy_item(listWidgetLabelScore, label_destroy); if (textFile != NULL) { - saveTextFile(textFile); - destroyTextFile(textFile); + textFile_save(textFile); + textFile_destroy(textFile); } } diff --git a/src/screen/table.h b/src/screen/table.h index a91b233..9f4bf46 100644 --- a/src/screen/table.h +++ b/src/screen/table.h @@ -6,12 +6,12 @@ # define SCREEN_TABLE_MAX_PLAYERS 10 # define SCREEN_TABLE_FILE_HIGHSCORE_NAME "highscore" -extern void startScreenTable(); -extern void drawScreenTable(); -extern void eventScreenTable(); -extern void stopScreenTable(); -extern int addPlayerInHighScore(char *name, int score); -extern void initScreenTable(); -extern void quitScreenTable(); +extern void table_start(); +extern void table_draw(); +extern void table_event(); +extern void table_stop(); +extern int table_add(char *name, int score); +extern void table_init(); +extern void table_quit(); #endif diff --git a/src/screen/world.c b/src/screen/world.c index 5fa3ecd..cb0daf6 100644 --- a/src/screen/world.c +++ b/src/screen/world.c @@ -53,7 +53,7 @@ static bool_t isEndWorld; static tux_t *tuxWithControlRightKeyboard; static tux_t *tuxWithControlLeftKeyboard; -bool_t isScreenWorldInicialized() +bool_t word_is_inicialized() { return isScreenWorldInit; } @@ -62,38 +62,38 @@ void setGameType() { int ret = 0; - ret = initNetMuliplayer(getSettingGameType(), getSettingIP(), - getSettingPort(), getSettingProto()); + ret = netMultiplayer_init(publicServer_get_settingGameType(), publicServer_get_settingIP(), + publicServer_get_settingPort(), publicServer_get_settingProto()); if (ret != 0) { fprintf(stderr, _("Network initialization error!\n")); - setWorldEnd(); + word_do_end(); } } -void setWorldArena(arenaFile_t * arenaFile) +void word_set_arena(arenaFile_t * arenaFile) { - arena = getArena(arenaFile); + arena = arenaFile_get_arena(arenaFile); #ifndef NO_SOUND - playMusic(arena->music, MUSIC_GROUP_USER); + music_play(arena->music, MUSIC_GROUP_USER); #endif } -void setWorldEnd() +void word_do_end() { isEndWorld = TRUE; } static void timer_endArena() { - if (getNetTypeGame() != NET_GAME_TYPE_CLIENT) { - setWorldEnd(); + if (netMultiplayer_get_game_type() != NET_GAME_TYPE_CLIENT) { + word_do_end(); return; } } -void countRoundInc() +void word_inc_round() { if (arena->max_countRound == WORLD_COUNT_ROUND_UNLIMITED || arena->countRound >= arena->max_countRound) { @@ -106,9 +106,9 @@ void countRoundInc() if (arena->countRound >= arena->max_countRound) { //printf("count %d ending\n", count); #ifndef NO_SOUND - playSound("end", SOUND_GROUP_BASE); + sound_play("end", SOUND_GROUP_BASE); #endif - addTaskToTimer(getCurrentArena()->listTimer, TIMER_ONE, timer_endArena, NULL, TIMER_END_ARENA); + timer_add_task(arena_get_current()->listTimer, TIMER_ONE, timer_endArena, NULL, TIMER_END_ARENA); } } @@ -117,58 +117,58 @@ void prepareArena() tux_t *tux; char name[STR_NAME_SIZE]; - //printf("getSettingAI = %s\n", getSettingAI()); - setCurrentArena(NULL); + //printf("publicServer_get_settingAI = %s\n", publicServer_get_settingAI()); + arena_set_current(NULL); tuxWithControlRightKeyboard = NULL; tuxWithControlLeftKeyboard = NULL; - if (getGemeTypeLoadSession() != NULL) { - loadArena(getGemeTypeLoadSession()); + if (gameType_load_session() != NULL) { + load_arena(gameType_load_session()); return; } - switch (getNetTypeGame()) { + switch (netMultiplayer_get_game_type()) { case NET_GAME_TYPE_NONE: - setWorldArena(getChoiceArena()); - addNewItem(arena->spaceItem, ID_UNKNOWN); - getSettingCountRound(&arena->max_countRound); + word_set_arena(choiceArena_get()); + item_add_new_item(arena->spaceItem, ID_UNKNOWN); + publicServer_get_settingCountRound(&arena->max_countRound); - tux = newTux(); + tux = tux_new(); tux->control = TUX_CONTROL_KEYBOARD_RIGHT; tuxWithControlRightKeyboard = tux; - getSettingNameRight(name); - tuxSetName(tux, name); - addObjectToSpace(arena->spaceTux, tux); + publicServer_get_settingNameRight(name); + tux_set_name(tux, name); + space_add(arena->spaceTux, tux); - tux = newTux(); + tux = tux_new(); tux->control = TUX_CONTROL_KEYBOARD_LEFT; tuxWithControlLeftKeyboard = tux; - getSettingNameLeft(name); - tuxSetName(tux, name); - addObjectToSpace(arena->spaceTux, tux); + publicServer_get_settingNameLeft(name); + tux_set_name(tux, name); + space_add(arena->spaceTux, tux); - if (isSettingAI()) { + if (setting_is_ai()) { tux->control = TUX_CONTROL_AI; - if (loadModule("libmodAI") != 0) { + if (module_load("libmodAI") != 0) { tux->control = TUX_CONTROL_KEYBOARD_LEFT; } } - //printf("getGemeTypeLoadSession = %s\n", getGemeTypeLoadSession()); + //printf("gameType_load_session = %s\n", gameType_load_session()); break; case NET_GAME_TYPE_SERVER: - setWorldArena(getChoiceArena()); - addNewItem(arena->spaceItem, ID_UNKNOWN); - getSettingCountRound(&arena->max_countRound); + word_set_arena(choiceArena_get()); + item_add_new_item(arena->spaceItem, ID_UNKNOWN); + publicServer_get_settingCountRound(&arena->max_countRound); - tux = newTux(); + tux = tux_new(); tux->control = TUX_CONTROL_KEYBOARD_RIGHT; tuxWithControlRightKeyboard = tux; - getSettingNameRight(name); - tuxSetName(tux, name); - addObjectToSpace(arena->spaceTux, tux); + publicServer_get_settingNameRight(name); + tux_set_name(tux, name); + space_add(arena->spaceTux, tux); break; case NET_GAME_TYPE_CLIENT: @@ -176,30 +176,30 @@ void prepareArena() } } -void drawWorld() +void word_draw() { if (arena != NULL) { - drawArena(arena); - drawPanel(tuxWithControlRightKeyboard, tuxWithControlLeftKeyboard); + arena_draw(arena); + panel_draw(tuxWithControlRightKeyboard, tuxWithControlLeftKeyboard); if (arena->w > WINDOW_SIZE_X || arena->h > WINDOW_SIZE_Y) { - drawRadar(arena); + radar_draw(arena); } } - drawChat(); - drawPauza(); - drawTerm(); - drawSaveDialog(); + chat_draw(); + pauza_draw(); + term_draw(); + saveDialog_draw(); } static void netAction(tux_t * tux, int action) { - if (getSettingGameType() == NET_GAME_TYPE_SERVER) { + if (publicServer_get_settingGameType() == NET_GAME_TYPE_SERVER) { proto_send_event_server(PROTO_SEND_ALL_SEES_TUX, NULL, tux, action); } - if (getSettingGameType() == NET_GAME_TYPE_CLIENT) { + if (publicServer_get_settingGameType() == NET_GAME_TYPE_CLIENT) { proto_send_event_client(action); } } @@ -216,80 +216,80 @@ static void control_keyboard_right(tux_t * tux) countKey = 0; - if (mapa[(SDLKey) getKey(KEY_TUX_RIGHT_MOVE_UP)] == SDL_PRESSED) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_UP)] == SDL_PRESSED) countKey++; - if (mapa[(SDLKey) getKey(KEY_TUX_RIGHT_MOVE_RIGHT)] == SDL_PRESSED) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_RIGHT)] == SDL_PRESSED) countKey++; - if (mapa[(SDLKey) getKey(KEY_TUX_RIGHT_MOVE_LEFT)] == SDL_PRESSED) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_LEFT)] == SDL_PRESSED) countKey++; - if (mapa[(SDLKey) getKey(KEY_TUX_RIGHT_MOVE_DOWN)] == SDL_PRESSED) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_DOWN)] == SDL_PRESSED) countKey++; - if (mapa[(SDLKey) getKey(KEY_TUX_RIGHT_SWITCH_WEAPON)] == SDL_PRESSED + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_SWITCH_WEAPON)] == SDL_PRESSED && tux->isCanSwitchGun == TRUE) { netAction(tux, TUX_SWITCH_GUN); - actionTux(tux, TUX_SWITCH_GUN); + tux_action(tux, TUX_SWITCH_GUN); return; } - if (mapa[(SDLKey) getKey(KEY_TUX_RIGHT_SHOOT)] == SDL_PRESSED + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_SHOOT)] == SDL_PRESSED && tux->isCanShot == TRUE) { netAction(tux, TUX_SHOT); - actionTux(tux, TUX_SHOT); + tux_action(tux, TUX_SHOT); return; } - if (mapa[(SDLKey) getKey(KEY_TUX_RIGHT_MOVE_UP)] == SDL_PRESSED) { - if (countKey > 1 && lastKey == getKey(KEY_TUX_RIGHT_MOVE_UP)) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_UP)] == SDL_PRESSED) { + if (countKey > 1 && lastKey == keyTable_get_key(KEY_TUX_RIGHT_MOVE_UP)) goto tuUp; if (countKey == 1) - lastKey = getKey(KEY_TUX_RIGHT_MOVE_UP); + lastKey = keyTable_get_key(KEY_TUX_RIGHT_MOVE_UP); netAction(tux, TUX_UP); - actionTux(tux, TUX_UP); + tux_action(tux, TUX_UP); return; tuUp:; } - if (mapa[(SDLKey) getKey(KEY_TUX_RIGHT_MOVE_RIGHT)] == SDL_PRESSED) { - if (countKey > 1 && lastKey == getKey(KEY_TUX_RIGHT_MOVE_RIGHT)) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_RIGHT)] == SDL_PRESSED) { + if (countKey > 1 && lastKey == keyTable_get_key(KEY_TUX_RIGHT_MOVE_RIGHT)) goto tuRight; if (countKey == 1) - lastKey = getKey(KEY_TUX_RIGHT_MOVE_RIGHT); + lastKey = keyTable_get_key(KEY_TUX_RIGHT_MOVE_RIGHT); netAction(tux, TUX_RIGHT); - actionTux(tux, TUX_RIGHT); + tux_action(tux, TUX_RIGHT); return; tuRight:; } - if (mapa[(SDLKey) getKey(KEY_TUX_RIGHT_MOVE_LEFT)] == SDL_PRESSED) { - if (countKey > 1 && lastKey == getKey(KEY_TUX_RIGHT_MOVE_LEFT)) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_LEFT)] == SDL_PRESSED) { + if (countKey > 1 && lastKey == keyTable_get_key(KEY_TUX_RIGHT_MOVE_LEFT)) goto tuLeft; if (countKey == 1) - lastKey = getKey(KEY_TUX_RIGHT_MOVE_LEFT); + lastKey = keyTable_get_key(KEY_TUX_RIGHT_MOVE_LEFT); netAction(tux, TUX_LEFT); - actionTux(tux, TUX_LEFT); + tux_action(tux, TUX_LEFT); return; tuLeft:; } - if (mapa[(SDLKey) getKey(KEY_TUX_RIGHT_MOVE_DOWN)] == SDL_PRESSED) { - if (countKey > 1 && lastKey == getKey(KEY_TUX_RIGHT_MOVE_DOWN)) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_DOWN)] == SDL_PRESSED) { + if (countKey > 1 && lastKey == keyTable_get_key(KEY_TUX_RIGHT_MOVE_DOWN)) goto tuDown; if (countKey == 1) - lastKey = getKey(KEY_TUX_RIGHT_MOVE_DOWN); + lastKey = keyTable_get_key(KEY_TUX_RIGHT_MOVE_DOWN); netAction(tux, TUX_DOWN); - actionTux(tux, TUX_DOWN); + tux_action(tux, TUX_DOWN); return; tuDown:; @@ -308,75 +308,75 @@ static void control_keyboard_left(tux_t * tux) countKey = 0; - if (mapa[(SDLKey) getKey(KEY_TUX_LEFT_MOVE_UP)] == SDL_PRESSED) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_UP)] == SDL_PRESSED) countKey++; - if (mapa[(SDLKey) getKey(KEY_TUX_LEFT_MOVE_RIGHT)] == SDL_PRESSED) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_RIGHT)] == SDL_PRESSED) countKey++; - if (mapa[(SDLKey) getKey(KEY_TUX_LEFT_MOVE_LEFT)] == SDL_PRESSED) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_LEFT)] == SDL_PRESSED) countKey++; - if (mapa[(SDLKey) getKey(KEY_TUX_LEFT_MOVE_DOWN)] == SDL_PRESSED) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_DOWN)] == SDL_PRESSED) countKey++; - if (mapa[(SDLKey) getKey(KEY_TUX_LEFT_SWITCH_WEAPON)] == SDL_PRESSED) { + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_SWITCH_WEAPON)] == SDL_PRESSED) { if (tux->isCanSwitchGun == TRUE) { - actionTux(tux, TUX_SWITCH_GUN); + tux_action(tux, TUX_SWITCH_GUN); return; } } - if (mapa[(SDLKey) getKey(KEY_TUX_LEFT_SHOOT)] == SDL_PRESSED + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_SHOOT)] == SDL_PRESSED && tux->isCanShot == TRUE) { - actionTux(tux, TUX_SHOT); + tux_action(tux, TUX_SHOT); return; } - if (mapa[(SDLKey) getKey(KEY_TUX_LEFT_MOVE_UP)] == SDL_PRESSED) { - if (countKey > 1 && lastKey == getKey(KEY_TUX_LEFT_MOVE_UP)) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_UP)] == SDL_PRESSED) { + if (countKey > 1 && lastKey == keyTable_get_key(KEY_TUX_LEFT_MOVE_UP)) goto tuUp; if (countKey == 1) - lastKey = getKey(KEY_TUX_LEFT_MOVE_UP); - actionTux(tux, TUX_UP); + lastKey = keyTable_get_key(KEY_TUX_LEFT_MOVE_UP); + tux_action(tux, TUX_UP); return; tuUp:; } - if (mapa[(SDLKey) getKey(KEY_TUX_LEFT_MOVE_RIGHT)] == SDL_PRESSED) { - if (countKey > 1 && lastKey == getKey(KEY_TUX_LEFT_MOVE_RIGHT)) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_RIGHT)] == SDL_PRESSED) { + if (countKey > 1 && lastKey == keyTable_get_key(KEY_TUX_LEFT_MOVE_RIGHT)) goto tuRight; if (countKey == 1) - lastKey = getKey(KEY_TUX_LEFT_MOVE_RIGHT); - actionTux(tux, TUX_RIGHT); + lastKey = keyTable_get_key(KEY_TUX_LEFT_MOVE_RIGHT); + tux_action(tux, TUX_RIGHT); return; tuRight:; } - if (mapa[(SDLKey) getKey(KEY_TUX_LEFT_MOVE_LEFT)] == SDL_PRESSED) { - if (countKey > 1 && lastKey == getKey(KEY_TUX_LEFT_MOVE_LEFT)) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_LEFT)] == SDL_PRESSED) { + if (countKey > 1 && lastKey == keyTable_get_key(KEY_TUX_LEFT_MOVE_LEFT)) goto tuLeft; if (countKey == 1) - lastKey = getKey(KEY_TUX_LEFT_MOVE_LEFT); - actionTux(tux, TUX_LEFT); + lastKey = keyTable_get_key(KEY_TUX_LEFT_MOVE_LEFT); + tux_action(tux, TUX_LEFT); return; tuLeft:; } - if (mapa[(SDLKey) getKey(KEY_TUX_LEFT_MOVE_DOWN)] == SDL_PRESSED) { - if (countKey > 1 && lastKey == getKey(KEY_TUX_LEFT_MOVE_DOWN)) + if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_DOWN)] == SDL_PRESSED) { + if (countKey > 1 && lastKey == keyTable_get_key(KEY_TUX_LEFT_MOVE_DOWN)) goto tuDown; if (countKey == 1) - lastKey = getKey(KEY_TUX_LEFT_MOVE_DOWN); - actionTux(tux, TUX_DOWN); + lastKey = keyTable_get_key(KEY_TUX_LEFT_MOVE_DOWN); + tux_action(tux, TUX_DOWN); return; tuDown:; @@ -386,12 +386,12 @@ static void control_keyboard_left(tux_t * tux) static void eventEnd() { if (isEndWorld == TRUE) { - setScreen("analyze"); + screen_set("analyze"); return; } } -tux_t *getControlTux(int control_type) +tux_t *word_get_control_tux(int control_type) { switch (control_type) { case TUX_CONTROL_KEYBOARD_RIGHT: @@ -405,7 +405,7 @@ tux_t *getControlTux(int control_type) return NULL; } -void setControlTux(tux_t * tux, int control_type) +void word_set_control_tux(tux_t * tux, int control_type) { switch (control_type) { case TUX_CONTROL_KEYBOARD_RIGHT: @@ -417,7 +417,7 @@ void setControlTux(tux_t * tux, int control_type) } } -void tuxControl(tux_t * p) +void word_tux_control(tux_t * p) { assert(p != NULL); @@ -431,57 +431,57 @@ void tuxControl(tux_t * p) break; case TUX_CONTROL_KEYBOARD_LEFT: - if (isChatActive() == FALSE) { + if (chat_is_active() == FALSE) { control_keyboard_left(p); } break; case TUX_CONTROL_KEYBOARD_RIGHT: - if (isChatActive() == FALSE) { + if (chat_is_active() == FALSE) { control_keyboard_right(p); } break; } } -void eventWorld() +void word_event() { tux_t *thisTux; if (arena == NULL) { - eventNetMultiplayer(); + netMultiplayer_event(); eventEnd(); return; } - eventNetMultiplayer(); + netMultiplayer_event(); - if (isPauzeActive() == FALSE && isSaveDialogActive() == FALSE) { - eventArena(arena); - //eventModule(); + if (pauza_is_active() == FALSE && saveDialog_is_active() == FALSE) { + arena_event(arena); + //module_event(); } - thisTux = getControlTux(TUX_CONTROL_KEYBOARD_RIGHT); + thisTux = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT); - addToRadar(thisTux->id, thisTux->x, thisTux->y, RADAR_TYPE_YOU); + radar_add(thisTux->id, thisTux->x, thisTux->y, RADAR_TYPE_YOU); - thisTux = getControlTux(TUX_CONTROL_KEYBOARD_LEFT); + thisTux = word_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT); if (thisTux != NULL) { - addToRadar(thisTux->id, thisTux->x, thisTux->y, RADAR_TYPE_TUX); + radar_add(thisTux->id, thisTux->x, thisTux->y, RADAR_TYPE_TUX); } eventEnd(); - eventChat(); - eventPauza(); - eventTerm(); - eventSaveDialog(); + chat_event(); + pauza_event(); + term_event(); + saveDialog_event(); } static void hotkey_escape() { - setWorldEnd(); + word_do_end(); } void startWorld() @@ -489,32 +489,32 @@ void startWorld() arena = NULL; isEndWorld = FALSE; - registerHotKey(SDLK_ESCAPE, hotkey_escape); - initArena(); - initListID(); - initRadar(); - initPauza(); - initTerm(); - initSaveDialog(); + hotKey_register(SDLK_ESCAPE, hotkey_escape); + arena_init(); + id_init_list(); + radar_init(); + pauza_init(); + term_init(); + saveDialog_init(); - initModule(); + module_init(); setGameType(); - initChat(); + chat_init(); prepareArena(); } static void action_analyze(space_t * space, tux_t * tux, void *p) { - addAnalyze(tux->name, tux->score); + analyze_add(tux->name, tux->score); } static void setAnalyze() { - restartAnalyze(); + analyze_restart(); - actionSpace(arena->spaceTux, action_analyze, NULL); + space_action(arena->spaceTux, action_analyze, NULL); - endAnalyze(); + analyze_end(); } static void setTable() @@ -522,19 +522,19 @@ static void setTable() tux_t *tuxRight; tux_t *tuxLeft; - if (getSettingGameType() != NET_GAME_TYPE_NONE) { + if (publicServer_get_settingGameType() != NET_GAME_TYPE_NONE) { return; } - tuxRight = getControlTux(TUX_CONTROL_KEYBOARD_RIGHT); - tuxLeft = getControlTux(TUX_CONTROL_KEYBOARD_LEFT); + tuxRight = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT); + tuxLeft = word_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT); if (tuxRight->score > tuxLeft->score) { - addPlayerInHighScore(tuxRight->name, tuxRight->score); + table_add(tuxRight->name, tuxRight->score); } if (tuxLeft->score > tuxRight->score) { - addPlayerInHighScore(tuxLeft->name, tuxLeft->score); + table_add(tuxLeft->name, tuxLeft->score); } } @@ -545,64 +545,64 @@ void stoptWorld() setAnalyze(); } - unregisterHotKey(SDLK_ESCAPE); - quitArena(); + unhotKey_register(SDLK_ESCAPE); + arena_quit(); - quitNetMultiplayer(); + netMultiplayer_quit(); if (arena != NULL) { - destroyArena(arena); + arena_destroy(arena); } - quitRadar(); - quitPauza(); - quitTerm(); - quitSaveDialog(); + radar_quit(); + pauza_quit(); + term_quit(); + saveDialog_quit(); #ifndef NO_SOUND - stopMusic(); + music_stop(); #endif - delAllImageInGroup(IMAGE_GROUP_USER); + image_del_all_image_in_group(IMAGE_GROUP_USER); #ifndef NO_SOUND - delAllMusicInGroup(MUSIC_GROUP_USER); + music_del_all_in_group(MUSIC_GROUP_USER); #endif - quitModule(); - quitChat(); - quitListID(); + module_quit(); + chat_quit(); + id_quit_list(); } -void initWorld() +void word_init() { - assert(isImageInicialized() == TRUE); - assert(isTuxInicialized() == TRUE); - assert(isShotInicialized() == TRUE); - assert(isPanelInicialized() == TRUE); - assert(isScreenInicialized() == TRUE); + assert(image_is_inicialized() == TRUE); + assert(tux_is_inicialized() == TRUE); + assert(shot_is_inicialized() == TRUE); + assert(panel_is_inicialized() == TRUE); + assert(screen_is_inicialized() == TRUE); - registerScreen(newScreen - ("world", startWorld, eventWorld, drawWorld, stoptWorld)); + screen_register(screen_new + ("world", startWorld, word_event, word_draw, stoptWorld)); #ifndef NO_SOUND - addSound("dead.ogg", "dead", SOUND_GROUP_BASE); - addSound("explozion.ogg", "explozion", SOUND_GROUP_BASE); - addSound("gun_lasser.ogg", "gun_lasser", SOUND_GROUP_BASE); - addSound("gun_revolver.ogg", "gun_revolver", SOUND_GROUP_BASE); - addSound("gun_scatter.ogg", "gun_scatter", SOUND_GROUP_BASE); - addSound("gun_tommy.ogg", "gun_tommy", SOUND_GROUP_BASE); - addSound("put_mine.ogg", "put_mine", SOUND_GROUP_BASE); - addSound("teleport.ogg", "teleport", SOUND_GROUP_BASE); - addSound("item_bonus.ogg", "item_bonus", SOUND_GROUP_BASE); - addSound("item_gun.ogg", "item_gun", SOUND_GROUP_BASE); - addSound("switch_gun.ogg", "switch_gun", SOUND_GROUP_BASE); - addSound("end.ogg", "end", SOUND_GROUP_BASE); + sound_add("dead.ogg", "dead", SOUND_GROUP_BASE); + sound_add("explozion.ogg", "explozion", SOUND_GROUP_BASE); + sound_add("gun_lasser.ogg", "gun_lasser", SOUND_GROUP_BASE); + sound_add("gun_revolver.ogg", "gun_revolver", SOUND_GROUP_BASE); + sound_add("gun_scatter.ogg", "gun_scatter", SOUND_GROUP_BASE); + sound_add("gun_tommy.ogg", "gun_tommy", SOUND_GROUP_BASE); + sound_add("put_mine.ogg", "put_mine", SOUND_GROUP_BASE); + sound_add("teleport.ogg", "teleport", SOUND_GROUP_BASE); + sound_add("item_bonus.ogg", "item_bonus", SOUND_GROUP_BASE); + sound_add("item_gun.ogg", "item_gun", SOUND_GROUP_BASE); + sound_add("switch_gun.ogg", "switch_gun", SOUND_GROUP_BASE); + sound_add("end.ogg", "end", SOUND_GROUP_BASE); #endif isScreenWorldInit = TRUE; } -void quitWorld() +void word_quit() { DEBUG_MSG(_("Quitting screen world\n")); isScreenWorldInit = FALSE; diff --git a/src/screen/world.h b/src/screen/world.h index 67935f7..0df8a48 100644 --- a/src/screen/world.h +++ b/src/screen/world.h @@ -13,18 +13,18 @@ # define WORLD_COUNT_ROUND_UNLIMITED -1 # define LAG_SERVER_UNKNOWN -1 -extern bool_t isScreenWorldInicialized(); -extern void initWorld(); -extern void setWorldArena(arenaFile_t * arenaFile); -extern void setWorldEnd(); -extern void countRoundInc(); -extern tux_t *getControlTux(int control_type); -extern void setControlTux(tux_t * tux, int control_type); -extern void tuxControl(tux_t * p); -extern void drawWorld(); -extern void eventWorld(); -extern void startArena(); -extern void stopArena(); -extern void quitWorld(); +extern bool_t word_is_inicialized(); +extern void word_init(); +extern void word_set_arena(arenaFile_t * arenaFile); +extern void word_do_end(); +extern void word_inc_round(); +extern tux_t *word_get_control_tux(int control_type); +extern void word_set_control_tux(tux_t * tux, int control_type); +extern void word_tux_control(tux_t * p); +extern void word_draw(); +extern void word_event(); +extern void word_start(); +extern void word_stop(); +extern void word_quit(); #endif |