Changeset 2848 for code/branches/gui/src/orxonox/objects/worldentities/pawns

Timestamp:

Mar 25, 2009, 7:37:00 PM (16 years ago)

Author:

rgrieder

Message:

Exported showsGraphics, etc. to a new class named GameMode in the core.

Location:

code/branches/gui/src/orxonox/objects/worldentities/pawns

Files:

• Pawn.cc (modified) (4 diffs)
• Spectator.cc (modified) (3 diffs)

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

@@ -30 +30 @@
 #include "Pawn.h"
 
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -63 +63 @@
         this->getPickUp().setPlayer(this);
 
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             this->weaponSystem_ = new WeaponSystem(this);
@@ -187 +187 @@
             this->getPlayer()->stopControl(this);
 
-        if (Core::isMaster())
+        if (GameMode::isMaster())
             this->deatheffect();
     }
@@ -234 +234 @@
     {
         this->setHealth(this->initialHealth_);
-        if (Core::isMaster())
+        if (GameMode::isMaster())
             this->spawneffect();
     }

code/branches/gui/src/orxonox/objects/worldentities/pawns/Spectator.cc

@@ -34 +34 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/Core.h"
+#include "core/GameMode.h"
 #include "objects/worldentities/Model.h"
 #include "objects/Scene.h"
@@ -63 +63 @@
         this->setDestroyWhenPlayerLeft(true);
 
-        if (Core::showsGraphics())
+        if (GameMode::showsGraphics())
         {
             this->greetingFlare_ = new BillboardSet();
@@ -206 +206 @@
         this->bGreeting_ = !this->bGreeting_;
 
-        if (Core::isMaster())
+        if (GameMode::isMaster())
         {
             this->bGreetingFlareVisible_ = this->bGreeting_;