diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user index 5127849..817bc4f 100644 --- a/CMakeLists.txt.user +++ b/CMakeLists.txt.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/playwindow.cpp b/playwindow.cpp index 67c9929..8907224 100644 --- a/playwindow.cpp +++ b/playwindow.cpp @@ -94,7 +94,6 @@ playWindow::playWindow(QWidget *parent) : QMainWindow(parent), connect(ui->playagainButton, &QPushButton::clicked, this, [=]{reset();}); turnCount = 0; - computerTurnCount = 0; player_wins = 0; computer_wins = 0; } @@ -143,6 +142,7 @@ void playWindow::computerTurn(void) QPixmap lose(":/images/lose.png"); QPixmap draw(":/images/draw.png"); + turnCount = 0; while (dealer->getHandValue() < 16){ dealer->addCard(deck->drawCard()); QPixmap img = QPixmap(":/images/cards/" + cardToImg[dealer->getLastCard()] + ".png"); @@ -150,9 +150,9 @@ void playWindow::computerTurn(void) ui->computerScoreLabel->setText("Computer: " + QString::number(dealer->getHandValue())); - countToDealerLabel[computerTurnCount]->setPixmap(img); + countToDealerLabel[turnCount]->setPixmap(img); - computerTurnCount++; + turnCount++; } //if computer is bust @@ -189,7 +189,6 @@ void playWindow::reset(void) //Clear Labels and Variables turnCount = 0; - computerTurnCount = 0; ui->playertotalLabel->setText("Total: " + QString::number(0)); diff --git a/playwindow.hpp b/playwindow.hpp index 1a1b740..438068d 100644 --- a/playwindow.hpp +++ b/playwindow.hpp @@ -53,7 +53,6 @@ private: std::unique_ptr dealer; std::unique_ptr player; uint8_t turnCount; - uint8_t computerTurnCount; int player_wins; int computer_wins; }; diff --git a/playwindow.ui b/playwindow.ui index 226cc62..880996f 100644 --- a/playwindow.ui +++ b/playwindow.ui @@ -192,7 +192,7 @@ border-image:url(:/images/blackjack_table.png) 0 0 0 0 stretch stretch; - + @@ -814,6 +814,9 @@ border-image:url(:/images/blackjack_table.png) 0 0 0 0 stretch stretch; Qt::Horizontal + + QSizePolicy::MinimumExpanding + 40 @@ -851,6 +854,9 @@ border-image:url(:/images/blackjack_table.png) 0 0 0 0 stretch stretch; Qt::Horizontal + + QSizePolicy::MinimumExpanding + 40