Changeset 2908 for code/branches/questsystem5/src/orxonox/objects/worldentities

Timestamp:

Apr 8, 2009, 12:58:47 AM (16 years ago)

Author:

dafrick

Message:

Reverted to revision 2906 (because I'm too stupid to merge correctly, 2nd try will follow shortly. )

Location:

code/branches/questsystem5

Files:

• . (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.cc (modified) (2 diffs, 1 prop)
• src/orxonox/objects/worldentities/Backlight.h (modified) (1 diff, 1 prop)
• src/orxonox/objects/worldentities/Billboard.cc (modified) (3 diffs)
• src/orxonox/objects/worldentities/Billboard.h (modified) (2 diffs)
• src/orxonox/objects/worldentities/BlinkingBillboard.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/worldentities/Camera.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.h (modified) (1 prop)
• src/orxonox/objects/worldentities/CameraPosition.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/CameraPosition.h (modified) (2 diffs)
• src/orxonox/objects/worldentities/ControllableEntity.cc (modified) (12 diffs)
• src/orxonox/objects/worldentities/ControllableEntity.h (modified) (2 diffs)
• src/orxonox/objects/worldentities/ExplosionChunk.cc (modified) (6 diffs)
• src/orxonox/objects/worldentities/Light.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/Light.h (modified) (2 diffs)
• src/orxonox/objects/worldentities/MobileEntity.cc (modified) (1 diff, 1 prop)
• src/orxonox/objects/worldentities/MobileEntity.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Model.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/MovableEntity.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/ParticleEmitter.cc (modified) (3 diffs)
• src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Planet.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/PongBall.cc (deleted)
• src/orxonox/objects/worldentities/PongBall.h (deleted)
• src/orxonox/objects/worldentities/PongBat.cc (deleted)
• src/orxonox/objects/worldentities/PongBat.h (deleted)
• src/orxonox/objects/worldentities/PongCenterpoint.cc (deleted)
• src/orxonox/objects/worldentities/PongCenterpoint.h (deleted)
• src/orxonox/objects/worldentities/StaticEntity.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/StaticEntity.h (modified) (1 prop)
• src/orxonox/objects/worldentities/TeamSpawnPoint.cc (deleted)
• src/orxonox/objects/worldentities/TeamSpawnPoint.h (deleted)
• src/orxonox/objects/worldentities/WorldEntity.cc (modified) (7 diffs)
• src/orxonox/objects/worldentities/WorldEntity.h (modified) (5 diffs)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (8 diffs)
• src/orxonox/objects/worldentities/pawns/Pawn.h (modified) (1 diff)
• src/orxonox/objects/worldentities/pawns/Spectator.cc (modified) (3 diffs)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (2 diffs, 1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 prop)

code/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.cc

@@ -33 +33 @@
 #include <OgreSceneManager.h>
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
@@ -58 +58 @@
         this->tickcount_ = 0;
 
-        if (GameMode::showsGraphics())
+        if (Core::showsGraphics())
         {
             if (!this->getScene())

code/branches/questsystem5/src/orxonox/objects/worldentities/Backlight.h

@@ -32 +32 @@
 #include "OrxonoxPrereqs.h"
 #include "FadingBillboard.h"
-#include "tools/TimeFactorListener.h"
+#include "gamestates/GSRoot.h"
 
 namespace orxonox

code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.cc

@@ -34 +34 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "objects/Scene.h"
 
@@ -81 +81 @@
         if (!this->billboard_.getBillboardSet())
         {
-            if (this->getScene() && GameMode::showsGraphics())
+            if (this->getScene() && Core::showsGraphics())
             {
                 this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->material_, this->colour_, 1);
@@ -98 +98 @@
         {
 /*
-            if (this->getScene() && GameMode::showsGraphics() && (this->material_ != ""))
+            if (this->getScene() && Core::showsGraphics() && (this->material_ != ""))
             {
                 this->billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->material_, this->colour_, 1);

code/branches/questsystem5/src/orxonox/objects/worldentities/Billboard.h

@@ -34 +34 @@
 #include "util/Math.h"
 #include "tools/BillboardSet.h"
-#include "objects/Teamcolourable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Billboard : public StaticEntity, public Teamcolourable
+    class _OrxonoxExport Billboard : public StaticEntity
     {
         public:
@@ -62 +61 @@
                 { return this->colour_; }
 
-            virtual void setTeamColour(const ColourValue& colour)
-                { this->setColour(colour); }
-
         protected:
             inline BillboardSet& getBillboardSet()

code/branches/questsystem5/src/orxonox/objects/worldentities/BlinkingBillboard.cc

@@ -30 +30 @@
 #include "BlinkingBillboard.h"
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -77 +77 @@
         SUPER(BlinkingBillboard, tick, dt);
 
-        if (GameMode::isMaster() && this->isActive())
+        if (Core::isMaster() && this->isActive())
         {
             this->time_ += dt;

code/branches/questsystem5/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -19 +19 @@
   Planet.cc
   SpawnPoint.cc
-  TeamSpawnPoint.cc
-  PongCenterpoint.cc
-  PongBall.cc
-  PongBat.cc
 )
 

code/branches/questsystem5/src/orxonox/objects/worldentities/CameraPosition.cc

@@ -44 +44 @@
         this->bDrag_ = false;
         this->bAllowMouseLook_ = false;
-        this->bAbsolute_ = false;
 
         this->setObjectMode(0x0);
@@ -59 +58 @@
         XMLPortParam(CameraPosition, "drag", setDrag, getDrag, xmlelement, mode).defaultValues(false);
         XMLPortParam(CameraPosition, "mouselook", setAllowMouseLook, getAllowMouseLook, xmlelement, mode).defaultValues(false);
-        XMLPortParam(CameraPosition, "absolute", setIsAbsolute, getIsAbsolute, xmlelement, mode).defaultValues(false);
     }
 

code/branches/questsystem5/src/orxonox/objects/worldentities/CameraPosition.h

@@ -54 +54 @@
                 { return this->bAllowMouseLook_; }
 
-            inline void setIsAbsolute(bool bAbsolute)
-                { this->bAbsolute_ = bAbsolute; }
-            inline bool getIsAbsolute() const
-                { return this->bAbsolute_; }
-
             void attachCamera(Camera* camera);
 
@@ -64 +59 @@
             bool bDrag_;
             bool bAllowMouseLook_;
-            bool bAbsolute_;
     };
 }

code/branches/questsystem5/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -34 +34 @@
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/XMLPort.h"
 #include "core/Template.h"
@@ -144 +144 @@
     void ControllableEntity::addCameraPosition(CameraPosition* position)
     {
-        if (!position->getIsAbsolute())
-        {
-            if (position->getAllowMouseLook())
-                position->attachToNode(this->cameraPositionRootNode_);
-            else
-                this->attach(position);
-        }
+        if (position->getAllowMouseLook())
+            position->attachToNode(this->cameraPositionRootNode_);
         else
-        {
-            WorldEntity* parent = this->getParent();
-            if (parent)
-                parent->attach(position);
-        }
+            this->attach(position);
         this->cameraPositions_.push_back(position);
     }
@@ -245 +236 @@
             this->startLocalHumanControl();
 
-            if (!GameMode::isMaster())
+            if (!Core::isMaster())
             {
                 this->client_overwrite_ = this->server_overwrite_;
@@ -251 +242 @@
             }
         }
-
-        this->changedPlayer();
     }
 
@@ -265 +254 @@
         this->bHasHumanController_ = false;
         this->setObjectMode(objectDirection::toclient);
-
-        this->changedPlayer();
 
         if (this->bDestroyWhenPlayerLeft_)
@@ -335 +322 @@
     }
 
-    void ControllableEntity::parentChanged()
-    {
-        WorldEntity::parentChanged();
-
-        WorldEntity* parent = this->getParent();
-        if (parent)
-        {
-            for (std::list<CameraPosition*>::iterator it = this->cameraPositions_.begin(); it != this->cameraPositions_.end(); ++it)
-                if ((*it)->getIsAbsolute())
-                    parent->attach((*it));
-        }
-    }
-
     void ControllableEntity::tick(float dt)
     {
@@ -357 +331 @@
             if (!this->isDynamic())
             {
-                if (GameMode::isMaster())
+                if (Core::isMaster())
                 {
                     this->server_position_ = this->getPosition();
@@ -472 +446 @@
     void ControllableEntity::setPosition(const Vector3& position)
     {
-        if (GameMode::isMaster())
+        if (Core::isMaster())
         {
             MobileEntity::setPosition(position);
@@ -487 +461 @@
     void ControllableEntity::setOrientation(const Quaternion& orientation)
     {
-        if (GameMode::isMaster())
+        if (Core::isMaster())
         {
             MobileEntity::setOrientation(orientation);
@@ -502 +476 @@
     void ControllableEntity::setVelocity(const Vector3& velocity)
     {
-        if (GameMode::isMaster())
+        if (Core::isMaster())
         {
             MobileEntity::setVelocity(velocity);
@@ -517 +491 @@
     void ControllableEntity::setAngularVelocity(const Vector3& velocity)
     {
-        if (GameMode::isMaster())
+        if (Core::isMaster())
         {
             MobileEntity::setAngularVelocity(velocity);
@@ -533 +507 @@
     {
         MobileEntity::setWorldTransform(worldTrans);
-        if (GameMode::isMaster())
+        if (Core::isMaster())
         {
             this->server_position_ = this->getPosition();

code/branches/questsystem5/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -49 +49 @@
 
             virtual void changedGametype();
-            virtual void changedPlayer() {}
 
             virtual void setPlayer(PlayerInfo* player);
@@ -137 +136 @@
             virtual void startLocalHumanControl();
             virtual void stopLocalHumanControl();
-            virtual void parentChanged();
 
             inline void setHudTemplate(const std::string& name)

code/branches/questsystem5/src/orxonox/objects/worldentities/ExplosionChunk.cc

@@ -32 +32 @@
 #include <OgreParticleSystem.h>
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
@@ -47 +47 @@
         RegisterObject(ExplosionChunk);
 
-        if ( GameMode::showsGraphics() && ( !this->getScene() || !this->getScene()->getSceneManager() ) )
+        if ( Core::showsGraphics() && ( !this->getScene() || !this->getScene()->getSceneManager() ) )
             ThrowException(AbortLoading, "Can't create ExplosionChunk, no scene or no scene manager given.");
 
@@ -53 +53 @@
         this->LOD_ = LODParticle::normal;
 
-        if ( GameMode::showsGraphics() )
+        if ( Core::showsGraphics() )
         {
             try
@@ -75 +75 @@
         }
 
-        if (GameMode::isMaster())
+        if (Core::isMaster())
         {
             Vector3 velocity(rnd(-1, 1), rnd(-1, 1), rnd(-1, 1));
@@ -132 +132 @@
             this->smoke_->setEnabled(false);
 
-        if (GameMode::isMaster())
+        if (Core::isMaster())
         {
             this->bStop_ = true;
@@ -148 +148 @@
         static const unsigned int CHANGES_PER_SECOND = 5;
 
-        if (GameMode::isMaster() && rnd() < dt*CHANGES_PER_SECOND)
+        if (Core::isMaster() && rnd() < dt*CHANGES_PER_SECOND)
         {
             float length = this->getVelocity().length();

code/branches/questsystem5/src/orxonox/objects/worldentities/Light.cc

@@ -37 +37 @@
 #include "util/String.h"
 #include "util/Exception.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -57 +57 @@
         this->spotlightRange_ = Vector3(40.0f, 30.0f, 1.0f);
 
-        if (GameMode::showsGraphics())
+        if (Core::showsGraphics())
         {
             if (!this->getScene())

code/branches/questsystem5/src/orxonox/objects/worldentities/Light.h

@@ -37 +37 @@
 
 #include "util/Math.h"
-#include "objects/Teamcolourable.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Light : public StaticEntity, public Teamcolourable
+    class _OrxonoxExport Light : public StaticEntity
     {
         public:
@@ -69 +68 @@
             inline const ColourValue& getSpecularColour() const
                 { return this->specular_; }
-
-            virtual void setTeamColour(const ColourValue& colour)
-                { this->setDiffuseColour(colour); this->setSpecularColour(colour); }
 
             /**

code/branches/questsystem5/src/orxonox/objects/worldentities/MobileEntity.cc

@@ -182 +182 @@
         // We use a dynamic body. So we translate our node accordingly.
         this->node_->setPosition(Vector3(worldTrans.getOrigin().x(), worldTrans.getOrigin().y(), worldTrans.getOrigin().z()));
-        btQuaternion temp(worldTrans.getRotation());
-        this->node_->setOrientation(Quaternion(temp.w(), temp.x(), temp.y(), temp.z()));
+        this->node_->setOrientation(Quaternion(worldTrans.getRotation().w(), worldTrans.getRotation().x(), worldTrans.getRotation().y(), worldTrans.getRotation().z()));
         this->linearVelocity_.x = this->physicalBody_->getLinearVelocity().x();
         this->linearVelocity_.y = this->physicalBody_->getLinearVelocity().y();

code/branches/questsystem5/src/orxonox/objects/worldentities/Model.cc

@@ -31 +31 @@
 #include <OgreEntity.h>
 #include "Model.h"
-#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -71 +70 @@
     void Model::changedMesh()
     {
-        if (GameMode::showsGraphics())
+        if (Core::showsGraphics())
         {
             if (this->mesh_.getEntity())

code/branches/questsystem5/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -34 +34 @@
 #include "core/XMLPort.h"
 #include "core/Executor.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 
 namespace orxonox
@@ -89 +89 @@
     void MovableEntity::resynchronize()
     {
-        if (GameMode::isMaster() && !this->continuousResynchroTimer_)
+        if (Core::isMaster() && !this->continuousResynchroTimer_)
         {
             // Resynchronise every few seconds because we only work with velocities (no positions)

code/branches/questsystem5/src/orxonox/objects/worldentities/ParticleEmitter.cc

@@ -39 +39 @@
 #include "tools/ParticleInterface.h"
 #include "util/Exception.h"
-#include "core/GameMode.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -52 +51 @@
         RegisterObject(ParticleEmitter);
 
-        if (GameMode::showsGraphics() && (!this->getScene() || !this->getScene()->getSceneManager()))
+        if (Core::showsGraphics() && (!this->getScene() || !this->getScene()->getSceneManager()))
             ThrowException(AbortLoading, "Can't create ParticleEmitter, no scene or no scene manager given.");
 
@@ -108 +107 @@
         }
 
-        if (GameMode::showsGraphics() && this->getScene() && this->getScene()->getSceneManager())
+        if (Core::showsGraphics() && this->getScene() && this->getScene()->getSceneManager())
         {
             try

code/branches/questsystem5/src/orxonox/objects/worldentities/Planet.cc

@@ -42 +42 @@
 #include "CameraManager.h"
 #include "Camera.h"
-#include "GraphicsManager.h"
+#include "GraphicsEngine.h"
 
 namespace orxonox

code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -181 +181 @@
 
         // Attach to parent if necessary
-        registerVariable(this->parentID_,       variableDirection::toclient, new NetworkCallback<WorldEntity>(this, &WorldEntity::networkcallback_parentChanged));
+        registerVariable(this->parentID_,       variableDirection::toclient, new NetworkCallback<WorldEntity>(this, &WorldEntity::parentChanged));
     }
 
@@ -188 +188 @@
         Network function that object this instance to its correct parent.
     */
-    void WorldEntity::networkcallback_parentChanged()
+    void WorldEntity::parentChanged()
     {
         if (this->parentID_ != OBJECTID_UNKNOWN)
@@ -362 +362 @@
         this->parentID_ = newParent->getObjectID();
 
-        this->parentChanged();
-
         // apply transform to collision shape
         this->collisionShape_->setPosition(this->getPosition());
         this->collisionShape_->setOrientation(this->getOrientation());
         // TODO: Scale
-
+        
         return true;
     }
@@ -408 +406 @@
         this->parent_ = 0;
         this->parentID_ = OBJECTID_UNKNOWN;
-
-        this->parentChanged();
 
         // reset orientation of the collisionShape (cannot be set within a WE usually)
@@ -492 +488 @@
 
     // Note: These functions are placed in WorldEntity.h as inline functions for the release build.
-#ifndef NDEBUG
+#ifndef _NDEBUG
     const Vector3& WorldEntity::getPosition() const
     {
@@ -660 +656 @@
         case TransformSpace::World:
             ogreRelativeTo = Ogre::Node::TS_WORLD; break;
-        default: OrxAssert(false, "Faulty TransformSpace::Enum assigned.");
         }
         this->node_->setDirection(direction, ogreRelativeTo, localDirectionVector);
@@ -760 +755 @@
         {
         case Dynamic:
-            this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() & !btCollisionObject::CF_STATIC_OBJECT & !btCollisionObject::CF_KINEMATIC_OBJECT);
+            this->physicalBody_->setCollisionFlags(this->physicalBody_->getCollisionFlags() & !(btCollisionObject::CF_STATIC_OBJECT | btCollisionObject::CF_KINEMATIC_OBJECT));
             break;
         case Kinematic:

code/branches/questsystem5/src/orxonox/objects/worldentities/WorldEntity.h

@@ -33 +33 @@
 #include "OrxonoxPrereqs.h"
 
-#ifdef NDEBUG
+#ifdef _NDEBUG
 #include <OgreSceneNode.h>
 #else
@@ -176 +176 @@
 
         protected:
-            virtual void parentChanged() {}
-
             Ogre::SceneNode* node_;
 
@@ -193 +191 @@
 
             // network callbacks
-            void networkcallback_parentChanged();
+            void parentChanged();
             inline void scaleChanged()
                 { this->setScale3D(this->getScale3D()); }
@@ -271 +269 @@
             @brief
                 Sets how much reaction is applied in a collision.
-
+                
                 Consider two equal spheres colliding with equal velocities:
                 Restitution 1 means that both spheres simply reverse their velocity (no loss of energy)
@@ -421 +419 @@
 
     // Inline heavily used functions for release builds. In debug, we better avoid including OgreSceneNode here.
-#ifdef NDEBUG
+#ifdef _NDEBUG
     inline const Vector3& WorldEntity::getPosition() const
         { return this->node_->getPosition(); }
     inline const Quaternion& WorldEntity::getOrientation() const
-        { return this->node_->getOrientation(); }
+        { return this->node_->getrOrientation(); }
     inline const Vector3& WorldEntity::getScale3D(void) const
         { return this->node_->getScale(); }

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

@@ -30 +30 @@
 #include "Pawn.h"
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -63 +63 @@
         this->getPickUp().setPlayer(this);
 
-        if (GameMode::isMaster())
+        if (Core::isMaster())
         {
             this->weaponSystem_ = new WeaponSystem(this);
@@ -133 +133 @@
     }
 
-    void Pawn::setPlayer(PlayerInfo* player)
-    {
-        ControllableEntity::setPlayer(player);
-
-        if (this->getGametype())
-            this->getGametype()->playerStartsControllingPawn(player, this);
-    }
-
-    void Pawn::removePlayer()
-    {
-        if (this->getGametype())
-            this->getGametype()->playerStopsControllingPawn(this->getPlayer(), this);
-
-        ControllableEntity::removePlayer();
-    }
-
     void Pawn::setHealth(float health)
     {
@@ -156 +140 @@
     void Pawn::damage(float damage, Pawn* originator)
     {
-        if (this->getGametype() && this->getGametype()->allowPawnDamage(this, originator))
-        {
-            this->setHealth(this->health_ - damage);
-            this->lastHitOriginator_ = originator;
-
-            // play damage effect
-        }
+        this->setHealth(this->health_ - damage);
+        this->lastHitOriginator_ = originator;
+
+        // play damage effect
     }
 
     void Pawn::hit(Pawn* originator, const Vector3& force, float damage)
     {
-        if (this->getGametype() && this->getGametype()->allowPawnHit(this, originator))
-        {
-            this->damage(damage, originator);
-            this->setVelocity(this->getVelocity() + force);
-
-            // play hit effect
-        }
+        this->damage(damage, originator);
+        this->setVelocity(this->getVelocity() + force);
+
+        // play hit effect
     }
 
@@ -198 +176 @@
     void Pawn::death()
     {
-        if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))
-        {
-            // Set bAlive_ to false and wait for PawnManager to do the destruction
-            this->bAlive_ = false;
-
-            this->setDestroyWhenPlayerLeft(false);
-
-            if (this->getGametype())
-                this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
-
-            if (this->getPlayer())
-                this->getPlayer()->stopControl(this);
-
-            if (GameMode::isMaster())
-                this->deatheffect();
-        }
-        else
-            this->setHealth(1);
+        // Set bAlive_ to false and wait for PawnManager to do the destruction
+        this->bAlive_ = false;
+
+        this->setDestroyWhenPlayerLeft(false);
+
+        if (this->getGametype())
+            this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
+
+        if (this->getPlayer())
+            this->getPlayer()->stopControl(this);
+
+        if (Core::isMaster())
+            this->deatheffect();
     }
 
@@ -249 +222 @@
             ExplosionChunk* chunk = new ExplosionChunk(this->getCreator());
             chunk->setPosition(this->getPosition());
+
         }
     }
@@ -260 +234 @@
     {
         this->setHealth(this->initialHealth_);
-        if (GameMode::isMaster())
+        if (Core::isMaster())
             this->spawneffect();
     }
@@ -269 +243 @@
     }
 
-
-    /* WeaponSystem:
-    *   functions load Slot, Set, Pack from XML and make sure all parent-pointers are set.
-    *   with setWeaponPack you can not just load a Pack from XML but if a Pack already exists anywhere, you can attach it.
-    *       --> e.g. Pickup-Items
-    */
     void Pawn::setWeaponSlot(WeaponSlot * wSlot)
     {

code/branches/questsystem5/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -47 +47 @@
             virtual void tick(float dt);
             void registerVariables();
-
-            virtual void setPlayer(PlayerInfo* player);
-            virtual void removePlayer();
 
             inline bool isAlive() const

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

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

code/branches/questsystem5/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -36 +36 @@
 #include "core/ConsoleCommand.h"
 #include "core/XMLPort.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "objects/Scene.h"
 
@@ -67 +67 @@
 //    this->bUpdating_ = false;
 
-    if (this->getScene() && GameMode::showsGraphics())
+    if (this->getScene() && Core::showsGraphics())
     {
       this->debugBillboard_.setBillboardSet(this->getScene()->getSceneManager(), "Examples/Flare", ColourValue(1.0, 0.0, 0.0), 1);