Changeset 7758 for code/branches/network5/src/orxonox

Timestamp:

Dec 12, 2010, 11:13:01 PM (15 years ago)

Author:

scheusso

Message:

merging network4 into network5 branch

Location:

code/branches/network5

Files:

• . (modified) (1 prop)
• src/orxonox/gametypes/Gametype.cc (modified) (2 diffs)
• src/orxonox/gametypes/Gametype.h (modified) (1 diff)

code/branches/network5/src/orxonox/gametypes/Gametype.cc

@@ -79 +79 @@
         else
             this->scoreboard_ = 0;
+
+        /* HACK HACK HACK */
+        this->dedicatedAddBots_ = createConsoleCommand( "dedicatedAddBots", createExecutor( createFunctor(&Gametype::addBots, this) ) );
+        this->dedicatedKillBots_ = createConsoleCommand( "dedicatedKillBots", createExecutor( createFunctor(&Gametype::killBots, this) ) );
+        /* HACK HACK HACK */
     }
 
@@ -86 +91 @@
         {
             this->gtinfo_->destroy();
+            if( this->dedicatedAddBots_ )
+                delete this->dedicatedAddBots_;
+            if( this->dedicatedKillBots_ )
+                delete this->dedicatedKillBots_;
         }
     }

code/branches/network5/src/orxonox/gametypes/Gametype.h

@@ -184 +184 @@
             // Config Values
             std::string scoreboardTemplate_;
+
+            /* HACK HACK HACK */
+            ConsoleCommand* dedicatedAddBots_;
+            ConsoleCommand* dedicatedKillBots_;
+            /* HACK HACK HACK */
     };
 }