Changeset 10388 for code

Timestamp:

Apr 23, 2015, 3:22:04 PM (9 years ago)

Author:

erbj

Message:

adjusted the TowerDefenseSelecter, but there is still a problem with the include (context in the TowerDefense.cc file

Location:

code/branches/towerdefenseFS15/src/modules/towerdefense

Files:

• TowerDefense.cc (modified) (2 diffs)
• TowerDefense.h (modified) (2 diffs)

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

@@ -88 +88 @@
 #include "core/command/ConsoleCommand.h"
 
+
 namespace orxonox
 {
@@ -108 +109 @@
         }*/
 
-        selectedPos = new TDCoordinate(0,0);
-//        TowerDefenseSelecter Selecter = new TowerDefenseSelecter();
+        this->Selecter = new TowerDefenseSelecter(context);
 
 

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

@@ -43 +43 @@
 #include "util/Output.h"
 #include "core/object/WeakPtr.h"
+#include "TowerDefenseSelecter.h"
+
 
 namespace orxonox
@@ -73 +75 @@
         int reduceLifes(int NumberofLifes){ return lifes_-=NumberofLifes; }
         TDCoordinate* selectedPos;
+        TowerDefenseSelecter* Selecter;
 
         //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);