Changeset 5917 for code/branches

Timestamp:

Oct 9, 2009, 4:44:50 PM (15 years ago)

Author:

scheusso

Message:

missing parts of last commit

Location:

code/branches/core5/src/orxonox

Files:

• Test.cc (modified) (1 diff)
• collisionshapes/WorldEntityCollisionShape.cc (modified) (1 diff)
• gametypes/Gametype.cc (modified) (3 diffs)
• gametypes/Gametype.h (modified) (1 diff)
• items/MultiStateEngine.cc (modified) (1 diff)
• weaponsystem/WeaponSlot.cc (modified) (1 diff)

code/branches/core5/src/orxonox/Test.cc

@@ -63 +63 @@
     setConfigValues();
     registerVariables();
-                setObjectMode(0x3);
+                setSyncMode(0x3);
         }
 

code/branches/core5/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

@@ -43 +43 @@
         this->worldEntityOwner_ = creator;
         // suppress synchronisation
-        this->setObjectMode(0x0);
+        this->setSyncMode(0x0);
     }
 

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

@@ -33 +33 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/GameMode.h"
+#include "core/ConsoleCommand.h"
 
 #include "infos/PlayerInfo.h"
@@ -78 +79 @@
         else
             this->scoreboard_ = 0;
+        
+        /* HACK HACK HACK */
+        this->hackAddBots_ = createConsoleCommand( createFunctor(&Gametype::addBots, this), "hackAddBots");
+        this->hackKillBots_ = createConsoleCommand( createFunctor(&Gametype::killBots, this), "hackKillBots");
+        CommandExecutor::addConsoleCommandShortcut( this->hackAddBots_ );
+        CommandExecutor::addConsoleCommandShortcut( this->hackKillBots_ );
+        /* HACK HACK HACK */
     }
     
@@ -83 +91 @@
     {
         if (this->isInitialized())
+        {
             this->gtinfo_->destroy();
+            if( this->hackAddBots_ )
+                delete this->hackAddBots_;
+            if( this->hackKillBots_ )
+                delete this->hackKillBots_;
+        }
     }
 

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

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

code/branches/core5/src/orxonox/items/MultiStateEngine.cc

@@ -91 +91 @@
             if (this->getShip()->hasLocalController())
             {
-                this->setObjectMode(ObjectDirection::Bidirectional);
+                this->setSyncMode(ObjectDirection::Bidirectional);
 
                 const Vector3& direction = this->getDirection();

code/branches/core5/src/orxonox/weaponsystem/WeaponSlot.cc

@@ -46 +46 @@
         this->weapon_ = 0;
 
-        this->setObjectMode(0x0);
+        this->setSyncMode(0x0);
     }