Changeset 10629 for code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h

Timestamp:

Oct 10, 2015, 4:34:26 PM (9 years ago)

Author:

fvultier

Message:

Merged towerdefenseFabien branch back to trunk. The towerdefense Minigame is now a plugin.

File:

• code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h (modified) (2 diffs)

code/trunk/src/modules/towerdefense/TowerDefenseEnemy.h

@@ -22 +22 @@
 #include "worldentities/pawns/SpaceShip.h"
 #include "util/Output.h"
-#include "controllers/ArtificialController.h"
 #include "TowerDefense.h"
 
@@ -39 +38 @@
 
         virtual void tick(float dt);
-        void addWaypoint(TDCoordinate* coord);
-        void popWaypoint();
-        TDCoordinate peekWaypoint();
-
-        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs);
-
+        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
 
     private:
-        TowerDefense* getGame();
+        WeakPtr<TowerDefense> getGame();
         WeakPtr<TowerDefense> game;
         TowerDefense* td;
         bool once_;
-        std::vector<TDCoordinate*> Waypointsvector_;
-
     };