Changeset 2991 for code/branches/netp3/src/orxonox/objects

Timestamp:

May 19, 2009, 10:04:39 PM (16 years ago)

Author:

scheusso

Message:

forgot some things

Location:

code/branches/netp3/src/orxonox/objects

Files:

• CMakeLists.txt (modified) (1 diff)
• controllers/AIController.cc (modified) (1 diff)
• worldentities/pawns/Pawn.cc (modified) (2 diffs)

code/branches/netp3/src/orxonox/objects/CMakeLists.txt

@@ -10 +10 @@
   Teamcolourable.cc
   Tickable.cc
-  Test.cc
   Scene.cc
   Script.cc

code/branches/netp3/src/orxonox/objects/controllers/AIController.cc

@@ -101 +101 @@
     void AIController::tick(float dt)
     {
-        if(Core::isMaster())
+        if(GameMode::isMaster())
         {
             if (!this->isActive())

code/branches/netp3/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -132 +132 @@
 //         this->firehack_ = 0x0;
 
-        if (Core::isMaster())
+        if (GameMode::isMaster())
           if (this->health_ <= 0)
             this->death();
@@ -263 +263 @@
     void Pawn::doFire(uint8_t fireMode)
     {
-        if(Core::isMaster())
+        if(GameMode::isMaster())
         {
             if (this->weaponSystem_)