Changeset 8668 for code/branches/presentation/src/orxonox/interfaces

Timestamp:

May 29, 2011, 7:15:43 PM (14 years ago)

Author:

landauf

Message:

small cleanup

Location:

code/branches/presentation/src/orxonox/interfaces

Files:

• InterfaceCompilation.cc (modified) (2 diffs)
• PlayerTrigger.h (modified) (2 diffs)

code/branches/presentation/src/orxonox/interfaces/InterfaceCompilation.cc

@@ -42 +42 @@
 #include "core/CoreIncludes.h"
 
+#include "infos/PlayerInfo.h"
+#include "worldentities/pawns/Pawn.h"
+
 namespace orxonox
 {
@@ -60 +63 @@
 
         this->isForPlayer_ = false;
+    }
+
+    void PlayerTrigger::setTriggeringPawn(Pawn* pawn)
+    {
+        assert(pawn);
+        this->pawn_ = WeakPtr<Pawn>(pawn);
+        if (pawn)
+            this->player_ = WeakPtr<PlayerInfo>(pawn->getPlayer());
     }
 

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

@@ -39 +39 @@
 
 #include "core/OrxonoxClass.h"
-
-#include "infos/PlayerInfo.h"
-#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -86 +83 @@
         @param player A pointer to the Pawn that triggered the PlayerTrigger.
         */
-        inline void setTriggeringPawn(Pawn* pawn)
-           { assert(pawn); this->player_ = WeakPtr<PlayerInfo>(pawn->getPlayer()); this->pawn_ = WeakPtr<Pawn>(pawn); }
+        void setTriggeringPawn(Pawn* pawn);
 
         /**