Remove some stray C++-style // comments.

[rrace.git] / src / curses.c

diff --git a/src/curses.c b/src/curses.c
index c0f4265e25fc98054f947cce25290b227e941ab6..dc870de7767d482d5617c0754c64e947a7a293d9 100644 (file)
--- a/src/curses.c
+++ b/src/curses.c
@@ -1,6 +1,6 @@
 /*
  * Curses UI for slide puzzle game
- * Copyright © 2022-2023 Nick Bowler
+ * Copyright © 2022-2024 Nick Bowler
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  */
 
 #include <config.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
 #include <assert.h>
@@ -24,17 +25,17 @@
 #include <curses.h>
 
 #include "help.h"
+#include "xtra.h"
 #include "version.h"
 
 #include "cursesui.h"
 #include "cursesopt.h"
 
 enum {
-       GAME_YPOS = 1 // top row of game and goal areas.
+       GAME_YPOS = 1 /* top row of game and goal areas. */
 };
 
 static const char *progname = "rrace";
-static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
 
 static struct app_state state;
 
@@ -53,7 +54,7 @@ static void print_usage(FILE *f)
                fprintf(f, "Try %s --help for more information.\n", progname);
 }
 
-static void print_help(void)
+static void print_help(const struct option *lopts)
 {
        struct lopt_help help = {0};
        const struct option *opt;
@@ -292,6 +293,8 @@ static void app_initialize(int argc, char **argv)
        int enable_mouse = 1;
        int opt;
 
+       XTRA_PACKED_LOPTS(lopts);
+
        if (argc > 0)
                progname = argv[0];
 
@@ -307,7 +310,7 @@ static void app_initialize(int argc, char **argv)
                        print_version();
                        exit(EXIT_SUCCESS);
                case LOPT_HELP:
-                       print_help();
+                       print_help(lopts);
                        exit(EXIT_SUCCESS);
                default:
                        print_usage(stderr);
@@ -422,6 +425,7 @@ void curs_new_game(struct app_state *state)
        game_reset(&state->board);
 
        do_reset_cursor(state);
+       state->view_goal_on_game = 0;
        curs_redraw_game(state, -1);
        curs_redraw_goal(state, -1);
        update_timer(state, 0);