xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2025-12-13 09:32:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

DroidFish: Don't allow setting up positions with too many pieces.

Browse Source
This commit is contained in:
Peter Osterlund
2011-12-18 00:11:51 +00:00
parent 71b7ec9bac
commit c01b7fbec4
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DroidFish/res/values/strings.xml
View File

@@ -392,6 +392,8 @@ you are not actively using the program.\
<string name="err_too_many_rows">Too many rows</string> <string name="err_too_many_rows">Too many rows</string>
<string name="err_too_many_columns">Too many columns</string> <string name="err_too_many_columns">Too many columns</string>
<string name="err_pawn_on_first_last_rank">Pawn on first/last rank</string> <string name="err_pawn_on_first_last_rank">Pawn on first/last rank</string>
<string name="err_too_many_white_pieces">Too many white pieces</string>
<string name="err_too_many_black_pieces">Too many black pieces</string>
<string name="option_new_game">New Game</string> <string name="option_new_game">New Game</string>
<string name="option_file">File</string> <string name="option_file">File</string>

42
DroidFish/src/org/petero/droidfish/gamelogic/TextIO.java
View File

@@ -128,24 +128,34 @@ public class TextIO {
} }
// Each side must have exactly one king // Each side must have exactly one king
int wKings = 0; int[] nPieces = new int[Piece.nPieceTypes];
int bKings = 0; for (int i = 0; i < Piece.nPieceTypes; i++)
for (int x = 0; x < 8; x++) { nPieces[i] = 0;
for (int y = 0; y < 8; y++) { for (int x = 0; x < 8; x++)
int p = pos.getPiece(Position.getSquare(x, y)); for (int y = 0; y < 8; y++)
if (p == Piece.WKING) { nPieces[pos.getPiece(Position.getSquare(x, y))]++;
wKings++; if (nPieces[Piece.WKING] != 1)
} else if (p == Piece.BKING) {
bKings++;
}
}
}
if (wKings != 1) {
throw new ChessParseError(R.string.err_white_num_kings, pos); throw new ChessParseError(R.string.err_white_num_kings, pos);
} if (nPieces[Piece.BKING] != 1)
if (bKings != 1) {
throw new ChessParseError(R.string.err_black_num_kings, pos); throw new ChessParseError(R.string.err_black_num_kings, pos);
}
// White must not have too many pieces
int maxWPawns = 8;
maxWPawns -= Math.max(0, nPieces[Piece.WKNIGHT] - 2);
maxWPawns -= Math.max(0, nPieces[Piece.WBISHOP] - 2);
maxWPawns -= Math.max(0, nPieces[Piece.WROOK ] - 2);
maxWPawns -= Math.max(0, nPieces[Piece.WQUEEN ] - 1);
if (nPieces[Piece.WPAWN] > maxWPawns)
throw new ChessParseError(R.string.err_too_many_white_pieces, pos);
// Black must not have too many pieces
int maxBPawns = 8;
maxBPawns -= Math.max(0, nPieces[Piece.BKNIGHT] - 2);
maxBPawns -= Math.max(0, nPieces[Piece.BBISHOP] - 2);
maxBPawns -= Math.max(0, nPieces[Piece.BROOK ] - 2);
maxBPawns -= Math.max(0, nPieces[Piece.BQUEEN ] - 1);
if (nPieces[Piece.BPAWN] > maxBPawns)
throw new ChessParseError(R.string.err_too_many_black_pieces, pos);
// Make sure king can not be captured // Make sure king can not be captured
Position pos2 = new Position(pos); Position pos2 = new Position(pos);