[Orxonox-commit 5725] r10388 - code/branches/towerdefenseFS15/src/modules/towerdefense

[erbj at orxonox.net]

Author: erbj
Date: 2015-04-23 15:22:04 +0200 (Thu, 23 Apr 2015)
New Revision: 10388

Modified:
   code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc
   code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h
Log:
adjusted the TowerDefenseSelecter, but there is still a problem with the include (context in the TowerDefense.cc file

Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc	2015-04-23 12:01:20 UTC (rev 10387)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.cc	2015-04-23 13:22:04 UTC (rev 10388)
@@ -87,6 +87,7 @@
 /* Part of a temporary hack to allow the player to add towers */
 #include "core/command/ConsoleCommand.h"
 
+
 namespace orxonox
 {
     static const std::string __CC_addTower_name  = "addTower";
@@ -107,8 +108,7 @@
             }
         }*/
 
-        selectedPos = new TDCoordinate(0,0);
-//        TowerDefenseSelecter Selecter = new TowerDefenseSelecter();
+        this->Selecter = new TowerDefenseSelecter(context);
 
 
         this->setHUDTemplate("TowerDefenseHUD");

Modified: code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h	2015-04-23 12:01:20 UTC (rev 10387)
+++ code/branches/towerdefenseFS15/src/modules/towerdefense/TowerDefense.h	2015-04-23 13:22:04 UTC (rev 10388)
@@ -42,7 +42,9 @@
 #include "TowerDefenseEnemy.h"
 #include "util/Output.h"
 #include "core/object/WeakPtr.h"
+#include "TowerDefenseSelecter.h"
 
+
 namespace orxonox
 {
     class _TowerDefenseExport TowerDefense : public TeamDeathmatch
@@ -72,6 +74,7 @@
         void nextwave(){ TowerDefenseEnemyvector.clear(); waves_++; time=0;}
         int reduceLifes(int NumberofLifes){ return lifes_-=NumberofLifes; }
         TDCoordinate* selectedPos;
+        TowerDefenseSelecter* Selecter;
 
         //virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
         //virtual void playerScored(PlayerInfo* player, int score);