Changeset 5727 for code/branches/libraries2/src/orxonox/objects

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.

Location:

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

Files:

• CMakeLists.txt (modified) (1 diff)
• DistanceTrigger.cc (modified) (1 diff)
• DistanceTrigger.h (modified) (2 diffs)
• PlayerTrigger.cc (deleted)

code/branches/libraries2/src/orxonox/objects/worldentities/triggers/CMakeLists.txt

@@ -3 +3 @@
   DistanceTrigger.cc
   EventTrigger.cc
-  PlayerTrigger.cc
   CheckPoint.cc
 )

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

@@ -37 +37 @@
   CreateFactory(DistanceTrigger);
 
-  DistanceTrigger::DistanceTrigger(BaseObject* creator) : PlayerTrigger(creator)
+  DistanceTrigger::DistanceTrigger(BaseObject* creator) : Trigger(creator)
   {
     RegisterObject(DistanceTrigger);

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

@@ -34 +34 @@
 #include <set>
 #include "core/ClassTreeMask.h"
-#include "PlayerTrigger.h"
+#include "Trigger.h"
+#include "interfaces/PlayerTrigger.h"
 
 namespace orxonox
 {
-  class _OrxonoxExport DistanceTrigger : public PlayerTrigger
+  class _OrxonoxExport DistanceTrigger : public Trigger, public PlayerTrigger
   {
     public:
@@ -67 +68 @@
       std::set<Ogre::Node*> targetSet_;
       float distance_;
-      
+
   };
 }