Changeset 11727 for code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc

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/Asteroids2DWeapon.cc (modified) (3 diffs)

code/branches/Presentation_HS17_merge/src/modules/asteroids2D/Asteroids2DWeapon.cc

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-// #include "core/XMLPort.h"
-// #include "core/command/Executor.h"
 
 #include "graphics/Model.h"
@@ -42 +40 @@
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/WeaponSystem.h"
-#include "worldentities/WorldEntity.h"
-#include "worldentities/pawns/Pawn.h"
 
 #include "weapons/projectiles/Projectile.h"
 #include "weapons/MuzzleFlash.h"
-
-#include "Asteroids2D.h"
 
 namespace orxonox
@@ -65 +59 @@
 
     }
-
-    Asteroids2D* Asteroids2DWeapon::getGame()
-    {
-        if (game == nullptr)
-        {
-            for (Asteroids2D* race : ObjectList<Asteroids2D>())
-            {
-                game = race;
-            }
-        }
-        return game;
-    }
-
 
     void Asteroids2DWeapon::shot()