- endMoves = cur + 6;
- killers[0].move = ss->killers[0];
- killers[1].move = ss->killers[1];
- killers[2].move = countermoves[0];
- killers[3].move = countermoves[1];
- killers[4].move = followupmoves[0];
- killers[5].move = followupmoves[1];
+ endMoves = cur + 2;
+
+ killers[0] = ss->killers[0];
+ killers[1] = ss->killers[1];
+ killers[2].move = MOVE_NONE;
+
+ // Be sure countermoves are different from killers
+ if ( countermove != killers[0]
+ && countermove != killers[1])
+ *endMoves++ = countermove;