Changeset 11727 for code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h

Timestamp:

Feb 11, 2018, 3:44:49 PM (6 years ago)

Author:

landauf

Message:

[Asteroid_HS17] cleanup (mostly includes)

File:

• code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h (modified) (2 diffs)

code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DShip.h

@@ -38 +38 @@
 #include "asteroids2D/Asteroids2DPrereqs.h"
 
-
-#include "core/XMLPort.h"
 #include "worldentities/pawns/SpaceShip.h"
-#include "weapons/WeaponsPrereqs.h"
-#include "graphics/Camera.h"
-
-#include "Asteroids2D.h" // Is necessary for getGame function
-//#include "Asteroids2DCenterPoint.h"
-#include "Asteroids2DStone.h"
-
 #include "tools/Timer.h"
-
 
 namespace orxonox
@@ -67 +57 @@
 
             virtual inline bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
-
-            bool isFireing;
             
             /*Functions that can be helpful while debugging.