Changeset 10256 for code/branches

Timestamp:

Feb 5, 2015, 11:21:35 PM (10 years ago)

Author:

landauf

Message:

found some hidden changes in a merge commit in presentationHS14 and applied it to this branch.
cleanup in Mini4DgamePrereqs.h

Location:

code/branches/presentationHS14merge/src/modules

Files:

• mini4dgame/Mini4DgamePrereqs.h (modified) (2 diffs)
• towerdefense/TowerDefenseEnemy.cc (modified) (2 diffs)
• towerdefense/TowerDefenseEnemy.h (modified) (1 diff)

code/branches/presentationHS14merge/src/modules/mini4dgame/Mini4DgamePrereqs.h

@@ -30 +30 @@
 @file
 @brief
-    Shared library macros, enums, constants and forward declarations for the pong module
+    Shared library macros, enums, constants and forward declarations for the mini4dgame module
 */
 
@@ -72 +72 @@
 }
 
-#endif /* _PongPrereqs_H__ */
+#endif /* _Mini4DgamePrereqs_H__ */

code/branches/presentationHS14merge/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().get());
+        once_=false;
 
     }
     //add credit if enemy is destroyed
     TowerDefenseEnemy::~TowerDefenseEnemy(){
-        this->td->addCredit(1);
+        //this->td->addCredit(1);
     }
 
@@ -48 +49 @@
     }
 
+    WeakPtr<TowerDefense> TowerDefenseEnemy::getGame()
+    {
+        if (game == NULL)
+        {
+            for (ObjectList<TowerDefense>::iterator it = ObjectList<TowerDefense>::begin(); it != ObjectList<TowerDefense>::end(); ++it)
+                game = *it;
+        }
+        return game;
+    }
+
+    void TowerDefenseEnemy::damage(float damage, float healthdamage, float shielddamage, Pawn* originator)
+    {
+        Pawn::damage(damage, healthdamage, shielddamage, originator);
+        if (getGame() && once_ == false && getHealth() <= 0)
+        {
+            getGame()->addCredit(1);
+            once_ = true;
+        }
+    }
 /*
     void TowerDefenseEnemy::popWaypoint()

code/branches/presentationHS14merge/src/modules/towerdefense/TowerDefenseEnemy.h

@@ -43 +43 @@
         TDCoordinate peekWaypoint();
 
+        virtual void damage(float damage, float healthdamage, float shielddamage, Pawn* originator);
+
 
     private:
+        WeakPtr<TowerDefense> getGame();
+        WeakPtr<TowerDefense> game;
         TowerDefense* td;
         bool once_;