- Timestamp:
- Jan 10, 2016, 1:54:11 PM (8 years ago)
- Location:
- code/branches/cpp11_v3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v3
- Property svn:mergeinfo changed
-
code/branches/cpp11_v3/src/modules/dodgerace/DodgeRaceShip.h
r10624 r11054 52 52 DodgeRaceShip(Context* context); 53 53 54 virtual void tick(float dt) ;54 virtual void tick(float dt) override; 55 55 56 56 // overwrite for 2d movement 57 virtual void moveFrontBack(const Vector2& value) ;58 virtual void moveRightLeft(const Vector2& value) ;57 virtual void moveFrontBack(const Vector2& value) override; 58 virtual void moveRightLeft(const Vector2& value) override; 59 59 60 60 // Starts or stops fireing 61 virtual void boost(bool bBoost) ;61 virtual void boost(bool bBoost) override; 62 62 63 63 //no rotation! 64 virtual void rotateYaw(const Vector2& value) {};65 virtual void rotatePitch(const Vector2& value) {};64 virtual void rotateYaw(const Vector2& value) override{}; 65 virtual void rotatePitch(const Vector2& value) override{}; 66 66 67 67 //return to main menu if game has ended. 68 virtual void rotateRoll(const Vector2& value) {if (getGame()) if (getGame()->bEndGame) getGame()->end();};68 virtual void rotateRoll(const Vector2& value) override{if (getGame()) if (getGame()->bEndGame) getGame()->end();}; 69 69 70 70 virtual void updateLevel(); 71 72 virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override; 71 73 72 74 float speed, damping, posforeward; … … 74 76 75 77 protected: 76 virtual void death() ;78 virtual void death() override; 77 79 78 80 private: 79 virtual inline bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);80 81 DodgeRace* getGame(); 81 82 WeakPtr<DodgeRace> game;
Note: See TracChangeset
for help on using the changeset viewer.