Changeset 9285

Timestamp:

Jun 10, 2012, 5:03:16 PM (13 years ago)

Author:

jo

Message:

Adaptions for easier merge.

Location:

code/branches/pCuts/src/modules/pong

Files:

• Pong.cc (modified) (4 diffs)
• Pong.h (modified) (1 diff)
• PongScore.cc (modified) (3 diffs)

code/branches/pCuts/src/modules/pong/Pong.cc

@@ -76 +76 @@
         // Set the type of Bots for this particular Gametype.
         this->botclass_ = Class(PongBot);
+
         this->scoreLimit_ = 10;
         this->setConfigValues();
@@ -88 +89 @@
         if (this->isInitialized())
             this->cleanup();
+    }
+
+    void Pong::setConfigValues()
+    {
+        SetConfigValue(scoreLimit_, 10).description("The player first reaching those points wins.");
     }
 
@@ -283 +289 @@
         }
 
-        // If a palyer gets 21 points, he won the game -> end of game
-
-        PlayerInfo* player1 = this->getLeftPlayer();
-        PlayerInfo* player2 = this->getRightPlayer();
-        if(player1==NULL||player2==NULL) return; //safety
-        if(this->getScore(player1) >= scoreLimit_)
-        {
-            std::string name1=player1->getName();
-            std::string message(name1 + " has won!");
-            ChatManager::message(message);
-            this->end();
-        }
-        else if(this->getScore(player2) >= scoreLimit_)
-        {
-             std::string name2=player2->getName();
-             std::string message2(name2 + " has won!");
-             ChatManager::message(message2);
+        // If a player gets enough points, he won the game -> end of game
+        PlayerInfo* winningPlayer = NULL;
+        if (this->getLeftPlayer() && this->getScore(this->getLeftPlayer()) >= scoreLimit_)
+            winningPlayer = this->getLeftPlayer();
+        else if (this->getRightPlayer() && this->getScore(this->getRightPlayer()) >= scoreLimit_)
+            winningPlayer = this->getRightPlayer();
+
+        if (winningPlayer)
+        {
+             ChatManager::message(winningPlayer->getName() + " has won!");
              this->end();
         }
+
         // Restart the timer to start the ball.
         this->starttimer_.startTimer();
-
     }
 
@@ -344 +343 @@
             return 0;
     }
-
-    /**
-     @brief
-         Make scoreLimit_ configurable e.g. in the menu.
-     */
-    void Pong::setConfigValues()
-    {
-        SetConfigValue(scoreLimit_, 10).description("The player first reaching those points wins.");
-    }
 }

code/branches/pCuts/src/modules/pong/Pong.h

@@ -82 +82 @@
                 { this->center_ = center; }
             void setConfigValues(); //!< Makes scoreLimit configurable.
-            
+
             PlayerInfo* getLeftPlayer() const; //!< Get the left player.
             PlayerInfo* getRightPlayer() const; //!< Get the right player.

code/branches/pCuts/src/modules/pong/PongScore.cc

@@ -60 +60 @@
         this->bShowLeftPlayer_ = false;
         this->bShowRightPlayer_ = false;
-        this->player1_ = NULL;
-        this->player2_ = NULL;
     }
 
@@ -100 +98 @@
         if (this->owner_ != NULL)
         {
-            if(!this->owner_->hasEnded())
+            if (!this->owner_->hasEnded())
             {
-                //get the two players
+                // Get the two players.
                 player1_ = this->owner_->getLeftPlayer();
                 player2_ = this->owner_->getRightPlayer();
             }
 
-            if(this->owner_->hasStarted())
+            std::string name1;
+            std::string name2;
+
+            std::string score1("0");
+            std::string score2("0");
+
+            // Save the name and score of each player as a string.
+            if (player1_ != NULL)
             {
-                // Get the two players.
+                name1 = player1_->getName();
+                score1 = multi_cast<std::string>(this->owner_->getScore(player1_));
+            }
+            if (player2_ != NULL)
+            {
+                name2 = player2_->getName();
+                score2 = multi_cast<std::string>(this->owner_->getScore(player2_));
+            }
 
-                std::string name1;
-                std::string name2;
+            // Assemble the strings, depending on what should all be displayed.
+            std::string output1;
+            if (this->bShowLeftPlayer_)
+            {
+                if (this->bShowName_ && this->bShowScore_ && player1_ != NULL)
+                    output1 = name1 + " - " + score1;
+                else if (this->bShowScore_)
+                    output1 = score1;
+                else if (this->bShowName_)
+                    output1 = name1;
+            }
 
-                std::string score1("0");
-                std::string score2("0");
-
-                // Save the name and score of each player as a string.
-                if (player1_ != NULL)
-                {
-                    name1 = player1_->getName();
-                    score1 = multi_cast<std::string>(this->owner_->getScore(player1_));
-                }
-                if (player2_ != NULL)
-                {
-                    name2 = player2_->getName();
-                    score2 = multi_cast<std::string>(this->owner_->getScore(player2_));
-                }
-
-                // Assemble the strings, depending on what should all be displayed.
-                std::string output1;
-                if (this->bShowLeftPlayer_)
-                {
-                    if (this->bShowName_ && this->bShowScore_ && player1_ != NULL)
-                         output1 = name1 + " - " + score1;
-                    else if (this->bShowScore_)
-                         output1 = score1;
-                    else if (this->bShowName_)
-                         output1 = name1;
-                }
-
-                std::string output2;
-                if (this->bShowRightPlayer_)
-                {
+            std::string output2;
+            if (this->bShowRightPlayer_)
+            {
                 if (this->bShowName_ && this->bShowScore_ && player2_ != NULL)
                     output2 = score2 + " - " + name2;
@@ -152 +146 @@
             }
 
-                std::string output("PONG");
-                if (this->bShowName_ || this->bShowScore_)
-                {
-                    if (this->bShowLeftPlayer_ && this->bShowRightPlayer_)
-                        output = output1 + ':' + output2;
-                    else if (this->bShowLeftPlayer_ || this->bShowRightPlayer_)
-                        output = output1 + output2;
-                }
-                this->setCaption(output);
+            std::string output("PONG");
+            if (this->bShowName_ || this->bShowScore_)
+            {
+                if (this->bShowLeftPlayer_ && this->bShowRightPlayer_)
+                    output = output1 + ':' + output2;
+                else if (this->bShowLeftPlayer_ || this->bShowRightPlayer_)
+                    output = output1 + output2;
             }
+
+            this->setCaption(output);
         }
     }