X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=30665ee03b8e35c8c3a6fb73a898500aca9dc394;hp=ee138b912687febc3a8030d53a8e0831b251b50d;hb=52ebf872384f73c14c486e94f9ebd57c3a6c39cd;hpb=f99cb3dc27719021e126690b7fd5aa5f43663ed8 diff --git a/src/movegen.cpp b/src/movegen.cpp index ee138b91..30665ee0 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -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-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 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 @@ -22,7 +22,7 @@ #include "movegen.h" #include "position.h" -/// Simple macro to wrap a very common while loop, no facny, no flexibility, +/// Simple macro to wrap a very common while loop, no fancy, no flexibility, /// hardcoded names 'mlist' and 'from'. #define SERIALIZE(b) while (b) (mlist++)->move = make_move(from, pop_lsb(&b)) @@ -46,10 +46,10 @@ namespace { assert(!pos.checkers()); - const int K = Chess960 ? kto > kfrom ? -1 : 1 - : Side == KING_SIDE ? -1 : 1; + const Square K = Chess960 ? kto > kfrom ? DELTA_W : DELTA_E + : Side == KING_SIDE ? DELTA_W : DELTA_E; - for (Square s = kto; s != kfrom; s += (Square)K) + for (Square s = kto; s != kfrom; s += K) if (pos.attackers_to(s) & enemies) return mlist; @@ -88,8 +88,8 @@ namespace { (mlist++)->move = make(to - Delta, to, KNIGHT); } - // Knight-promotion is the only one that can give a direct check not - // already included in the queen-promotion. + // Knight promotion is the only promotion that can give a direct check + // that's not already included in the queen promotion. if (Type == QUIET_CHECKS && (StepAttacksBB[W_KNIGHT][to] & ci->ksq)) (mlist++)->move = make(to - Delta, to, KNIGHT); else @@ -144,7 +144,7 @@ namespace { // Add pawn pushes which give discovered check. This is possible only // if the pawn is not on the same file as the enemy king, because we // don't generate captures. Note that a possible discovery check - // promotion has been already generated among captures. + // promotion has been already generated amongst the captures. if (pawnsNotOn7 & ci->dcCandidates) { dc1 = shift_bb(pawnsNotOn7 & ci->dcCandidates) & emptySquares & ~file_bb(ci->ksq); @@ -325,7 +325,7 @@ ExtMove* generate(const Position& pos, ExtMove* mlist) { PieceType pt = type_of(pos.piece_on(from)); if (pt == PAWN) - continue; // Will be generated togheter with direct checks + continue; // Will be generated together with direct checks Bitboard b = pos.attacks_from(Piece(pt), from) & ~pos.pieces(); @@ -355,8 +355,9 @@ ExtMove* generate(const Position& pos, ExtMove* mlist) { assert(pos.checkers()); - // Find squares attacked by slider checkers, we will remove them from the king - // evasions so to skip known illegal moves avoiding useless legality check later. + // Find all the squares attacked by slider checkers. We will remove them from + // the king evasions in order to skip known illegal moves, which avoids any + // useless legality checks later on. do { ++checkersCnt;