From 5e77e63b7a0a194e001f53918d057a233a9e1913 Mon Sep 17 00:00:00 2001
From: mig <michel.gutierrez@gmail.com>
Date: Fri, 5 May 2017 17:34:11 +0200
Subject: [PATCH] make captureInstantRemove not only about pivots

---
 src/games/checkers/checkers-xd-view.js   | 2 ++
 src/games/checkers/checkersbase-model.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/games/checkers/checkers-xd-view.js b/src/games/checkers/checkers-xd-view.js
index 55318f1..a702e31 100644
--- a/src/games/checkers/checkers-xd-view.js
+++ b/src/games/checkers/checkers-xd-view.js
@@ -1681,8 +1681,10 @@
 			xdv.updateGadget("piece#"+captPiece,{
 				"2d": {
 					opacity : 0.3,
+					visible: !aGame.g.captureInstantRemove
 				},
 				"3d" : {
+					visible: !aGame.g.captureInstantRemove,
 					materials: { 
 						"base" : {
 							opacity: .3,
diff --git a/src/games/checkers/checkersbase-model.js b/src/games/checkers/checkersbase-model.js
index 9d7fef6..f5035ca 100644
--- a/src/games/checkers/checkersbase-model.js
+++ b/src/games/checkers/checkersbase-model.js
@@ -322,7 +322,7 @@
 							}
 							if(aGame.g.canCaptureBackward || forward==true) {
 								var pos1=aGame.g.Graph[pos0][dir];
-								if(pos1!=null && ($this.board[pos1]==-1 || pos1==poss[0])) {
+								if(pos1!=null && ($this.board[pos1]==-1 || pos1==poss[0] || (pos1!==null && aGame.g.captureInstantRemove && capts.indexOf(pos1)>=0))) {
 									var keep=true;
 									for(var i=0;i<dirs.length;i++)
 										if((aGame.g.captureInstantRemove && capts[i]==pos0) ||
@@ -370,7 +370,7 @@
 										pos0=aGame.g.Graph[pos0][dir];
 									}
 								} else {
-									while($this.board[pos0]==-1 || pos0==poss[0]) {
+									while($this.board[pos0]==-1 || pos0==poss[0] || (pos0!==null && aGame.g.captureInstantRemove && capts.indexOf(pos0)>=0)) {
 										var keep=true;
 										for(var i=0;i<dirs.length;i++)
 											if((aGame.g.captureInstantRemove && capts[i]==caught) ||