X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpiece.h;h=7f5ea7a400cff15601518cf36d8f210476232776;hb=ea2b8a93eb3cf2765e51d33ecf37c3994eacb84d;hp=cf23c0288c2e79dc25bf6cdc6da720f858011532;hpb=74160ac60266f9e6824a5a6417d8a0ac8c0b39cf;p=stockfish diff --git a/src/piece.h b/src/piece.h index cf23c028..7f5ea7a4 100644 --- a/src/piece.h +++ b/src/piece.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008 Marco Costalba + Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -34,14 +34,13 @@ //// enum PieceType { - NO_PIECE_TYPE = 0, + PIECE_TYPE_NONE = 0, PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6 }; enum Piece { - NO_PIECE = 0, WP = 1, WN = 2, WB = 3, WR = 4, WQ = 5, WK = 6, - BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14, - EMPTY = 16, OUTSIDE = 17 + PIECE_NONE_DARK_SQ = 0, WP = 1, WN = 2, WB = 3, WR = 4, WQ = 5, WK = 6, + BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14, PIECE_NONE = 16 }; @@ -83,10 +82,6 @@ inline int piece_is_slider(Piece p) { return SlidingArray[int(p)]; } -inline int piece_is_slider(PieceType pt) { - return SlidingArray[int(pt)]; -} - inline SquareDelta pawn_push(Color c) { return (c == WHITE ? DELTA_N : DELTA_S); } @@ -104,7 +99,7 @@ inline bool piece_is_ok(Piece pc) { //// Prototypes //// -extern int piece_type_to_char(PieceType pt, bool upcase = false); +extern char piece_type_to_char(PieceType pt, bool upcase = false); extern PieceType piece_type_from_char(char c);