Adjust X11 include ordering.

[rrace.git] / src / x11.c

diff --git a/src/x11.c b/src/x11.c
index 3b12bd33fef8b42546595b7c75d0dee6b28d8cb2..94a0619b473a2d6d27b48011f48b0dfc597acf9e 100644 (file)
--- a/src/x11.c
+++ b/src/x11.c
@@ -19,18 +19,20 @@
 #include <config.h>
 #include <stdio.h>
 #include <assert.h>
+
+#include <X11/Intrinsic.h>
 #include <Xm/XmStrDefs.h>
 #include "motif.h"
 
 /* TODO user-selectable colours */
 static const char * const colours[][3] = {
        /*primary    bottom      top */
-       "#fa2e2e", "#c02323", "#ff3939", /* red */
-       "#ff8c00", "#c46c00", "#ffa400", /* orange */
-       "#ffd700", "#c4a500", "#ffed00", /* yellow */
-       "#228b22", "#186318", "#27a027", /* green */
-       "#4682b4", "#325c80", "#4c8dc3", /* blue */
-       "#faf0e6", "#b2aaa3", "#fff9ee", /* white */
+       "#8d2e28", "#6a1b17", "#a14842", /* red */
+       "#b46e28", "#924a16", "#c7904f", /* orange */
+       "#d8b740", "#c59f39", "#e2c65d", /* yellow */
+       "#286428", "#194719", "#4e874e", /* green */
+       "#003471", "#001f4f", "#00528b", /* blue */
+       "#dcdcdc", "#c0c0c0", "#eaeaea", /* white */
 };
 
 static void init_colours(struct app_state *state, Screen *screen)
@@ -143,7 +145,7 @@ void x11_redraw_game(struct app_state *state)
        w /= 5; h /= 5;
 
        for (i = 0; i < 25; i++) {
-               uint_least32_t *gp = state->board.game+1;
+               uint_least32_t *gp = state->board.game;
 
                redraw_tile(state, display, game,
                            gp[0], gp[1], gp[2],