Changeset 5727 for code/branches/libraries2/src/orxonox/interfaces/PlayerTrigger.h

Timestamp:

Aug 31, 2009, 9:18:17 PM (15 years ago)

Author:

landauf

Message:

PlayerTrigger is now an interface instead of a child of Trigger. DistanceTrigger inherits now from Trigger AND PlayerTrigger.

File:

• code/branches/libraries2/src/orxonox/interfaces/PlayerTrigger.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h) (3 diffs)

code/branches/libraries2/src/orxonox/interfaces/PlayerTrigger.h

@@ -37 +37 @@
 
 #include "OrxonoxPrereqs.h"
-#include "Trigger.h"
+#include "core/OrxonoxClass.h"
 
 namespace orxonox
@@ -47 +47 @@
         Damian 'Mozork' Frick
     */
-    class _OrxonoxExport PlayerTrigger : public Trigger
+    class _OrxonoxExport PlayerTrigger : virtual public OrxonoxClass
     {
     public:
-        PlayerTrigger(BaseObject* creator);
-        virtual ~PlayerTrigger();
-
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PlayerTrigger object through XML.
+        PlayerTrigger();
+        virtual ~PlayerTrigger() {}
 
         /**
@@ -70 +68 @@
 
     protected:
-        virtual bool isTriggered(TriggerMode::Value mode) = 0;
-
         /**
         @brief Set the player that triggered the PlayerTrigger. This is normally done by classes inheriting vom PlayerTrigger.