Changeset 12260 for code/branches/OrxoBlox_FS19/src

Timestamp:

Mar 28, 2019, 3:49:58 PM (6 years ago)

Author:

ahuwyler

Message:

Changed OrxoBlox.cc

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• OrxoBlox.cc (modified) (8 diffs)
• OrxoBlox.h (modified) (1 diff)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

@@ -47 +47 @@
 #include "OrxoBloxBot.h"
 #include "OrxoBloxAI.h"
+
 namespace orxonox
 {
@@ -66 +67 @@
         this->ball_ = nullptr;
         this->bat_[0] = nullptr;
-        this->bat_[1] = nullptr;
 
         this->setHUDTemplate("OrxoBloxHUD");
@@ -157 +157 @@
             this->center_->attach(this->bat_[1]);
             this->bat_[0]->setPosition(-this->center_->getFieldDimension().x / 2, 0, 0);
-            this->bat_[1]->setPosition( this->center_->getFieldDimension().x / 2, 0, 0);
             this->bat_[0]->yaw(Degree(-90));
-            this->bat_[1]->yaw(Degree(90));
             this->bat_[0]->setSpeed(this->center_->getBatSpeed());
-            this->bat_[1]->setSpeed(this->center_->getBatSpeed());
             this->bat_[0]->setFieldHeight(this->center_->getFieldDimension().y);
-            this->bat_[1]->setFieldHeight(this->center_->getFieldDimension().y);
             this->bat_[0]->setLength(this->center_->getBatLength());
-            this->bat_[1]->setLength(this->center_->getBatLength());
 
             // Set the bats for the ball.
@@ -235 +230 @@
             this->players_[player].state_ = PlayerState::Alive;
         }
-        // If the second (right) bat has no player.
-        else if (this->bat_[1]->getPlayer() == nullptr)
-        {
-            player->startControl(this->bat_[1]);
-            this->players_[player].state_ = PlayerState::Alive;
-        }
-        // If both bats are taken.
         else
             return;
@@ -264 +252 @@
         {
             // Fire an event for the player that has scored, to be able to react to it in the level, e.g. by displaying fireworks.
-            if (player == this->getRightPlayer())
-                this->center_->fireEvent(FireEventName(OrxoBloxCenterpoint, right));
-            else if (player == this->getLeftPlayer())
+            
+            if (player == this->getLeftPlayer())
                 this->center_->fireEvent(FireEventName(OrxoBloxCenterpoint, left));
 
@@ -287 +274 @@
         {
             this->bat_[0]->setPosition(-this->center_->getFieldDimension().x / 2, 0, 0);
-            this->bat_[1]->setPosition( this->center_->getFieldDimension().x / 2, 0, 0);
+            
         }
 
@@ -294 +281 @@
         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)
@@ -337 +322 @@
         Returns a pointer to the player playing on the right. If there is no right player, nullptr is returned.
     */
-    PlayerInfo* OrxoBlox::getRightPlayer() const
-    {
-        if (this->bat_[1] != nullptr)
-            return this->bat_[1]->getPlayer();
-        else
-            return nullptr;
-    }
+    
 }

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.h

@@ -94 +94 @@
             WeakPtr<OrxoBloxCenterpoint> center_; //!< The playing field.
             WeakPtr<OrxoBloxBall> ball_; //!< The OrxoBlox ball.
-            WeakPtr<OrxoBloxBat> bat_[2]; //!< The two bats.
+            WeakPtr<OrxoBloxBat> bat_[1]; //!< The two bats.
             Timer starttimer_; //!< A timer to delay the start of the game.
             int scoreLimit_; //!< If a player scored that much points, the game is ended.