Changeset 9709 for code/branches/invaders/src

Timestamp:

Oct 21, 2013, 3:53:13 PM (11 years ago)

Author:

zifloria

Message:

InvaderShip created

Location:

code/branches/invaders/src/modules/invader

Files:

• CMakeLists.txt (modified) (1 diff)
• Invader.cc (modified) (4 diffs)
• Invader.h (modified) (2 diffs)
• InvaderPrereqs.h (modified) (1 diff)

code/branches/invaders/src/modules/invader/CMakeLists.txt

@@ -2 +2 @@
 BUILD_UNIT InvaderBuildUnit.cc
   Invader.cc
+  InvaderCenterPoint.cc
+  InvaderShip.cc
 END_BUILD_UNIT
 )

code/branches/invaders/src/modules/invader/Invader.cc

@@ -42 +42 @@
 #include "chat/ChatManager.h"
 
+#include "InvaderShip.h"
+// ! HACK
+#include "infos/PlayerInfo.h"
+
+#include "InvaderCenterPoint.h"
+
 namespace orxonox
 {
@@ -50 +56 @@
         RegisterObject(Invader);
 
+        this->center_ = 0;
+        //this->context = context;
     }
 
@@ -56 +64 @@
     }
 
+    // inject custom player controller
+ /**   void Invader::spawnPlayer(PlayerInfo* player)
+    {
+        assert(player);
+
+        //player->startControl(new InvaderShip(this->center_->getContext() ) );
+    }*/
+
     void Invader::start()
     {
@@ -61 +77 @@
         this->bForceSpawn_ = true;
 
+        if (this->center_ == NULL)  // abandon mission!
+        {
+            orxout(internal_error) << "Invader: No Centerpoint specified." << endl;
+            GSLevel::startMainMenu();
+            return;
+        }
         // Call start for the parent class.
         Deathmatch::start();

code/branches/invaders/src/modules/invader/Invader.h

@@ -40 +40 @@
 #include "gametypes/Deathmatch.h"
 
+#include "InvaderCenterPoint.h"
+
 namespace orxonox
 {
@@ -51 +53 @@
             virtual void start(); //!< Starts the Invader minigame.
             virtual void end(); ///!< Ends the Invader minigame.
+
+            //virtual void spawnPlayer(PlayerInfo* player); //!< Spawns the input player.
+
+            void setCenterpoint(InvaderCenterPoint* center)
+            { this->center_ = center; }
+        private:
+            WeakPtr<InvaderCenterPoint> center_;
+            //Context* context;
     };
 }

code/branches/invaders/src/modules/invader/InvaderPrereqs.h

@@ -69 +69 @@
 {
     class Invader;
+    class InvaderCenterPoint;
+    class InvaderShip;
 }