X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FOtage.js;h=7915715760139b0f29ac069b50590a9692c79574;hb=1006b211894bdc0624e2fd332ac78322bf8ca0ee;hp=2a8891ff6e8c0fa39dac74fbbcc5b00c544cdc8f;hpb=d982fffc441a0443be90ba6f57a94d1d60b702c8;p=vchess.git

diff --git a/client/src/variants/Otage.js b/client/src/variants/Otage.js
index 2a8891ff..79157157 100644
--- a/client/src/variants/Otage.js
+++ b/client/src/variants/Otage.js
@@ -355,7 +355,7 @@ export class OtageRules extends ChessRules {
     }
     let baseMoves = [];
     const c = this.turn;
-    switch (piece || this.getPiece(x, y)) {
+    switch (piece) {
       case V.PAWN: {
         const firstRank = (c == 'w' ? 7 : 0);
         baseMoves = this.getPotentialPawnMoves([x, y]).filter(m => {
@@ -704,8 +704,8 @@ export class OtageRules extends ChessRules {
     const lm = this.lastMoveEnd[L-1];
     const piece =
       !!lm
-        ? lm.p :
-        this.getPiece(move.vanish[0].x, move.vanish[0].y);
+        ? lm.p
+        : this.getPiece(move.vanish[0].x, move.vanish[0].y);
     if (piece == V.KING)
       this.kingPos[c] = [move.appear[0].x, move.appear[0].y];
     this.updateCastleFlags(move, piece);
@@ -762,6 +762,13 @@ export class OtageRules extends ChessRules {
   postUndo(move) {
     if (this.getPiece(move.start.x, move.start.y) == V.KING)
       this.kingPos[this.turn] = [move.start.x, move.start.y];
+    else {
+      // Check if a king is being released: put it on releasing square
+      const L = this.lastMoveEnd.length;
+      const lm = this.lastMoveEnd[L-1];
+      if (!!lm && lm.p == V.KING)
+        this.kingPos[this.turn] = [move.start.x, move.start.y];
+    }
   }
 
   getCurrentScore() {