deepcrayon/lila
deepcrayon/lila
1
0
Fork 0
Code Releases Activity

Merge pull request #3057 from niklasf/fix-interrupted-pre-promotion

Browse source 
fix pre-promotions interrupted by opponents move (closes #2839)
This commit is contained in:
Thibault Duplessis 2017-05-20 09:56:39 +02:00 committed by GitHub
parent cc06a19dfb 840a8bbc16
commit 35dbd7f582
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ui/round2/src/promotion.ts
View file

@ -22,7 +22,7 @@ export function start(ctrl, orig, dest, meta) {
(dest[1] == 8 && d.player.color === 'white') ||
(dest[1] == 1 && d.player.color === 'black'))) {
if (prePromotionRole && meta.premove) return sendPromotion(ctrl, orig, dest, prePromotionRole, meta);
if (!meta.ctrlKey && (d.pref.autoQueen === 3 || (d.pref.autoQueen === 2 && premovePiece))) {
if (!meta.ctrlKey && !promoting && (d.pref.autoQueen === 3 || (d.pref.autoQueen === 2 && premovePiece))) {
if (premovePiece) setPrePromotion(ctrl, dest, 'queen');
else sendPromotion(ctrl, orig, dest, 'queen', meta);
return true;
@ -60,10 +60,11 @@ export function cancelPrePromotion(ctrl) {
function finish(ctrl, role) {
if (promoting) {
if (promoting.pre) setPrePromotion(ctrl, promoting.move[1], role);
else sendPromotion(ctrl, promoting.move[0], promoting.move[1], role, promoting.meta);
const info = promoting;
promoting = undefined;
if (info.pre) setPrePromotion(ctrl, info.move[1], role);
else sendPromotion(ctrl, info.move[0], info.move[1], role, info.meta);
}
promoting = undefined;
}
export function cancel(ctrl) {