summaryrefslogtreecommitdiff
path: root/src/screen
diff options
context:
space:
mode:
Diffstat (limited to 'src/screen')
-rw-r--r--src/screen/analyze.c2
-rw-r--r--src/screen/browser.c2
-rw-r--r--src/screen/choiceArena.c2
-rw-r--r--src/screen/credits.c2
-rw-r--r--src/screen/gameType.c2
-rw-r--r--src/screen/mainMenu.c2
-rw-r--r--src/screen/setting.c4
-rw-r--r--src/screen/setting.h2
-rw-r--r--src/screen/settingKeys.c2
-rw-r--r--src/screen/table.c2
-rw-r--r--src/screen/world.c48
-rw-r--r--src/screen/world.h26
12 files changed, 48 insertions, 48 deletions
diff --git a/src/screen/analyze.c b/src/screen/analyze.c
index eb20faf..3b5be95 100644
--- a/src/screen/analyze.c
+++ b/src/screen/analyze.c
@@ -94,7 +94,7 @@ void analyze_stop()
label_destroy(widgetLabelMsg);
widgetLabelMsg = label_new("", WINDOW_SIZE_X / 2, 250, WIDGET_LABEL_CENTER);
- unhot_key_register(SDLK_ESCAPE);
+ hot_key_unregister(SDLK_ESCAPE);
}
static void eventWidget(void *p)
diff --git a/src/screen/browser.c b/src/screen/browser.c
index a971ba4..4369fa4 100644
--- a/src/screen/browser.c
+++ b/src/screen/browser.c
@@ -124,7 +124,7 @@ void browser_stop()
//select_server->list = list_new();
select_remove_all(select_server);
- unhot_key_register(SDLK_ESCAPE);
+ hot_key_unregister(SDLK_ESCAPE);
while (1) {
i = 0;
diff --git a/src/screen/choiceArena.c b/src/screen/choiceArena.c
index 4a633be..7bfee61 100644
--- a/src/screen/choiceArena.c
+++ b/src/screen/choiceArena.c
@@ -91,7 +91,7 @@ void choice_arena_event()
void stopScreenChoiceArena()
{
- unhot_key_register(SDLK_ESCAPE);
+ hot_key_unregister(SDLK_ESCAPE);
}
static void button_eventImage(void *p)
diff --git a/src/screen/credits.c b/src/screen/credits.c
index 52e5959..8aa9734 100644
--- a/src/screen/credits.c
+++ b/src/screen/credits.c
@@ -86,7 +86,7 @@ void scredits_event()
void scredits_stop()
{
- unhot_key_register(SDLK_ESCAPE);
+ hot_key_unregister(SDLK_ESCAPE);
}
static void eventWidget(void *p)
diff --git a/src/screen/gameType.c b/src/screen/gameType.c
index 87886af..58199e8 100644
--- a/src/screen/gameType.c
+++ b/src/screen/gameType.c
@@ -177,7 +177,7 @@ void game_type_event()
void stopScreenGameType()
{
- unhot_key_register(SDLK_ESCAPE);
+ hot_key_unregister(SDLK_ESCAPE);
}
static void eventWidget(void *p)
diff --git a/src/screen/mainMenu.c b/src/screen/mainMenu.c
index 567a1f6..d196b08 100644
--- a/src/screen/mainMenu.c
+++ b/src/screen/mainMenu.c
@@ -68,7 +68,7 @@ void main_menu_event()
void main_menu_stop()
{
- unhot_key_register(SDLK_ESCAPE);
+ hot_key_unregister(SDLK_ESCAPE);
}
static void eventWidget(void *p)
diff --git a/src/screen/setting.c b/src/screen/setting.c
index dfcdcd7..8403056 100644
--- a/src/screen/setting.c
+++ b/src/screen/setting.c
@@ -181,7 +181,7 @@ void setting_event()
void stopScreenSetting()
{
- unhot_key_register(SDLK_ESCAPE);
+ hot_key_unregister(SDLK_ESCAPE);
}
static void eventWidget(void *p)
@@ -434,7 +434,7 @@ void setting_init()
#endif
}
-void public_server_get_settingNameRight(char *s)
+void public_server_get_setting_name_right(char *s)
{
strcpy(s, text_field_get_text(textfield_name_player1));
}
diff --git a/src/screen/setting.h b/src/screen/setting.h
index b15ab3c..e98aa01 100644
--- a/src/screen/setting.h
+++ b/src/screen/setting.h
@@ -12,7 +12,7 @@
extern void setting_init();
extern void setting_draw();
extern void setting_event();
-extern void public_server_get_settingNameRight(char *s);
+extern void public_server_get_setting_name_right(char *s);
extern void public_server_get_settingNameLeft(char *s);
extern void public_server_get_settingCountRound(int *n);
extern bool_t setting_is_ai();
diff --git a/src/screen/settingKeys.c b/src/screen/settingKeys.c
index c24eadb..3e4de43 100644
--- a/src/screen/settingKeys.c
+++ b/src/screen/settingKeys.c
@@ -371,7 +371,7 @@ void
stopScreenSettingKeys()
{
- unhot_key_register(SDLK_ESCAPE);
+ hot_key_unregister(SDLK_ESCAPE);
}
void
diff --git a/src/screen/table.c b/src/screen/table.c
index a21c20e..ad7232f 100644
--- a/src/screen/table.c
+++ b/src/screen/table.c
@@ -80,7 +80,7 @@ void table_event()
void table_stop()
{
- unhot_key_register(SDLK_ESCAPE);
+ hot_key_unregister(SDLK_ESCAPE);
}
static void eventWidget(void *p)
diff --git a/src/screen/world.c b/src/screen/world.c
index 19f1094..e32ca1a 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 word_is_inicialized()
+bool_t world_is_inicialized()
{
return isScreenWorldInit;
}
@@ -67,11 +67,11 @@ void setGameType()
if (ret != 0) {
fprintf(stderr, _("Network initialization error!\n"));
- word_do_end();
+ world_do_end();
}
}
-void word_set_arena(arenaFile_t * arenaFile)
+void world_set_arena(arenaFile_t * arenaFile)
{
arena = arena_file_get_arena(arenaFile);
@@ -80,7 +80,7 @@ void word_set_arena(arenaFile_t * arenaFile)
#endif
}
-void word_do_end()
+void world_do_end()
{
isEndWorld = TRUE;
}
@@ -88,12 +88,12 @@ void word_do_end()
static void timer_endArena()
{
if (net_multiplayer_get_game_type() != NET_GAME_TYPE_CLIENT) {
- word_do_end();
+ world_do_end();
return;
}
}
-void word_inc_round()
+void world_inc_round()
{
if (arena->max_countRound == WORLD_COUNT_ROUND_UNLIMITED ||
arena->countRound >= arena->max_countRound) {
@@ -129,14 +129,14 @@ void prepareArena()
switch (net_multiplayer_get_game_type()) {
case NET_GAME_TYPE_NONE:
- word_set_arena(choice_arena_get());
+ world_set_arena(choice_arena_get());
item_add_new_item(arena->spaceItem, ID_UNKNOWN);
public_server_get_settingCountRound(&arena->max_countRound);
tux = tux_new();
tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
tuxWithControlRightKeyboard = tux;
- public_server_get_settingNameRight(name);
+ public_server_get_setting_name_right(name);
tux_set_name(tux, name);
space_add(arena->spaceTux, tux);
@@ -159,14 +159,14 @@ void prepareArena()
break;
case NET_GAME_TYPE_SERVER:
- word_set_arena(choice_arena_get());
+ world_set_arena(choice_arena_get());
item_add_new_item(arena->spaceItem, ID_UNKNOWN);
public_server_get_settingCountRound(&arena->max_countRound);
tux = tux_new();
tux->control = TUX_CONTROL_KEYBOARD_RIGHT;
tuxWithControlRightKeyboard = tux;
- public_server_get_settingNameRight(name);
+ public_server_get_setting_name_right(name);
tux_set_name(tux, name);
space_add(arena->spaceTux, tux);
break;
@@ -176,7 +176,7 @@ void prepareArena()
}
}
-void word_draw()
+void world_draw()
{
if (arena != NULL) {
arena_draw(arena);
@@ -391,7 +391,7 @@ static void eventEnd()
}
}
-tux_t *word_get_control_tux(int control_type)
+tux_t *world_get_control_tux(int control_type)
{
switch (control_type) {
case TUX_CONTROL_KEYBOARD_RIGHT:
@@ -405,7 +405,7 @@ tux_t *word_get_control_tux(int control_type)
return NULL;
}
-void word_set_control_tux(tux_t * tux, int control_type)
+void world_set_control_tux(tux_t * tux, int control_type)
{
switch (control_type) {
case TUX_CONTROL_KEYBOARD_RIGHT:
@@ -417,7 +417,7 @@ void word_set_control_tux(tux_t * tux, int control_type)
}
}
-void word_tux_control(tux_t * p)
+void world_tux_control(tux_t * p)
{
assert(p != NULL);
@@ -444,7 +444,7 @@ void word_tux_control(tux_t * p)
}
}
-void word_event()
+void world_event()
{
tux_t *thisTux;
@@ -461,11 +461,11 @@ void word_event()
//module_event();
}
- thisTux = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+ thisTux = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
radar_add(thisTux->id, thisTux->x, thisTux->y, RADAR_TYPE_YOU);
- thisTux = word_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
+ thisTux = world_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
if (thisTux != NULL) {
radar_add(thisTux->id, thisTux->x, thisTux->y, RADAR_TYPE_TUX);
@@ -481,7 +481,7 @@ void word_event()
static void hotkey_escape()
{
- word_do_end();
+ world_do_end();
}
void startWorld()
@@ -526,8 +526,8 @@ static void setTable()
return;
}
- tuxRight = word_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
- tuxLeft = word_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
+ tuxRight = world_get_control_tux(TUX_CONTROL_KEYBOARD_RIGHT);
+ tuxLeft = world_get_control_tux(TUX_CONTROL_KEYBOARD_LEFT);
if (tuxRight->score > tuxLeft->score) {
table_add(tuxRight->name, tuxRight->score);
@@ -545,7 +545,7 @@ void stoptWorld()
setAnalyze();
}
- unhot_key_register(SDLK_ESCAPE);
+ hot_key_unregister(SDLK_ESCAPE);
arena_quit();
net_multiplayer_quit();
@@ -573,7 +573,7 @@ void stoptWorld()
id_quit_list();
}
-void word_init()
+void world_init()
{
assert(image_is_inicialized() == TRUE);
assert(tux_is_inicialized() == TRUE);
@@ -582,7 +582,7 @@ void word_init()
assert(screen_is_inicialized() == TRUE);
screen_register(screen_new
- ("world", startWorld, word_event, word_draw, stoptWorld));
+ ("world", startWorld, world_event, world_draw, stoptWorld));
#ifndef NO_SOUND
sound_add("dead.ogg", "dead", SOUND_GROUP_BASE);
@@ -602,7 +602,7 @@ void word_init()
isScreenWorldInit = TRUE;
}
-void word_quit()
+void world_quit()
{
DEBUG_MSG(_("Quitting screen world\n"));
isScreenWorldInit = FALSE;
diff --git a/src/screen/world.h b/src/screen/world.h
index 0df8a48..1030dca 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 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();
+extern bool_t world_is_inicialized();
+extern void world_init();
+extern void world_set_arena(arenaFile_t * arenaFile);
+extern void world_do_end();
+extern void world_inc_round();
+extern tux_t *world_get_control_tux(int control_type);
+extern void world_set_control_tux(tux_t * tux, int control_type);
+extern void world_tux_control(tux_t * p);
+extern void world_draw();
+extern void world_event();
+extern void world_start();
+extern void world_stop();
+extern void world_quit();
#endif
generated by cgit v1.2.3 (git 2.46.0) at 2026-09-13 07:39:53 +0000