Changeset 12268 for code/branches/OrxoBlox_FS19/src

Timestamp:

Apr 4, 2019, 2:40:29 PM (6 years ago)

Author:

ahuwyler

Message:

OrxoBlox in the HUD

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• CMakeLists.txt (modified) (1 diff)
• OrxoBlox.cc (modified) (6 diffs)
• OrxoBlox.h (modified) (1 diff)
• OrxoBloxBot.cc (modified) (2 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt

@@ -6 +6 @@
   BallGun/BallProjectile.cc
   OrxoBlox.cc
-  OrxoBloxAI.cc
+  
   OrxoBloxBall.cc
   OrxoBloxBat.cc

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

@@ -46 +46 @@
 #include "OrxoBloxBat.h"
 #include "OrxoBloxBot.h"
-#include "OrxoBloxAI.h"
+#include "OrxoBloxStones.h"
 
 namespace orxonox
@@ -75 +75 @@
 
         // Set the type of Bots for this particular Gametype.
-        this->botclass_ = Class(OrxoBloxBot);
+        this->botclass_ = Class(OrxoBloxBat);
 
         this->scoreLimit_ = 10;
@@ -193 +193 @@
     void OrxoBlox::end()
     {
+        ChatManager::message("You suck!!");
         this->cleanup();
 
@@ -233 +234 @@
         else
             return;
-
-        // If the player is an AI, it receives a pointer to the ball.
-        if (player->getController() != nullptr && player->getController()->isA(Class(OrxoBloxAI)))
-        {
-            OrxoBloxAI* ai = orxonox_cast<OrxoBloxAI*>(player->getController());
-            ai->setOrxoBloxBall(this->ball_);
-        }
     }
 
@@ -278 +272 @@
         }
 
-        // If a player gets enough points, he won the game -> end of game
-        PlayerInfo* winningPlayer = nullptr;
-        if (this->getLeftPlayer() && this->getScore(this->getLeftPlayer()) >= scoreLimit_)
-            winningPlayer = this->getLeftPlayer();
-
-        if (winningPlayer)
-        {
-             ChatManager::message(winningPlayer->getName() + " has won!");
-             this->end();
-        }
 
         // Restart the timer to start the ball.
@@ -317 +301 @@
     }
 
-    /**
-    @brief
-        Get the right player.
-    @return
-        Returns a pointer to the player playing on the right. If there is no right player, nullptr is returned.
-    */
     
 }

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

@@ -84 +84 @@
 
             PlayerInfo* getLeftPlayer() const; //!< Get the left player.
-            PlayerInfo* getRightPlayer() const; //!< Get the right player.
 
         protected:

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

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "OrxoBloxAI.h"
 
 namespace orxonox
@@ -49 +48 @@
         RegisterObject(OrxoBloxBot);
 
-        this->defaultController_ = Class(OrxoBloxAI);
-        this->createController();
+        
     }
 }