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

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.cc (modified) (2 diffs)

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

@@ -30 +30 @@
         //needed to keep track of the PlayerStats coded in TowerDefense.h
         this->td = orxonox_cast<TowerDefense*>(this->getGametype());
-        once_=false;
+        once_ = false;
+    }
+
+    TowerDefenseEnemy::~TowerDefenseEnemy()
+    {
 
     }
-    //add credit if enemy is destroyed
-    TowerDefenseEnemy::~TowerDefenseEnemy(){
 
-        if (this->isInitialized())
-        {
-                getGame()->addCredit(1);
-        }
+    void TowerDefenseEnemy::tick(float dt)
+    {   
+        //orxout() << "TDE tick1" << endl;
+        SUPER(TowerDefenseEnemy, tick, dt);
+        //orxout() << "TDE tick2" << endl;
     }
 
-    void TowerDefenseEnemy::addWaypoint(TDCoordinate* coord)
-    {
-        this->Waypointsvector_.push_back(coord);
-    }
-
-
-    void TowerDefenseEnemy::tick(float dt)
-    {
-        SUPER(TowerDefenseEnemy, tick, dt);
-    }
-
-    TowerDefense* TowerDefenseEnemy::getGame()
+    WeakPtr<TowerDefense> TowerDefenseEnemy::getGame()
     {
         if (game == NULL)
@@ -63 +55 @@
     }
 
-    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator, const btCollisionShape* cs)
+    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
     {
-        Pawn::damage(damage, healthdamage, shielddamage, originator, cs);
+        Pawn::damage(damage, healthdamage, shielddamage, originator);
+        
         if (getGame() && once_ == false && getHealth() <= 0)
         {
-                orxout() << "damagefunctionIF" << endl;
             getGame()->addCredit(1);
             once_ = true;
         }
-        orxout() << "damagefunction" << endl;
-
     }
-
-/*
-    void TowerDefenseEnemy::popWaypoint()
-    {
-        if(Waypointsvector_.size()>0)
-            Waypointsvector_.pop_back();
-    }
-
-    TDCoordinate TowerDefenseEnemy::peekWaypoint()
-    {
-        if(Waypointsvector_.size()<=0){
-            TDCoordinate* coord = TDCoordinate(-1,-1);
-            return coord;
-        }else{
-            return Waypointsvector_.at(Waypointsvector_.size()-1);
-
-        }
-
-
-    }
-*/
-
 }