Changeset 10629 for code/trunk/src/modules/towerdefense/TowerDefenseTower.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/TowerDefenseTower.h (modified) (3 diffs)

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

@@ -19 +19 @@
 
 #include "towerdefense/TowerDefensePrereqs.h"
-#include "worldentities/pawns/SpaceShip.h"
 #include "objects/Turret.h"
 
@@ -38 +37 @@
 
         // Overriding these to stop TowerDefenseTowers from spasing out
-        /*
-        void setOrientation(const Quaternion& orientation);
-        virtual void rotateYaw(const Vector2& value);
-        virtual void rotatePitch(const Vector2& value);
-        virtual void rotateRoll(const Vector2& value);
-        */
+        //void setOrientation(const Quaternion& orientation);
+        //virtual void rotateYaw(const Vector2& value);
+        //virtual void rotatePitch(const Vector2& value);
+        //virtual void rotateRoll(const Vector2& value);
         virtual bool upgradeTower();
 
@@ -49 +46 @@
         void setGame(TowerDefense* Towerdefense)
         { assert(Towerdefense); game_ = Towerdefense; }
-        int upgrade;
-        int upgradeMax;
     private:
         TowerDefense* game_;
-
+        int upgrade;
     };
 }