Changeset 10443 for code/branches/cpp11/src/modules/invader

Timestamp:

May 17, 2015, 9:45:02 PM (10 years ago)

Author:

landauf

Message:

fixed includes to make it compile without build units

Location:

code/branches/cpp11/src/modules/invader

Files:

• Invader.cc (modified) (1 diff)
• Invader.h (modified) (2 diffs)
• InvaderEnemy.cc (modified) (1 diff)
• InvaderEnemy.h (modified) (1 diff)
• InvaderEnemyShooter.cc (modified) (1 diff)
• InvaderHUDinfo.cc (modified) (1 diff)
• InvaderShip.cc (modified) (2 diffs)
• InvaderShip.h (modified) (2 diffs)
• InvaderWeapon.h (modified) (1 diff)
• InvaderWeaponEnemy.cc (modified) (1 diff)
• InvaderWeaponEnemy.h (modified) (1 diff)

code/branches/cpp11/src/modules/invader/Invader.cc

@@ -134 +134 @@
     }
 
+    void Invader::setCenterpoint(InvaderCenterPoint* center)
+    {
+        this->center_ = center;
+    }
+
     void Invader::costLife()
     {

code/branches/cpp11/src/modules/invader/Invader.h

@@ -39 +39 @@
 
 #include "gametypes/Deathmatch.h"
-
-#include "InvaderCenterPoint.h"
-
 #include "tools/Timer.h"
 
@@ -58 +55 @@
             void spawnEnemy();
 
-            void setCenterpoint(InvaderCenterPoint* center)
-            { this->center_ = center; }
+            void setCenterpoint(InvaderCenterPoint* center);
 
             int getLives(){return this->lives;}

code/branches/cpp11/src/modules/invader/InvaderEnemy.cc

@@ -32 +32 @@
 */
 
-#include "invader/InvaderPrereqs.h"
 #include "InvaderEnemy.h"
+
+#include "core/CoreIncludes.h"
+#include "Invader.h"
 #include "InvaderShip.h"
 

code/branches/cpp11/src/modules/invader/InvaderEnemy.h

@@ -37 +37 @@
 #include "invader/InvaderPrereqs.h"
 
-#include "worldentities/pawns/SpaceShip.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox

code/branches/cpp11/src/modules/invader/InvaderEnemyShooter.cc

@@ -32 +32 @@
 */
 
-#include "invader/InvaderPrereqs.h"
 #include "InvaderEnemyShooter.h"
-// #include "worldentities/pawns/SpaceShip.h"
+
+#include "core/CoreIncludes.h"
+#include "core/command/Executor.h"
+#include "Invader.h"
+#include "InvaderShip.h"
 
 namespace orxonox

code/branches/cpp11/src/modules/invader/InvaderHUDinfo.cc

@@ -30 +30 @@
 #include "core/XMLPort.h"
 #include "util/Convert.h"
-// #include "Invader.h"
+#include "Invader.h"
 
 namespace orxonox

code/branches/cpp11/src/modules/invader/InvaderShip.cc

@@ -37 +37 @@
 #include "core/XMLPort.h"
 #include "Invader.h"
+#include "InvaderEnemy.h"
+#include "graphics/Camera.h"
+#include "weapons/projectiles/Projectile.h"
 
 namespace orxonox
@@ -139 +142 @@
         isFireing = bBoost;
     }
+    void InvaderShip::rotateRoll(const Vector2& value)
+    {
+        if (getGame())
+            if (getGame()->bEndGame)
+                getGame()->end();
+    }
     inline bool InvaderShip::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {

code/branches/cpp11/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();

code/branches/cpp11/src/modules/invader/InvaderWeapon.h

@@ -35 +35 @@
 #define _InvaderWeapon_H__
 
+#include "invader/InvaderPrereqs.h"
+
+#include "weapons/WeaponsPrereqs.h"
 #include "weapons/weaponmodes/HsW01.h"
-#include "weapons/WeaponsPrereqs.h"
-
-#include "tools/Timer.h"
 
 namespace orxonox

code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.cc

@@ -34 +34 @@
 #include "InvaderWeaponEnemy.h"
 
+#include "core/CoreIncludes.h"
+#include "weapons/projectiles/Projectile.h"
+
 namespace orxonox
 {

code/branches/cpp11/src/modules/invader/InvaderWeaponEnemy.h

@@ -35 +35 @@
 #define _InvaderWeaponEnemy_H__
 
-// #include "weapons/weaponmodes/HsW01.h"
-// #include "weapons/WeaponsPrereqs.h"
-#include "invader/InvaderWeapon.h"
+#include "invader/InvaderPrereqs.h"
+
+#include "InvaderWeapon.h"
 #include "tools/Timer.h"