Changeset 10351

Timestamp:

Apr 7, 2015, 10:12:07 PM (9 years ago)

Author:

landauf

Message:

using the 'official' way to define a non-static console command

Location:

code/branches/towerdefenseFS15

Files:

• . (modified) (1 prop)
• src/modules/towerdefense/TowerDefense.cc (modified) (3 diffs)
• src/modules/towerdefense/TowerDefense.h (modified) (1 diff)

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

@@ -90 +90 @@
 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);
 
@@ -108 +114 @@
         //this->stats_ = new TowerDefensePlayerStats();
 
-        /* Temporary hack to allow the player to add towers and upgrade them */
-        this->dedicatedAddTower_ = createConsoleCommand( "addTower", createExecutor( createFunctor(&TowerDefense::addTower, this) ) );
-        this->dedicatedUpgradeTower_ = createConsoleCommand( "upgradeTower", createExecutor( createFunctor(&TowerDefense::upgradeTower, this) ) );
+        ModifyConsoleCommand(__CC_addTower_name).setObject(this);
+        ModifyConsoleCommand(__CC_upgradeTower_name).setObject(this);
     }
 
@@ -118 +123 @@
         if (this->isInitialized())
         {
-            if( this->dedicatedAddTower_ )
-                delete this->dedicatedAddTower_;
+            ModifyConsoleCommand(__CC_addTower_name).setObject(NULL);
+            ModifyConsoleCommand(__CC_upgradeTower_name).setObject(NULL);
         }
     }

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

@@ -86 +86 @@
 
         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()