Changeset 10319

Timestamp:

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

Author:

erbj

Message:

tower now inherits from turret

Location:

code/branches/towerdefenseFS15/src/modules/towerdefense

Files:

• CMakeLists.txt (modified) (2 diffs)
• Tower.cc (deleted)
• Tower.h (deleted)
• TowerDefense.cc (modified) (4 diffs)
• TowerDefenseTower.cc (modified) (1 diff)
• TowerDefenseTower.h (modified) (1 diff)
• TowerTurret.cc (deleted)
• TowerTurret.h (deleted)

code/branches/towerdefenseFS15/src/modules/towerdefense/CMakeLists.txt

@@ -2 +2 @@
   TowerDefense.cc
   TowerDefenseTower.cc
-  TowerTurret.cc
   TowerDefenseCenterpoint.cc
   TowerDefenseHUDController.cc
@@ -17 +16 @@
     orxonox
     overlays
+    objects
   SOURCE_FILES ${TOWERDEFENSE_SRC_FILES}
 )

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

@@ -77 +77 @@
 #include "TowerDefenseCenterpoint.h"
 //#include "TDCoordinate.h"
-#include "TowerTurret.h"
 #include "worldentities/SpawnPoint.h"
 #include "worldentities/pawns/Pawn.h"
@@ -141 +140 @@
         }
 
+        //the path of the spacehips has to be blocked, so that no towers can be build there
         for (int k=0; k<3; k++)
             towermatrix[1][k]=true;
@@ -153 +153 @@
 
         //set initial credits, lifes and WaveNumber
-        this->setCredit(200);
+        this->setCredit(1000);
         this->setLifes(50);
         this->setWaveNumber(0);
@@ -159 +159 @@
 
         //adds initial towers
+        /*
         for (int i=0; i <7; i++){
             addTower(i+3,4);
-        }/*
-        for (int j=0; j < 7; j++){
-            addTower(9,j+5);
-        }*/
+        }
+        */
     }
 

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();

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

@@ -20 +20 @@
 #include "towerdefense/TowerDefensePrereqs.h"
 #include "worldentities/pawns/SpaceShip.h"
+#include "objects/Turret.h"
 
 
 namespace orxonox
 {
-    class _TowerDefenseExport TowerDefenseTower : public Pawn
+    class _TowerDefenseExport TowerDefenseTower : public Turret
     {
     public: