Ticket #124: gunnar_7_10.5.diff

engine/persistent.c

@@ -1280 +1280 @@
   int pos;
 
   for (pos = BOARDMIN; pos < BOARDMAX; pos++)
-    goal[pos] = goala[pos] || goalb[pos];
+    if (ON_BOARD(pos))
+      goal[pos] = goala[pos] || goalb[pos];
+
   store_persistent_cache(&semeai_cache, routine,
                          apos, bpos, cpos, color, goal_hash,
                          resulta, resultb, move, NO_MOVE,

engine/owl.c

@@ -669 +669 @@
       && tt_get(&ttable, SEMEAI, apos, bpos, depth - stackp, NULL,
                 &value1, &value2, &xpos) == 2) {
     TRACE_CACHED_RESULT2(value1, value2, xpos);
-    if (value1 != 0)
-      *move = xpos;
+    *move = xpos;
       
     *resulta = value1;
     *resultb = value2;
@@ -1293 +1292 @@
     /* FIXME: Are all owl_data fields and relevant static
      * variables properly set up for a call to do_owl_attack()?
      */
-    *this_resulta = REVERSE_RESULT(do_owl_attack(apos, NULL, NULL, owla, 0));
+    *this_resulta = REVERSE_RESULT(do_owl_attack(apos, semeai_move, NULL, owla, 0));
     *this_resultb = *this_resulta;
   }
   else {
@@ -1851 +1850 @@
              &value1, &value2, &xpos) == 2) {
 
     TRACE_CACHED_RESULT(value1, xpos);
-    if (value1 != 0) {
-      if (move)
-        *move = xpos;
-    }
+    if (move)
+      *move = xpos;
+
     if (value1 == GAIN) {
       if (wormid) {
         if (goal_worms_computed)
@@ -2492 +2490 @@
              &value1, &value2, &xpos) == 2) {
     
     TRACE_CACHED_RESULT(value1, xpos);
-    if (value1 != 0) {
-      if (move)
-        *move = xpos;
-    }
+    if (move)
+      *move = xpos;
+
     if (value1 == LOSS) {
       if (wormid) {
         if (goal_worms_computed)