Changeset 6295 for code/branches/presentation2/src/orxonox/controllers/Controller.h

Timestamp:

Dec 9, 2009, 4:54:20 PM (15 years ago)

Author:

wirthmi

Message:

Changed a function call when hit from damage() to hit(). Pass through to controller

File:

• code/branches/presentation2/src/orxonox/controllers/Controller.h (modified) (1 diff)

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

@@ -50 +50 @@
                 { return this->player_; }
 
+            virtual inline void hit(Pawn* originator, btManifoldPoint& contactpoint, float damage) {};
+
             inline ControllableEntity* getControllableEntity() const
                 { return this->controllableEntity_; }