Changeset 12367 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

Timestamp:

May 16, 2019, 11:00:57 AM (5 years ago)

Author:

ahuwyler

Message:

We have a spaceship!

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified) (7 diffs)

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

@@ -129 +129 @@
     */
     void OrxoBlox::start()
+
     {
         if (this->center_ != nullptr) // There needs to be a OrxoBloxCenterpoint, i.e. the area the game takes place.
@@ -169 +170 @@
         // Set variable to temporarily force the player to spawn.
         // Set variable to temporarily force the player to spawn.
-        bool temp = this->bForceSpawn_;
+        //bool temp = this->bForceSpawn_;
         this->bForceSpawn_ = true;
 
@@ -176 +177 @@
 
         // Reset the variable.
-        this->bForceSpawn_ = temp;
+        //this->bForceSpawn_ = temp;
 
     }
@@ -206 +207 @@
     }
    
-    void OrxoBlox::spawnPlayer(PlayerInfo* player)
-    {
-        assert(player);
-
-        if(this->player_ == nullptr)
-        {
-            this->player_ = player;
-            this->players_[player].state_ = PlayerState::Alive;
-        }
-
-    }
+    // void OrxoBlox::spawnPlayer(PlayerInfo* player)
+    // {
+    //     assert(player);
+
+    //     if(this->player_ == nullptr)
+    //     {
+    //         this->player_ = player;
+    //         this->players_[player].state_ = PlayerState::Alive;
+    //     }
+
+    // }
 
     void OrxoBlox::LevelUp(){
@@ -287 +288 @@
     OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) {
 
-        orxout() << "Checking for Collision" << endl;
+        //orxout() << "Checking for Collision" << endl;
         Vector3 BallPosition = Ball->getPosition();
         for(OrxoBloxStones* someStone : this->stones_)
@@ -295 +296 @@
                 continue;
             }
-            orxout() << "Checking a stone" << endl;
+            //orxout() << "Checking a stone" << endl;
             const Vector3& StonePosition = someStone->getPosition(); //!< Saves the position of the currentStone
             int size = someStone->getSize()/2;
@@ -307 +308 @@
         return nullptr;
     }
+
+    void OrxoBlox::playerPreSpawn(PlayerInfo* player)
+    {
+        this->player_ = player;
+    }
     
 }