[Orxonox-commit 5690] r10350 - code/branches/core7/src/modules/towerdefense

[landauf at orxonox.net]

Author: landauf
Date: 2015-04-06 22:40:54 +0200 (Mon, 06 Apr 2015)
New Revision: 10350

Modified:
   code/branches/core7/src/modules/towerdefense/TowerDefense.cc
   code/branches/core7/src/modules/towerdefense/TowerDefense.h
Log:
removed hack

Modified: code/branches/core7/src/modules/towerdefense/TowerDefense.cc
===================================================================
--- code/branches/core7/src/modules/towerdefense/TowerDefense.cc	2015-04-06 20:18:25 UTC (rev 10349)
+++ code/branches/core7/src/modules/towerdefense/TowerDefense.cc	2015-04-06 20:40:54 UTC (rev 10350)
@@ -90,6 +90,12 @@
 
 namespace orxonox
 {
+    static const std::string __CC_addTower_name  = "addTower";
+    static const std::string __CC_upgradeTower_name = "upgradeTower";
+
+    SetConsoleCommand("TowerDefense", __CC_addTower_name,  &TowerDefense::addTower ).addShortcut().defaultValues(1);
+    SetConsoleCommand("TowerDefense", __CC_upgradeTower_name, &TowerDefense::upgradeTower).addShortcut().defaultValues(0);
+
     RegisterUnloadableClass(TowerDefense);
 
     TowerDefense::TowerDefense(Context* context) : Deathmatch(context)
@@ -106,9 +112,8 @@
 
         //this->stats_ = new TowerDefensePlayerStats();
 
-        /* Temporary hack to allow the player to add towers and upgrade them */
-        this->dedicatedAddTower_ = new ConsoleCommand( "addTower", createExecutor( createFunctor(&TowerDefense::addTower, this) ) );
-        this->dedicatedUpgradeTower_ = new ConsoleCommand( "upgradeTower", createExecutor( createFunctor(&TowerDefense::upgradeTower, this) ) );
+        ModifyConsoleCommand(__CC_addTower_name).setObject(this);
+        ModifyConsoleCommand(__CC_upgradeTower_name).setObject(this);
     }
 
     TowerDefense::~TowerDefense()
@@ -116,8 +121,8 @@
         /* Part of a temporary hack to allow the player to add towers */
         if (this->isInitialized())
         {
-            if( this->dedicatedAddTower_ )
-                delete this->dedicatedAddTower_;
+            ModifyConsoleCommand(__CC_addTower_name).setObject(NULL);
+            ModifyConsoleCommand(__CC_upgradeTower_name).setObject(NULL);
         }
     }
 

Modified: code/branches/core7/src/modules/towerdefense/TowerDefense.h
===================================================================
--- code/branches/core7/src/modules/towerdefense/TowerDefense.h	2015-04-06 20:18:25 UTC (rev 10349)
+++ code/branches/core7/src/modules/towerdefense/TowerDefense.h	2015-04-06 20:40:54 UTC (rev 10350)
@@ -84,9 +84,6 @@
         void addTower(int x, int y);
 
         void upgradeTower(int x, int y);
-        /* Part of a temporary hack to allow the player to add towers */
-        ConsoleCommand* dedicatedAddTower_;
-        ConsoleCommand* dedicatedUpgradeTower_;
 
         //TODO: void spawnNewWave()
         //TODO: create a timer which regularly calls the spawnNewWave function  (time driven)