Changeset 6356 for code/branches/presentation2

Timestamp:

Dec 15, 2009, 11:04:39 PM (15 years ago)

Author:

scheusso

Message:

god mode hack for presentation

Location:

code/branches/presentation2/src/orxonox

Files:

• controllers/Controller.cc (modified) (1 diff)
• controllers/Controller.h (modified) (2 diffs)
• controllers/HumanController.cc (modified) (2 diffs)
• controllers/HumanController.h (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/presentation2/src/orxonox/controllers/Controller.cc

@@ -41 +41 @@
         this->player_ = 0;
         this->controllableEntity_ = 0;
+        this->bGodMode_ = false;
     }
 

code/branches/presentation2/src/orxonox/controllers/Controller.h

@@ -51 +51 @@
 
             virtual inline void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {};
+            
+            void setGodMode( bool mode ){ this->bGodMode_ = mode; }
+            bool getGodMode(){ return this->bGodMode_; }
 
             inline ControllableEntity* getControllableEntity() const
@@ -70 +73 @@
             PlayerInfo* player_;
             ControllableEntity* controllableEntity_;
+        private:
+            bool bGodMode_;
     };
 }

code/branches/presentation2/src/orxonox/controllers/HumanController.cc

@@ -54 +54 @@
     SetConsoleCommand(HumanController, mouseLook,     true);
     SetConsoleCommand(HumanController, suicide,       true);
+    SetConsoleCommand(HumanController, toggleGodMode, true);
     SetConsoleCommand(HumanController, addBots,       true).defaultValues(1);
     SetConsoleCommand(HumanController, killBots,      true).defaultValues(0);
@@ -209 +210 @@
     }
 
+    void HumanController::toggleGodMode()
+    {
+        HumanController::getLocalControllerSingleton()->setGodMode( !HumanController::getLocalControllerSingleton()->getGodMode() );
+    }
+
     void HumanController::useItem()
     {

code/branches/presentation2/src/orxonox/controllers/HumanController.h

@@ -74 +74 @@
 
             static void suicide();
+            static void toggleGodMode();
 
             static void addBots(unsigned int amount);

code/branches/presentation2/src/orxonox/worldentities/pawns/Pawn.cc

@@ -168 +168 @@
     void Pawn::hit(Pawn* originator, const Vector3& force, float damage)
     {
-        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator))
+        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
         {
             this->damage(damage, originator);
@@ -179 +179 @@
     void Pawn::hit(Pawn* originator, btManifoldPoint& contactpoint, float damage)
     {
-        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator))
+        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator) && (!this->getController() || !this->getController()->getGodMode()) )
         {
             this->damage(damage, originator);