Changeset 10319 for code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc

Timestamp:

Mar 19, 2015, 1:31:54 PM (9 years ago)

Author:

erbj

Message:

tower now inherits from turret

File:

• code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc (modified) (1 diff)

code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefenseTower.cc

@@ -22 +22 @@
         Constructor. Registers and initializes the object.
     */
-    TowerDefenseTower::TowerDefenseTower(Context* context) : Pawn(context)
+    TowerDefenseTower::TowerDefenseTower(Context* context) : Turret(context)
     {
         RegisterObject(TowerDefenseTower);
-
+        game_ =NULL;
         this->setCollisionType(WorldEntity::Dynamic);
         upgrade = 0;
+
+
+
 
         //this->removeAllEngines();