Index: code/branches/libraries2/src/modules/objects/triggers/CMakeLists.txt
===================================================================
--- code/branches/libraries2/src/orxonox/objects/worldentities/triggers/CMakeLists.txt	(revision 5720)
+++ code/branches/libraries2/src/modules/objects/triggers/CMakeLists.txt	(revision 5728)
@@ -3,5 +3,4 @@
   DistanceTrigger.cc
   EventTrigger.cc
-  PlayerTrigger.cc
   CheckPoint.cc
 )
Index: code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc
===================================================================
--- code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc	(revision 5720)
+++ code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.cc	(revision 5728)
@@ -37,5 +37,5 @@
   CreateFactory(DistanceTrigger);
 
-  DistanceTrigger::DistanceTrigger(BaseObject* creator) : PlayerTrigger(creator)
+  DistanceTrigger::DistanceTrigger(BaseObject* creator) : Trigger(creator)
   {
     RegisterObject(DistanceTrigger);
Index: code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.h
===================================================================
--- code/branches/libraries2/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h	(revision 5720)
+++ code/branches/libraries2/src/modules/objects/triggers/DistanceTrigger.h	(revision 5728)
@@ -34,9 +34,10 @@
 #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,5 +68,5 @@
       std::set<Ogre::Node*> targetSet_;
       float distance_;
-      
+
   };
 }
Index: code/branches/libraries2/src/modules/objects/triggers/PlayerTrigger.cc
===================================================================
--- code/branches/libraries2/src/orxonox/objects/worldentities/triggers/PlayerTrigger.cc	(revision 5720)
+++ 	(revision )
@@ -1,68 +1,0 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Damian 'Mozork' Frick
- *   Co-authors:
- *      ...
- *
- */
-
-/**
-    @file
-    @brief
-    Implementation of the PlayerTrigger class.
-*/
-
-#include "PlayerTrigger.h"
-#include "core/CoreIncludes.h"
-
-namespace orxonox
-{
-    /**
-    @brief
-        Constructor. Registers the object and initializes defaults.
-    */
-    PlayerTrigger::PlayerTrigger(BaseObject* creator) : Trigger(creator)
-    {
-        RegisterObject(PlayerTrigger);
-
-        this->player_ = NULL;
-        this->isForPlayer_ = true;
-    }
-
-    /**
-    @brief
-        Destructor.
-    */
-    PlayerTrigger::~PlayerTrigger()
-    {
-    }
-
-    /**
-    @brief
-        Method for creating a QuestEffectBeacon object through XML.
-    */
-    void PlayerTrigger::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(PlayerTrigger, XMLPort, xmlelement, mode);
-    }
-}
Index: code/branches/libraries2/src/modules/objects/triggers/PlayerTrigger.h
===================================================================
--- code/branches/libraries2/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h	(revision 5720)
+++ 	(revision )
@@ -1,96 +1,0 @@
-/*
- *   ORXONOX - the hottest 3D action shooter ever to exist
- *                    > www.orxonox.net <
- *
- *
- *   License notice:
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation; either version 2
- *   of the License, or (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- *   Author:
- *      Damian 'Mozork' Frick
- *   Co-authors:
- *      ...
- *
- */
-
-/**
-    @file
-    @brief
-    Definition of the PlayerTrigger class.
-*/
-
-#ifndef _PlayerTrigger_H__
-#define _PlayerTrigger_H__
-
-#include "OrxonoxPrereqs.h"
-#include "Trigger.h"
-
-namespace orxonox
-{
-    /**
-    @brief
-        A PlayerTrigger is a trigger which is normally triggered by ControllableEntities and can as such return a pointer to the ControllableEntity which triggered it.
-    @author
-        Damian 'Mozork' Frick
-    */
-    class _OrxonoxExport PlayerTrigger : public Trigger
-    {
-    public:
-        PlayerTrigger(BaseObject* creator);
-        virtual ~PlayerTrigger();
-
-        virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a PlayerTrigger object through XML.
-
-        /**
-        @brief Returns the player that triggered the PlayerTrigger.
-        @return Returns a pointer to the ControllableEntity that triggered the PlayerTrigger.
-        */
-        inline Pawn* getTriggeringPlayer(void) const
-            { return this->player_; }
-
-        /**
-        @brief Checks whether the PlayerTrigger normally returns a ControllableEntity.
-        @return Returns true if the PlayerTrigger normally returns a ControllableEntity.
-        */
-        inline bool isForPlayer(void) const
-           { return this->isForPlayer_; }
-
-    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.
-        @param player A pointer to the ControllableEntity that triggered the PlayerTrigger.
-        */
-        inline void setTriggeringPlayer(Pawn* player)
-           { this->player_ = player; }
-
-            /**
-            @brief Set whether the PlayerTrigger normally is triggered by ControllableEntities.
-            @param isForPlayer Should be true when the PlayerTrigger should be set to normally be triggered by ControllableEntities, false if not.
-            */
-        inline void setForPlayer(bool isForPlayer)
-           { this->isForPlayer_ = isForPlayer; }
-
-    private:
-        Pawn* player_; //!< The player that triggered the PlayerTrigger.
-        bool isForPlayer_; //!< Is true when the PlayerTrigger should be set to normally be triggered by ControllableEntities.
-
-    };
-
-}
-
-#endif /* _PlayerTrigger_H__ */
