Miroirs/eliot
1
0
Fork 0
mirror of git://git.savannah.nongnu.org/eliot.git synced 2024-12-28 09:58:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Arbitration: do not consider the "No move" move as a real move assignment

Browse source
This commit is contained in:
Olivier Teulière 2012-04-04 21:04:21 +02:00
parent 4e5c86ef11
commit 2f7c09ec83
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
qt/arbit_assignments.cpp
View file

@ -150,11 +150,16 @@ void ArbitAssignments::updatePlayersModel()
for (unsigned int i = 0; i < m_game->getNbPlayers(); ++i) for (unsigned int i = 0; i < m_game->getNbPlayers(); ++i)
{ {
const Player &player = m_game->getPlayer(i); const Player &player = m_game->getPlayer(i);
if (hideAssignedPlayers && m_game->hasPlayed(player.getId()))
continue;
// Only display human players // Only display human players
if (!player.isHuman()) if (!player.isHuman())
continue; continue;
// Hide players with an assigned move other than "No move"
if (hideAssignedPlayers && m_game->hasPlayed(player.getId()) &&
player.getLastMove().getType() != Move::NO_MOVE)
{
continue;
}
const int rowNum = m_playersModel->rowCount(); const int rowNum = m_playersModel->rowCount();
m_playersModel->insertRow(rowNum); m_playersModel->insertRow(rowNum);
m_playersModel->setData(m_playersModel->index(rowNum, 0), player.getTableNb()); m_playersModel->setData(m_playersModel->index(rowNum, 0), player.getTableNb());
@ -273,7 +278,6 @@ void ArbitAssignments::populatePlayersMenu(QMenu &iMenu, const QPoint &iPoint)
void ArbitAssignments::on_checkBoxHideAssigned_toggled(bool) void ArbitAssignments::on_checkBoxHideAssigned_toggled(bool)
{ {
treeViewPlayers->selectionModel()->clearSelection();
updatePlayersModel(); updatePlayersModel();
} }
@ -486,8 +490,11 @@ void ArbitAssignments::helperAssignMove(const Move &iMove)
QSet<unsigned int> assignedIdSet; QSet<unsigned int> assignedIdSet;
BOOST_FOREACH(unsigned int id, playersIdSet) BOOST_FOREACH(unsigned int id, playersIdSet)
{ {
if (m_game->hasPlayed(id)) if (m_game->hasPlayed(id) &&
m_game->getPlayer(id).getLastMove().getType() != Move::NO_MOVE)
{
assignedIdSet.insert(id); assignedIdSet.insert(id);
}
} }
if (!assignedIdSet.empty()) if (!assignedIdSet.empty())
{ {