X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/a70b0ef8bf7cb26cc779e9b2da480295f5ebf2bd..5ba271c9a2d679094dc69dd4e9eff33122022ea0:/src/curses.c

diff --git a/src/curses.c b/src/curses.c
index c0f4265..46f0d7e 100644
--- a/src/curses.c
+++ b/src/curses.c
@@ -24,6 +24,7 @@
 #include <curses.h>
 
 #include "help.h"
+#include "xtra.h"
 #include "version.h"
 
 #include "cursesui.h"
@@ -34,7 +35,6 @@ enum {
 };
 
 static const char *progname = "rrace";
-static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
 
 static struct app_state state;
 
@@ -53,7 +53,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 +292,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 +309,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 +424,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);