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

Timestamp:

May 2, 2019, 4:40:50 PM (5 years ago)

Author:

pomselj

Message:

Ball can do bouncy stuff

File:

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

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

@@ -64 +64 @@
         Constructor. Registers and initializes the object.
     */
-    OrxoBlox::OrxoBlox(Context* context) : Deathmatch(context)
+    OrxoBlox::OrxoBlox(Context* context) : ::orxonox::Deathmatch::Deathmatch(context)
     {
         RegisterObject(OrxoBlox);
@@ -154 +154 @@
             this->createWall();
 
+            //Create Ship
+            //this->ship_ = new OrxoBloxShip(this->center_->getContext());
+            //this->ship_->setPosition(0, 0, 0);
+
         }
         else // If no centerpoint was specified, an error is thrown and the level is exited.
@@ -166 +170 @@
 
         // Set variable to temporarily force the player to spawn.
-        this->bForceSpawn_ = false;
+        this->bForceSpawn_ = true;
 
         // Call start for the parent class.
@@ -186 +190 @@
     }
 
-    /**
-    @brief
-        Spawns the input player.
-    @param player
-        The player to be spawned.
-    */
+    OrxoBloxShip* OrxoBlox::getPlayer()
+    {
+        if (playership == nullptr)
+        {
+            for (OrxoBloxShip* ship_ : ObjectList<OrxoBloxShip>())
+            {
+                playership = ship_;
+            }
+        }
+        return playership;
+    }
+   
     void OrxoBlox::spawnPlayer(PlayerInfo* player)
     {
-         assert(player);
+        assert(player);
 
         if(this->player_ == nullptr)
@@ -201 +211 @@
             this->players_[player].state_ = PlayerState::Alive;
         }
-    }
-
-
-    OrxoBloxShip* OrxoBlox::getPlayer()
-    {
-        for (OrxoBloxShip* ship : ObjectList<OrxoBloxShip>())
-        {
-            return ship;
-        }
-        return nullptr;
+
     }
 
     //void startWall(void);
-    
     void OrxoBlox::LevelUp(){
         level_++;