X-Git-Url: https://git.draconx.ca/gitweb/rrace.git/blobdiff_plain/8e6b9fd79ca87c131d33d74d40f68df9696c7f5c..ec2e7b448d7d0d404c0b3102c5b25ac9464d9fc5:/src/motif.c

diff --git a/src/motif.c b/src/motif.c
index be5900d..12959f7 100644
--- a/src/motif.c
+++ b/src/motif.c
@@ -40,7 +40,6 @@ static char * const default_resources[] = {
 	"*game.XmFrame.shadowThickness: 3",
 	"*game.XmFrame.shadowType: shadow_in",
 	"*goalArea.leftOffset: 1",
-	"*gameCanvas.background: #202020",
 
 	"*gameNew.accelerator: Ctrl<Key>N",
 	"*gameNew.acceleratorText: Ctrl+N",
@@ -141,9 +140,12 @@ static void proc_new_game(Widget w, XEvent *e, String *argv, Cardinal *argc)
 		shell = XtParent(shell);
 
 	game_reset(&state.board);
+
 	x11_redraw_goal(&state, -1);
 	x11_redraw_game(&state, -1);
 	x11_redraw_icon(&state, shell);
+
+	game_begin(&state.board);
 }
 
 static const XtActionsRec menu_actions[] = {
@@ -155,6 +157,7 @@ static XtAppContext app_initialize(int argc, char **argv)
 {
 	XtAppContext app;
 	Widget shell;
+	int i;
 
 	if (argc > 0)
 		progname = argv[0];
@@ -163,7 +166,13 @@ static XtAppContext app_initialize(int argc, char **argv)
 	XtAppAddActions(app, (void *)menu_actions, XtNumber(menu_actions));
 	ui_initialize(&state, shell);
 	x11_initialize(&state, shell);
+
+	/* Begin with the game in winning state */
 	game_reset(&state.board);
+	for (i = 0; i < 3; i++)
+		state.board.game[i] = state.board.goal[i] << GOAL_SHIFT;
+	game_finish(&state.board);
+
 	state.use_ewmh_icons = ewmh_probe_wm_icon(shell);
 	XtRealizeWidget(shell);