ap7mp/solitare
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

slight code clean up

Browse source
This commit is contained in:
ItsDrike 2024-12-06 17:09:19 +01:00
parent 18891308bc
commit 2b44a39ee8
Signed by: ItsDrike
GPG key ID: FA2745890B7048C0
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gamestate.cpp
View file

@ -451,7 +451,6 @@ void GameState::cleanupBoard(bool emitChanges) {
QString GameState::generateStateHash() const { QString GameState::generateStateHash() const {
QString stateHash; QString stateHash;
// The repetition here is annoying, I know
for (const auto& column : m_columns) { for (const auto& column : m_columns) {
for (const ColumnSlot* slot : column) { for (const ColumnSlot* slot : column) {
stateHash += QString::number(slot->card()->value()) + "." + QString::number(slot->card()->suit()); stateHash += QString::number(slot->card()->value()) + "." + QString::number(slot->card()->suit());
@ -592,10 +591,8 @@ bool GameState::isColumnMoveValid(const PlayingCard& cardToMove, int columnId) c
const PlayingCard& columnCard = *columnStack.last()->card(); const PlayingCard& columnCard = *columnStack.last()->card();
// The card's value must be one less than the card in the column // The card's value must be one less than the card in the column
if (cardToMove.value() != columnCard.value() - 1) { if (cardToMove.value() != static_cast<PlayingCard::Value>(static_cast<int>(columnCard.value() - 1)))
qDebug() << "* Move attempt failed (wrong value)";
return false; return false;
}
// The card must be of opposite color // The card must be of opposite color
return PlayingCard::areOppositeColors(cardToMove, columnCard); return PlayingCard::areOppositeColors(cardToMove, columnCard);