Changeset 7219 for code/branches/consolecommands3/src/libraries/network

Timestamp:

Aug 26, 2010, 12:09:12 AM (14 years ago)

Author:

landauf

Message:

adapted all console commands to the new interface

Location:

code/branches/consolecommands3/src/libraries/network

Files:

• Host.cc (modified) (3 diffs)
• Host.h (modified) (1 diff)

code/branches/consolecommands3/src/libraries/network/Host.cc

@@ -38 +38 @@
 namespace orxonox {
 
-  SetConsoleCommandShortcut(Host, Chat);
+  static const std::string __CC_printRTT_name = "printRTT";
+
+  _SetConsoleCommand("chat", &Host::Chat);
+  _SetConsoleCommand(__CC_printRTT_name, &Host::printRTT);
 
   // Host*               Host::instance_=0;
@@ -52 +55 @@
   //   assert(instance_==0);
     instances_s.push_back(this);
-    this->printRTTCC_ = createConsoleCommand( createFunctor(&Host::printRTT, this), "printRTT" );
-    CommandExecutor::addConsoleCommandShortcut( this->printRTTCC_ );
+    _ModifyConsoleCommand(__CC_printRTT_name).setObject(this);
     this->bIsActive_ = false;
   }
@@ -65 +67 @@
     assert( std::find( instances_s.begin(), instances_s.end(), this )!=instances_s.end() );
     instances_s.erase(std::find( instances_s.begin(), instances_s.end(), this ));
-    if( this->printRTTCC_ )
-      delete this->printRTTCC_;
+    _ModifyConsoleCommand(__CC_printRTT_name).setObject(0);
   }
 

code/branches/consolecommands3/src/libraries/network/Host.h

@@ -85 +85 @@
     bool isActive(){ return bIsActive_; }
   private:
-    ConsoleCommand* printRTTCC_;
     static uint32_t clientID_s;
     static uint32_t shipID_s;