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

position: 去掉 chSide 成员变量

This commit is contained in:
Calcitem 2020-07-05 20:09:05 +08:00
parent cb34e7f6be
commit 9568a01aae
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/position.cpp
View File

@ -751,7 +751,7 @@ bool Position::checkGameOverCondition(int8_t updateCmdlist)
if (rule.isLoseButNotChangeTurnWhenNoWay) { if (rule.isLoseButNotChangeTurnWhenNoWay) {
if (updateCmdlist) { if (updateCmdlist) {
tips = "玩家" + Player::chToStr(chSide) + "无子可走被闷"; tips = "玩家" + Player::chToStr(Player::colorToCh(sideToMove)) + "无子可走被闷";
winner = ~sideToMove; winner = ~sideToMove;
sprintf(cmdline, "Player%d no way to go. Player%d win!", sideToMove, winner); sprintf(cmdline, "Player%d no way to go. Player%d win!", sideToMove, winner);
cmdlist.emplace_back(string(cmdline)); // TODO: memleak cmdlist.emplace_back(string(cmdline)); // TODO: memleak
@ -816,9 +816,6 @@ void Position::cleanBannedLocations()
void Position::setSideToMove(Color c) void Position::setSideToMove(Color c)
{ {
sideToMove = c; sideToMove = c;
chSide = Player::colorToCh(sideToMove);
them = ~sideToMove; them = ~sideToMove;
} }
@ -847,7 +844,7 @@ bool Position::undoNullMove()
void Position::setTips() void Position::setTips()
{ {
string winnerStr, t; string winnerStr, t;
string turnStr = Player::chToStr(chSide); string turnStr = Player::chToStr(Player::colorToCh(sideToMove));
switch (phase) { switch (phase) {
case PHASE_READY: case PHASE_READY:

1
src/game/position.h
View File

@ -52,7 +52,6 @@ public:
enum Phase phase {PHASE_NONE}; enum Phase phase {PHASE_NONE};
Color sideToMove {NOCOLOR}; Color sideToMove {NOCOLOR};
char chSide {'0'};
Color them { NOCOLOR }; Color them { NOCOLOR };
enum Action action { }; enum Action action { };