Changeset 8668

Timestamp:

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

Author:

landauf

Message:

small cleanup

Location:

code/branches/presentation/src/orxonox

Files:

• controllers/Controller.h (modified) (1 diff)
• interfaces/InterfaceCompilation.cc (modified) (2 diffs)
• interfaces/PlayerTrigger.h (modified) (2 diffs)
• worldentities/pawns/SpaceShip.cc (modified) (2 diffs)

code/branches/presentation/src/orxonox/controllers/Controller.h

@@ -50 +50 @@
                 { return this->player_; }
 
-            virtual inline void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {};
+            virtual void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {};
 
 /* Override needed for different visual effects (e.g. in "NewHumanController.cc") depending on

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);
 
         /**

code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -245 +245 @@
         Pawn::rotateYaw(value);
 
-                //This function call adds a lift to the ship when it is rotating to make it's movement more "realistic" and enhance the feeling.
+        //This function call adds a lift to the ship when it is rotating to make it's movement more "realistic" and enhance the feeling.
         if (abs(this-> getLocalVelocity().z) < stallSpeed_)  {this->moveRightLeft(-lift_ / 5 * value * sqrt(abs(this-> getLocalVelocity().z)));}
     }
@@ -255 +255 @@
         Pawn::rotatePitch(value);
 
-                //This function call adds a lift to the ship when it is pitching to make it's movement more "realistic" and enhance the feeling.
+        //This function call adds a lift to the ship when it is pitching to make it's movement more "realistic" and enhance the feeling.
         if (abs(this-> getLocalVelocity().z) < stallSpeed_)  {this->moveUpDown(lift_ / 5 * value * sqrt(abs(this-> getLocalVelocity().z)));}
     }