Changeset 2986 for code/branches/gametypes/src/orxonox/objects/worldentities/triggers

Timestamp:

May 18, 2009, 6:00:13 PM (15 years ago)

Author:

Aurelian

Message:

Respawning changed, not possible anymore, not completely working. Movable Entity is now able to cause damage.

Location:

code/branches/gametypes/src/orxonox/objects/worldentities/triggers

Files:

• CheckPoint.cc (modified) (3 diffs)
• CheckPoint.h (modified) (1 diff)
• DistanceTrigger.cc (modified) (3 diffs)
• DistanceTrigger.h (modified) (1 diff)
• PlayerTrigger.h (modified) (3 diffs)

code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc

@@ -37 +37 @@
 
 #include "orxonox/objects/worldentities/ControllableEntity.h"
+#include "orxonox/objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -51 +52 @@
     this->bIsDestination_ = false;
     //this->setVisible(true);
+
+    this->notifyMaskUpdate();
   }
 
@@ -87 +90 @@
      }
   }
+
+  void CheckPoint::notifyMaskUpdate()
+  {
+      this->targetMask_.exclude(Class(BaseObject));
+      this->targetMask_.include(Class(Pawn));
+  }
 }

code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h

@@ -57 +57 @@
     private:
       virtual void triggered(bool bIsTriggered); 
+      virtual void notifyMaskUpdate();
 
       inline void setDestination(bool isDestination)

code/branches/gametypes/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -35 +35 @@
 #include "core/XMLPort.h"
 
-#include "orxonox/objects/worldentities/ControllableEntity.h"
+#include "orxonox/objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -109 +109 @@
     WEMask.include(Class(WorldEntity));
     this->targetMask_ *= WEMask;
+
+    this->notifyMaskUpdate();
   }
 
@@ -133 +135 @@
         if(this->isForPlayer())
         {
-          ControllableEntity* player = dynamic_cast<ControllableEntity*>(entity);
+          Pawn* player = dynamic_cast<Pawn*>(entity);
           this->setTriggeringPlayer(player);
         }

code/branches/gametypes/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h

@@ -63 +63 @@
     protected:
       virtual bool isTriggered(TriggerMode mode);
+      virtual void notifyMaskUpdate() {}
+
+      ClassTreeMask targetMask_;
 
     private:
-      ClassTreeMask targetMask_;
       std::set<Ogre::Node*> targetSet_;
       float distance_;

code/branches/gametypes/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h

@@ -60 +60 @@
         @return Returns a pointer to the ControllableEntity that triggered the PlayerTrigger.
         */
-        inline ControllableEntity* getTriggeringPlayer(void) const
+        inline Pawn* getTriggeringPlayer(void) const
             { return this->player_; }
         
@@ -77 +77 @@
         @param player A pointer to the ControllableEntity that triggered the PlayerTrigger.
         */
-        inline void setTriggeringPlayer(ControllableEntity* player)
+        inline void setTriggeringPlayer(Pawn* player)
            { this->player_ = player; }
 
@@ -88 +88 @@
         
     private:
-        ControllableEntity* player_; //!< The player that triggered the PlayerTrigger.
+        Pawn* player_; //!< The player that triggered the PlayerTrigger.
         bool isForPlayer_; //!< Is true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities.