demo_header_write() now writes the header. :-P

[neverball] / ball / main.c

diff --git a/ball/main.c b/ball/main.c
index 832dd1c..ff97ead 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);
 }
 
 /*---------------------------------------------------------------------------*/
@@ -218,6 +217,7 @@ static int loop(void)
 /*---------------------------------------------------------------------------*/
 
 /* Option values */
+
 static char *data_path    = NULL;
 static char *replay_path  = NULL;
 static char *level_path   = NULL;
@@ -225,33 +225,35 @@ static int   display_info = 0;
 
 /* Option handling */
 
-#define USAGE  _( \
-        "Usage: %s [options ...]\n" \
-        "-r, --replay file         play the replay 'file'.\n" \
-        "-l, --level file.sol      play the level 'file.sol'.\n" \
-        "-i, --info                display info about level or replay.\n" \
-        "    --data dir            use 'dir' as game data directory.\n" \
-        "-v, --version             show version.\n" \
-        "-h, -?, --help            show this usage message.\n")
-
 static void parse_args(int argc, char **argv)
 {
-#define CASE(x) (strcmp(*argv, (x)) == 0)       /* Check current option */
-#define MAND    !(missing = (argv[1] == NULL))  /* Argument is mandatory */
     char *exec = *(argv++);
     int missing; /* Argument is missing. */
 
+    const char *usage = _(
+        "Usage: %s [options ...]\n"
+        "-r, --replay file         play the replay 'file'.\n"
+        "-l, --level file.sol      play the level 'file.sol'.\n"
+        "-i, --info                display info about level or replay.\n"
+        "    --data dir            use 'dir' as game data directory.\n"
+        "-v, --version             show version.\n"
+        "-h, -?, --help            show this usage message.\n"
+    );
+
+#define CASE(x) (strcmp(*argv, (x)) == 0)       /* Check current option */
+#define MAND    !(missing = (argv[1] == NULL))  /* Argument is mandatory */
+
     while (*argv != NULL)
     {
         missing = 0;
         if (CASE("-h") || CASE("-?") || CASE("--help"))
         {
-            printf(USAGE, exec);
+            printf(usage, exec);
             exit(0);
         }
         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)
@@ -265,14 +267,14 @@ static void parse_args(int argc, char **argv)
         else if (!missing)
         {
             fprintf(stderr, _("%s: unknown option %s\n"), exec, *argv);
-            fprintf(stderr, USAGE, exec);
+            fprintf(stderr, usage, exec);
             exit(1);
         }
         else
         {
             fprintf(stderr, _("%s: option %s requires an argument\n"), exec,
                     *argv);
-            fprintf(stderr, USAGE, exec);
+            fprintf(stderr, usage, exec);
             exit(1);
         }
         argv++;
@@ -283,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);
 
@@ -311,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)
@@ -395,6 +395,16 @@ int main(int argc, char *argv[])
     SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE,  16);
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
+    /* Set the WM icon */
+
+    icon = IMG_Load(config_data("icon/neverball.png"));
+
+    if (icon)
+    {
+        SDL_WM_SetIcon(icon, NULL);
+        SDL_FreeSurface(icon);
+    }
+
     /* Initialize the video. */
 
     if (!config_mode(config_get_d(CONFIG_FULLSCREEN),
@@ -404,19 +414,17 @@ int main(int argc, char *argv[])
         return 1;
     }
 
-    /* Set the WM icon */
-
-    icon = IMG_Load(config_data("icon/neverball.png"));
-    SDL_WM_SetIcon(icon, NULL);
     SDL_WM_SetCaption(TITLE, TITLE);
 
     /* 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)
     {
@@ -436,7 +444,7 @@ int main(int argc, char *argv[])
             {
                 st_paint();
                 gui_blank();
-                SDL_Delay(10); /* Be nice! */
+                SDL_Delay(10);
             }
             else
             {