Fix order of ops

glinscott · glinscott · commit 19cbbf473da1 · 2012-12-24T17:27:18.000-08:00
diff --git a/js/garbochess.js b/js/garbochess.js
@@ -1554,29 +1554,29 @@ function InitializeFromFen(fen) {
     
     g_castleRights = 0;
     if (chunks[2].indexOf('K') != -1) { 
-        if (g_board[MakeSquare(7, 4)] != pieceKing | colorWhite ||
-            g_board[MakeSquare(7, 7)] != pieceRook | colorWhite) {
+        if (g_board[MakeSquare(7, 4)] != (pieceKing | colorWhite) ||
+            g_board[MakeSquare(7, 7)] != (pieceRook | colorWhite)) {
             return 'Invalid FEN: White kingside castling not allowed';
         }
         g_castleRights |= 1;
     }
     if (chunks[2].indexOf('Q') != -1) {
-        if (g_board[MakeSquare(7, 4)] != pieceKing | colorWhite ||
-            g_board[MakeSquare(7, 0)] != pieceRook | colorWhite) {
+        if (g_board[MakeSquare(7, 4)] != (pieceKing | colorWhite) ||
+            g_board[MakeSquare(7, 0)] != (pieceRook | colorWhite)) {
             return 'Invalid FEN: White queenside castling not allowed';
         }
         g_castleRights |= 2;
     }
     if (chunks[2].indexOf('k') != -1) {
-        if (g_board[MakeSquare(0, 4)] != pieceKing | colorBlack ||
-            g_board[MakeSquare(0, 7)] != pieceRook | colorBlack) {
+        if (g_board[MakeSquare(0, 4)] != (pieceKing | colorBlack) ||
+            g_board[MakeSquare(0, 7)] != (pieceRook | colorBlack)) {
             return 'Invalid FEN: Black kingside castling not allowed';
         }
         g_castleRights |= 4;
     }
     if (chunks[2].indexOf('q') != -1) {
-        if (g_board[MakeSquare(0, 4)] != pieceKing | colorBlack ||
-            g_board[MakeSquare(0, 0)] != pieceRook | colorBlack) {
+        if (g_board[MakeSquare(0, 4)] != (pieceKing | colorBlack) ||
+            g_board[MakeSquare(0, 0)] != (pieceRook | colorBlack)) {
             return 'Invalid FEN: Black queenside castling not allowed';
         }
         g_castleRights |= 8;

Original file line number	Diff line number	Diff line change
`@@ -1554,29 +1554,29 @@ function InitializeFromFen(fen) {`
`1554`	`1554`
`1555`	`1555`	`g_castleRights = 0;`
`1556`	`1556`	`if (chunks[2].indexOf('K') != -1) {`
`1557`		`- if (g_board[MakeSquare(7, 4)] != pieceKing \| colorWhite \|\|`
`1558`		`- g_board[MakeSquare(7, 7)] != pieceRook \| colorWhite) {`
	`1557`	`+ if (g_board[MakeSquare(7, 4)] != (pieceKing \| colorWhite) \|\|`
	`1558`	`+ g_board[MakeSquare(7, 7)] != (pieceRook \| colorWhite)) {`
`1559`	`1559`	`return 'Invalid FEN: White kingside castling not allowed';`
`1560`	`1560`	`}`
`1561`	`1561`	`g_castleRights \|= 1;`
`1562`	`1562`	`}`
`1563`	`1563`	`if (chunks[2].indexOf('Q') != -1) {`
`1564`		`- if (g_board[MakeSquare(7, 4)] != pieceKing \| colorWhite \|\|`
`1565`		`- g_board[MakeSquare(7, 0)] != pieceRook \| colorWhite) {`
	`1564`	`+ if (g_board[MakeSquare(7, 4)] != (pieceKing \| colorWhite) \|\|`
	`1565`	`+ g_board[MakeSquare(7, 0)] != (pieceRook \| colorWhite)) {`
`1566`	`1566`	`return 'Invalid FEN: White queenside castling not allowed';`
`1567`	`1567`	`}`
`1568`	`1568`	`g_castleRights \|= 2;`
`1569`	`1569`	`}`
`1570`	`1570`	`if (chunks[2].indexOf('k') != -1) {`
`1571`		`- if (g_board[MakeSquare(0, 4)] != pieceKing \| colorBlack \|\|`
`1572`		`- g_board[MakeSquare(0, 7)] != pieceRook \| colorBlack) {`
	`1571`	`+ if (g_board[MakeSquare(0, 4)] != (pieceKing \| colorBlack) \|\|`
	`1572`	`+ g_board[MakeSquare(0, 7)] != (pieceRook \| colorBlack)) {`
`1573`	`1573`	`return 'Invalid FEN: Black kingside castling not allowed';`
`1574`	`1574`	`}`
`1575`	`1575`	`g_castleRights \|= 4;`
`1576`	`1576`	`}`
`1577`	`1577`	`if (chunks[2].indexOf('q') != -1) {`
`1578`		`- if (g_board[MakeSquare(0, 4)] != pieceKing \| colorBlack \|\|`
`1579`		`- g_board[MakeSquare(0, 0)] != pieceRook \| colorBlack) {`
	`1578`	`+ if (g_board[MakeSquare(0, 4)] != (pieceKing \| colorBlack) \|\|`
	`1579`	`+ g_board[MakeSquare(0, 0)] != (pieceRook \| colorBlack)) {`
`1580`	`1580`	`return 'Invalid FEN: Black queenside castling not allowed';`
`1581`	`1581`	`}`
`1582`	`1582`	`g_castleRights \|= 8;`