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

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/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/EventTarget.cc (modified) (1 diff)
• src/orxonox/objects/Level.cc (modified) (1 diff, 1 prop)
• src/orxonox/objects/Level.h (modified) (1 prop)
• src/orxonox/objects/Radar.cc (modified) (1 diff)
• src/orxonox/objects/Scene.cc (modified) (7 diffs)
• src/orxonox/objects/Teamcolourable.cc (deleted)
• src/orxonox/objects/Teamcolourable.h (deleted)
• src/orxonox/objects/collisionshapes (modified) (1 prop)
• src/orxonox/objects/controllers/AIController.cc (modified) (2 diffs)
• src/orxonox/objects/controllers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/controllers/Controller.cc (modified) (1 diff)
• src/orxonox/objects/controllers/Controller.h (modified) (1 diff)
• src/orxonox/objects/controllers/HumanController.cc (modified) (2 diffs)
• src/orxonox/objects/controllers/PongAI.cc (deleted)
• src/orxonox/objects/controllers/PongAI.h (deleted)
• src/orxonox/objects/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/gametypes/Deathmatch.cc (deleted)
• src/orxonox/objects/gametypes/Deathmatch.h (deleted)
• src/orxonox/objects/gametypes/Gametype.cc (modified) (14 diffs)
• src/orxonox/objects/gametypes/Gametype.h (modified) (4 diffs)
• src/orxonox/objects/gametypes/Pong.cc (deleted)
• src/orxonox/objects/gametypes/Pong.h (deleted)
• src/orxonox/objects/gametypes/TeamDeathmatch.cc (deleted)
• src/orxonox/objects/gametypes/TeamDeathmatch.h (deleted)
• src/orxonox/objects/infos/Bot.cc (modified) (2 diffs)
• src/orxonox/objects/infos/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/infos/GametypeInfo.cc (modified) (1 diff)
• src/orxonox/objects/infos/GametypeInfo.h (modified) (2 diffs)
• src/orxonox/objects/infos/HumanPlayer.cc (modified) (8 diffs)
• src/orxonox/objects/infos/HumanPlayer.h (modified) (3 diffs)
• src/orxonox/objects/infos/PlayerInfo.cc (modified) (3 diffs)
• src/orxonox/objects/infos/PlayerInfo.h (modified) (2 diffs)
• src/orxonox/objects/infos/PongBot.cc (deleted)
• src/orxonox/objects/infos/PongBot.h (deleted)
• src/orxonox/objects/items/MultiStateEngine.cc (modified) (2 diffs)
• src/orxonox/objects/pickup/PickupSpawner.cc (modified) (1 diff)
• src/orxonox/objects/pickup/Usable.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.cc (modified) (1 diff, 1 prop)
• src/orxonox/objects/quest/AddQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddQuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.cc (modified) (1 prop)
• src/orxonox/objects/quest/AddReward.h (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.cc (modified) (1 prop)
• src/orxonox/objects/quest/ChangeQuestStatus.h (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/CompleteQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/FailQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/GlobalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.cc (modified) (1 prop)
• src/orxonox/objects/quest/LocalQuest.h (modified) (1 prop)
• src/orxonox/objects/quest/Quest.cc (modified) (1 prop)
• src/orxonox/objects/quest/Quest.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestDescription.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestEffect.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestHint.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestItem.h (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.cc (modified) (1 prop)
• src/orxonox/objects/quest/QuestManager.h (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.cc (modified) (1 prop)
• src/orxonox/objects/quest/Rewardable.h (modified) (1 prop)
• src/orxonox/objects/weaponSystem/Munition.cc (modified) (1 diff)
• src/orxonox/objects/weaponSystem/Weapon.cc (modified) (8 diffs)
• src/orxonox/objects/weaponSystem/Weapon.h (modified) (4 diffs)
• src/orxonox/objects/weaponSystem/WeaponPack.cc (modified) (4 diffs)
• src/orxonox/objects/weaponSystem/WeaponPack.h (modified) (1 diff)
• src/orxonox/objects/weaponSystem/WeaponSet.cc (modified) (3 diffs)
• src/orxonox/objects/weaponSystem/WeaponSystem.cc (modified) (5 diffs, 1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (3 diffs, 1 prop)
• src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/weaponSystem/munitions/FusionMunition.cc (deleted)
• src/orxonox/objects/weaponSystem/munitions/FusionMunition.h (deleted)
• src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc (modified) (1 diff)
• src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc (modified) (3 diffs)
• src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc (modified) (2 diffs)
• src/orxonox/objects/weaponSystem/projectiles/Projectile.cc (modified) (4 diffs)
• src/orxonox/objects/weaponSystem/weapons/LaserGun.cc (modified) (2 diffs)
• src/orxonox/objects/weaponSystem/weapons/LaserGun.h (modified) (1 diff)
• 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/CMakeLists.txt

@@ -8 +8 @@
   RadarListener.cc
   RadarViewable.cc
-  Teamcolourable.cc
   Tickable.cc
   Test.cc

code/branches/questsystem5/src/orxonox/objects/EventTarget.cc

@@ -66 +66 @@
     void EventTarget::addAsEvent(BaseObject* object)
     {
-        if (object != static_cast<BaseObject*>(this))
+        if (object != (BaseObject*)this)
             object->addEvent(this, "");
     }

code/branches/questsystem5/src/orxonox/objects/Level.cc

@@ -105 +105 @@
     {
         Identifier* identifier = ClassByString(gametype);
-
-        if (!identifier || !identifier->isA(Class(Gametype)))
+        if (identifier && identifier->isA(Class(Gametype)))
         {
-            COUT(0) << "Error: \"" << gametype << "\" is not a valid gametype." << std::endl;
-            identifier = Class(Gametype);
-            this->gametype_ = "Gametype";
-        }
-        else
             this->gametype_ = gametype;
 
-std::cout << "Load Gametype: " << this->gametype_ << std::endl;
+            Gametype* rootgametype = dynamic_cast<Gametype*>(identifier->fabricate(this));
+            this->setGametype(rootgametype);
 
-        Gametype* rootgametype = dynamic_cast<Gametype*>(identifier->fabricate(this));
-        this->setGametype(rootgametype);
+            for (std::list<BaseObject*>::iterator it = this->objects_.begin(); it != this->objects_.end(); ++it)
+                (*it)->setGametype(rootgametype);
 
-std::cout << "root gametype: " << rootgametype->getIdentifier()->getName() << std::endl;
-
-        for (std::list<BaseObject*>::iterator it = this->objects_.begin(); it != this->objects_.end(); ++it)
-            (*it)->setGametype(rootgametype);
-
-        if (LevelManager::getInstancePtr())
-            LevelManager::getInstance().requestActivity(this);
+            if (LevelManager::getInstancePtr())
+                LevelManager::getInstance().requestActivity(this);
+        }
     }
 

code/branches/questsystem5/src/orxonox/objects/Radar.cc

@@ -144 +144 @@
             for (ObjectList<RadarViewable>::iterator it = ObjectList<RadarViewable>::begin(); it; ++it)
             {
-                if (*it == static_cast<RadarViewable*>(this)->owner_)
+                if (*it == (RadarViewable*)this->owner_)
                     continue;
 

code/branches/questsystem5/src/orxonox/objects/Scene.cc

@@ -41 +41 @@
 
 #include "core/CoreIncludes.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/XMLPort.h"
 #include "tools/BulletConversions.h"
@@ -57 +57 @@
         this->bShadows_ = true;
 
-        if (GameMode::showsGraphics())
+        if (Core::showsGraphics())
         {
             if (Ogre::Root::getSingletonPtr())
@@ -99 +99 @@
                 Ogre::Root::getSingleton().destroySceneManager(this->sceneManager_);
             }
-            else if (!GameMode::showsGraphics())
+            else if (!Core::showsGraphics())
             {
                 delete this->sceneManager_;
@@ -227 +227 @@
     void Scene::tick(float dt)
     {
-        if (!GameMode::showsGraphics())
+        if (!Core::showsGraphics())
         {
             // We need to update the scene nodes if we don't render
@@ -256 +256 @@
     void Scene::setSkybox(const std::string& skybox)
     {
-        if (GameMode::showsGraphics() && this->sceneManager_)
+        if (Core::showsGraphics() && this->sceneManager_)
             this->sceneManager_->setSkyBox(true, skybox);
 
@@ -264 +264 @@
     void Scene::setAmbientLight(const ColourValue& colour)
     {
-        if (GameMode::showsGraphics() && this->sceneManager_)
+        if (Core::showsGraphics() && this->sceneManager_)
             this->sceneManager_->setAmbientLight(colour);
 
@@ -272 +272 @@
     void Scene::setShadow(bool bShadow)
     {
-        if (GameMode::showsGraphics() && this->sceneManager_)
+        if (Core::showsGraphics() && this->sceneManager_)
         {
             if (bShadow)

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

@@ -30 +30 @@
 #include "AIController.h"
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
@@ -45 +45 @@
         RegisterObject(AIController);
 
-        if (GameMode::isMaster())
+        if (Core::isMaster())
             this->actionTimer_.setTimer(ACTION_INTERVAL, true, this, createExecutor(createFunctor(&AIController::action)));
     }

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

@@ -5 +5 @@
   AIController.cc
   ScriptController.cc
-  PongAI.cc
 )

code/branches/questsystem5/src/orxonox/objects/controllers/Controller.cc

@@ -43 +43 @@
         this->player_ = 0;
         this->controllableEntity_ = 0;
+        this->hud_ = 0;
+        this->bUpdateHUD_ = false;
     }
 
     Controller::~Controller()
     {
+        if (this->isInitialized() && this->hud_)
+            delete this->hud_;
+    }
+
+    void Controller::changedControllableEntity()
+    {
+        if (this->bUpdateHUD_)
+        {
+            this->updateHUD();
+            this->bUpdateHUD_ = false;
+        }
+
+        if (this->hud_)
+            this->hud_->setOwner(this->getControllableEntity());
+    }
+
+    void Controller::updateHUD()
+    {
+        if (this->hud_)
+        {
+            delete this->hud_;
+            this->hud_ = 0;
+        }
+
+        if (this->hudtemplate_ != "")
+        {
+            this->hud_ = new OverlayGroup(this);
+            this->hud_->addTemplate(this->hudtemplate_);
+            this->hud_->setOwner(this->getControllableEntity());
+        }
     }
 }

code/branches/questsystem5/src/orxonox/objects/controllers/Controller.h

@@ -57 +57 @@
             inline ControllableEntity* getControllableEntity() const
                 { return this->controllableEntity_; }
-            virtual void changedControllableEntity() {}
+            virtual void changedControllableEntity();
+
+            inline void setHUDTemplate(const std::string& name)
+            {
+                if (name != this->hudtemplate_)
+                {
+                    this->hudtemplate_ = name;
+                    if (this->controllableEntity_)
+                        this->updateHUD();
+                    else
+                        this->bUpdateHUD_ = true;
+                }
+            }
+            inline const std::string& getHUDTemplate() const
+                { return this->hudtemplate_; }
+
+            inline OverlayGroup* getHUD() const
+                { return this->hud_; }
 
         protected:
+            void updateHUD();
+
             PlayerInfo* player_;
             ControllableEntity* controllableEntity_;
+            std::string hudtemplate_;
+            OverlayGroup* hud_;
+            bool bUpdateHUD_;
     };
 }

code/branches/questsystem5/src/orxonox/objects/controllers/HumanController.cc

@@ -35 +35 @@
 #include "objects/worldentities/pawns/Pawn.h"
 #include "objects/gametypes/Gametype.h"
-#include "objects/infos/PlayerInfo.h"
 
 namespace orxonox
@@ -158 +157 @@
             if (pawn)
                 pawn->kill();
-            else if (HumanController::localController_s->player_)
-                HumanController::localController_s->player_->stopControl(HumanController::localController_s->controllableEntity_);
         }
     }

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Gametype.cc
-  Deathmatch.cc
-  TeamDeathmatch.cc
-  Pong.cc
 )

code/branches/questsystem5/src/orxonox/objects/gametypes/Gametype.cc

@@ -36 +36 @@
 #include "core/ConfigValueIncludes.h"
 #include "core/Template.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "overlays/OverlayGroup.h"
 #include "objects/infos/PlayerInfo.h"
@@ -44 +44 @@
 #include "objects/worldentities/Camera.h"
 
+#include "network/Host.h"
+
 namespace orxonox
 {
@@ -64 +66 @@
         this->setConfigValues();
 
+        this->addBots(this->numberOfBots_);
+
         // load the corresponding score board
-        if (GameMode::showsGraphics() && this->scoreboardTemplate_ != "")
+        if (Core::showsGraphics() && this->scoreboardTemplate_ != "")
         {
             this->scoreboard_ = new OverlayGroup(this);
@@ -101 +105 @@
     void Gametype::start()
     {
-        this->addBots(this->numberOfBots_);
-
+        COUT(0) << "game started" << std::endl;
         this->gtinfo_.bStarted_ = true;
 
@@ -110 +113 @@
     void Gametype::end()
     {
+        COUT(0) << "game ended" << std::endl;
         this->gtinfo_.bEnded_ = true;
     }
@@ -116 +120 @@
     {
         this->players_[player].state_ = PlayerState::Joined;
-    }
-
-    bool Gametype::playerLeft(PlayerInfo* player)
+
+        std::string message = player->getName() + " entered the game";
+        COUT(0) << message << std::endl;
+        Host::Broadcast(message);
+    }
+
+    void Gametype::playerLeft(PlayerInfo* player)
     {
         std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
@@ -124 +132 @@
         {
             this->players_.erase(it);
-            return true;
-        }
-        return false;
+
+            std::string message = player->getName() + " left the game";
+            COUT(0) << message << std::endl;
+            Host::Broadcast(message);
+        }
     }
 
@@ -137 +147 @@
     }
 
-    bool Gametype::playerChangedName(PlayerInfo* player)
+    void Gametype::playerChangedName(PlayerInfo* player)
     {
         if (this->players_.find(player) != this->players_.end())
@@ -143 +153 @@
             if (player->getName() != player->getOldName())
             {
-                return true;
-            }
-        }
-        return false;
+                std::string message = player->getOldName() + " changed name to " + player->getName();
+                COUT(0) << message << std::endl;
+                Host::Broadcast(message);
+            }
+        }
     }
 
@@ -157 +168 @@
     }
 
-    void Gametype::playerPreSpawn(PlayerInfo* player)
-    {
-    }
-
-    void Gametype::playerPostSpawn(PlayerInfo* player)
-    {
-    }
-
-    void Gametype::playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn)
-    {
-    }
-
-    void Gametype::playerStopsControllingPawn(PlayerInfo* player, Pawn* pawn)
-    {
-    }
-
-    bool Gametype::allowPawnHit(Pawn* victim, Pawn* originator)
-    {
-        return true;
-    }
-
-    bool Gametype::allowPawnDamage(Pawn* victim, Pawn* originator)
-    {
-        return true;
-    }
-
-    bool Gametype::allowPawnDeath(Pawn* victim, Pawn* originator)
-    {
-        return true;
-    }
-
     void Gametype::pawnKilled(Pawn* victim, Pawn* killer)
     {
+        if (victim && victim->getPlayer())
+        {
+            std::string message;
+            if (killer)
+            {
+                if (killer->getPlayer())
+                    message = victim->getPlayer()->getName() + " was killed by " + killer->getPlayer()->getName();
+                else
+                    message = victim->getPlayer()->getName() + " was killed";
+            }
+            else
+                message = victim->getPlayer()->getName() + " died";
+
+            COUT(0) << message << std::endl;
+            Host::Broadcast(message);
+        }
+
         if (victim && victim->getPlayer())
         {
@@ -201 +198 @@
                 if (killer)
                 {
-                    std::map<PlayerInfo*, Player>::iterator it = this->players_.find(killer->getPlayer());
-                    if (it != this->players_.end())
-                        it->second.frags_++;
+                    std::map<PlayerInfo*, Player>::iterator itKiller = this->players_.find(killer->getPlayer());
+                    if (itKiller != this->players_.end())
+                    {
+                        this->playerScored(itKiller->second);
+                    }
+                    else
+                        COUT(2) << "Warning: Killing Pawn was not in the playerlist" << std::endl;
                 }
 
@@ -224 +225 @@
     }
 
-    void Gametype::playerScored(PlayerInfo* player)
-    {
-        std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
-        if (it != this->players_.end())
-            it->second.frags_++;
-    }
-
-    int Gametype::getScore(PlayerInfo* player) const
-    {
-        std::map<PlayerInfo*, Player>::const_iterator it = this->players_.find(player);
-        if (it != this->players_.end())
-            return it->second.frags_;
-        else
-            return 0;
+    void Gametype::playerScored(Player& player)
+    {
+        player.frags_++;
     }
 
@@ -346 +336 @@
         if (spawnpoint)
         {
-            this->playerPreSpawn(player);
             player->startControl(spawnpoint->spawn());
             this->players_[player].state_ = PlayerState::Alive;
-            this->playerPostSpawn(player);
         }
         else
@@ -361 +349 @@
     {
         for (unsigned int i = 0; i < amount; ++i)
-            this->botclass_.fabricate(this);
+            new Bot(this);
     }
 

code/branches/questsystem5/src/orxonox/objects/gametypes/Gametype.h

@@ -84 +84 @@
             virtual void end();
             virtual void playerEntered(PlayerInfo* player);
-            virtual bool playerLeft(PlayerInfo* player);
+            virtual void playerLeft(PlayerInfo* player);
             virtual void playerSwitched(PlayerInfo* player, Gametype* newgametype);
             virtual void playerSwitchedBack(PlayerInfo* player, Gametype* oldgametype);
-            virtual bool playerChangedName(PlayerInfo* player);
+            virtual void playerChangedName(PlayerInfo* player);
 
-            virtual void playerScored(PlayerInfo* player);
-
-            virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);
-            virtual bool allowPawnDamage(Pawn* victim, Pawn* originator = 0);
-            virtual bool allowPawnDeath(Pawn* victim, Pawn* originator = 0);
+            virtual void playerScored(Player& player);
 
             virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
             virtual void pawnPreSpawn(Pawn* pawn);
             virtual void pawnPostSpawn(Pawn* pawn);
-            virtual void playerPreSpawn(PlayerInfo* player);
-            virtual void playerPostSpawn(PlayerInfo* player);
-
-            virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
-            virtual void playerStopsControllingPawn(PlayerInfo* player, Pawn* pawn);
 
             inline const std::map<PlayerInfo*, Player>& getPlayers() const
                 { return this->players_; }
-
-            int getScore(PlayerInfo* player) const;
 
             inline void registerSpawnPoint(SpawnPoint* spawnpoint)
@@ -117 +106 @@
                 { return this->gtinfo_.startCountdown_; }
 
-            inline void setHUDTemplate(const std::string& name)
-                { this->gtinfo_.hudtemplate_ = name; }
-            inline const std::string& getHUDTemplate() const
-                { return this->gtinfo_.hudtemplate_; }
-
             void addBots(unsigned int amount);
             void killBots(unsigned int amount = 0);
@@ -128 +112 @@
                 { return this->players_.size(); }
 
-        protected:
+        private:
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
 
-            virtual void assignDefaultPawnsIfNeeded();
-            virtual void checkStart();
-            virtual void spawnPlayer(PlayerInfo* player);
-            virtual void spawnPlayersIfRequested();
-            virtual void spawnDeadPlayersIfRequested();
+            void addPlayer(PlayerInfo* player);
+            void removePlayer(PlayerInfo* player);
+
+            void assignDefaultPawnsIfNeeded();
+            void checkStart();
+            void spawnPlayer(PlayerInfo* player);
+            void spawnPlayersIfRequested();
+            void spawnDeadPlayersIfRequested();
 
             GametypeInfo gtinfo_;
@@ -144 +131 @@
             float initialStartCountdown_;
             unsigned int numberOfBots_;
-            SubclassIdentifier<Bot> botclass_;
 
             std::map<PlayerInfo*, Player> players_;

code/branches/questsystem5/src/orxonox/objects/infos/Bot.cc

@@ -30 +30 @@
 #include "Bot.h"
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -46 +46 @@
 
         this->bHumanPlayer_ = false;
-        this->bLocalPlayer_ = GameMode::isMaster();
+        this->bLocalPlayer_ = Core::isMaster();
         this->bSetUnreadyAfterSpawn_ = false;
         this->setReadyToSpawn(true);

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

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Bot.cc
-  PongBot.cc
   Info.cc
   PlayerInfo.cc

code/branches/questsystem5/src/orxonox/objects/infos/GametypeInfo.cc

@@ -58 +58 @@
         registerVariable(this->startCountdown_,         variableDirection::toclient);
         registerVariable(this->bStartCountdownRunning_, variableDirection::toclient);
-        registerVariable(this->hudtemplate_,            variableDirection::toclient);
     }
 }

code/branches/questsystem5/src/orxonox/objects/infos/GametypeInfo.h

@@ -56 +56 @@
                 { return this->startCountdown_; }
 
-            inline const std::string& getHUDTemplate() const
-                { return this->hudtemplate_; }
-
         private:
             bool bStarted_;
@@ -64 +61 @@
             bool bStartCountdownRunning_;
             float startCountdown_;
-            std::string hudtemplate_;
     };
 }

code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.cc

@@ -30 +30 @@
 #include "HumanPlayer.h"
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -47 +47 @@
         RegisterObject(HumanPlayer);
 
-        this->server_initialized_ = GameMode::isMaster();
+        this->server_initialized_ = Core::isMaster();
         this->client_initialized_ = false;
 
         this->bHumanPlayer_ = true;
         this->defaultController_ = Class(HumanController);
-
-        this->humanHud_ = 0;
-        this->gametypeHud_ = 0;
 
         this->setConfigValues();
@@ -62 +59 @@
     HumanPlayer::~HumanPlayer()
     {
-        if (this->BaseObject::isInitialized())
-        {
-            if (this->humanHud_)
-                delete this->humanHud_;
-
-            if (this->gametypeHud_)
-                delete this->gametypeHud_;
-        }
     }
 
@@ -93 +82 @@
             this->synchronize_nick_ = this->nick_;
 
-            if (GameMode::isMaster())
+            if (Core::isMaster())
                 this->setName(this->nick_);
         }
@@ -100 +89 @@
     void HumanPlayer::configvaluecallback_changedHUDTemplate()
     {
-        this->setHumanHUDTemplate(this->hudtemplate_);
+        this->changedController();
     }
 
@@ -116 +105 @@
             this->client_initialized_ = true;
 
-            if (!GameMode::isMaster())
+            if (!Core::isMaster())
                 this->setObjectMode(objectDirection::bidirectional);
             else
@@ -122 +111 @@
 
             this->createController();
-            this->updateHumanHUD();
         }
     }
@@ -158 +146 @@
     }
 
-    void HumanPlayer::changedGametype()
+    void HumanPlayer::changedController()
     {
-        PlayerInfo::changedGametype();
+        if (this->getController())
+        {
+            this->getController()->setHUDTemplate(this->hudtemplate_);
 
-        if (this->isInitialized() && this->isLocalPlayer())
-            if (this->getGametype()->getHUDTemplate() != "")
-                this->setGametypeHUDTemplate(this->getGametype()->getHUDTemplate());
-    }
-
-    void HumanPlayer::changedControllableEntity()
-    {
-        PlayerInfo::changedControllableEntity();
-
-        if (this->humanHud_)
-            this->humanHud_->setOwner(this->getControllableEntity());
-    }
-
-    void HumanPlayer::updateHumanHUD()
-    {
-        if (this->humanHud_)
-        {
-            delete this->humanHud_;
-            this->humanHud_ = 0;
-        }
-
-        if (this->isLocalPlayer() && this->humanHudTemplate_ != "")
-        {
-            this->humanHud_ = new OverlayGroup(this);
-            this->humanHud_->addTemplate(this->humanHudTemplate_);
-            this->humanHud_->setOwner(this->getControllableEntity());
-        }
-    }
-
-    void HumanPlayer::updateGametypeHUD()
-    {
-        if (this->gametypeHud_)
-        {
-            delete this->gametypeHud_;
-            this->gametypeHud_ = 0;
-        }
-
-        if (this->isLocalPlayer() && this->gametypeHudTemplate_ != "")
-        {
-            this->gametypeHud_ = new OverlayGroup(this);
-            this->gametypeHud_->addTemplate(this->gametypeHudTemplate_);
-            this->gametypeHud_->setOwner(this->getGametype());
+            if (this->getController() && this->getController()->getHUD())
+                this->getController()->getHUD()->setOwner(this->getControllableEntity());
         }
     }

code/branches/questsystem5/src/orxonox/objects/infos/HumanPlayer.h

@@ -51 +51 @@
             void setClientID(unsigned int clientID);
 
-            virtual void changedGametype();
-            virtual void changedControllableEntity();
-
-            inline void setHumanHUDTemplate(const std::string& name)
-            {
-                if (name != this->humanHudTemplate_)
-                {
-                    this->humanHudTemplate_ = name;
-                    this->updateHumanHUD();
-                }
-            }
-            inline const std::string& getHumanHUDTemplate() const
-                { return this->humanHudTemplate_; }
-            inline OverlayGroup* getHumanHUD() const
-                { return this->humanHud_; }
-
-            inline void setGametypeHUDTemplate(const std::string& name)
-            {
-                if (name != this->gametypeHudTemplate_)
-                {
-                    this->gametypeHudTemplate_ = name;
-                    this->updateGametypeHUD();
-                }
-            }
-            inline const std::string& getGametypeHUDTemplate() const
-                { return this->gametypeHudTemplate_; }
-            inline OverlayGroup* getGametypeHUD() const
-                { return this->gametypeHud_; }
+            virtual void changedController();
 
         protected:
@@ -88 +61 @@
             void networkcallback_client_initialized();
 
-            void updateHumanHUD();
-            void updateGametypeHUD();
-
             std::string nick_;
             std::string synchronize_nick_;
@@ -96 +66 @@
             bool server_initialized_;
             bool client_initialized_;
-
-            std::string humanHudTemplate_;
-            OverlayGroup* humanHud_;
-            std::string gametypeHudTemplate_;
-            OverlayGroup* gametypeHud_;
     };
 }

code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.cc

@@ -110 +110 @@
     void PlayerInfo::createController()
     {
-        if (this->controller_)
-        {
-            delete this->controller_;
-            this->controller_ = 0;
-        }
         this->controller_ = this->defaultController_.fabricate(this);
         assert(this->controller_);
@@ -146 +141 @@
         if (this->controller_)
             this->controller_->setControllableEntity(entity);
-
-        this->changedControllableEntity();
     }
 
@@ -162 +155 @@
             if (callback)
                 entity->removePlayer();
-
-            this->changedControllableEntity();
         }
     }

code/branches/questsystem5/src/orxonox/objects/infos/PlayerInfo.h

@@ -49 +49 @@
             virtual void changedGametype();
 
-            virtual void changedController() {}
-            virtual void changedControllableEntity() {}
-
             inline bool isHumanPlayer() const
                 { return this->bHumanPlayer_; }
@@ -76 +73 @@
             inline Controller* getController() const
                 { return this->controller_; }
+            virtual void changedController() {}
 
         protected:

code/branches/questsystem5/src/orxonox/objects/items/MultiStateEngine.cc

@@ -30 +30 @@
 #include "MultiStateEngine.h"
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -123 +123 @@
             }
 
-            if (GameMode::isMaster())
+            if (Core::isMaster())
             {
                 for (std::list<WorldEntity*>::const_iterator it = this->activeEffects_.begin(); it != this->activeEffects_.end(); ++it)

code/branches/questsystem5/src/orxonox/objects/pickup/PickupSpawner.cc

@@ -89 +89 @@
                 ExecutorMember<BaseObject>* executor = createExecutor(createFunctor(&BaseObject::setActive));
                 executor->setDefaultValues(true);
-                RespawnTimer_.setTimer(this->respawntimer_, false, this, executor);
+                RespawnTimer_.setTimer(this->respawntimer_, false, (BaseObject*)this, executor);
                 COUT(0) << "TIMER SET" << std::endl;
         }

code/branches/questsystem5/src/orxonox/objects/quest/AddQuest.cc

@@ -42 +42 @@
 #include "orxonox/objects/infos/PlayerInfo.h"
 #include "QuestManager.h"
-#include "QuestDescription.h"
+#include "QuestDescription.h";
 #include "Quest.h"
 

code/branches/questsystem5/src/orxonox/objects/weaponSystem/Munition.cc

@@ -105 +105 @@
     void Munition::fillBullets()
     {
+//COUT(0) << "Munition::fillBullets maxBullets_=" << this->maxBullets_ << std::endl;
         this->bullets_ = this->maxBullets_;
     }

code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.cc

@@ -42 +42 @@
     {
         RegisterObject(Weapon);
-
         this->bulletReadyToShoot_ = true;
         this->magazineReadyToShoot_ = true;
         this->parentWeaponSystem_ = 0;
         this->attachedToWeaponSlot_ = 0;
+        this->munition_ = 0;
         this->bulletLoadingTime_ = 0;
         this->magazineLoadingTime_ = 0;
         this->bReloading_ = false;
-        this->bulletAmount_= 0;
-        this->magazineAmount_ = 0;
-        this->munition_ = 0;
-        this->unlimitedMunition_ = false;
+
         this->setObjectMode(0x0);
     }
@@ -68 +65 @@
         XMLPortParam(Weapon, "bulletLoadingTime", setBulletLoadingTime, getBulletLoadingTime, xmlelement, mode);
         XMLPortParam(Weapon, "magazineLoadingTime", setMagazineLoadingTime, getMagazineLoadingTime, xmlelement, mode);
-        XMLPortParam(Weapon, "bullets", setBulletAmount, getBulletAmount, xmlelement, mode);
-        XMLPortParam(Weapon, "magazines", setMagazineAmount, getMagazineAmount, xmlelement, mode);
-        XMLPortParam(Weapon, "unlimitedMunition", setUnlimitedMunition, getUnlimitedMunition, xmlelement, mode);
     }
 
@@ -79 +73 @@
     }
 
-    void Weapon::setMunition()
-    {
-        this->munition_->setMaxBullets(this->bulletAmount_);
-        this->munition_->setMaxMagazines(this->magazineAmount_);
-    }
 
     void Weapon::fire()
     {
+//COUT(0) << "LaserGun::fire, this=" << this << std::endl;
         if ( this->bulletReadyToShoot_ && this->magazineReadyToShoot_ && !this->bReloading_)
         {
+//COUT(0) << "LaserGun::fire - ready to shoot" << std::endl;
+//COUT(0) << "LaserGun::fire - bullets" << this->munition_->bullets() << std::endl;
             this->bulletReadyToShoot_ = false;
-            if ( this->unlimitedMunition_== true )
+            if ( this->munition_->bullets() > 0)
             {
                 //shoot
-                this->reloadBullet();
+                this->takeBullets();
                 this->createProjectile();
+            }
+            //if there are no bullets, but magazines
+            else if ( this->munition_->magazines() > 0 && this->munition_->bullets() == 0 )
+            {
+//COUT(0) << "LaserGun::fire - no bullets" << std::endl;
+                this->takeMagazines();
             }
             else
             {
-                if ( this->munition_->bullets() > 0)
-                {
-                    //shoot and reload
-                    this->takeBullets();
-                    this->reloadBullet();
-                    this->createProjectile();
-                }
-                //if there are no bullets, but magazines
-                else if ( this->munition_->magazines() > 0 && this->munition_->bullets() == 0 )
-                {
-                    //reload magazine
-                    this->takeMagazines();
-                    this->reloadMagazine();
-                }
-                else
-                {
-                    //no magazines
-                }
+//COUT(0) << "LaserGun::fire - no magazines" << std::endl;
+                //actions
             }
         }
         else
         {
-            //weapon not reloaded
+//COUT(0) << "LaserGun::fire - weapon not reloaded - bullets remaining:" << this->munition_->bullets() << std::endl;
+            //actions
         }
 
@@ -126 +109 @@
 
 
-    //weapon reloading
     void Weapon::bulletTimer(float bulletLoadingTime)
     {
+//COUT(0) << "Weapon::bulletTimer started" << std::endl;
         this->bReloading_ = true;
         this->bulletReloadTimer_.setTimer( bulletLoadingTime , false , this , createExecutor(createFunctor(&Weapon::bulletReloaded)));
@@ -134 +117 @@
     void Weapon::magazineTimer(float magazineLoadingTime)
     {
+//COUT(0) << "Weapon::magazineTimer started" << std::endl;
         this->bReloading_ = true;
         this->magazineReloadTimer_.setTimer( magazineLoadingTime , false , this , createExecutor(createFunctor(&Weapon::magazineReloaded)));
@@ -148 +132 @@
         this->bReloading_ = false;
         this->munition_->fillBullets();
+        this->magazineReadyToShoot_ = true;
+        this->bulletReadyToShoot_ = true;
     }
-
 
 
     void Weapon::attachNeededMunition(std::string munitionName)
     {
-        /*  if munition type already exists attach it, else create a new one of this type and attach it to the weapon and to the WeaponSystem
-        */
+//COUT(0) << "Weapon::attachNeededMunition, parentWeaponSystem=" << this->parentWeaponSystem_ << std::endl;
+        //if munition type already exists attach it, else create a new one of this type and attach it to the weapon and to the WeaponSystem
         if (this->parentWeaponSystem_)
         {
-            //getMunitionType returns 0 if there is no such munitionType
+//COUT(0) << "Weapon::attachNeededMunition " << munitionName << std::endl;
             Munition* munition = this->parentWeaponSystem_->getMunitionType(munitionName);
             if ( munition )
-            {
                 this->munition_ = munition;
-                this->setMunition();
-            }
             else
             {
-                //create new munition with identifier because there is no such munitionType
+                //create new munition with identifier
+//COUT(0) << "Weapon::attachNeededMunition, create new Munition of Type " << munitionName << std::endl;
                 this->munitionIdentifier_ = ClassByString(munitionName);
                 this->munition_ = this->munitionIdentifier_.fabricate(this);
                 this->parentWeaponSystem_->setNewMunition(munitionName, this->munition_);
-                this->setMunition();
             }
         }
@@ -177 +159 @@
 
 
-    Munition * Weapon::getAttachedMunition(std::string munitionType)
-    {
-        this->munition_ = this->parentWeaponSystem_->getMunitionType(munitionType);
-        return this->munition_;
-    }
+     /*get and set functions
+     *
+     */
 
-
-    //these function are defined in the weapon classes
-    void Weapon::takeBullets() { };
-    void Weapon::createProjectile() { };
-    void Weapon::takeMagazines() { };
-    void Weapon::reloadBullet() { };
-    void Weapon::reloadMagazine() { };
-
-
-    //get and set functions for XMLPort
     void Weapon::setMunitionType(std::string munitionType)
     {   this->munitionType_ = munitionType; }
@@ -211 +181 @@
     {   return this->magazineLoadingTime_;  }
 
-    void Weapon::setBulletAmount(unsigned int amount)
-    {   this->bulletAmount_ = amount; }
 
-    const unsigned int Weapon::getBulletAmount()
-    {   return this->bulletAmount_;  }
+    Munition * Weapon::getAttachedMunition(std::string munitionType)
+    {
+//COUT(0) << "Weapon::getAttachedMunition, parentWeaponSystem_="<< this->parentWeaponSystem_ << std::endl;
+        this->munition_ = this->parentWeaponSystem_->getMunitionType(munitionType);
+//COUT(0) << "Weapon::getAttachedMunition, munition_="<< this->munition_ << std::endl;
+        return this->munition_;
+    }
 
-    void Weapon::setMagazineAmount(unsigned int amount)
-    {   this->magazineAmount_ = amount; }
-
-    const unsigned int Weapon::getMagazineAmount()
-    {   return this->magazineAmount_;   }
-
-    void Weapon::setUnlimitedMunition(bool unlimitedMunition)
-    {   this->unlimitedMunition_ = unlimitedMunition;   }
-
-    const bool Weapon::getUnlimitedMunition()
-    {   return this->unlimitedMunition_;    }
+    void Weapon::takeBullets() { };
+    void Weapon::createProjectile() { };
+    void Weapon::takeMagazines() { };
 
 }

code/branches/questsystem5/src/orxonox/objects/weaponSystem/Weapon.h

@@ -62 +62 @@
             void magazineReloaded();
 
-            //XMLPort functions
             virtual void setMunitionType(std::string munitionType);
             virtual const std::string getMunitionType();
@@ -69 +68 @@
             virtual void setMagazineLoadingTime(float loadingTime);
             virtual const float getMagazineLoadingTime();
-            virtual void setBulletAmount(unsigned int amount);
-            virtual const unsigned int getBulletAmount();
-            virtual void setMagazineAmount(unsigned int amount);
-            virtual const unsigned int getMagazineAmount();
-            virtual void setUnlimitedMunition(bool unlimitedMunition);
-            virtual const bool getUnlimitedMunition();
 
-            //weapon actions
             virtual void takeBullets();
             virtual void takeMagazines();
             virtual void createProjectile();
-            virtual void reloadBullet();
-            virtual void reloadMagazine();
 
-            //manually set or reset
-            virtual void setWeapon();
-            virtual void setMunition();
-            
             inline void setParentWeaponSystem(WeaponSystem *parentWeaponSystem)
                 { this->parentWeaponSystem_=parentWeaponSystem; };
@@ -97 +83 @@
                 { return this->attachedToWeaponSlot_; }
 
+            virtual void setWeapon();
 
         private:
@@ -104 +91 @@
             bool bulletReadyToShoot_;
             bool magazineReadyToShoot_;
-            bool unlimitedMunition_;
             float bulletLoadingTime_;
             float magazineLoadingTime_;
-            unsigned int bulletAmount_;
-            unsigned int magazineAmount_;
             std::string munitionType_;
 

code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponPack.cc

@@ -63 +63 @@
         for (int i=0; i < (int) this->weapons_.size(); i++)
         {
+//COUT(0) << "WeaponPack::fire (attached from WeaponSet)  from Weapon: "<< i << std::endl;
             this->weapons_[i]->getAttachedToWeaponSlot()->fire();
         }
@@ -82 +83 @@
     void WeaponPack::setFireMode(unsigned int firemode)
     {
+//COUT(0) << "WeaponPack::setFireMode " << std::endl;
         this->firemode_ = firemode;
     }
@@ -92 +94 @@
     void WeaponPack::addWeapon(Weapon * weapon)
     {
+//COUT(0) << "WeaponPack::addWeapon:" << weapon << "   munition " << weapon->getMunitionType() << std::endl;
         this->weapons_.push_back(weapon);
     }
@@ -114 +117 @@
         {
             this->weapons_[i]->attachNeededMunition(weapons_[i]->getMunitionType());
+            //hack!
             this->weapons_[i]->setWeapon();
         }

code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponPack.h

@@ -59 +59 @@
             const Weapon * getWeapon(unsigned int index);
 
-            //functions with effect to all weapons of the weaponPack
             //functions needed for creating Pointer to the right objects (-->Pawn.cc)
             void setParentWeaponSystemToAllWeapons(WeaponSystem * weaponSystem);

code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSet.cc

@@ -56 +56 @@
     void WeaponSet::attachWeaponPack(WeaponPack *wPack)
     {
+//COUT(0) << "WeaponSet::attachWeaponPack" << std::endl;
+//COUT(0) << "........ parentWeaponSystem_=" << this->parentWeaponSystem_ << std::endl;
+//COUT(0) << "........ this->parentWeaponSystem_->getWeaponSlotSize()" << this->parentWeaponSystem_->getWeaponSlotSize() << std::endl;
+//COUT(0) << "........ wPack->getSize()" << wPack->getSize() << std::endl;
         if ( this->parentWeaponSystem_->getWeaponSlotSize()>0 && wPack->getSize()>0 && ( wPack->getSize() <= this->parentWeaponSystem_->getWeaponSlotSize() ) )
         {
+//COUT(0) << "WeaponSet::attachWeaponPack after if" << std::endl;
             this->attachedWeaponPack_ = wPack;
             int wPackWeapon = 0;    //WeaponCounter for Attaching
-           
             //should be possible to choose which slot to use
-            //attach every weapon of the weaponPack to a weaponSlot
             for (  int i=0; i < wPack->getSize() ; i++  )
             {
                 //at the moment this function only works for one weaponPack in the entire WeaponSystem...
-                //it also takes the first free weaponSlot...
                 if ( this->parentWeaponSystem_->getWeaponSlotPointer(i)->getAttachedWeapon() == 0 && this->parentWeaponSystem_->getWeaponSlotPointer(i) != 0) //if slot not full
                 {
+//COUT(0) << "WeaponSet::attachWeaponPack attaching Weapon" << std::endl;
                     this->setWeaponSlots_.push_back( this->parentWeaponSystem_->getWeaponSlotPointer(i) );
                     this->parentWeaponSystem_->getWeaponSlotPointer(i)->attachWeapon( wPack->getWeaponPointer(wPackWeapon) );
@@ -80 +83 @@
                         if ( this->parentWeaponSystem_->getWeaponSlotPointer(k)->getAttachedWeapon() == 0 )
                         {
+//COUT(0) << "WeaponSet::attachWeaponPack mode 2 k="<< k << std::endl;
                             this->setWeaponSlots_.push_back( this->parentWeaponSystem_->getWeaponSlotPointer(k) );
                             this->parentWeaponSystem_->getWeaponSlotPointer(k)->attachWeapon( wPack->getWeaponPointer(wPackWeapon) );
@@ -95 +99 @@
     {
         //fires all WeaponSlots available for this weaponSet attached from the WeaponPack
+//COUT(0) << "WeaponSet::fire from Pack: " << this->attachedWeaponPack_ << std::endl;
         if (this->attachedWeaponPack_)
             this->attachedWeaponPack_->fire();

code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.cc

@@ -38 +38 @@
 
 
-/* WeaponSystem
+/* WEAPONSYSTEM
+ * creates the WeaponSystem and the ability to use weapons and munition
+ * loads the weapon the whole weaponSystem setting from an xml file
  *
- *  www.orxonox.net/wiki/WeaponSystem
  */
 
@@ -51 +52 @@
         RegisterObject(WeaponSystem);
 
+        this->activeWeaponSet_ = 0;
         this->parentPawn_ = 0;
     }
@@ -82 +84 @@
     }
 
-
-    //returns the Pointer to the munitionType, if this munitionType doesn't exist returns 0, see Weapon::attachNeededMunition
+    //returns the Pointer to the munitionType
     Munition * WeaponSystem::getMunitionType(std::string munitionType)
     {
+//COUT(0) << "WeaponSystem::getMunitionType " << munitionType << std::endl;
         std::map<std::string, Munition *>::const_iterator it = this->munitionSet_.find(munitionType);
         if (it != this->munitionSet_.end())
@@ -94 +96 @@
 
 
+/*
+    //the first weaponSet is at n=0
+    void WeaponSystem::setActiveWeaponSet(unsigned int n)
+    {
+        if (n < this->weaponSets_.size())
+            this->activeWeaponSet_ = this->weaponSets_[n];
+        else
+            this->activeWeaponSet_ = this->weaponSets_[0];
+    }
+*/
+
+
     //n is the n'th weaponSet, starting with zero
-    //SpaceShip.cc only needs to have the keybinding to a specific Set-number n (=firemode)
-    //in future this could be well defined and not only for 3 different WeaponModes
+    //SpaceShip.cc only needs to have the keybinding to a specific Set-number n
     void WeaponSystem::fire(WeaponMode::Enum n)
     {
@@ -112 +125 @@
                 break;
         }
+//COUT(0) << "WeaponSystem::fire" << std::endl;
         if (set < (int)this->weaponSets_.size())
+//COUT(0) << "WeaponSystem::fire - after if" << std::endl;
             this->weaponSets_[set]->fire();
     }

code/branches/questsystem5/src/orxonox/objects/weaponSystem/WeaponSystem.h

@@ -53 +53 @@
             //void fire();
             void fire(WeaponMode::Enum fireMode);
+            //void setActiveWeaponSet(unsigned int n);
             void attachWeaponPack(WeaponPack * wPack, unsigned int firemode);
             WeaponSet * getWeaponSetPointer(unsigned int n);
@@ -58 +59 @@
             WeaponPack * getWeaponPackPointer(unsigned int n);
             void setNewMunition(std::string munitionType, Munition * munitionToAdd);
-            void setNewSharedMunition(std::string munitionType, Munition * munitionToAdd);
             Munition * getMunitionType(std::string munitionType);
 
@@ -74 +74 @@
             std::vector<WeaponPack *> weaponPacks_;
             std::map<std::string, Munition *> munitionSet_;
+            WeaponSet *activeWeaponSet_;
             Pawn *parentPawn_;
     };

code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   LaserGunMunition.cc
-  FusionMunition.cc
 )

code/branches/questsystem5/src/orxonox/objects/weaponSystem/munitions/LaserGunMunition.cc

@@ -43 +43 @@
         RegisterObject(LaserGunMunition);
 
-        //default if not defined in XML
         this->maxBullets_ = 40;
         this->maxMagazines_ = 100;

code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/BillboardProjectile.cc

@@ -32 +32 @@
 #include <OgreBillboardSet.h>
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "objects/Scene.h"
@@ -44 +44 @@
         RegisterObject(BillboardProjectile);
 
-        if (GameMode::showsGraphics())
+        if (Core::showsGraphics())
         {
             assert(this->getScene()->getSceneManager()); // getScene() was already checked by WorldEntity
@@ -56 +56 @@
     BillboardProjectile::~BillboardProjectile()
     {
-        if (this->isInitialized() && GameMode::showsGraphics() && this->billboard_.getBillboardSet())
+        if (this->isInitialized() && Core::showsGraphics() && this->billboard_.getBillboardSet())
             this->detachOgreObject(this->billboard_.getBillboardSet());
     }

code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/ParticleProjectile.cc

@@ -33 +33 @@
 #include <OgreParticleEmitter.h>
 
-#include "core/GameMode.h"
+#include "core/Core.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -46 +46 @@
         RegisterObject(ParticleProjectile);
 
-        if (GameMode::showsGraphics())
+        if (Core::showsGraphics())
         {
             this->particles_ = new ParticleInterface(this->getScene()->getSceneManager(), "Orxonox/shot3_small", LODParticle::normal);

code/branches/questsystem5/src/orxonox/objects/weaponSystem/projectiles/Projectile.cc

@@ -41 +41 @@
 #include "objects/worldentities/ParticleSpawner.h"
 #include "objects/collisionshapes/SphereCollisionShape.h"
-#include "core/GameMode.h"
+#include "core/Core.h"
 
 namespace orxonox
@@ -55 +55 @@
         // Get notification about collisions
 
-        if (GameMode::isMaster())
+        if (Core::isMaster())
         {
             this->enableCollisionCallback();
@@ -93 +93 @@
     void Projectile::destroyObject()
     {
-        if (GameMode::isMaster())
+        if (Core::isMaster())
             delete this;
     }
@@ -99 +99 @@
     bool Projectile::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
     {
-        if (!this->bDestroy_ && GameMode::isMaster())
+        if (!this->bDestroy_ && Core::isMaster())
         {
             this->bDestroy_ = true;

code/branches/questsystem5/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -53 +53 @@
     }
 
-    void LaserGun::reloadBullet()
-    {
-        this->bulletTimer(this->bulletLoadingTime_);
-    }
-
-    void LaserGun::reloadMagazine()
-    {
-        this->magazineTimer(this->magazineLoadingTime_);
-    }
-
     void LaserGun::takeBullets()
     {
+//COUT(0) << "LaserGun::takeBullets" << std::endl;
         this->munition_->removeBullets(1);
+        this->bulletTimer(this->bulletLoadingTime_);
     }
 
@@ -71 +63 @@
     {
         this->munition_->removeMagazines(1);
+        this->magazineTimer(this->magazineLoadingTime_);
     }
 
     void LaserGun::createProjectile()
     {
+//COUT(0) << "LaserGun::createProjectile" << std::endl;
         BillboardProjectile* projectile = new ParticleProjectile(this);
         projectile->setOrientation(this->getWorldOrientation());

code/branches/questsystem5/src/orxonox/objects/weaponSystem/weapons/LaserGun.h

@@ -51 +51 @@
             virtual void takeMagazines();
             virtual void createProjectile();
-            virtual void reloadBullet();
-            virtual void reloadMagazine();
 
         private:

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);