- Timestamp:
- Oct 31, 2015, 6:11:53 PM (8 years ago)
- Location:
- code/branches/cpp11_v2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/cpp11_v2
- Property svn:mergeinfo changed
/code/branches/cpp11 (added) merged: 10439-10441,10443,10545
- Property svn:mergeinfo changed
-
code/branches/cpp11_v2/src/modules/invader/InvaderShip.cc
r10624 r10733 37 37 #include "core/XMLPort.h" 38 38 #include "Invader.h" 39 #include "InvaderEnemy.h" 40 #include "graphics/Camera.h" 41 #include "weapons/projectiles/Projectile.h" 39 42 40 43 namespace orxonox … … 139 142 isFireing = bBoost; 140 143 } 144 void InvaderShip::rotateRoll(const Vector2& value) 145 { 146 if (getGame()) 147 if (getGame()->bEndGame) 148 getGame()->end(); 149 } 141 150 inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint) 142 151 {
Note: See TracChangeset
for help on using the changeset viewer.