organ
/
Sanmill
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor: stage 改名回 phase

This commit is contained in:
CalciteM Team 2019-09-13 01:23:32 +08:00
parent b9db47a752
commit f2bc38a177
10 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ai/evaluate.cpp
View File

@ -31,16 +31,16 @@ value_t Evaluation::getValue(Position &dummyPosition, PositionContext *positionC
int nPiecesNeedRemove = 0;
#ifdef DEBUG_AB_TREE
node->stage = positionContext->stage;
node->phase = positionContext->phase;
node->action = positionContext->action;
node->evaluated = true;
#endif
switch (positionContext->stage) {
case GAME_NOTSTARTED:
switch (positionContext->phase) {
case PHASE_NOTSTARTED:
break;
case GAME_PLACING:
case PHASE_PLACING:
// 按手中的棋子计分，不要break;
nPiecesInHandDiff = positionContext->nPiecesInHand_1 - positionContext->nPiecesInHand_2;
value += nPiecesInHandDiff * 50;
@ -76,7 +76,7 @@ value_t Evaluation::getValue(Position &dummyPosition, PositionContext *positionC
break;
case GAME_MOVING:
case PHASE_MOVING:
// 按场上棋子计分
value += positionContext->nPiecesOnBoard_1 * 100 - positionContext->nPiecesOnBoard_2 * 100;
@ -107,7 +107,7 @@ value_t Evaluation::getValue(Position &dummyPosition, PositionContext *positionC
break;
// 终局评价最简单
case GAME_OVER:
case PHASE_GAMEOVER:
// 布局阶段闷棋判断
if (positionContext->nPiecesOnBoard_1 + positionContext->nPiecesOnBoard_2 >=
Board::N_SEATS * Board::N_RINGS) {

14
src/ai/movegen.cpp
View File

@ -32,8 +32,8 @@ void MoveList::generateLegalMoves(MillGameAi_ab &ai_ab, Position &dummyPosition,
size_t newCapacity = 24;
// 留足余量空间避免多次重新分配，此动作本身也占用 CPU/内存 开销
switch (dummyPosition.getStage()) {
case GAME_PLACING:
switch (dummyPosition.getPhase()) {
case PHASE_PLACING:
if (dummyPosition.getAction() == ACTION_CAPTURE) {
if (dummyPosition.whosTurn() == PLAYER1)
newCapacity = static_cast<size_t>(dummyPosition.getPiecesOnBoardCount_2());
@ -43,7 +43,7 @@ void MoveList::generateLegalMoves(MillGameAi_ab &ai_ab, Position &dummyPosition,
newCapacity = static_cast<size_t>(dummyPosition.getPiecesInHandCount_1() + dummyPosition.getPiecesInHandCount_2());
}
break;
case GAME_MOVING:
case PHASE_MOVING:
if (dummyPosition.getAction() == ACTION_CAPTURE) {
if (dummyPosition.whosTurn() == PLAYER1)
newCapacity = static_cast<size_t>(dummyPosition.getPiecesOnBoardCount_2());
@ -53,7 +53,7 @@ void MoveList::generateLegalMoves(MillGameAi_ab &ai_ab, Position &dummyPosition,
newCapacity = 6;
}
break;
case GAME_NOTSTARTED:
case PHASE_NOTSTARTED:
newCapacity = 24;
break;
default:
@ -77,7 +77,7 @@ void MoveList::generateLegalMoves(MillGameAi_ab &ai_ab, Position &dummyPosition,
case ACTION_CHOOSE:
case ACTION_PLACE:
// 对于摆子阶段
if (dummyPosition.context.stage & (GAME_PLACING | GAME_NOTSTARTED)) {
if (dummyPosition.context.phase & (PHASE_PLACING | PHASE_NOTSTARTED)) {
for (move_t i : movePriorityTable) {
location = i;
@ -85,7 +85,7 @@ void MoveList::generateLegalMoves(MillGameAi_ab &ai_ab, Position &dummyPosition,
continue;
}
if (dummyPosition.context.stage != GAME_NOTSTARTED || node != rootNode) {
if (dummyPosition.context.phase != PHASE_NOTSTARTED || node != rootNode) {
ai_ab.addNode(node, 0, (move_t)location, bestMove, dummyPosition.context.turn);
} else {
// 若为先手，则抢占星位
@ -98,7 +98,7 @@ void MoveList::generateLegalMoves(MillGameAi_ab &ai_ab, Position &dummyPosition,
}
// 对于移子阶段
if (dummyPosition.context.stage & GAME_MOVING) {
if (dummyPosition.context.phase & PHASE_MOVING) {
int newLocation, oldLocation;
// 尽量走理论上较差的位置的棋子

20
src/ai/search.cpp
View File

@ -57,7 +57,7 @@ depth_t MillGameAi_ab::changeDepth(depth_t originalDepth)
{
depth_t newDepth = originalDepth;
if ((dummyPosition.context.stage) & (GAME_PLACING)) {
if ((dummyPosition.context.phase) & (PHASE_PLACING)) {
#ifdef GAME_PLACING_DYNAMIC_DEPTH
#ifdef DEAL_WITH_HORIZON_EFFECT
#ifdef TRANSPOSITION_TABLE_ENABLE
@ -85,7 +85,7 @@ depth_t MillGameAi_ab::changeDepth(depth_t originalDepth)
#ifdef GAME_MOVING_FIXED_DEPTH
// 走棋阶段将深度调整
if ((dummyPosition.context.stage) & (GAME_MOVING)) {
if ((dummyPosition.context.phase) & (PHASE_MOVING)) {
newDepth = GAME_MOVING_FIXED_DEPTH;
}
#endif /* GAME_MOVING_FIXED_DEPTH */
@ -141,7 +141,7 @@ struct MillGameAi_ab::Node *MillGameAi_ab::addNode(
#ifdef DEBUG_AB_TREE
newNode->root = rootNode;
newNode->stage = dummyPosition.context.stage;
newNode->phase = dummyPosition.context.phase;
newNode->action = dummyPosition.context.action;
newNode->evaluated = false;
newNode->nPiecesInHandDiff = INT_MAX;
@ -176,7 +176,7 @@ struct MillGameAi_ab::Node *MillGameAi_ab::addNode(
if (bestMove == 0 || move != bestMove) {
#ifdef MILL_FIRST
// 优先成三
if (dummyPosition.getStage() == GAME_PLACING && move > 0 && dummyPosition.context.board.isInMills(move, true)) {
if (dummyPosition.getPhase() == GAME_PLACING && move > 0 && dummyPosition.context.board.isInMills(move, true)) {
parent->children.insert(parent->children.begin(), newNode);
} else {
parent->children.push_back(newNode);
@ -295,7 +295,7 @@ void MillGameAi_ab::setPosition(const Position &position)
#endif
#ifdef DEBUG_AB_TREE
rootNode->action = ACTION_NONE;
rootNode->stage = GAME_NONE;
rootNode->phase = GAME_NONE;
rootNode->root = rootNode;
#endif
}
@ -313,7 +313,7 @@ int MillGameAi_ab::alphaBetaPruning(depth_t depth)
chrono::steady_clock::time_point timeEnd;
#ifdef BOOK_LEARNING
if (position_.getStage() == GAME_PLACING)
if (position_.getPhase() == GAME_PLACING)
{
if (position_.context.nPiecesInHand_1 <= 10) {
// 开局库只记录摆棋阶段最后的局面
@ -328,7 +328,7 @@ int MillGameAi_ab::alphaBetaPruning(depth_t depth)
#ifdef THREEFOLD_REPETITION
static int nRepetition = 0;
if (position_.getStage() == GAME_MOVING) {
if (position_.getPhase() == PHASE_MOVING) {
hash_t hash = position_.getHash();
if (std::find(positions.begin(), positions.end(), hash) != positions.end()) {
@ -342,7 +342,7 @@ int MillGameAi_ab::alphaBetaPruning(depth_t depth)
}
}
if (position_.getStage() == GAME_PLACING) {
if (position_.getPhase() == PHASE_PLACING) {
positions.clear();
}
#endif // THREEFOLD_REPETITION
@ -459,7 +459,7 @@ value_t MillGameAi_ab::alphaBetaPruning(depth_t depth, value_t alpha, value_t be
#endif // DEBUG_AB_TREE
// 搜索到叶子节点（决胜局面） // TODO: 对哈希进行特殊处理
if (positionContext->stage == GAME_OVER) {
if (positionContext->phase == PHASE_GAMEOVER) {
// 局面评估
node->value = Evaluation::getValue(dummyPosition, positionContext, node);
evaluatedNodeCount++;
@ -504,7 +504,7 @@ value_t MillGameAi_ab::alphaBetaPruning(depth_t depth, value_t alpha, value_t be
#ifdef BOOK_LEARNING
// 检索开局库
if (positionContext->stage == GAME_PLACING && findBookHash(hash, hashValue)) {
if (positionContext->phase == GAME_PLACING && findBookHash(hash, hashValue)) {
if (positionContext->turn == PLAYER2) {
// 是否需对后手扣分 // TODO: 先后手都处理
node->value += 1;

2
src/ai/search.h
View File

@ -75,7 +75,7 @@ public:
bool isTimeout; // 是否遍历到此结点时因为超时而被迫退出
bool isLeaf; // 是否为叶子结点, 叶子结点是决胜局面
bool visited; // 是否在遍历时访问过
PositionStage stage; // 摆棋阶段还是走棋阶段
PositionPhase phase; // 摆棋阶段还是走棋阶段
Action action; // 动作状态
int nPiecesOnBoardDiff; // 场上棋子个数和对手的差值
int nPiecesInHandDiff; // 手中的棋子个数和对手的差值

98
src/game/position.cpp
View File

@ -136,14 +136,14 @@ bool Position::setContext(const struct Rule *rule, step_t maxStepsLedToDraw, int
this->moveStep = initialStep;
// 局面阶段标识
if (flags & GAME_NOTSTARTED) {
context.stage = GAME_NOTSTARTED;
} else if (flags & GAME_PLACING) {
context.stage = GAME_PLACING;
} else if (flags & GAME_MOVING) {
context.stage = GAME_MOVING;
} else if (flags & GAME_OVER) {
context.stage = GAME_OVER;
if (flags & PHASE_NOTSTARTED) {
context.phase = PHASE_NOTSTARTED;
} else if (flags & PHASE_PLACING) {
context.phase = PHASE_PLACING;
} else if (flags & PHASE_MOVING) {
context.phase = PHASE_MOVING;
} else if (flags & PHASE_GAMEOVER) {
context.phase = PHASE_GAMEOVER;
} else {
return false;
}
@ -271,7 +271,7 @@ void Position::getContext(struct Rule &rule, step_t &step, int &flags,
{
rule = this->currentRule;
step = this->currentStep;
flags = context.stage | context.turn | context.action;
flags = context.phase | context.turn | context.action;
board_ = board;
nPiecesInHand_1 = context.nPiecesInHand_1;
nPiecesInHand_2 = context.nPiecesInHand_2;
@ -280,7 +280,7 @@ void Position::getContext(struct Rule &rule, step_t &step, int &flags,
bool Position::reset()
{
if (context.stage == GAME_NOTSTARTED &&
if (context.phase == PHASE_NOTSTARTED &&
elapsedSeconds_1 == elapsedSeconds_2 == 0) {
return true;
}
@ -290,7 +290,7 @@ bool Position::reset()
moveStep = 0;
// 局面阶段标识
context.stage = GAME_NOTSTARTED;
context.phase = PHASE_NOTSTARTED;
// 轮流状态标识
context.turn = PLAYER1;
@ -353,21 +353,21 @@ bool Position::reset()
bool Position::start()
{
switch (context.stage) {
switch (context.phase) {
// 如果游戏已经开始，则返回false
case GAME_PLACING:
case GAME_MOVING:
case PHASE_PLACING:
case PHASE_MOVING:
return false;
// 如果游戏结束，则重置游戏，进入未开始状态
case GAME_OVER:
case PHASE_GAMEOVER:
reset();
[[fallthrough]];
// 如果游戏处于未开始状态
case GAME_NOTSTARTED:
case PHASE_NOTSTARTED:
// 启动计时器
startTime = time(NULL);
// 进入开局状态
context.stage = GAME_PLACING;
context.phase = PHASE_PLACING;
return true;
default:
return false;
@ -377,11 +377,11 @@ bool Position::start()
bool Position::place(int location, int time_p, int8_t rs)
{
// 如果局面为“结局”，返回false
if (context.stage == GAME_OVER)
if (context.phase == PHASE_GAMEOVER)
return false;
// 如果局面为“未开局”，则开局
if (context.stage == GAME_NOTSTARTED)
if (context.phase == PHASE_NOTSTARTED)
start();
// 如非“落子”状态，返回false
@ -404,7 +404,7 @@ bool Position::place(int location, int time_p, int8_t rs)
int piece = '\x00';
int n = 0;
if (context.stage == GAME_PLACING) {
if (context.phase == PHASE_PLACING) {
// 先手下
if (context.turn == PLAYER1) {
piece = '\x11' + currentRule.nTotalPiecesEachSide - context.nPiecesInHand_1;
@ -441,7 +441,7 @@ bool Position::place(int location, int time_p, int8_t rs)
// 如果双方都无未放置的棋子
if (context.nPiecesInHand_1 == 0 && context.nPiecesInHand_2 == 0) {
// 进入中局阶段
context.stage = GAME_MOVING;
context.phase = PHASE_MOVING;
// 进入选子状态
context.action = ACTION_CHOOSE;
@ -484,7 +484,7 @@ bool Position::place(int location, int time_p, int8_t rs)
goto out;
}
// 对于中局落子 (ontext.stage == GAME_MOVING)
// 对于中局落子 (ontext.phase == GAME_MOVING)
// 如果落子不合法
if ((context.turn == PLAYER1 &&
@ -575,7 +575,7 @@ bool Position::_capture(int r, int s, int time_p)
bool Position::capture(int location, int time_p, int8_t cp)
{
// 如果局面为"未开局"或“结局”，返回false
if (context.stage == GAME_NOTSTARTED || context.stage == GAME_OVER)
if (context.phase == PHASE_NOTSTARTED || context.phase == PHASE_GAMEOVER)
return false;
// 如非“去子”状态，返回false
@ -609,7 +609,7 @@ bool Position::capture(int location, int time_p, int8_t cp)
}
// 去子（设置禁点）
if (currentRule.hasForbiddenPoint && context.stage == GAME_PLACING) {
if (currentRule.hasForbiddenPoint && context.phase == PHASE_PLACING) {
revertHash(location);
board_[location] = '\x0f';
updateHash(location);
@ -653,12 +653,12 @@ bool Position::capture(int location, int time_p, int8_t cp)
// 所有去子都完成了
// 开局阶段
if (context.stage == GAME_PLACING) {
if (context.phase == PHASE_PLACING) {
// 如果双方都无未放置的棋子
if (context.nPiecesInHand_1 == 0 && context.nPiecesInHand_2 == 0) {
// 进入中局阶段
context.stage = GAME_MOVING;
context.phase = PHASE_MOVING;
// 进入选子状态
context.action = ACTION_CHOOSE;
@ -717,7 +717,7 @@ out:
bool Position::choose(int location)
{
// 如果局面不是"中局”，返回false
if (context.stage != GAME_MOVING)
if (context.phase != PHASE_MOVING)
return false;
// 如非“选子”或“落子”状态，返回false
@ -752,13 +752,13 @@ bool Position::choose(int r, int s)
bool Position::giveup(Player loser)
{
if (context.stage == GAME_NOTSTARTED ||
context.stage == GAME_OVER ||
context.stage == GAME_NONE) {
if (context.phase == PHASE_NOTSTARTED ||
context.phase == PHASE_GAMEOVER ||
context.phase == PHASE_NONE) {
return false;
}
context.stage = GAME_OVER;
context.phase = PHASE_GAMEOVER;
if (loser == PLAYER1) {
winner = PLAYER2;
@ -850,7 +850,7 @@ bool Position::command(const char *cmd)
}
if (!strcmp(cmd, "draw")) {
context.stage = GAME_OVER;
context.phase = PHASE_GAMEOVER;
winner = PLAYER_DRAW;
score_draw++;
tips = "三次重复局面判和。";
@ -888,7 +888,7 @@ inline int Position::update(int time_p /*= -1*/)
// 根据局面调整计时器
if (!(context.stage == GAME_PLACING || context.stage == GAME_MOVING)) {
if (!(context.phase == PHASE_PLACING || context.phase == PHASE_MOVING)) {
return -1;
}
@ -919,17 +919,17 @@ bool Position::win()
// 是否分出胜负
bool Position::win(bool forceDraw)
{
if (context.stage == GAME_OVER) {
if (context.phase == PHASE_GAMEOVER) {
return true;
}
if (context.stage == GAME_NOTSTARTED) {
if (context.phase == PHASE_NOTSTARTED) {
return false;
}
// 如果有时间限定
if (currentRule.maxTimeLedToLose > 0) {
context.stage = GAME_OVER;
context.phase = PHASE_GAMEOVER;
// 这里不能update更新时间，否则会形成循环嵌套
// 如果玩家1超时
@ -955,7 +955,7 @@ bool Position::win(bool forceDraw)
if (currentRule.maxStepsLedToDraw > 0 &&
moveStep > currentRule.maxStepsLedToDraw) {
winner = PLAYER_DRAW;
context.stage = GAME_OVER;
context.phase = PHASE_GAMEOVER;
sprintf(cmdline, "Steps over. In draw!");
cmdlist.emplace_back(string(cmdline));
return true;
@ -964,7 +964,7 @@ bool Position::win(bool forceDraw)
// 如果玩家1子数小于赛点，则玩家2获胜
if (context.nPiecesOnBoard_1 + context.nPiecesInHand_1 < currentRule.nPiecesAtLeast) {
winner = PLAYER2;
context.stage = GAME_OVER;
context.phase = PHASE_GAMEOVER;
sprintf(cmdline, "Player2 win!");
cmdlist.emplace_back(string(cmdline));
return true;
@ -973,7 +973,7 @@ bool Position::win(bool forceDraw)
// 如果玩家2子数小于赛点，则玩家1获胜
if (context.nPiecesOnBoard_2 + context.nPiecesInHand_2 < currentRule.nPiecesAtLeast) {
winner = PLAYER1;
context.stage = GAME_OVER;
context.phase = PHASE_GAMEOVER;
sprintf(cmdline, "Player1 win!");
cmdlist.emplace_back(string(cmdline));
#ifdef BOOK_LEARNING
@ -984,7 +984,7 @@ bool Position::win(bool forceDraw)
// 如果摆满了，根据规则判断胜负
if (context.nPiecesOnBoard_1 + context.nPiecesOnBoard_2 >= Board::N_SEATS * Board::N_RINGS) {
context.stage = GAME_OVER;
context.phase = PHASE_GAMEOVER;
if (currentRule.isStartingPlayerLoseWhenBoardFull) {
winner = PLAYER2;
@ -999,9 +999,9 @@ bool Position::win(bool forceDraw)
}
// 如果中局被“闷”
if (context.stage == GAME_MOVING && context.action == ACTION_CHOOSE && context.board.isAllSurrounded(context.turn, currentRule, context.nPiecesOnBoard_1, context.nPiecesOnBoard_2, context.turn)) {
if (context.phase == PHASE_MOVING && context.action == ACTION_CHOOSE && context.board.isAllSurrounded(context.turn, currentRule, context.nPiecesOnBoard_1, context.nPiecesOnBoard_2, context.turn)) {
// 规则要求被“闷”判负，则对手获胜
context.stage = GAME_OVER;
context.phase = PHASE_GAMEOVER;
if (currentRule.isLoseWhenNoWay) {
if (context.turn == PLAYER1) {
@ -1032,7 +1032,7 @@ bool Position::win(bool forceDraw)
{
tips = "重复三次局面和棋！";
winner = PLAYER_DRAW;
context.stage = GAME_OVER;
context.phase = PHASE_GAMEOVER;
sprintf(cmdline, "Threefold Repetition. Draw!");
cmdlist.emplace_back(string(cmdline));
return true;
@ -1092,13 +1092,13 @@ enum Player Position::changeTurn()
void Position::setTips()
{
switch (context.stage) {
case GAME_NOTSTARTED:
switch (context.phase) {
case PHASE_NOTSTARTED:
tips = "轮到玩家1落子，剩余" + std::to_string(context.nPiecesInHand_1) + "子" +
" 比分 " + to_string(score_1) + ":" + to_string(score_2) + ", 和棋 " + to_string(score_draw);
break;
case GAME_PLACING:
case PHASE_PLACING:
if (context.action == ACTION_PLACE) {
if (context.turn == PLAYER1) {
tips = "轮到玩家1落子，剩余" + std::to_string(context.nPiecesInHand_1) + "子";
@ -1114,7 +1114,7 @@ void Position::setTips()
}
break;
case GAME_MOVING:
case PHASE_MOVING:
if (context.action == ACTION_PLACE || context.action == ACTION_CHOOSE) {
if (context.turn == PLAYER1) {
tips = "轮到玩家1选子移动";
@ -1130,7 +1130,7 @@ void Position::setTips()
}
break;
case GAME_OVER:
case PHASE_GAMEOVER:
if (winner == PLAYER_DRAW) {
score_draw++;
tips = "双方平局！比分 " + to_string(score_1) + ":" + to_string(score_2) + ", 和棋 " + to_string(score_draw);
@ -1224,7 +1224,7 @@ hash_t Position::updateHashMisc()
}
context.hash |= static_cast<hash_t>(context.nPiecesNeedRemove) << 2;
context.hash |= static_cast<hash_t>(context.nPiecesInHand_1) << 4; // TODO: 或许换 position.stage 也可以？
context.hash |= static_cast<hash_t>(context.nPiecesInHand_1) << 4; // TODO: 或许换 position.phase 也可以？
return context.hash;
}

12
src/game/position.h
View File

@ -48,13 +48,13 @@ public:
hash_t zobrist[Board::N_LOCATIONS][POINT_TYPE_COUNT]{};
// 局面阶段标识
enum PositionStage stage;
enum phase_t phase;
// 轮流状态标识
enum Player turn;
// 动作状态标识
enum Action action
enum action_t action
{
};
@ -128,7 +128,7 @@ public:
step_t maxStepsLedToDraw = 0, // 限制步数
int maxTimeLedToLose = 0, // 限制时间
step_t initialStep = 0, // 默认起始步数为0
int flags = GAME_NOTSTARTED | PLAYER1 | ACTION_PLACE, // 默认状态
int flags = PHASE_NOTSTARTED | PLAYER1 | ACTION_PLACE, // 默认状态
const char *board = nullptr, // 默认空棋盘
int nPiecesInHand_1 = 12, // 玩家1剩余未放置子数
int nPiecesInHand_2 = 12, // 玩家2剩余未放置子数
@ -188,9 +188,9 @@ public:
}
// 获取局面阶段标识
enum PositionStage getStage() const
enum phase_t getPhase() const
{
return context.stage;
return context.phase;
}
// 获取轮流状态标识
@ -200,7 +200,7 @@ public:
}
// 获取动作状态标识
enum Action getAction() const
enum action_t getAction() const
{
return context.action;
}

14
src/game/types.h
View File

@ -71,17 +71,17 @@ enum Player : uint8_t
};
// 局面阶段标识
enum PositionStage : uint16_t
enum phase_t : uint16_t
{
GAME_NONE = 0x0000,
GAME_NOTSTARTED = 0x0001, // 未开局
GAME_PLACING = 0x0002, // 开局（摆棋）
GAME_MOVING = 0x0004, // 中局（走棋）
GAME_OVER = 0x0008 // 结局
PHASE_NONE = 0,
PHASE_NOTSTARTED = 1, // 未开局
PHASE_PLACING = 1 << 1, // 开局（摆棋）
PHASE_MOVING = 1 << 2, // 中局（走棋）
PHASE_GAMEOVER = 1 << 3 // 结局
};
// 动作状态标识
enum Action : uint16_t
enum action_t : uint16_t
{
ACTION_NONE = 0x0000,
ACTION_CHOOSE = 0x0100, // 选子

20
src/ui/qt/gamecontroller.cpp
View File

@ -137,7 +137,7 @@ void GameController::gameReset()
timeID = 0;
// 棋未下完，则算对手得分
if (position_.getStage() == GAME_MOVING &&
if (position_.getPhase() == PHASE_MOVING &&
position_.whoWin() == PLAYER_NOBODY) {
giveUp();
}
@ -412,7 +412,7 @@ void GameController::flip()
if (currentRow == row - 1)
updateScence();
else
stageChange(currentRow, true);
phaseChange(currentRow, true);
ai1.setAi(position_);
ai2.setAi(position_);
@ -454,7 +454,7 @@ void GameController::mirror()
if (currentRow == row - 1)
updateScence();
else
stageChange(currentRow, true);
phaseChange(currentRow, true);
ai1.setAi(position_);
ai2.setAi(position_);
@ -494,7 +494,7 @@ void GameController::turnRight()
if (currentRow == row - 1)
updateScence();
else
stageChange(currentRow, true);
phaseChange(currentRow, true);
ai1.setAi(position_);
ai2.setAi(position_);
@ -664,7 +664,7 @@ bool GameController::actionPiece(QPointF pos)
}
// 如果未开局则开局
if (position_.getStage() == GAME_NOTSTARTED)
if (position_.getPhase() == PHASE_NOTSTARTED)
gameStart();
// 判断执行选子、落子或去子
@ -837,7 +837,7 @@ bool GameController::command(const QString &cmd, bool update /* = true */)
}
// 如果未开局则开局
if (position_.getStage() == GAME_NOTSTARTED) {
if (position_.getPhase() == PHASE_NOTSTARTED) {
gameStart();
}
@ -943,7 +943,7 @@ bool GameController::command(const QString &cmd, bool update /* = true */)
}
// 浏览历史局面，通过command函数刷新局面显示
bool GameController::stageChange(int row, bool forceUpdate)
bool GameController::phaseChange(int row, bool forceUpdate)
{
// 如果row是当前浏览的棋谱行，则不需要刷新
if (currentRow == row && !forceUpdate)
@ -1043,7 +1043,7 @@ bool GameController::updateScence(Position &game)
deletedPiece = piece;
#ifdef GAME_PLACING_SHOW_CAPTURED_PIECES
if (game.getStage() == GAME_MOVING) {
if (game.getPhase() == GAME_MOVING) {
#endif
QPropertyAnimation *animation = new QPropertyAnimation(piece, "pos");
animation->setDuration(durationTime);
@ -1061,7 +1061,7 @@ bool GameController::updateScence(Position &game)
}
// 添加摆棋阶段禁子点
if (game.getRule()->hasForbiddenPoint && game.getStage() == GAME_PLACING) {
if (game.getRule()->hasForbiddenPoint && game.getPhase() == PHASE_PLACING) {
for (int j = Board::LOCATION_BEGIN; j < Board::LOCATION_END; j++) {
if (board[j] == 0x0F) {
pos = scene.rs2pos(j / Board::N_SEATS, j % Board::N_SEATS + 1);
@ -1080,7 +1080,7 @@ bool GameController::updateScence(Position &game)
}
// 走棋阶段清除禁子点
if (game.getRule()->hasForbiddenPoint && game.getStage() != GAME_PLACING) {
if (game.getRule()->hasForbiddenPoint && game.getPhase() != PHASE_PLACING) {
while (nTotalPieces < pieceList.size()) {
delete pieceList.at(nTotalPieces);
pieceList.removeAt(nTotalPieces);

2
src/ui/qt/gamecontroller.h
View File

@ -188,7 +188,7 @@ public slots:
bool command(const QString &cmd, bool update = true);
// 历史局面及局面改变
bool stageChange(int row, bool forceUpdate = false);
bool phaseChange(int row, bool forceUpdate = false);
// 更新棋局显示，每步后执行才能刷新局面
bool updateScence();

6
src/ui/qt/gamewindow.cpp
View File

@ -745,12 +745,12 @@ void MillGameWindow::on_actionRowChange()
}
// 更新局面
game->stageChange(currentRow);
game->phaseChange(currentRow);
#if 0
// 下面的代码全部取消，改用QTimer的方式实现
// 更新局面
bool changed = game->stageChange(currentRow);
bool changed = game->phaseChange(currentRow);
// 处理自动播放时的动画
if (changed && game->isAnimation()) {
// 不使用processEvents函数进行非阻塞延时，频繁调用占用CPU较多
@ -814,7 +814,7 @@ void MillGameWindow::onAutoRunTimeOut(QPrivateSignal signal)
}
// 更新局面
game->stageChange(currentRow);
game->phaseChange(currentRow);
}
// 自动运行