mirror of
https://github.com/sockspls/badfish
synced 2025-05-01 01:03:09 +00:00
Retire piece_type_from_char()
No functional change. Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
parent
2511386155
commit
5b2ac7590c
3 changed files with 7 additions and 32 deletions
|
@ -26,6 +26,7 @@
|
||||||
|
|
||||||
#include "bitcount.h"
|
#include "bitcount.h"
|
||||||
#include "endgame.h"
|
#include "endgame.h"
|
||||||
|
#include "pawns.h"
|
||||||
|
|
||||||
|
|
||||||
////
|
////
|
||||||
|
|
|
@ -93,6 +93,10 @@ private:
|
||||||
//// Inline functions
|
//// Inline functions
|
||||||
////
|
////
|
||||||
|
|
||||||
|
inline Square pawn_push(Color c) {
|
||||||
|
return c == WHITE ? DELTA_N : DELTA_S;
|
||||||
|
}
|
||||||
|
|
||||||
inline void PawnInfoTable::prefetch(Key key) const {
|
inline void PawnInfoTable::prefetch(Key key) const {
|
||||||
|
|
||||||
unsigned index = unsigned(key & (PawnTableSize - 1));
|
unsigned index = unsigned(key & (PawnTableSize - 1));
|
||||||
|
|
34
src/piece.h
34
src/piece.h
|
@ -17,25 +17,12 @@
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#if !defined(PIECE_H_INCLUDED)
|
#if !defined(PIECE_H_INCLUDED)
|
||||||
#define PIECE_H_INCLUDED
|
#define PIECE_H_INCLUDED
|
||||||
|
|
||||||
////
|
|
||||||
//// Includes
|
|
||||||
////
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
#include "color.h"
|
#include "color.h"
|
||||||
#include "square.h"
|
|
||||||
#include "value.h"
|
#include "value.h"
|
||||||
|
|
||||||
|
|
||||||
////
|
|
||||||
//// Types
|
|
||||||
////
|
|
||||||
|
|
||||||
enum PieceType {
|
enum PieceType {
|
||||||
PIECE_TYPE_NONE = 0,
|
PIECE_TYPE_NONE = 0,
|
||||||
PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6
|
PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6
|
||||||
|
@ -49,11 +36,6 @@ enum Piece {
|
||||||
ENABLE_OPERATORS_ON(PieceType)
|
ENABLE_OPERATORS_ON(PieceType)
|
||||||
ENABLE_OPERATORS_ON(Piece)
|
ENABLE_OPERATORS_ON(Piece)
|
||||||
|
|
||||||
|
|
||||||
////
|
|
||||||
//// Constants
|
|
||||||
////
|
|
||||||
|
|
||||||
/// Important: If the material values are changed, one must also
|
/// Important: If the material values are changed, one must also
|
||||||
/// adjust the piece square tables, and the method game_phase() in the
|
/// adjust the piece square tables, and the method game_phase() in the
|
||||||
/// Position class!
|
/// Position class!
|
||||||
|
@ -71,11 +53,6 @@ const Value RookValueEndgame = Value(0x4FE);
|
||||||
const Value QueenValueMidgame = Value(0x9D9);
|
const Value QueenValueMidgame = Value(0x9D9);
|
||||||
const Value QueenValueEndgame = Value(0x9FE);
|
const Value QueenValueEndgame = Value(0x9FE);
|
||||||
|
|
||||||
|
|
||||||
////
|
|
||||||
//// Inline functions
|
|
||||||
////
|
|
||||||
|
|
||||||
inline PieceType type_of_piece(Piece p) {
|
inline PieceType type_of_piece(Piece p) {
|
||||||
return PieceType(int(p) & 7);
|
return PieceType(int(p) & 7);
|
||||||
}
|
}
|
||||||
|
@ -88,10 +65,6 @@ inline Piece piece_of_color_and_type(Color c, PieceType pt) {
|
||||||
return Piece((int(c) << 3) | int(pt));
|
return Piece((int(c) << 3) | int(pt));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline Square pawn_push(Color c) {
|
|
||||||
return (c == WHITE ? DELTA_N : DELTA_S);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool piece_type_is_ok(PieceType pt) {
|
inline bool piece_type_is_ok(PieceType pt) {
|
||||||
return pt >= PAWN && pt <= KING;
|
return pt >= PAWN && pt <= KING;
|
||||||
}
|
}
|
||||||
|
@ -101,11 +74,8 @@ inline bool piece_is_ok(Piece p) {
|
||||||
}
|
}
|
||||||
|
|
||||||
inline char piece_type_to_char(PieceType pt) {
|
inline char piece_type_to_char(PieceType pt) {
|
||||||
return std::string(" PNBRQK")[pt];
|
static const char ch[] = " PNBRQK";
|
||||||
}
|
return ch[pt];
|
||||||
|
|
||||||
inline PieceType piece_type_from_char(char c) {
|
|
||||||
return PieceType(std::string(" PNBRQK").find(c));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // !defined(PIECE_H_INCLUDED)
|
#endif // !defined(PIECE_H_INCLUDED)
|
||||||
|
|
Loading…
Add table
Reference in a new issue