Changeset 8895 for code/branches

Timestamp:

Oct 13, 2011, 8:59:27 PM (13 years ago)

Author:

jo

Message:

Added end to pong gametype. Unfortunately the hud isn't consistent at the game's end at the moment.

Location:

code/branches/gamecontent/src/modules/pong

Files:

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

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

@@ -39 +39 @@
 
 #include "gamestates/GSLevel.h"
+#include "chat/ChatManager.h"
 
 #include "PongCenterpoint.h"
@@ -45 +46 @@
 #include "PongBot.h"
 #include "PongAI.h"
-
 namespace orxonox
 {
@@ -75 +75 @@
         // Set the type of Bots for this particular Gametype.
         this->botclass_ = Class(PongBot);
+        this->scoreLimit_ = 3; //TODO: 21
     }
 
@@ -280 +281 @@
         }
 
+        // 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);
+             this->end();
+        }
         // Restart the timer to start the ball.
         this->starttimer_.startTimer();
+
     }
 

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

@@ -94 +94 @@
             WeakPtr<PongBall> ball_; //!< The Pong ball.
             WeakPtr<PongBat> bat_[2]; //!< The two bats.
-            Timer starttimer_; //!< A timer to delay the start of the game.
+            Timer starttimer_; //!< A timer to delay the start of the game.
+            int scoreLimit_; //!< If a player scored that much points, the game is ended.
     };
 }

code/branches/gamecontent/src/modules/pong/PongAI.h

@@ -80 +80 @@
             void delayedMove(); //!< Is called, when a delayed move takes effect.
 
-            PongBall* ball_; //!< A pointer to the ball.
+            WeakPtr<PongBall> ball_; //!< A weak pointer to the ball.
             Vector2 ballDirection_; //!< Vector to store the (x,z) direction in which the ball is flying.
             float ballEndPosition_; //!< The calculated end position of the ball.