X-Git-Url: http://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/5278747bc6615197749a4e882283c9d06901cd80..820ca1a966bd2cb0b77d7e36d979645b527a1b2b:/src/motif.c

diff --git a/src/motif.c b/src/motif.c
index 66e31df..8b0fa41 100644
--- a/src/motif.c
+++ b/src/motif.c
@@ -25,6 +25,7 @@
 #include <Xm/XmAll.h>
 
 #include "help.h"
+#include "xtra.h"
 #include "motif.h"
 #include "ewmhicon.h"
 #include "motifopt.h"
@@ -40,7 +41,6 @@
 
 #define PROGNAME "rrace"
 static const char *progname = PROGNAME;
-static const struct option lopts[] = { LOPTS_INITIALIZER, {0} };
 
 static char * const default_resources[] = {
 	"*title: RRace",
@@ -76,7 +76,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;
@@ -100,6 +100,8 @@ static Widget early_setup(XtAppContext *app, int argc, char **argv)
 	Widget shell;
 	int opt;
 
+	XTRA_PACKED_LOPTS(lopts);
+
 	/* Check for --help/--version early (before X connection) */
 	opterr = 0;
 	while ((opt = getopt_long_only(argc, argv, "", lopts, NULL)) != -1) {
@@ -108,7 +110,7 @@ static Widget early_setup(XtAppContext *app, int argc, char **argv)
 			print_version();
 			exit(EXIT_SUCCESS);
 		case LOPT_HELP:
-			print_help();
+			print_help(lopts);
 			exit(EXIT_SUCCESS);
 		}
 	}
@@ -158,16 +160,7 @@ static void do_input_move(struct app_state *state, int x, int y)
 
 	if ((mask = game_do_move(&state->board, x, y)) != 0) {
 		if (game_check_goal(&state->board) == 0) {
-			int_fast32_t ms = game_finish(&state->board);
-			unsigned min, sec;
-
-			ui_timer_update(state, ms);
-
-			sec = ms / 1000, ms %= 1000;
-			min = sec / 60, sec %= 60;
-			printf("You won!  Time was %u:%.2u.%.3u\n",
-			       min, sec, (unsigned)ms);
-
+			ui_timer_update(state, game_finish(&state->board));
 			mask |= ~GOAL_MASK;
 		}
 
@@ -236,6 +229,7 @@ static void proc_new_game(Widget w, XEvent *e, String *argv, Cardinal *argc)
 
 	game_reset(&state.board);
 
+	state.flags &= ~FLAG_VIEW_GOAL_ON_GAME;
 	x11_redraw_goal(&state, -1, get_shell(w));
 	x11_redraw_game(&state, -1);