--- spellcast-1.0.orig/xgest.c
+++ spellcast-1.0/xgest.c
@@ -23,7 +23,7 @@
 #include "bvp.bm"
 #include "bvs.bm"
 #include "bvw.bm"
-
+	 
 #include "sc.bm"
 #include "sd.bm"
 #include "sd2.bm"
@@ -37,10 +37,8 @@
 #include "sw2.bm"
 #include "sdot.bm"
 
-#define COLUMN_SIZE (8)
-#define COLUMN_X (476)
-#define COLUMN_Y (33)
-#define GEST_SPACE (50)
+#include <libintl.h>
+#define _(String) gettext (String)
 
 void init_bitmaps(py)
 struct player *py;
@@ -116,6 +114,34 @@
     py->spelllistbm[1][6] = 0; /* no double dots */
 
 }
+#ifdef COLOUR
+
+static long check_name(struct player *py, char *str)
+{
+  char *temp;
+  int i;
+
+  for (i = 0; i < MAXPLAYERS; i++){
+    temp = str;
+
+    /* is there a name in this entry */
+
+    if (namelist[i]){
+
+      /* does it match the start of the string we were passed? */
+
+      if (strncmp(namelist[i], temp, strlen(namelist[i])) == 0){
+
+       return (col_list[i]);
+      }
+    }
+  }  
+  /* return default colour */
+
+  return (BlackPixel(py->dpy, py->scn));
+}
+
+#endif                
 
 void redraw_column(py)
 struct player *py;
@@ -126,17 +152,28 @@
     int posx, posy;
     int pnum = py-players;
 
+#ifdef COLOUR
+    long col;
+#endif    
+
     if (turnstate==State_Init) {
 	return;
     }
-
     for (ix=0; ix<numplayers; ix++) {
 	posx = COLUMN_X + ix*(2*GEST_SIZE + 20);
 	posy = COLUMN_Y;
+#ifdef COLOUR
+       /* F.Hendrikx */
 
+       col = check_name(py, NameOfBeing(gameval, QuVal_Target_Wizard, ix));
+       XSetForeground(py->dpy, py->blackgc, col);
+#endif
+          
 	DrawStringCentered(py, NameOfBeing(gameval, QuVal_Target_Wizard, ix),
 			posx+GEST_SIZE, posy-py->lineheight+py->ascent);
-
+#ifdef COLOUR
+       XSetForeground(py->dpy, py->blackgc, BlackPixel(py->dpy, py->scn));
+#endif
 	if (turnstate!=State_Top) {
 	    SeeGesture(gameval, ix, pnum, buf, COLUMN_SIZE);
 	    gx=0;
@@ -205,9 +242,9 @@
     int posx, posy;
 
     draw_frame(py, &py->gesture_rect);
-    sprintf(gesture_prompt[0], "What gesture do you want to");
-    sprintf(gesture_prompt[1], "make with your %s hand?",
-		py->gesture_hand?"right":"left");
+    sprintf(gesture_prompt[0], _("What gesture do you want to"));
+    sprintf(gesture_prompt[1], _("make with your %s hand?"),
+		py->gesture_hand?_("right"):_("left"));
     XDrawImageString(py->dpy, py->win, py->blackgc, py->gesture_rect.x+20,
 		py->gesture_rect.y+10+py->lineheight, gesture_prompt[0],
 		strlen(gesture_prompt[0]));
@@ -292,7 +329,7 @@
 	hit = (-1);
 
     if (hit==py->gesture_sel)
-	return;
+	return 0;
 
     if (py->gesture_sel != (-1)) {
 	/* erase old */
@@ -315,6 +352,7 @@
 	XDrawRectangle(py->dpy, py->win, py->blackgc, posx+hitx*GEST_SPACE-2,
 			posy+hity*GEST_SPACE-2, GEST_SIZE+3, GEST_SIZE+3);
     }
+     return 0;
 }
 
 int gesture_release(py, xpos, ypos, button)
@@ -340,4 +378,5 @@
     XCopyPlane(py->dpy, py->gesturebm[1][py->gesture_chosen[1]], py->win,
 		py->blackgc, 0, 0, GEST_SIZE, GEST_SIZE, posx+GEST_SPACE,
 		posy+(GEST_SPACE)*(COLUMN_SIZE-1), 1);
+    return 0;
 }