- second cleanup: move game/round points inside array

- order is defined by Color::order[] used by server and client (gui too)

1 files changed, 12 insertions, 21 deletions

diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index f5d4b7f..9c53513 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -41,10 +41,10 @@ void MainWidget::createGui()
   QVBoxLayout *layout = new QVBoxLayout(this);
   QHBoxLayout *scoreLayout = new QHBoxLayout();
 
-  for (unsigned int i = 1; i < 4; ++i)
+  for (unsigned int i = 0; Color::order[i] != Color::none ; ++i)
   {
-    QGroupBox *scoreBox = new QGroupBox(QString("Spieler %1").arg(i), this);
-    scoreBox->setObjectName(QString("actor%1").arg(i));
+    QGroupBox *scoreBox = new QGroupBox(QString("Spieler %1").arg(i + 1), this);
+    scoreBox->setObjectName(QString("actor%1").arg(i + 1));
     scoreBox->setCheckable(true);
     connect(scoreBox, SIGNAL(clicked()), this, SLOT(playerScoreClicked()));
     scoreLayout->addWidget(scoreBox);
@@ -80,24 +80,15 @@ void MainWidget::createGui()
 
 void MainWidget::updateScore(const ProtoBuf::MapUpdate& packet)
 {
-  QLabel *turnPointsLbl;
-  QLabel *allPointsLbl;
-
-  //TODO: change proto and move that inside an array
-  turnPointsLbl = dynamic_cast<QLabel*>(m_playerScoreLayouts.at(0)->itemAtPosition(0,1)->widget());
-  allPointsLbl = dynamic_cast<QLabel*>(m_playerScoreLayouts.at(0)->itemAtPosition(1,1)->widget());
-  turnPointsLbl->setText(QString::number(packet.round_points_red()));
-  allPointsLbl->setText(QString::number(packet.game_points_red()));
-
-  turnPointsLbl = dynamic_cast<QLabel*>(m_playerScoreLayouts.at(1)->itemAtPosition(0,1)->widget());
-  allPointsLbl = dynamic_cast<QLabel*>(m_playerScoreLayouts.at(1)->itemAtPosition(1,1)->widget());
-  turnPointsLbl->setText(QString::number(packet.round_points_blue()));
-  allPointsLbl->setText(QString::number(packet.game_points_blue()));
-
-  turnPointsLbl = dynamic_cast<QLabel*>(m_playerScoreLayouts.at(2)->itemAtPosition(0,1)->widget());
-  allPointsLbl = dynamic_cast<QLabel*>(m_playerScoreLayouts.at(2)->itemAtPosition(1,1)->widget());
-  turnPointsLbl->setText(QString::number(packet.round_points_green()));
-  allPointsLbl->setText(QString::number(packet.game_points_green()));
+  for(unsigned i = 0; Color::order[i] != Color::none; ++i)
+  {
+    QGridLayout *score = m_playerScoreLayouts.at(i);
+    QLabel *turnPointsLbl = dynamic_cast<QLabel*>(score->itemAtPosition(0, 1)->widget());
+    turnPointsLbl->setText(QString::number(packet.round_points(i)));
+
+    QLabel *allPointsLbl = dynamic_cast<QLabel*>(score->itemAtPosition(1, 1)->widget());
+    allPointsLbl->setText(QString::number(packet.round_points(i)));
+  }
 }
 
 Transmission::field_t MainWidget::translateKey(int key)