From d47be83ae588d059671840cd07681bc2c7871f32 Mon Sep 17 00:00:00 2001 From: Calcitem Date: Fri, 20 Mar 2020 22:31:46 +0800 Subject: [PATCH] Fix build warnings --- src/ai/movegen.cpp | 8 ++++---- src/ai/search.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ai/movegen.cpp b/src/ai/movegen.cpp index aaef1b16..d352e046 100644 --- a/src/ai/movegen.cpp +++ b/src/ai/movegen.cpp @@ -114,16 +114,16 @@ int StateInfo::generateMoves(Stack &moves) // 对于原有位置,遍历四个方向的着法,如果棋盘上为空位就加到结点列表中 newSquare = static_cast(MoveList::moveTable[oldSquare][direction]); if (newSquare && !boardLocations[newSquare]) { - move_t move = move_t((oldSquare << 8) + newSquare); - moves.push_back((move_t)move); + move_t m = move_t((oldSquare << 8) + newSquare); + moves.push_back((move_t)m); } } } else { // 对于棋盘上还有不到3个字,但允许飞子的情况,不要求在着法表中,是空位就行 for (newSquare = SQ_BEGIN; newSquare < SQ_END; newSquare = static_cast(newSquare + 1)) { if (!boardLocations[newSquare]) { - move_t move = move_t((oldSquare << 8) + newSquare); - moves.push_back((move_t)move); + move_t m = move_t((oldSquare << 8) + newSquare); + moves.push_back((move_t)m); } } } diff --git a/src/ai/search.cpp b/src/ai/search.cpp index a7584a71..2bac1252 100644 --- a/src/ai/search.cpp +++ b/src/ai/search.cpp @@ -197,7 +197,7 @@ void AIAlgorithm::buildRoot() } Node *Node::addChild( - const move_t &move, + const move_t &m, AIAlgorithm *ai, StateInfo *st #ifdef BEST_MOVE_ENABLE @@ -214,7 +214,7 @@ Node *Node::addChild( return nullptr; } - newNode->move = move; + newNode->move = m; #ifdef ALPHABETA_AI newNode->value = VALUE_ZERO; @@ -288,12 +288,12 @@ Node *Node::addChild( // 若没有启用置换表,或启用了但为叶子节点,则 bestMove 为0 square_t sq = SQ_0; - if (move > 0) { + if (m > 0) { // 摆子或者走子 - sq = (square_t)(move & 0x00ff); + sq = (square_t)(m & 0x00ff); } else { // 吃子 - sq = (square_t)((-move) & 0x00ff); + sq = (square_t)((-m) & 0x00ff); } int nMills = st->position->board.inHowManyMills(sq, st->position->sideToMove); @@ -301,7 +301,7 @@ Node *Node::addChild( #ifdef SORT_MOVE_WITH_HUMAN_KNOWLEDGES // TODO: rule.allowRemoveMultiPieces 以及 适配打三棋之外的其他规则 - if (move > 0) { + if (m > 0) { // 在任何阶段, 都检测落子点是否能使得本方成三 // TODO: 为走子之前的统计故走棋阶段可能会从 @-0-@ 走成 0-@-@, 并未成三 if (nMills > 0) { @@ -346,11 +346,11 @@ Node *Node::addChild( #ifdef ALPHABETA_AI if (rule.nTotalPiecesEachSide == 12 && st->getPiecesOnBoardCount(2) < 2 && // patch: 仅当白方第2着时 - Board::isStar(static_cast(move))) { + Board::isStar(static_cast(m))) { newNode->rating += RATING_STAR_SQUARE; } #endif - } else if (move < 0) { + } else if (m < 0) { int nPlayerPiece = 0; int nOpponentPiece = 0; int nForbidden = 0;