Fix #69

[neverball] / ball / main.c

diff --git a/ball/main.c b/ball/main.c
index 846b11a..0077026 100644 (file)
--- a/ball/main.c
+++ b/ball/main.c
@@ -57,8 +57,7 @@ static void shot(void)
 
     sprintf(filename, _("screen%02d.png"), num++);
 
-    image_snap(filename, config_get_d(CONFIG_WIDTH),
-               config_get_d(CONFIG_HEIGHT));
+    image_snap(filename);
 }
 
 /*---------------------------------------------------------------------------*/
@@ -254,7 +253,7 @@ static void parse_args(int argc, char **argv)
         }
         else if (CASE("-v") || CASE("--version"))
         {
-            printf(_("%s: %s version %s\n"), exec, TITLE, VERSION);
+            printf("%s %s\n", TITLE, VERSION);
             exit(0);
         }
         else if (CASE("--data") && MAND)
@@ -286,8 +285,9 @@ static void parse_args(int argc, char **argv)
 int main(int argc, char *argv[])
 {
     SDL_Joystick *joy = NULL;
-    int t1, t0;               /* ticks */
-    SDL_Surface *icon;        /* WM icon */
+    SDL_Surface *icon;
+
+    int t1, t0;
 
     language_init("neverball", CONFIG_LOCALE);
 
@@ -314,17 +314,14 @@ int main(int argc, char *argv[])
 
     language_set(language_from_code(config_simple_get_s(CONFIG_LANG)));
 
-    /* Prepare run without sdl */
+    /* Prepare run without SDL */
 
-    if (replay_path != NULL)
+    if (replay_path)
     {
         if (!level_replay(replay_path))
         {
-            fprintf(stderr, _("Replay file '%s': "), replay_path);
-            if (errno)
-                perror(NULL);
-            else
-                fprintf(stderr, _("Not a replay file\n"));
+            fprintf(stderr, _("Replay file '%s': %s\n"), replay_path,
+                    errno ? strerror(errno) : _("Not a replay file"));
             return 1;
         }
         else if (display_info)
@@ -371,10 +368,10 @@ int main(int argc, char *argv[])
     /* Initialize the audio. */
 
     audio_bind(AUD_MENU,   3, "snd/menu.wav");
-    audio_bind(AUD_START,  1, "snd/select.ogg");
-    audio_bind(AUD_READY,  1, "snd/ready.ogg");
-    audio_bind(AUD_SET,    1, "snd/set.ogg");
-    audio_bind(AUD_GO,     1, "snd/go.ogg");
+    audio_bind(AUD_START,  1, _("snd/select.ogg"));
+    audio_bind(AUD_READY,  1, _("snd/ready.ogg"));
+    audio_bind(AUD_SET,    1, _("snd/set.ogg"));
+    audio_bind(AUD_GO,     1, _("snd/go.ogg"));
     audio_bind(AUD_BALL,   2, "snd/ball.ogg");
     audio_bind(AUD_BUMP,   3, "snd/bump.ogg");
     audio_bind(AUD_COIN,   2, "snd/coin.wav");
@@ -383,10 +380,10 @@ int main(int argc, char *argv[])
     audio_bind(AUD_SWITCH, 5, "snd/switch.wav");
     audio_bind(AUD_JUMP,   5, "snd/jump.ogg");
     audio_bind(AUD_GOAL,   5, "snd/goal.wav");
-    audio_bind(AUD_SCORE,  1, "snd/record.ogg");
-    audio_bind(AUD_FALL,   1, "snd/fall.ogg");
-    audio_bind(AUD_TIME,   1, "snd/time.ogg");
-    audio_bind(AUD_OVER,   1, "snd/over.ogg");
+    audio_bind(AUD_SCORE,  1, _("snd/record.ogg"));
+    audio_bind(AUD_FALL,   1, _("snd/fall.ogg"));
+    audio_bind(AUD_TIME,   1, _("snd/time.ogg"));
+    audio_bind(AUD_OVER,   1, _("snd/over.ogg"));
 
     audio_init();
 
@@ -422,10 +419,12 @@ int main(int argc, char *argv[])
     /* Initialize the run state. */
 
     init_state(&st_null);
-    if (replay_path != NULL)
+
+    if (replay_path)
     {
         level_replay(replay_path);
-        goto_demo_play(1);
+        demo_play_goto(1);
+        goto_state(&st_demo_play);
     }
     else if (level_path != NULL)
     {
@@ -445,7 +444,7 @@ int main(int argc, char *argv[])
             {
                 st_paint();
                 gui_blank();
-                SDL_Delay(10); /* Be nice! */
+                SDL_Delay(10);
             }
             else
             {