diff options
Diffstat (limited to 'src/screen')
| -rw-r--r-- | src/screen/downArena.c | 2 | ||||
| -rw-r--r-- | src/screen/gameType.c | 4 | ||||
| -rw-r--r-- | src/screen/settingKeys.c | 6 | ||||
| -rw-r--r-- | src/screen/table.c | 8 | ||||
| -rw-r--r-- | src/screen/world.c | 6 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/screen/downArena.c b/src/screen/downArena.c index e150a03..ac211a9 100644 --- a/src/screen/downArena.c +++ b/src/screen/downArena.c @@ -287,7 +287,7 @@ static void readArenaFromStatus() connectToDownServer(); - printf("[Debug] arenaNetName: %s\n", arenaNetName); + debug("arenaNetName: %s", arenaNetName); } } } diff --git a/src/screen/gameType.c b/src/screen/gameType.c index c593c4c..f570fb9 100644 --- a/src/screen/gameType.c +++ b/src/screen/gameType.c @@ -302,7 +302,7 @@ int public_server_get_settingGameType() return NET_GAME_TYPE_CLIENT; } - assert(!_("[Error] Unknown game type")); + fatal("Unknown game type"); return -1; } @@ -356,7 +356,7 @@ int public_server_get_settingProto() return PROTO_UDPv6; } - DEBUG_MSG(_("[Error] Unknown version of IP protocol\n")); + debug("Unknown version of IP protocol"); return -1; } diff --git a/src/screen/settingKeys.c b/src/screen/settingKeys.c index a1bf4ad..90a35f2 100644 --- a/src/screen/settingKeys.c +++ b/src/screen/settingKeys.c @@ -138,13 +138,13 @@ void key_table_init() keycontrolFile = text_file_load(path); if (keycontrolFile == NULL) { - fprintf(stderr, _("[Error] Unable to load config file [%s]\n"), path); - fprintf(stderr, _("[Debug] Creating config file [%s]\n"), path); + error("Unable to load config file [%s]", path); + debug("Creating config file [%s]", path); keycontrolFile = text_file_new(path); if (keycontrolFile == NULL) { - fprintf(stderr, _("[Error] Unable to create config file [%s]\n"), path); + error("Unable to create config file [%s]", path); return; } } diff --git a/src/screen/table.c b/src/screen/table.c index 993ff18..01995a4 100644 --- a/src/screen/table.c +++ b/src/screen/table.c @@ -98,7 +98,7 @@ static void setWidgetLabel() int i; if (textFile == NULL) { - fprintf(stderr, _("[Error] Didn't load the high score file [%s]"), SCREEN_TABLE_FILE_HIGHSCORE_NAME); + error("Didn't load the high score file [%s]", SCREEN_TABLE_FILE_HIGHSCORE_NAME); return; } @@ -147,15 +147,15 @@ static void loadHighscoreFile() textFile = text_file_load(path); if (textFile == NULL) { - fprintf(stderr, _("[Error] Unable to load the high score file [%s]\n"), path); - fprintf(stderr, _("[Debug] Creating the high score file [%s]\n"), path); + error("Unable to load the high score file [%s]", path); + debug("Creating the high score file [%s]", path); textFile = text_file_new(path); } else { return; } if (textFile == NULL) { - fprintf(stderr, _("[Error] Unable to create the high score file [%s]\n"), path); + error("Unable to create the high score file [%s]", path); return; } diff --git a/src/screen/world.c b/src/screen/world.c index f368c41..a37da1b 100644 --- a/src/screen/world.c +++ b/src/screen/world.c @@ -68,7 +68,7 @@ void setGameType() public_server_get_settingPort(), public_server_get_settingProto()); if (ret != 0) { - fprintf(stderr, _("[Error] Unable to initialize network\n")); + error("Unable to initialize network"); world_do_end(); } } @@ -317,7 +317,7 @@ void world_tux_control(tux_t *p) switch (p->control) { case TUX_CONTROL_NONE: - assert(!_("[Error] Controls not defined")); + fatal("Controls not defined"); break; case TUX_CONTROL_KEYBOARD_RIGHT: @@ -502,6 +502,6 @@ void world_init() void world_quit() { - DEBUG_MSG(_("[Debug] Shutting down the world screen\n")); + debug("Shutting down the world screen"); isScreenWorldInit = FALSE; } |