summaryrefslogtreecommitdiff
path: root/src/screen
diff options
context:
space:
mode:
Diffstat (limited to 'src/screen')
-rw-r--r--src/screen/analyze.c4
-rw-r--r--src/screen/browser.c8
-rw-r--r--src/screen/choiceArena.c50
-rw-r--r--src/screen/choiceArena.h12
-rw-r--r--src/screen/credits.c8
-rw-r--r--src/screen/downArena.c38
-rw-r--r--src/screen/downArena.h12
-rw-r--r--src/screen/gameType.c108
-rw-r--r--src/screen/gameType.h22
-rw-r--r--src/screen/mainMenu.c20
-rw-r--r--src/screen/mainMenu.h12
-rw-r--r--src/screen/setting.c70
-rw-r--r--src/screen/setting.h6
-rw-r--r--src/screen/settingKeys.c180
-rw-r--r--src/screen/settingKeys.h14
-rw-r--r--src/screen/table.c16
-rw-r--r--src/screen/world.c130
17 files changed, 355 insertions, 355 deletions
diff --git a/src/screen/analyze.c b/src/screen/analyze.c
index 306c7bd..eb20faf 100644
--- a/src/screen/analyze.c
+++ b/src/screen/analyze.c
@@ -60,7 +60,7 @@ void analyze_start()
music_play("menu", MUSIC_GROUP_BASE);
#endif
- hotKey_register(SDLK_ESCAPE, hotkey_escape);
+ hot_key_register(SDLK_ESCAPE, hotkey_escape);
}
void analyze_draw()
@@ -94,7 +94,7 @@ void analyze_stop()
label_destroy(widgetLabelMsg);
widgetLabelMsg = label_new("", WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER);
- unhotKey_register(SDLK_ESCAPE);
+ unhot_key_register(SDLK_ESCAPE);
}
static void eventWidget(void *p)
diff --git a/src/screen/browser.c b/src/screen/browser.c
index 9e4db3a..a971ba4 100644
--- a/src/screen/browser.c
+++ b/src/screen/browser.c
@@ -83,7 +83,7 @@ void browser_start()
music_play("menu", MUSIC_GROUP_BASE);
#endif
- hotKey_register(SDLK_ESCAPE, hotkey_escape);
+ hot_key_register(SDLK_ESCAPE, hotkey_escape);
LoadServers();
}
@@ -124,7 +124,7 @@ void browser_stop()
//select_server->list = list_new();
select_remove_all(select_server);
- unhotKey_register(SDLK_ESCAPE);
+ unhot_key_register(SDLK_ESCAPE);
while (1) {
i = 0;
@@ -175,8 +175,8 @@ static void eventWidget(void *p)
char *address = (char *) inet_ntoa(srv);
setSettingGameType(NET_GAME_TYPE_CLIENT);
- gameType_set_ip(address);
- gameType_set_port(server->port);
+ game_type_set_ip(address);
+ game_type_set_port(server->port);
screen_set("world");
}
diff --git a/src/screen/choiceArena.c b/src/screen/choiceArena.c
index 9e0d72a..4a633be 100644
--- a/src/screen/choiceArena.c
+++ b/src/screen/choiceArena.c
@@ -56,10 +56,10 @@ void screen_startChoiceArena()
music_play("menu", MUSIC_GROUP_BASE);
#endif
- hotKey_register(SDLK_ESCAPE, hotkey_escape);
+ hot_key_register(SDLK_ESCAPE, hotkey_escape);
}
-void choiceArena_draw()
+void choice_arena_draw()
{
int i;
@@ -71,11 +71,11 @@ void choiceArena_draw()
if (show_map_buttons.prev) { button_draw(button_prev); }
for (i = show_map_buttons.min ; i < show_map_buttons.max; i++) {
- buttonImage_draw((widget_t*)listAllWidgetButtonimage->list[i]);
+ button_image_draw((widget_t*)listAllWidgetButtonimage->list[i]);
}
}
-void choiceArena_event()
+void choice_arena_event()
{
int i;
@@ -85,13 +85,13 @@ void choiceArena_event()
if (show_map_buttons.prev) { button_event(button_prev); }
for (i = show_map_buttons.min ; i < show_map_buttons.max; i++) {
- buttonImage_event((widget_t*)listAllWidgetButtonimage->list[i]);
+ button_image_event((widget_t*)listAllWidgetButtonimage->list[i]);
}
}
void stopScreenChoiceArena()
{
- unhotKey_register(SDLK_ESCAPE);
+ unhot_key_register(SDLK_ESCAPE);
}
static void button_eventImage(void *p)
@@ -107,30 +107,30 @@ static void button_eventImage(void *p)
this = (widget_t *) (listAllWidgetButtonimage->list[i]);
if (buttonimage == this) {
- buttonImage_set_active(this, TRUE);
- currentArena = arenaFile_get(i);
+ button_image_set_active(this, TRUE);
+ currentArena = arena_file_get(i);
} else {
- buttonImage_set_active(this, FALSE);
+ button_image_set_active(this, FALSE);
}
}
}
-arenaFile_t *choiceArena_get()
+arenaFile_t *choice_arena_get()
{
return currentArena;
}
-void choiceArena_set(arenaFile_t * arenaFile)
+void choice_arena_set(arenaFile_t * arenaFile)
{
widget_t *widget_buttonimage;
int id;
- id = arenaFile_get_id(arenaFile);
+ id = arena_file_get_id(arenaFile);
currentArena = arenaFile;
if (id >= 0) {
widget_buttonimage = (widget_t *) listAllWidgetButtonimage->list[id];
- buttonImage_set_active(widget_buttonimage, TRUE);
+ button_image_set_active(widget_buttonimage, TRUE);
}
}
@@ -168,18 +168,18 @@ static void eventWidget(void *p)
static void activateHandledMapButtonGroup(void) {
int min = handled_map_button_group * 6;
min = min < 0 ? 0 : min;
- min = min <= arenaFile_get_count() ? min : arenaFile_get_count();
- int max = min+6 <= arenaFile_get_count() ? min+6 : arenaFile_get_count();
+ min = min <= arena_file_get_count() ? min : arena_file_get_count();
+ int max = min+6 <= arena_file_get_count() ? min+6 : arena_file_get_count();
if (min) { show_map_buttons.prev = 1; }
else { show_map_buttons.prev = 0; }
- if (max < arenaFile_get_count()) { show_map_buttons.next = 1; }
+ if (max < arena_file_get_count()) { show_map_buttons.next = 1; }
else { show_map_buttons.next = 0; }
show_map_buttons.min = min;
show_map_buttons.max = max;
}
-void choiceArena_init()
+void choice_arena_init()
{
image_t *image;
int i;
@@ -196,14 +196,14 @@ void choiceArena_init()
listAllWidgetButtonimage = list_new();
currentArena = NULL;
- for (i = 0; i < arenaFile_get_count(); i++) {
+ for (i = 0; i < arena_file_get_count(); i++) {
widget_t *widget_buttonimage;
arenaFile_t *arenaFile;
int x, y;
- 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),
+ arenaFile = arena_file_get(i);
+ //image = image_add(arena_file_get_image(i), IMAGE_NO_ALPHA, "none", IMAGE_GROUP_BASE);
+ image = arena_file_load_image(arenaFile, arena_file_get_image(arenaFile),
IMAGE_GROUP_BASE, "none", IMAGE_NO_ALPHA);
// only 6 map buttons can be shown at once;
@@ -214,7 +214,7 @@ void choiceArena_init()
x = 100 + 200 * (pos - 3 * (pos / 3));
y = 150 + 200 * (pos / 3);
- widget_buttonimage = buttonImage_new(image, x, y, button_eventImage);
+ widget_buttonimage = button_image_new(image, x, y, button_eventImage);
/*
if( i == choiceArenaId )
{
@@ -227,11 +227,11 @@ void choiceArena_init()
}
screen_register( screen_new("chiceArena", screen_startChoiceArena,
- choiceArena_event, choiceArena_draw,
+ choice_arena_event, choice_arena_draw,
stopScreenChoiceArena));
}
-void choiceArena_quit()
+void choice_arena_quit()
{
wid_image_destroy(image_backgorund);
@@ -241,5 +241,5 @@ void choiceArena_quit()
button_destroy(button_next);
button_destroy(button_prev);
- list_destroy_item(listAllWidgetButtonimage, buttonImage_destroy);
+ list_destroy_item(listAllWidgetButtonimage, button_image_destroy);
}
diff --git a/src/screen/choiceArena.h b/src/screen/choiceArena.h
index 163ab60..b0e1ce4 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 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();
+extern void choice_arena_draw();
+extern void choice_arena_event();
+extern arenaFile_t *choice_arena_get();
+extern void choice_arena_set(arenaFile_t * arenaFile);
+extern void choice_arena_init();
+extern void choice_arena_quit();
#endif
diff --git a/src/screen/credits.c b/src/screen/credits.c
index c9521b1..52e5959 100644
--- a/src/screen/credits.c
+++ b/src/screen/credits.c
@@ -41,7 +41,7 @@ void scredits_start()
#endif
offset = 0;
- hotKey_register(SDLK_ESCAPE, hotkey_escape);
+ hot_key_register(SDLK_ESCAPE, hotkey_escape);
}
void scredits_draw()
@@ -86,7 +86,7 @@ void scredits_event()
void scredits_stop()
{
- unhotKey_register(SDLK_ESCAPE);
+ unhot_key_register(SDLK_ESCAPE);
}
static void eventWidget(void *p)
@@ -115,7 +115,7 @@ void scredits_init()
if (tryExistFile(PATH_DOC SCREEN_CREDITS_FILE) == 0) {
creditExists = 1;
- textFile = textFile_load(PATH_DOC SCREEN_CREDITS_FILE);
+ textFile = text_file_load(PATH_DOC SCREEN_CREDITS_FILE);
for (i = 0; i < textFile->text->count; i++) {
widget_t *label;
@@ -158,6 +158,6 @@ void scredits_quit()
list_destroy_item(listWidgetLabel, label_destroy);
if (creditExists) {
- textFile_destroy(textFile);
+ text_file_destroy(textFile);
}
}
diff --git a/src/screen/downArena.c b/src/screen/downArena.c
index 7752513..9daf051 100644
--- a/src/screen/downArena.c
+++ b/src/screen/downArena.c
@@ -62,11 +62,11 @@ static void connectToDownServer()
char status[STR_SIZE];
char msg[STR_PROTO_SIZE];
- sock_server_tcp = sock_tcp_connect(publicServer_get_settingIP(), publicServer_get_settingPort());
+ sock_server_tcp = sock_tcp_connect(public_server_get_settingIP(), public_server_get_settingPort());
if( sock_server_tcp == NULL )
{
- sprintf(status, "I do not connect to %s %d TCP down server", publicServer_get_settingIP(), publicServer_get_settingPort());
+ sprintf(status, "I do not connect to %s %d TCP down server", public_server_get_settingIP(), public_server_get_settingPort());
setStatusString(status);
return;
}
@@ -85,7 +85,7 @@ static void connectToDownServer()
buffer_append(sendBuffer, msg, strlen(msg));
- sprintf(status, "Connect to %s %d TCP down server", publicServer_get_settingIP(), publicServer_get_settingPort());
+ sprintf(status, "Connect to %s %d TCP down server", public_server_get_settingIP(), public_server_get_settingPort());
setStatusString(status);
}
@@ -106,7 +106,7 @@ static void sendStatusToGameServer()
if( countSendMsg > DOWN_ARENA_MAX_SEND_MSG_STATUS )
{
char status[STR_SIZE];
- sprintf(status, "Game server %s %d is down", publicServer_get_settingIP(), publicServer_get_settingPort());
+ sprintf(status, "Game server %s %d is down", public_server_get_settingIP(), public_server_get_settingPort());
setStatusString(status);
return;
}
@@ -118,36 +118,36 @@ static void sendStatusToGameServer()
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", publicServer_get_settingIP(), publicServer_get_settingPort());
+ sprintf(status, "I do not send message to %s %d UDP game server", public_server_get_settingIP(), public_server_get_settingPort());
setStatusString(status);
}
}
-void downArena_start()
+void down_arena_start()
{
char status[STR_SIZE];
strcpy(str_status, "none");
memset(arenaNetName, 0, STR_SIZE);
- sock_server_udp = sock_udp_connect(publicServer_get_settingIP(), publicServer_get_settingPort());
+ sock_server_udp = sock_udp_connect(public_server_get_settingIP(), public_server_get_settingPort());
if (sock_server_udp == NULL)
{
- sprintf(status, "I do not connect to %s %d UDP game server", publicServer_get_settingIP(), publicServer_get_settingPort());
+ sprintf(status, "I do not connect to %s %d UDP game server", public_server_get_settingIP(), public_server_get_settingPort());
setStatusString(status);
return;
}
sock_udp_set_non_block(sock_server_udp);
- sprintf(status, "Connect to %s %d UDP game server", publicServer_get_settingIP(), publicServer_get_settingPort());
+ sprintf(status, "Connect to %s %d UDP game server", public_server_get_settingIP(), public_server_get_settingPort());
setStatusString(status);
sendStatusToGameServer();
}
-void downArena_draw()
+void down_arena_draw()
{
wid_image_draw(image_backgorund);
label_draw(label_status);
@@ -160,7 +160,7 @@ static void proto_ok(char *line)
fileSize = atoi(line + 3);
fileOffset = 0;
- sprintf(path, "%s/%s.zip", homeDirector_get(), arenaNetName);
+ sprintf(path, "%s/%s.zip", home_director_get(), arenaNetName);
//printf("path = %s\n", path);
file = fopen(path, "wb");
}
@@ -281,7 +281,7 @@ static void readArenaFromStatus()
sock_server_udp = NULL;
strncpy(arenaNetName, offset_begin, offset_end - offset_begin);
- if (arenaFile_get_file_format_net_name(arenaNetName) != NULL) {
+ if (arena_file_get_file_format_net_name(arenaNetName) != NULL) {
screen_set("world");
return;
}
@@ -307,7 +307,7 @@ static void eventStatus()
}
}
-void downArena_event()
+void down_arena_event()
{
int i;
@@ -331,14 +331,14 @@ void downArena_event()
fclose(file);
file = NULL;
closeConnectFromDownServer();
- arenaFile_load(path);
+ arena_file_load(path);
screen_set("world");
}
button_event(button_back);
}
-void downArena_stop()
+void down_arena_stop()
{
if (file != NULL) {
unlink(path);
@@ -365,7 +365,7 @@ static void eventWidget(void *p)
}
}
-void downArena_init()
+void down_arena_init()
{
image_t *image;
@@ -379,11 +379,11 @@ void downArena_init()
label_status =
label_new("none", WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER);
- screen_register( screen_new("downArena", downArena_start, downArena_event,
- downArena_draw, downArena_stop));
+ screen_register( screen_new("downArena", down_arena_start, down_arena_event,
+ down_arena_draw, down_arena_stop));
}
-void downArena_quit()
+void down_arena_quit()
{
wid_image_destroy(image_backgorund);
button_destroy(button_back);
diff --git a/src/screen/downArena.h b/src/screen/downArena.h
index 2ce5f07..c71a556 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 downArena_start();
-extern void downArena_draw();
-extern void downArena_event();
-extern void downArena_stop();
-extern void downArena_init();
-extern void downArena_quit();
+extern void down_arena_start();
+extern void down_arena_draw();
+extern void down_arena_event();
+extern void down_arena_stop();
+extern void down_arena_init();
+extern void down_arena_quit();
#endif
diff --git a/src/screen/gameType.c b/src/screen/gameType.c
index f143a2b..87886af 100644
--- a/src/screen/gameType.c
+++ b/src/screen/gameType.c
@@ -62,7 +62,7 @@ static void loadSession(widget_t * p)
director_t *director;
int i;
- director = director_load(homeDirector_get());
+ director = director_load(home_director_get());
select_remove_all(p);
@@ -101,10 +101,10 @@ void screen_startGameType()
loadSession(selectSession);
- hotKey_register(SDLK_ESCAPE, hotkey_escape);
+ hot_key_register(SDLK_ESCAPE, hotkey_escape);
}
-void gameType_draw()
+void game_type_draw()
{
int i;
@@ -114,7 +114,7 @@ void gameType_draw()
widget_t *this;
this = (widget_t *) listChoiceGroup->list[i];
- choiceGroup_draw(this);
+ choice_group_draw(this);
}
label_draw(label_none);
@@ -122,25 +122,25 @@ void gameType_draw()
label_draw(label_client);
label_draw(label_load_session);
- if (choiceGroup_get_status(check_server) == TRUE || choiceGroup_get_status(check_client) == TRUE) {
+ if (choice_group_get_status(check_server) == TRUE || choice_group_get_status(check_client) == TRUE) {
label_draw(label_port);
- textField_draw(textfield_port);
+ text_field_draw(textfield_port);
label_draw(label_ip);
- textField_draw(textfield_ip);
+ text_field_draw(textfield_ip);
}
- if (choiceGroup_get_status(check_load_session) == TRUE) {
+ if (choice_group_get_status(check_load_session) == TRUE) {
label_draw(label_session);
select_draw(selectSession);
}
#if 0
if (check_server->status == TRUE) {
- gameType_set_ip(getParamElse("--ip", "127.0.0.1"));
- gameType_set_port(atoi(getParamElse("--port", "2200")));
+ game_type_set_ip(getParamElse("--ip", "127.0.0.1"));
+ game_type_set_port(atoi(getParamElse("--port", "2200")));
}
#endif
- if (choiceGroup_get_status(check_client) == TRUE)
+ if (choice_group_get_status(check_client) == TRUE)
button_draw(button_browser);
button_draw(button_back);
@@ -148,7 +148,7 @@ void gameType_draw()
}
-void gameType_event()
+void game_type_event()
{
int i;
@@ -156,28 +156,28 @@ void gameType_event()
widget_t *this;
this = (widget_t *) listChoiceGroup->list[i];
- choiceGroup_event(this);
+ choice_group_event(this);
}
- if (choiceGroup_get_status(check_server) == TRUE || choiceGroup_get_status(check_client) == TRUE) {
- textField_event(textfield_ip);
- textField_event(textfield_port);
+ if (choice_group_get_status(check_server) == TRUE || choice_group_get_status(check_client) == TRUE) {
+ text_field_event(textfield_ip);
+ text_field_event(textfield_port);
}
- if (choiceGroup_get_status(check_load_session) == TRUE) {
+ if (choice_group_get_status(check_load_session) == TRUE) {
select_event(selectSession);
}
button_event(button_back);
button_event(button_play);
- if (choiceGroup_get_status(check_client) == TRUE)
+ if (choice_group_get_status(check_client) == TRUE)
button_event(button_browser);
}
void stopScreenGameType()
{
- unhotKey_register(SDLK_ESCAPE);
+ unhot_key_register(SDLK_ESCAPE);
}
static void eventWidget(void *p)
@@ -193,14 +193,14 @@ static void eventWidget(void *p)
if (button == button_play) {
char *str;
- str = gameType_load_session();
+ str = game_type_load_session();
if (str != NULL) {
screen_set("world");
return;
}
- if (publicServer_get_settingGameType() == NET_GAME_TYPE_CLIENT) {
+ if (public_server_get_settingGameType() == NET_GAME_TYPE_CLIENT) {
screen_set("downArena");
//screen_set("world");
} else {
@@ -213,7 +213,7 @@ static void eventWidget(void *p)
}
}
-void gameType_init()
+void game_type_init()
{
image_t *image;
@@ -225,10 +225,10 @@ void gameType_init()
button_browser = button_new(_("browser"), 300, 345, 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);
+ check_none = choice_group_new(100, 150, FALSE, listChoiceGroup, eventWidget);
+ check_server = choice_group_new(100, 200, FALSE, listChoiceGroup, eventWidget);
+ check_client = choice_group_new(100, 250, FALSE, listChoiceGroup, eventWidget);
+ check_load_session = choice_group_new(100, 300, FALSE, listChoiceGroup, eventWidget);
if (isParamFlag("--server")) {
choiceGroup_set_status(check_server, TRUE);
@@ -247,17 +247,17 @@ void gameType_init()
label_port = label_new(_("port"), 300, 245, WIDGET_LABEL_LEFT);
label_session = label_new("load session :", 300, 145, WIDGET_LABEL_LEFT);
- textfield_ip = textField_new(getParamElse("--ip", "127.0.0.1"),
+ textfield_ip = text_field_new(getParamElse("--ip", "127.0.0.1"),
WIDGET_TEXTFIELD_FILTER_IP_OR_DOMAIN,
300, 180);
- textfield_port = textField_new(getParamElse("--port", "6800"),
+ textfield_port = text_field_new(getParamElse("--port", "6800"),
WIDGET_TEXTFIELD_FILTER_NUM, 300, 280);
selectSession = select_new(300, 185, eventWidget);
- screen_register( screen_new("gameType", screen_startGameType, gameType_event,
- gameType_draw, stopScreenGameType));
+ screen_register( screen_new("gameType", screen_startGameType, game_type_event,
+ game_type_draw, stopScreenGameType));
}
int setSettingGameType(int status)
@@ -280,17 +280,17 @@ int setSettingGameType(int status)
return -1;
}
-int publicServer_get_settingGameType()
+int public_server_get_settingGameType()
{
- if (choiceGroup_get_status(check_none) == TRUE || choiceGroup_get_status(check_load_session) == TRUE) {
+ if (choice_group_get_status(check_none) == TRUE || choice_group_get_status(check_load_session) == TRUE) {
return NET_GAME_TYPE_NONE;
}
- if (choiceGroup_get_status(check_server) == TRUE) {
+ if (choice_group_get_status(check_server) == TRUE) {
return NET_GAME_TYPE_SERVER;
}
- if (choiceGroup_get_status(check_client) == TRUE) {
+ if (choice_group_get_status(check_client) == TRUE) {
return NET_GAME_TYPE_CLIENT;
}
@@ -299,52 +299,52 @@ int publicServer_get_settingGameType()
return -1;
}
-char *gameType_load_session()
+char *game_type_load_session()
{
- if (choiceGroup_get_status(check_load_session) == TRUE) {
+ if (choice_group_get_status(check_load_session) == TRUE) {
return select_get_item(selectSession);
}
return NULL;
}
-int gameType_set_ip(char *address)
+int game_type_set_ip(char *address)
{
char str[STR_SIZE];
strcpy(str, address);
- textField_set_text(textfield_ip, str);
+ text_field_set_text(textfield_ip, str);
return 1;
}
-char *publicServer_get_settingIP()
+char *public_server_get_settingIP()
{
- return textField_get_text(textfield_ip);
+ return text_field_get_text(textfield_ip);
}
-int gameType_set_port(int port)
+int game_type_set_port(int port)
{
char str[STR_SIZE];
sprintf(str, "%d", port);
- textField_set_text(textfield_port, str);
+ text_field_set_text(textfield_port, str);
return 0;
}
-int publicServer_get_settingPort()
+int public_server_get_settingPort()
{
- return atoi(textField_get_text(textfield_port));
+ return atoi(text_field_get_text(textfield_port));
}
-int publicServer_get_settingProto()
+int public_server_get_settingProto()
{
- if (strstr(textField_get_text(textfield_ip), ".") != NULL) {
+ if (strstr(text_field_get_text(textfield_ip), ".") != NULL) {
return PROTO_UDPv4;
}
- if (strstr(textField_get_text(textfield_ip), ":") != NULL) {
+ if (strstr(text_field_get_text(textfield_ip), ":") != NULL) {
return PROTO_UDPv6;
}
@@ -353,7 +353,7 @@ int publicServer_get_settingProto()
return -1;
}
-void gameType_quit()
+void game_type_quit()
{
wid_image_destroy(image_backgorund);
@@ -366,8 +366,8 @@ void gameType_quit()
label_destroy(label_port);
label_destroy(label_session);
- textField_destroy(textfield_ip);
- textField_destroy(textfield_port);
+ text_field_destroy(textfield_ip);
+ text_field_destroy(textfield_port);
select_destroy(selectSession);
@@ -375,10 +375,10 @@ void gameType_quit()
button_destroy(button_play);
button_destroy(button_browser);
- choiceGroup_destroy(check_none);
- choiceGroup_destroy(check_server);
- choiceGroup_destroy(check_client);
- choiceGroup_destroy(check_load_session);
+ choice_group_destroy(check_none);
+ choice_group_destroy(check_server);
+ choice_group_destroy(check_client);
+ choice_group_destroy(check_load_session);
list_destroy(listChoiceGroup);
}
diff --git a/src/screen/gameType.h b/src/screen/gameType.h
index a2b4457..9e88c60 100644
--- a/src/screen/gameType.h
+++ b/src/screen/gameType.h
@@ -5,17 +5,17 @@
# include "main.h"
-extern void gameType_draw();
-extern void gameType_event();
-extern void gameType_init();
+extern void game_type_draw();
+extern void game_type_event();
+extern void game_type_init();
extern int setSettingGameType(int status);
-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();
+extern int public_server_get_settingGameType();
+extern char *game_type_load_session();
+extern int game_type_set_ip(char *address);
+extern char *public_server_get_settingIP();
+extern int game_type_set_port(int port);
+extern int public_server_get_settingPort();
+extern int public_server_get_settingProto();
+extern void game_type_quit();
#endif
diff --git a/src/screen/mainMenu.c b/src/screen/mainMenu.c
index d9df377..567a1f6 100644
--- a/src/screen/mainMenu.c
+++ b/src/screen/mainMenu.c
@@ -37,16 +37,16 @@ static void hotkey_escape()
game_quit();
}
-void mainMenu_start()
+void main_menu_start()
{
#ifndef NO_SOUND
music_play("menu", MUSIC_GROUP_BASE);
#endif
- hotKey_register(SDLK_ESCAPE, hotkey_escape);
+ hot_key_register(SDLK_ESCAPE, hotkey_escape);
}
-void mainMenu_draw()
+void main_menu_draw()
{
wid_image_draw(image_backgorund);
@@ -57,7 +57,7 @@ void mainMenu_draw()
button_draw(button_end);
}
-void mainMenu_event()
+void main_menu_event()
{
button_event(button_play);
button_event(button_setting);
@@ -66,9 +66,9 @@ void mainMenu_event()
button_event(button_end);
}
-void mainMenu_stop()
+void main_menu_stop()
{
- unhotKey_register(SDLK_ESCAPE);
+ unhot_key_register(SDLK_ESCAPE);
}
static void eventWidget(void *p)
@@ -98,7 +98,7 @@ static void eventWidget(void *p)
}
}
-void mainMenu_init()
+void main_menu_init()
{
image_t *image;
@@ -117,11 +117,11 @@ void mainMenu_init()
music_add("menu.ogg", "menu", MUSIC_GROUP_BASE);
#endif
- screen_register( screen_new("mainMenu", mainMenu_start, mainMenu_event,
- mainMenu_draw, mainMenu_stop));
+ screen_register( screen_new("mainMenu", main_menu_start, main_menu_event,
+ main_menu_draw, main_menu_stop));
}
-void mainMenu_quit()
+void main_menu_quit()
{
wid_image_destroy(image_backgorund);
diff --git a/src/screen/mainMenu.h b/src/screen/mainMenu.h
index 84048a1..ec25150 100644
--- a/src/screen/mainMenu.h
+++ b/src/screen/mainMenu.h
@@ -5,11 +5,11 @@
# include "main.h"
-extern void mainMenu_start();
-extern void mainMenu_draw();
-extern void mainMenu_event();
-extern void mainMenu_stop();
-extern void mainMenu_init();
-extern void mainMenu_quit();
+extern void main_menu_start();
+extern void main_menu_draw();
+extern void main_menu_event();
+extern void main_menu_stop();
+extern void main_menu_init();
+extern void main_menu_quit();
#endif
diff --git a/src/screen/setting.c b/src/screen/setting.c
index d5c5c1a..dfcdcd7 100644
--- a/src/screen/setting.c
+++ b/src/screen/setting.c
@@ -90,7 +90,7 @@ void screen_startSetting()
music_play("menu", MUSIC_GROUP_BASE);
#endif
- hotKey_register(SDLK_ESCAPE, hotkey_escape);
+ hot_key_register(SDLK_ESCAPE, hotkey_escape);
}
void setting_draw()
@@ -108,12 +108,12 @@ void setting_draw()
label_draw(label_sound);
#endif
- textField_draw(textfield_count_cound);
- textField_draw(textfield_name_player1);
+ text_field_draw(textfield_count_cound);
+ text_field_draw(textfield_name_player1);
if (check_get_status(check_ai) == FALSE) {
label_draw(label_name_player2);
- textField_draw(textfield_name_player2);
+ text_field_draw(textfield_name_player2);
}
wid_image_draw(image_gun_dual_revolver);
@@ -153,11 +153,11 @@ void setting_event()
{
int i;
- textField_event(textfield_count_cound);
- textField_event(textfield_name_player1);
+ text_field_event(textfield_count_cound);
+ text_field_event(textfield_name_player1);
if (check_get_status(check_ai) == FALSE) {
- textField_event(textfield_name_player2);
+ text_field_event(textfield_name_player2);
}
#ifndef NO_SOUND
@@ -181,7 +181,7 @@ void setting_event()
void stopScreenSetting()
{
- unhotKey_register(SDLK_ESCAPE);
+ unhot_key_register(SDLK_ESCAPE);
}
static void eventWidget(void *p)
@@ -216,15 +216,15 @@ static void initSettingFile()
char path[STR_PATH_SIZE];
char val[STR_SIZE];
- sprintf(path, "%s/tuxanci.conf", homeDirector_get());
+ sprintf(path, "%s/tuxanci.conf", home_director_get());
- configFile = textFile_load(path);
+ configFile = text_file_load(path);
if (configFile == NULL) {
fprintf(stderr, _("I am unable to load: \"%s\"!\n"), path);
fprintf(stderr, _("Creating: \"%s\"\n"), path);
- configFile = textFile_new(path);
+ configFile = text_file_new(path);
}
if (configFile == NULL) {
@@ -233,15 +233,15 @@ static void initSettingFile()
}
loadValueFromConfigFile(configFile, "COUNT_ROUND", val, STR_SIZE, "15");
- textField_set_text(textfield_count_cound, val);
+ text_field_set_text(textfield_count_cound, val);
loadValueFromConfigFile(configFile, "NAME_PLAYER_RIGHT", val, STR_SIZE,
NAME_PLAYER_RIGHT);
- textField_set_text(textfield_name_player1, val);
+ text_field_set_text(textfield_name_player1, val);
loadValueFromConfigFile(configFile, "NAME_PLAYER_LEFT", val, STR_SIZE,
NAME_PLAYER_LEFT);
- textField_set_text(textfield_name_player2, val);
+ text_field_set_text(textfield_name_player2, val);
loadValueFromConfigFile(configFile, "GUN_DUAL_SIMPLE", val, STR_SIZE,
"YES");
@@ -283,9 +283,9 @@ static void initSettingFile()
#endif
loadValueFromConfigFile(configFile, "ARENA", val, STR_SIZE, "FAGN");
- choiceArena_set(arenaFile_get_file_format_net_name(val));
+ choice_arena_set(arena_file_get_file_format_net_name(val));
- textFile_save(configFile);
+ text_file_save(configFile);
}
static void saveAndDestroyConfigFile()
@@ -295,9 +295,9 @@ static void saveAndDestroyConfigFile()
return;
}
- 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, "COUNT_ROUND", text_field_get_text(textfield_count_cound));
+ setValueInConfigFile(configFile, "NAME_PLAYER_RIGHT", text_field_get_text(textfield_name_player1));
+ setValueInConfigFile(configFile, "NAME_PLAYER_LEFT", text_field_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])));
@@ -317,14 +317,14 @@ static void saveAndDestroyConfigFile()
setValueInConfigFile(configFile, "SOUND", getYesOrNo(check_get_status(check_sound)));
#endif
- if( choiceArena_get() != NULL )
+ if( choice_arena_get() != NULL )
{
- setValueInConfigFile(configFile, "ARENA", arenaFile_get_net_name(choiceArena_get()));
+ setValueInConfigFile(configFile, "ARENA", arena_file_get_net_name(choice_arena_get()));
}
//TODO
- textFile_save(configFile);
- textFile_destroy(configFile);
+ text_file_save(configFile);
+ text_file_destroy(configFile);
}
void setting_init()
@@ -363,16 +363,16 @@ void setting_init()
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 = textField_new(getParamElse("--count", "15"),
+ textfield_count_cound = text_field_new(getParamElse("--count", "15"),
WIDGET_TEXTFIELD_FILTER_NUM,
110 + label_count_round->w,
WINDOW_SIZE_Y - 200);
- textfield_name_player1 = textField_new(getParamElse("--name1", NAME_PLAYER_RIGHT),
+ textfield_name_player1 = text_field_new(getParamElse("--name1", NAME_PLAYER_RIGHT),
WIDGET_TEXTFIELD_FILTER_ALPHANUM,
110 + label_count_round->w, WINDOW_SIZE_Y - 160);
- textfield_name_player2 = textField_new(getParamElse("--name2", NAME_PLAYER_LEFT),
+ textfield_name_player2 = text_field_new(getParamElse("--name2", NAME_PLAYER_LEFT),
WIDGET_TEXTFIELD_FILTER_ALPHANUM,
110 + label_count_round->w, WINDOW_SIZE_Y - 120);
@@ -434,23 +434,23 @@ void setting_init()
#endif
}
-void publicServer_get_settingNameRight(char *s)
+void public_server_get_settingNameRight(char *s)
{
- strcpy(s, textField_get_text(textfield_name_player1));
+ strcpy(s, text_field_get_text(textfield_name_player1));
}
-void publicServer_get_settingNameLeft(char *s)
+void public_server_get_settingNameLeft(char *s)
{
if (check_get_status(check_ai)) {
strcpy(s, NAME_AI);
} else {
- strcpy(s, textField_get_text(textfield_name_player2));
+ strcpy(s, text_field_get_text(textfield_name_player2));
}
}
-void publicServer_get_settingCountRound(int *n)
+void public_server_get_settingCountRound(int *n)
{
- *n = atoi(textField_get_text(textfield_count_cound));
+ *n = atoi(text_field_get_text(textfield_count_cound));
}
bool_t setting_is_ai()
@@ -499,10 +499,10 @@ void setting_quit()
label_destroy(label_sound);
#endif
label_destroy(label_name_player2);
- textField_destroy(textfield_name_player2);
+ text_field_destroy(textfield_name_player2);
- textField_destroy(textfield_name_player1);
- textField_destroy(textfield_count_cound);
+ text_field_destroy(textfield_name_player1);
+ text_field_destroy(textfield_count_cound);
wid_image_destroy(image_gun_dual_revolver);
wid_image_destroy(image_gun_scatter);
diff --git a/src/screen/setting.h b/src/screen/setting.h
index 6c5ec16..b15ab3c 100644
--- a/src/screen/setting.h
+++ b/src/screen/setting.h
@@ -12,9 +12,9 @@
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 void public_server_get_settingNameRight(char *s);
+extern void public_server_get_settingNameLeft(char *s);
+extern void public_server_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);
diff --git a/src/screen/settingKeys.c b/src/screen/settingKeys.c
index 2e44339..c24eadb 100644
--- a/src/screen/settingKeys.c
+++ b/src/screen/settingKeys.c
@@ -87,7 +87,7 @@ void screen_startSettingKeys()
music_play("menu", MUSIC_GROUP_BASE);
#endif
- hotKey_register(SDLK_ESCAPE, hotkey_escape);
+ hot_key_register(SDLK_ESCAPE, hotkey_escape);
}
static void setKeytableFromConfigFile(textFile_t * configFile)
{
@@ -158,7 +158,7 @@ keytable[KEY_TUX_LEFT_SWITCH_WEAPON] = atoi(val);
}
void
- keyTable_init()
+ key_table_init()
{
char path[STR_PATH_SIZE];
@@ -166,9 +166,9 @@ char path[STR_PATH_SIZE];
/*
int i;
*/
- sprintf(path, "%s/keycontrol.conf", homeDirector_get());
+ sprintf(path, "%s/keycontrol.conf", home_director_get());
-keycontrolFile = textFile_load(path);
+keycontrolFile = text_file_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 = textFile_new(path);
+keycontrolFile = text_file_new(path);
}
@@ -198,7 +198,7 @@ setKeytableFromConfigFile(keycontrolFile);
*/
}
-int keyTable_get_key(int n)
+int key_table_get_key(int n)
{
// printf("keytable[n] = %d\n", keytable[n]);
@@ -206,7 +206,7 @@ int keyTable_get_key(int n)
}
-void settingKey_draw()
+void setting_key_draw()
{
wid_image_draw(image_backgorund);
@@ -243,29 +243,29 @@ label_draw(tux_left_keyswitch);
label_draw(tux_left_keyfire);
// key values
- catchKey_draw(tux_right_keyup_val);
+ catch_key_draw(tux_right_keyup_val);
-catchKey_draw(tux_right_keydown_val);
+catch_key_draw(tux_right_keydown_val);
-catchKey_draw(tux_right_keyleft_val);
+catch_key_draw(tux_right_keyleft_val);
-catchKey_draw(tux_right_keyright_val);
+catch_key_draw(tux_right_keyright_val);
-catchKey_draw(tux_right_keyswitch_val);
+catch_key_draw(tux_right_keyswitch_val);
-catchKey_draw(tux_right_keyfire_val);
+catch_key_draw(tux_right_keyfire_val);
-catchKey_draw(tux_left_keyup_val);
+catch_key_draw(tux_left_keyup_val);
-catchKey_draw(tux_left_keydown_val);
+catch_key_draw(tux_left_keydown_val);
-catchKey_draw(tux_left_keyleft_val);
+catch_key_draw(tux_left_keyleft_val);
-catchKey_draw(tux_left_keyright_val);
+catch_key_draw(tux_left_keyright_val);
-catchKey_draw(tux_left_keyswitch_val);
+catch_key_draw(tux_left_keyswitch_val);
-catchKey_draw(tux_left_keyfire_val);
+catch_key_draw(tux_left_keyfire_val);
}
static void
@@ -273,29 +273,29 @@ static void
refreshKeytable()
{
-keytable[6] = catchKey_get(tux_left_keyup_val);
+keytable[6] = catch_key_get(tux_left_keyup_val);
-keytable[9] = catchKey_get(tux_left_keydown_val);
+keytable[9] = catch_key_get(tux_left_keydown_val);
-keytable[8] = catchKey_get(tux_left_keyleft_val);
+keytable[8] = catch_key_get(tux_left_keyleft_val);
-keytable[7] = catchKey_get(tux_left_keyright_val);
+keytable[7] = catch_key_get(tux_left_keyright_val);
-keytable[10] = catchKey_get(tux_left_keyfire_val);
+keytable[10] = catch_key_get(tux_left_keyfire_val);
-keytable[11] = catchKey_get(tux_left_keyswitch_val);
+keytable[11] = catch_key_get(tux_left_keyswitch_val);
-keytable[0] = catchKey_get(tux_right_keyup_val);
+keytable[0] = catch_key_get(tux_right_keyup_val);
-keytable[3] = catchKey_get(tux_right_keydown_val);
+keytable[3] = catch_key_get(tux_right_keydown_val);
-keytable[2] = catchKey_get(tux_right_keyleft_val);
+keytable[2] = catch_key_get(tux_right_keyleft_val);
-keytable[1] = catchKey_get(tux_right_keyright_val);
+keytable[1] = catch_key_get(tux_right_keyright_val);
-keytable[4] = catchKey_get(tux_right_keyfire_val);
+keytable[4] = catch_key_get(tux_right_keyfire_val);
-keytable[5] = catchKey_get(tux_right_keyswitch_val);
+keytable[5] = catch_key_get(tux_right_keyswitch_val);
}
static void eventWidget(void *p)
@@ -337,51 +337,51 @@ screen_set("setting");
}
-void settingKey_event()
+void setting_key_event()
{
button_event(button_back);
-catchKey_event(tux_right_keyup_val);
+catch_key_event(tux_right_keyup_val);
-catchKey_event(tux_right_keydown_val);
+catch_key_event(tux_right_keydown_val);
-catchKey_event(tux_right_keyleft_val);
+catch_key_event(tux_right_keyleft_val);
-catchKey_event(tux_right_keyright_val);
+catch_key_event(tux_right_keyright_val);
-catchKey_event(tux_right_keyswitch_val);
+catch_key_event(tux_right_keyswitch_val);
-catchKey_event(tux_right_keyfire_val);
+catch_key_event(tux_right_keyfire_val);
-catchKey_event(tux_left_keyup_val);
+catch_key_event(tux_left_keyup_val);
-catchKey_event(tux_left_keydown_val);
+catch_key_event(tux_left_keydown_val);
-catchKey_event(tux_left_keyleft_val);
+catch_key_event(tux_left_keyleft_val);
-catchKey_event(tux_left_keyright_val);
+catch_key_event(tux_left_keyright_val);
-catchKey_event(tux_left_keyswitch_val);
+catch_key_event(tux_left_keyswitch_val);
-catchKey_event(tux_left_keyfire_val);
+catch_key_event(tux_left_keyfire_val);
}
void
stopScreenSettingKeys()
{
- unhotKey_register(SDLK_ESCAPE);
+ unhot_key_register(SDLK_ESCAPE);
}
void
- settingKey_int()
+ setting_key_int()
{
image_t * image;
-keyTable_init();
+key_table_init();
image = image_get(IMAGE_GROUP_BASE, "screen_main");
@@ -448,109 +448,109 @@ tux_right_keyswitch =
tux_left_keyfire->y + 20, WIDGET_LABEL_LEFT);
tux_left_keyup_val =
- catchKey_new(keytable[6], tux_left_keyup->x + 200,
+ catch_key_new(keytable[6], tux_left_keyup->x + 200,
tux_left->y + 50, eventWidget);
tux_left_keydown_val =
- catchKey_new(keytable[9], tux_left_keyup_val->x,
+ catch_key_new(keytable[9], tux_left_keyup_val->x,
tux_left_keyup->y + 20, eventWidget);
tux_left_keyleft_val =
- catchKey_new(keytable[8], tux_left_keyup_val->x,
+ catch_key_new(keytable[8], tux_left_keyup_val->x,
tux_left_keydown->y + 20, eventWidget);
tux_left_keyright_val =
- catchKey_new(keytable[7], tux_left_keyup_val->x,
+ catch_key_new(keytable[7], tux_left_keyup_val->x,
tux_left_keyleft->y + 20, eventWidget);
tux_left_keyfire_val =
- catchKey_new(keytable[10], tux_left_keyup_val->x,
+ catch_key_new(keytable[10], tux_left_keyup_val->x,
tux_left_keyright->y + 20, eventWidget);
tux_left_keyswitch_val =
- catchKey_new(keytable[11], tux_left_keyup_val->x,
+ catch_key_new(keytable[11], tux_left_keyup_val->x,
tux_left_keyfire->y + 20, eventWidget);
tux_right_keyup_val =
- catchKey_new(keytable[0],
+ catch_key_new(keytable[0],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_left->y + 50, eventWidget);
tux_right_keydown_val =
- catchKey_new(keytable[3],
+ catch_key_new(keytable[3],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_left_keyup->y + 20, eventWidget);
tux_right_keyleft_val =
- catchKey_new(keytable[2],
+ catch_key_new(keytable[2],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_right_keydown->y + 20, eventWidget);
tux_right_keyright_val =
- catchKey_new(keytable[1],
+ catch_key_new(keytable[1],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_right_keyleft->y + 20, eventWidget);
tux_right_keyfire_val =
- catchKey_new(keytable[4],
+ catch_key_new(keytable[4],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_left_keyright->y + 20, eventWidget);
tux_right_keyswitch_val =
- catchKey_new(keytable[5],
+ catch_key_new(keytable[5],
WINDOW_SIZE_X / 2 + tux_left_keyup_val->x,
tux_left_keyfire->y + 20, eventWidget);
screen_register(screen_new
("settingKeys", screen_startSettingKeys,
- settingKey_event,
-settingKey_draw,
+ setting_key_event,
+setting_key_draw,
stopScreenSettingKeys));
}
-void keyTable_quit()
+void key_table_quit()
{
- textFile_destroy(keycontrolFile);
+ text_file_destroy(keycontrolFile);
}
void saveKeyTable(textFile_t * configFile)
{
char str[STR_SIZE];
- sprintf(str, "%d", catchKey_get(tux_left_keyup_val));
+ sprintf(str, "%d", catch_key_get(tux_left_keyup_val));
setValueInConfigFile(configFile, "TUX_LEFT_MOVE_UP", str);
- sprintf(str, "%d", catchKey_get(tux_left_keydown_val));
+ sprintf(str, "%d", catch_key_get(tux_left_keydown_val));
setValueInConfigFile(configFile, "TUX_LEFT_MOVE_DOWN", str);
- sprintf(str, "%d", catchKey_get(tux_left_keyleft_val));
+ sprintf(str, "%d", catch_key_get(tux_left_keyleft_val));
setValueInConfigFile(configFile, "TUX_LEFT_MOVE_LEFT", str);
- sprintf(str, "%d", catchKey_get(tux_left_keyright_val));
+ sprintf(str, "%d", catch_key_get(tux_left_keyright_val));
setValueInConfigFile(configFile, "TUX_LEFT_MOVE_RIGHT", str);
- sprintf(str, "%d", catchKey_get(tux_left_keyfire_val));
+ sprintf(str, "%d", catch_key_get(tux_left_keyfire_val));
setValueInConfigFile(configFile, "TUX_LEFT_SHOOT", str);
- sprintf(str, "%d", catchKey_get(tux_left_keyswitch_val));
+ sprintf(str, "%d", catch_key_get(tux_left_keyswitch_val));
setValueInConfigFile(configFile, "TUX_LEFT_SWITCH_WEAPON", str);
- sprintf(str, "%d", catchKey_get(tux_right_keyup_val));
+ sprintf(str, "%d", catch_key_get(tux_right_keyup_val));
setValueInConfigFile(configFile, "TUX_RIGHT_MOVE_UP", str);
- sprintf(str, "%d", catchKey_get(tux_right_keydown_val));
+ sprintf(str, "%d", catch_key_get(tux_right_keydown_val));
setValueInConfigFile(configFile, "TUX_RIGHT_MOVE_DOWN", str);
- sprintf(str, "%d", catchKey_get(tux_right_keyleft_val));
+ sprintf(str, "%d", catch_key_get(tux_right_keyleft_val));
setValueInConfigFile(configFile, "TUX_RIGHT_MOVE_LEFT", str);
- sprintf(str, "%d", catchKey_get(tux_right_keyright_val));
+ sprintf(str, "%d", catch_key_get(tux_right_keyright_val));
setValueInConfigFile(configFile, "TUX_RIGHT_MOVE_RIGHT", str);
- sprintf(str, "%d", catchKey_get(tux_right_keyfire_val));
+ sprintf(str, "%d", catch_key_get(tux_right_keyfire_val));
setValueInConfigFile(configFile, "TUX_RIGHT_SHOOT", str);
- sprintf(str, "%d", catchKey_get(tux_right_keyswitch_val));
+ sprintf(str, "%d", catch_key_get(tux_right_keyswitch_val));
setValueInConfigFile(configFile, "TUX_RIGHT_SWITCH_WEAPON", str);
- textFile_save(configFile);
+ text_file_save(configFile);
}
-void settingKey_quit()
+void setting_key_quit()
{
saveKeyTable(keycontrolFile);
- keyTable_quit();
+ key_table_quit();
// key names
wid_image_destroy(image_backgorund);
@@ -571,19 +571,19 @@ void settingKey_quit()
label_destroy(tux_left_keyfire);
// key values
- catchKey_destroy(tux_right_keyup_val);
+ catch_key_destroy(tux_right_keyup_val);
- 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);
+ catch_key_destroy(tux_right_keydown_val);
+ catch_key_destroy(tux_right_keyleft_val);
+ catch_key_destroy(tux_right_keyright_val);
+ catch_key_destroy(tux_right_keyswitch_val);
+ catch_key_destroy(tux_right_keyfire_val);
+ catch_key_destroy(tux_left_keyup_val);
+ catch_key_destroy(tux_left_keydown_val);
+ catch_key_destroy(tux_left_keyleft_val);
+ catch_key_destroy(tux_left_keyright_val);
+ catch_key_destroy(tux_left_keyswitch_val);
+ catch_key_destroy(tux_left_keyfire_val);
button_destroy(button_back);
}
diff --git a/src/screen/settingKeys.h b/src/screen/settingKeys.h
index a52a4a8..e0a6793 100644
--- a/src/screen/settingKeys.h
+++ b/src/screen/settingKeys.h
@@ -16,12 +16,12 @@
# define KEY_LENGTH 12
# include "main.h"
- 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();
+ extern void setting_key_int();
+ extern void setting_key_draw();
+ extern void setting_key_event();
+ extern void setting_key_quit();
+ extern void key_table_init();
+ extern int key_table_get_key(int n);
+ extern void key_table_quit();
#endif /* */
diff --git a/src/screen/table.c b/src/screen/table.c
index 7d5771f..a21c20e 100644
--- a/src/screen/table.c
+++ b/src/screen/table.c
@@ -43,7 +43,7 @@ void table_start()
music_play("menu", MUSIC_GROUP_BASE);
#endif
- hotKey_register(SDLK_ESCAPE, hotkey_escape);
+ hot_key_register(SDLK_ESCAPE, hotkey_escape);
}
void table_draw()
@@ -80,7 +80,7 @@ void table_event()
void table_stop()
{
- unhotKey_register(SDLK_ESCAPE);
+ unhot_key_register(SDLK_ESCAPE);
}
static void eventWidget(void *p)
@@ -144,13 +144,13 @@ static void loadHighscoreFile()
char path[STR_PATH_SIZE];
int i;
- sprintf(path, "%s/" SCREEN_TABLE_FILE_HIGHSCORE_NAME, homeDirector_get());
- textFile = textFile_load(path);
+ sprintf(path, "%s/" SCREEN_TABLE_FILE_HIGHSCORE_NAME, home_director_get());
+ textFile = text_file_load(path);
if (textFile == NULL) {
fprintf(stderr, _("I am unable to load: \"%s\"!\n"), path);
fprintf(stderr, _("Creating: \"%s\"\n"), path);
- textFile = textFile_new(path);
+ textFile = text_file_new(path);
} else {
return;
}
@@ -164,7 +164,7 @@ static void loadHighscoreFile()
list_add(textFile->text, strdup("no_name 0"));
}
- textFile_save(textFile);
+ text_file_save(textFile);
}
int table_add(char *name, int score)
@@ -223,7 +223,7 @@ void table_quit()
list_destroy_item(listWidgetLabelScore, label_destroy);
if (textFile != NULL) {
- textFile_save(textFile);
- textFile_destroy(textFile);
+ text_file_save(textFile);
+ text_file_destroy(textFile);
}
}
diff --git a/src/screen/world.c b/src/screen/world.c
index cb0daf6..19f1094 100644
--- a/src/screen/world.c
+++ b/src/screen/world.c
@@ -62,8 +62,8 @@ void setGameType()
{
int ret = 0;
- ret = netMultiplayer_init(publicServer_get_settingGameType(), publicServer_get_settingIP(),
- publicServer_get_settingPort(), publicServer_get_settingProto());
+ ret = net_multiplayer_init(public_server_get_settingGameType(), public_server_get_settingIP(),
+ public_server_get_settingPort(), public_server_get_settingProto());
if (ret != 0) {
fprintf(stderr, _("Network initialization error!\n"));
@@ -73,7 +73,7 @@ void setGameType()
void word_set_arena(arenaFile_t * arenaFile)
{
- arena = arenaFile_get_arena(arenaFile);
+ arena = arena_file_get_arena(arenaFile);
#ifndef NO_SOUND
music_play(arena->music, MUSIC_GROUP_USER);
@@ -87,7 +87,7 @@ void word_do_end()
static void timer_endArena()
{
- if (netMultiplayer_get_game_type() != NET_GAME_TYPE_CLIENT) {
+ if (net_multiplayer_get_game_type() != NET_GAME_TYPE_CLIENT) {
word_do_end();
return;
}
@@ -117,33 +117,33 @@ void prepareArena()
tux_t *tux;
char name[STR_NAME_SIZE];
- //printf("publicServer_get_settingAI = %s\n", publicServer_get_settingAI());
+ //printf("public_server_get_settingAI = %s\n", public_server_get_settingAI());
arena_set_current(NULL);
tuxWithControlRightKeyboard = NULL;
tuxWithControlLeftKeyboard = NULL;
- if (gameType_load_session() != NULL) {
- load_arena(gameType_load_session());
+ if (game_type_load_session() != NULL) {
+ load_arena(game_type_load_session());
return;
}
- switch (netMultiplayer_get_game_type()) {
+ switch (net_multiplayer_get_game_type()) {
case NET_GAME_TYPE_NONE:
- word_set_arena(choiceArena_get());
+ word_set_arena(choice_arena_get());
item_add_new_item(arena->spaceItem, ID_UNKNOWN);
- publicServer_get_settingCountRound(&arena->max_countRound);
+ public_server_get_settingCountRound(&arena->max_countRound);
tux = tux_new();
tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
tuxWithControlRightKeyboard = tux;
- publicServer_get_settingNameRight(name);
+ public_server_get_settingNameRight(name);
tux_set_name(tux, name);
space_add(arena->spaceTux, tux);
tux = tux_new();
tux->control = TUX_CONTROL_KEYBOARD_LEFT;
tuxWithControlLeftKeyboard = tux;
- publicServer_get_settingNameLeft(name);
+ public_server_get_settingNameLeft(name);
tux_set_name(tux, name);
space_add(arena->spaceTux, tux);
@@ -154,19 +154,19 @@ void prepareArena()
tux->control = TUX_CONTROL_KEYBOARD_LEFT;
}
}
- //printf("gameType_load_session = %s\n", gameType_load_session());
+ //printf("game_type_load_session = %s\n", game_type_load_session());
break;
case NET_GAME_TYPE_SERVER:
- word_set_arena(choiceArena_get());
+ word_set_arena(choice_arena_get());
item_add_new_item(arena->spaceItem, ID_UNKNOWN);
- publicServer_get_settingCountRound(&arena->max_countRound);
+ public_server_get_settingCountRound(&arena->max_countRound);
tux = tux_new();
tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
tuxWithControlRightKeyboard = tux;
- publicServer_get_settingNameRight(name);
+ public_server_get_settingNameRight(name);
tux_set_name(tux, name);
space_add(arena->spaceTux, tux);
break;
@@ -190,16 +190,16 @@ void word_draw()
chat_draw();
pauza_draw();
term_draw();
- saveDialog_draw();
+ save_dialog_draw();
}
static void netAction(tux_t * tux, int action)
{
- if (publicServer_get_settingGameType() == NET_GAME_TYPE_SERVER) {
+ if (public_server_get_settingGameType() == NET_GAME_TYPE_SERVER) {
proto_send_event_server(PROTO_SEND_ALL_SEES_TUX, NULL, tux, action);
}
- if (publicServer_get_settingGameType() == NET_GAME_TYPE_CLIENT) {
+ if (public_server_get_settingGameType() == NET_GAME_TYPE_CLIENT) {
proto_send_event_client(action);
}
}
@@ -216,38 +216,38 @@ static void control_keyboard_right(tux_t * tux)
countKey = 0;
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_UP)] == SDL_PRESSED)
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_RIGHT_MOVE_UP)] == SDL_PRESSED)
countKey++;
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_RIGHT)] == SDL_PRESSED)
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_RIGHT_MOVE_RIGHT)] == SDL_PRESSED)
countKey++;
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_LEFT)] == SDL_PRESSED)
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_RIGHT_MOVE_LEFT)] == SDL_PRESSED)
countKey++;
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_MOVE_DOWN)] == SDL_PRESSED)
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_RIGHT_MOVE_DOWN)] == SDL_PRESSED)
countKey++;
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_SWITCH_WEAPON)] == SDL_PRESSED
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_RIGHT_SWITCH_WEAPON)] == SDL_PRESSED
&& tux->isCanSwitchGun == TRUE) {
netAction(tux, TUX_SWITCH_GUN);
tux_action(tux, TUX_SWITCH_GUN);
return;
}
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_RIGHT_SHOOT)] == SDL_PRESSED
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_RIGHT_SHOOT)] == SDL_PRESSED
&& tux->isCanShot == TRUE) {
netAction(tux, TUX_SHOT);
tux_action(tux, TUX_SHOT);
return;
}
- 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))
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_RIGHT_MOVE_UP)] == SDL_PRESSED) {
+ if (countKey > 1 && lastKey == key_table_get_key(KEY_TUX_RIGHT_MOVE_UP))
goto tuUp;
if (countKey == 1)
- lastKey = keyTable_get_key(KEY_TUX_RIGHT_MOVE_UP);
+ lastKey = key_table_get_key(KEY_TUX_RIGHT_MOVE_UP);
netAction(tux, TUX_UP);
tux_action(tux, TUX_UP);
return;
@@ -255,12 +255,12 @@ static void control_keyboard_right(tux_t * tux)
tuUp:;
}
- 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))
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_RIGHT_MOVE_RIGHT)] == SDL_PRESSED) {
+ if (countKey > 1 && lastKey == key_table_get_key(KEY_TUX_RIGHT_MOVE_RIGHT))
goto tuRight;
if (countKey == 1)
- lastKey = keyTable_get_key(KEY_TUX_RIGHT_MOVE_RIGHT);
+ lastKey = key_table_get_key(KEY_TUX_RIGHT_MOVE_RIGHT);
netAction(tux, TUX_RIGHT);
tux_action(tux, TUX_RIGHT);
return;
@@ -269,12 +269,12 @@ static void control_keyboard_right(tux_t * tux)
}
- 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))
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_RIGHT_MOVE_LEFT)] == SDL_PRESSED) {
+ if (countKey > 1 && lastKey == key_table_get_key(KEY_TUX_RIGHT_MOVE_LEFT))
goto tuLeft;
if (countKey == 1)
- lastKey = keyTable_get_key(KEY_TUX_RIGHT_MOVE_LEFT);
+ lastKey = key_table_get_key(KEY_TUX_RIGHT_MOVE_LEFT);
netAction(tux, TUX_LEFT);
tux_action(tux, TUX_LEFT);
return;
@@ -282,12 +282,12 @@ static void control_keyboard_right(tux_t * tux)
tuLeft:;
}
- 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))
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_RIGHT_MOVE_DOWN)] == SDL_PRESSED) {
+ if (countKey > 1 && lastKey == key_table_get_key(KEY_TUX_RIGHT_MOVE_DOWN))
goto tuDown;
if (countKey == 1)
- lastKey = keyTable_get_key(KEY_TUX_RIGHT_MOVE_DOWN);
+ lastKey = key_table_get_key(KEY_TUX_RIGHT_MOVE_DOWN);
netAction(tux, TUX_DOWN);
tux_action(tux, TUX_DOWN);
return;
@@ -308,49 +308,49 @@ static void control_keyboard_left(tux_t * tux)
countKey = 0;
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_UP)] == SDL_PRESSED)
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_LEFT_MOVE_UP)] == SDL_PRESSED)
countKey++;
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_RIGHT)] == SDL_PRESSED)
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_LEFT_MOVE_RIGHT)] == SDL_PRESSED)
countKey++;
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_LEFT)] == SDL_PRESSED)
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_LEFT_MOVE_LEFT)] == SDL_PRESSED)
countKey++;
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_MOVE_DOWN)] == SDL_PRESSED)
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_LEFT_MOVE_DOWN)] == SDL_PRESSED)
countKey++;
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_SWITCH_WEAPON)] == SDL_PRESSED) {
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_LEFT_SWITCH_WEAPON)] == SDL_PRESSED) {
if (tux->isCanSwitchGun == TRUE) {
tux_action(tux, TUX_SWITCH_GUN);
return;
}
}
- if (mapa[(SDLKey) keyTable_get_key(KEY_TUX_LEFT_SHOOT)] == SDL_PRESSED
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_LEFT_SHOOT)] == SDL_PRESSED
&& tux->isCanShot == TRUE) {
tux_action(tux, TUX_SHOT);
return;
}
- 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))
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_LEFT_MOVE_UP)] == SDL_PRESSED) {
+ if (countKey > 1 && lastKey == key_table_get_key(KEY_TUX_LEFT_MOVE_UP))
goto tuUp;
if (countKey == 1)
- lastKey = keyTable_get_key(KEY_TUX_LEFT_MOVE_UP);
+ lastKey = key_table_get_key(KEY_TUX_LEFT_MOVE_UP);
tux_action(tux, TUX_UP);
return;
tuUp:;
}
- 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))
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_LEFT_MOVE_RIGHT)] == SDL_PRESSED) {
+ if (countKey > 1 && lastKey == key_table_get_key(KEY_TUX_LEFT_MOVE_RIGHT))
goto tuRight;
if (countKey == 1)
- lastKey = keyTable_get_key(KEY_TUX_LEFT_MOVE_RIGHT);
+ lastKey = key_table_get_key(KEY_TUX_LEFT_MOVE_RIGHT);
tux_action(tux, TUX_RIGHT);
return;
@@ -358,24 +358,24 @@ static void control_keyboard_left(tux_t * tux)
}
- 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))
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_LEFT_MOVE_LEFT)] == SDL_PRESSED) {
+ if (countKey > 1 && lastKey == key_table_get_key(KEY_TUX_LEFT_MOVE_LEFT))
goto tuLeft;
if (countKey == 1)
- lastKey = keyTable_get_key(KEY_TUX_LEFT_MOVE_LEFT);
+ lastKey = key_table_get_key(KEY_TUX_LEFT_MOVE_LEFT);
tux_action(tux, TUX_LEFT);
return;
tuLeft:;
}
- 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))
+ if (mapa[(SDLKey) key_table_get_key(KEY_TUX_LEFT_MOVE_DOWN)] == SDL_PRESSED) {
+ if (countKey > 1 && lastKey == key_table_get_key(KEY_TUX_LEFT_MOVE_DOWN))
goto tuDown;
if (countKey == 1)
- lastKey = keyTable_get_key(KEY_TUX_LEFT_MOVE_DOWN);
+ lastKey = key_table_get_key(KEY_TUX_LEFT_MOVE_DOWN);
tux_action(tux, TUX_DOWN);
return;
@@ -449,14 +449,14 @@ void word_event()
tux_t *thisTux;
if (arena == NULL) {
- netMultiplayer_event();
+ net_multiplayer_event();
eventEnd();
return;
}
- netMultiplayer_event();
+ net_multiplayer_event();
- if (pauza_is_active() == FALSE && saveDialog_is_active() == FALSE) {
+ if (pauza_is_active() == FALSE && save_dialog_is_active() == FALSE) {
arena_event(arena);
//module_event();
}
@@ -475,7 +475,7 @@ void word_event()
chat_event();
pauza_event();
term_event();
- saveDialog_event();
+ save_dialog_event();
}
@@ -489,13 +489,13 @@ void startWorld()
arena = NULL;
isEndWorld = FALSE;
- hotKey_register(SDLK_ESCAPE, hotkey_escape);
+ hot_key_register(SDLK_ESCAPE, hotkey_escape);
arena_init();
id_init_list();
radar_init();
pauza_init();
term_init();
- saveDialog_init();
+ save_dialog_init();
module_init();
setGameType();
@@ -522,7 +522,7 @@ static void setTable()
tux_t *tuxRight;
tux_t *tuxLeft;
- if (publicServer_get_settingGameType() != NET_GAME_TYPE_NONE) {
+ if (public_server_get_settingGameType() != NET_GAME_TYPE_NONE) {
return;
}
@@ -545,10 +545,10 @@ void stoptWorld()
setAnalyze();
}
- unhotKey_register(SDLK_ESCAPE);
+ unhot_key_register(SDLK_ESCAPE);
arena_quit();
- netMultiplayer_quit();
+ net_multiplayer_quit();
if (arena != NULL) {
arena_destroy(arena);
@@ -557,7 +557,7 @@ void stoptWorld()
radar_quit();
pauza_quit();
term_quit();
- saveDialog_quit();
+ save_dialog_quit();
#ifndef NO_SOUND
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 23:28:23 +0000