Changeset 11071 for code/trunk/src/modules/invader/InvaderEnemy.h
- Timestamp:
- Jan 17, 2016, 10:29:21 PM (8 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/modules/invader/InvaderEnemy.h
r10625 r11071 37 37 #include "invader/InvaderPrereqs.h" 38 38 39 #include "worldentities/pawns/ SpaceShip.h"39 #include "worldentities/pawns/Pawn.h" 40 40 41 41 namespace orxonox … … 46 46 InvaderEnemy(Context* context); 47 47 48 virtual void tick(float dt) ;49 virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);50 virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) ;48 virtual void tick(float dt) override; 49 virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override; 50 virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs) override; 51 51 virtual void setPlayer(InvaderShip* player){this->player = player;} 52 52
Note: See TracChangeset
for help on using the changeset viewer.