1 files changed, 6 insertions, 3 deletions
diff --git a/src/generate.c b/src/generate.c
index 7d7778f..7362fba 100755
--- a/src/generate.c
+++ b/src/generate.c
@@ -2454,7 +2454,7 @@ Return value:
     ULONG uHashMoveLoc = (ULONG)-1;
     ULONG uColor = pos->uToMove;
     PRECOMP_KILLERS sKillers[4];
-    COOR cEnprise = GetEnprisePiece(pos, uColor);
+    COOR cEnprise = FindEnprisePiece(ctx, uColor);
 
     //
     // We have generated all moves here.  We also know that we are not
@@ -2467,7 +2467,10 @@ Return value:
     //
 
     //
-    // Pre-populate killer/bonuses
+    // Pre-populate killer/bonuses.  (Tried Crafty-style ordering here
+    // -- both of this ply's own killers before either ply-2-back one
+    // -- measured worse EBF on ecm_quick than this interleaved order.
+    // Back to interleaved as the known-good baseline.)
     //
     sKillers[0].mv = ctx->mvKiller[uPly][0];
     sKillers[0].uBonus = FIRST_KILLER;
@@ -2857,7 +2860,7 @@ Return value:
     MOVE mv;
     MOVE mvLast = (pi-1)->mv;
     SCORE s;
-    COOR cEnprise = GetEnprisePiece(pos, uColor);
+    COOR cEnprise = FindEnprisePiece(ctx, uColor);
 
     //
     // We have generate all moves or just legal escapes from check