Changeset 10733 for code/branches/cpp11_v2/src/modules/invader/InvaderShip.h

Timestamp:

Oct 31, 2015, 6:11:53 PM (8 years ago)

Author:

landauf

Message:

merged branch cpp11 to cpp11_v2

Location:

code/branches/cpp11_v2

Files:

• . (modified) (1 prop)
• src/modules/invader/InvaderShip.h (modified) (2 diffs)

code/branches/cpp11_v2/src/modules/invader/InvaderShip.h

@@ -37 +37 @@
 #include "invader/InvaderPrereqs.h"
 
+#include "weapons/WeaponsPrereqs.h"
 #include "worldentities/pawns/SpaceShip.h"
-#include "graphics/Camera.h"
-#include "weapons/projectiles/Projectile.h"
 
 namespace orxonox
@@ -61 +60 @@
             virtual void rotatePitch(const Vector2& value){};
             //return to main menu if game has ended.
-            virtual void rotateRoll(const Vector2& value){if (getGame()) if (getGame()->bEndGame) getGame()->end();};
+            virtual void rotateRoll(const Vector2& value);
 
             virtual void updateLevel();