Changeset 7753 for code/branches/network4/src/orxonox

Timestamp:

Dec 10, 2010, 5:07:02 PM (14 years ago)

Author:

scheusso

Message:

-(hopefully) fixed that nasty bug
-some cleaning up
-readding hackaddbots and renaming it to dedicatedAddBots

Location:

code/branches/network4/src/orxonox

Files:

• gametypes/Gametype.cc (modified) (2 diffs)
• gametypes/Gametype.h (modified) (1 diff)
• worldentities/ControllableEntity.cc (modified) (2 diffs)

code/branches/network4/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/network4/src/orxonox/gametypes/Gametype.h

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

code/branches/network4/src/orxonox/worldentities/ControllableEntity.cc

@@ -87 +87 @@
         this->setPriority( Priority::VeryHigh );
         this->registerVariables();
-        COUT(0) << "CE creator" << endl;
-        if( GameMode::isMaster() )
-          callMemberNetworkFunction(ControllableEntity, fire, this->getObjectID(), 1, 0);
     }
 
@@ -244 +241 @@
     void ControllableEntity::fire(unsigned int firemode)
     {
-        COUT(0) << "fire........." << endl;
         if(GameMode::isMaster())
         {