diff options
| author | Michal Zima <xhire@mujmalysvet.cz> | 2010-02-08 22:59:42 +0100 |
|---|---|---|
| committer | Michal Zima <xhire@mujmalysvet.cz> | 2010-02-08 22:59:42 +0100 |
| commit | 446ee442f34bb9f8e6f52d29e3985c9025fbffd7 (patch) | |
| tree | fc0c39ba0b9fd5a05d8d86ce4ffe3331e6006887 /src | |
| parent | 6d80682e084f0f51a9441f7f94ac955d7700d12d (diff) | |
Found one more string to be translated
More code style corrections
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/yes_no_dialog.c | 7 | ||||
| -rw-r--r-- | src/screen/world.c | 6 | ||||
| -rw-r--r-- | src/server/log.c | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/src/client/yes_no_dialog.c b/src/client/yes_no_dialog.c index 0b7f9b3..d982933 100644 --- a/src/client/yes_no_dialog.c +++ b/src/client/yes_no_dialog.c @@ -73,12 +73,9 @@ void yes_no_dialog_set_active(bool_t active) { active_dialog = active; - if (active_dialog == TRUE) - { + if (active_dialog == TRUE) { hot_key_register(SDLK_ESCAPE, hotkey_escape); - } - else - { + } else { hot_key_unregister(SDLK_ESCAPE); } } diff --git a/src/screen/world.c b/src/screen/world.c index c2615c8..b1043a1 100644 --- a/src/screen/world.c +++ b/src/screen/world.c @@ -387,9 +387,9 @@ void dialog_no(void *p) static void hotkey_escape() { - yes_no_dialog_set("Naozaj chete ukoncit hru ?", dialog_yes, dialog_no, NULL); + yes_no_dialog_set(_("Do you really want to quit the game?"), dialog_yes, dialog_no, NULL); yes_no_dialog_set_active(TRUE); - //world_do_end(); + /*world_do_end();*/ } void startWorld() @@ -417,7 +417,7 @@ void startWorld() prepareArena(); } -static void action_analyze(space_t * space, tux_t * tux, void *p) +static void action_analyze(space_t *space, tux_t *tux, void *p) { UNUSED(space); UNUSED(p); diff --git a/src/server/log.c b/src/server/log.c index 7f038ce..00cde64 100644 --- a/src/server/log.c +++ b/src/server/log.c @@ -59,7 +59,7 @@ void log_add(int type, char *msg) } sprintf(str, "[%02d-%02d-%02d %02d:%02d:%02d] [%s] %s\n", - 1900 + tm_struct->tm_year, tm_struct->tm_mon+1, tm_struct->tm_mday, + 1900 + tm_struct->tm_year, tm_struct->tm_mon + 1, tm_struct->tm_mday, tm_struct->tm_hour, tm_struct->tm_min, tm_struct->tm_sec, str_type, msg); |