X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=www%2Fjs%2Fremoteglot.js;h=b3b8163f0bd1dca60ca0c495eda7b987c413b0bd;hp=d614c7ea1016a44f8b92afa841eb42c09b5a81b0;hb=b4059a786029132eb27769a42ca52eca6d8b44cc;hpb=4c690438b189e0656720b0e20eb09ec97b52727a

diff --git a/www/js/remoteglot.js b/www/js/remoteglot.js
index d614c7e..b3b8163 100644
--- a/www/js/remoteglot.js
+++ b/www/js/remoteglot.js
@@ -7,7 +7,7 @@
  * @type {Number}
  * @const
  * @private */
-var SCRIPT_VERSION = 2016113002;
+var SCRIPT_VERSION = 2016113007;
 
 /**
  * The current backend URL.
@@ -864,7 +864,7 @@ var update_refutation_lines = function() {
  */
 var chess_from = function(fen, moves, last_move) {
 	var hiddenboard = new Chess();
-	if (fen !== null) {
+	if (fen !== null && fen !== undefined) {
 		hiddenboard.load(fen);
 	}
 	for (var i = 0; i <= last_move; ++i) {
@@ -945,6 +945,32 @@ var possibly_switch_game_from_hash = function() {
 	}
 }
 
+/**
+ * If this is a Chess960 castling which doesn't move the king,
+ * move the rook instead.
+*/
+var patch_move = function(move) {
+	if (move === null) return null;
+	if (move.from !== move.to) return move;
+
+	var f = move.rook_sq & 15;
+	var r = move.rook_sq >> 4;
+	var from = ('abcdefgh'.substring(f,f+1) + '87654321'.substring(r,r+1));
+	var to = move.to;
+
+	if (move.to === 'g1') {
+		to = 'f1';
+	} else if (move.to === 'g8') {
+		to = 'f8';
+	} else if (move.to === 'b1') {
+		to = 'c1';
+	} else if (move.to === 'b8') {
+		to = 'c8';
+	}
+
+	return { from: from, to: to };
+}
+
 /** Update all the HTML on the page, based on current global state.
  */
 var update_board = function() {
@@ -957,7 +983,8 @@ var update_board = function() {
 	// unconditionally taken from current_data (we're not interested in
 	// historic history).
 	if (current_data['position']['history']) {
-		add_pv('start', current_data['position']['history'], 1, 'W', null, 0, 8, true);
+		var start = (current_data['position'] && current_data['position']['start_fen']) ? current_data['position']['start_fen'] : 'start';
+		add_pv(start, current_data['position']['history'], 1, 'W', null, 0, 8, true);
 	} else {
 		display_lines.push(null);
 	}
@@ -1083,7 +1110,8 @@ var update_board = function() {
 		// We don't have historic analysis for this position, but we
 		// can reconstruct what the last move was by just replaying
 		// from the start.
-		var hiddenboard = chess_from(null, current_display_line.pv, current_display_move);
+		var position = (data['position'] && data['position']['start_fen']) ? data['position']['start_fen'] : null;
+		var hiddenboard = chess_from(position, current_display_line.pv, current_display_move);
 		var moves = hiddenboard.history({ verbose: true });
 		last_move = moves.pop();
 		highlight_from = last_move.from;
@@ -1172,7 +1200,8 @@ var update_board = function() {
 		// draw a continuation arrow as long as it's the same piece
 		var last_to;
 		for (var i = 0; i < data['pv'].length; i += 2) {
-			var move = hiddenboard.move(data['pv'][i]);
+			var move = patch_move(hiddenboard.move(data['pv'][i]));
+
 			if ((i >= 2 && move.from != last_to) ||
 			     interfering_arrow(move.from, move.to)) {
 				break;
@@ -1185,7 +1214,7 @@ var update_board = function() {
 		var alt_moves = find_nonstupid_moves(data, 30, data['position']['toplay'] === 'B');
 		for (var i = 1; i < alt_moves.length && i < 3; ++i) {
 			hiddenboard = new Chess(base_fen);
-			var move = hiddenboard.move(alt_moves[i]);
+			var move = patch_move(hiddenboard.move(alt_moves[i]));
 			if (move !== null) {
 				create_arrow(move.from, move.to, '#f66', 1, 10);
 			}
@@ -1607,7 +1636,7 @@ var update_historic_analysis = function() {
 	}
 
 	// Fetch old analysis for this line if it exists.
-	var hiddenboard = chess_from(null, current_display_line.pv, current_display_move);
+	var hiddenboard = chess_from(current_display_line.start_fen, current_display_line.pv, current_display_move);
 	var filename = "/history/move" + (current_display_move + 1) + "-" +
 		hiddenboard.fen().replace(/ /g, '_').replace(/\//g, '-') + ".json";