Changeset 2500

Timestamp:

Dec 17, 2008, 8:00:43 AM (15 years ago)

Author:

landauf

Message:

merged pickups2 to presentation

Location:

code/branches/presentation

Files:

• . (modified) (1 prop)
• bin/def_keybindings.ini (modified) (1 diff)
• src/core/Template.cc (modified) (1 prop)
• src/core/Template.h (modified) (1 prop)
• src/core/XMLFile.h (modified) (1 prop)
• src/core/XMLIncludes.h (modified) (1 prop)
• src/orxonox/CameraManager.cc (modified) (1 prop)
• src/orxonox/CameraManager.h (modified) (1 prop)
• src/orxonox/objects/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/controllers/HumanController.cc (modified) (2 diffs)
• src/orxonox/objects/controllers/HumanController.h (modified) (1 diff)
• src/orxonox/objects/items/Engine.cc (modified) (1 diff)
• src/orxonox/objects/pickup/BaseItem.cc (added)
• src/orxonox/objects/pickup/BaseItem.h (added)
• src/orxonox/objects/pickup/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/pickup/PickupSpawner.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.cc) (8 diffs, 1 prop)
• src/orxonox/objects/pickup/PickupSpawner.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/PickupSpawner.h) (1 diff, 1 prop)
• src/orxonox/objects/pickup/ShipEquipment.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/ShipEquipment.cc) (10 diffs, 1 prop)
• src/orxonox/objects/pickup/ShipEquipment.h (modified) (2 diffs)
• src/orxonox/objects/pickup/ShipEquipmentClasses.cc (modified) (3 diffs)
• src/orxonox/objects/pickup/ShipEquipmentClasses.h (modified) (2 diffs)
• src/orxonox/objects/pickup/ShipItem.cc (modified) (1 diff)
• src/orxonox/objects/pickup/ShipItem.h (modified) (3 diffs)
• src/orxonox/objects/pickup/Turbo.cc (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/Turbo.cc) (8 diffs, 1 prop)
• src/orxonox/objects/pickup/Turbo.h (copied) (copied from code/branches/pickups2/src/orxonox/objects/pickup/Turbo.h) (3 diffs, 1 prop)
• src/orxonox/objects/pickup/Usable.h (modified) (1 prop)
• src/orxonox/objects/quest/AddQuest.cc (modified) (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/WeaponSystem.cc (modified) (1 prop)
• src/orxonox/objects/weaponSystem/WeaponSystem.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Backlight.h (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/Camera.h (modified) (1 prop)
• src/orxonox/objects/worldentities/ControllableEntity.h (modified) (1 diff)
• src/orxonox/objects/worldentities/ParticleSpawner.cc (modified) (1 prop)
• src/orxonox/objects/worldentities/ParticleSpawner.h (modified) (1 prop)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/pawns/Pawn.h (modified) (4 diffs)
• src/orxonox/objects/worldentities/pawns/SpaceShip.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/pawns/SpaceShip.h (modified) (1 diff)
• 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) (1 prop)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (1 prop)
• src/orxonox/overlays/notifications/NotificationQueue.cc (modified) (4 diffs)
• src/tolua/tolua-5.1.pkg (modified) (1 prop)
• src/util (modified) (1 prop)
• src/util/Exception.cc (modified) (1 prop)
• src/util/Exception.h (modified) (1 prop)
• src/util/SignalHandler.cc (modified) (1 prop)
• src/util/SignalHandler.h (modified) (1 prop)
• visual_studio/vc8/audio.vsprops (modified) (1 prop)
• visual_studio/vc8/base.vsprops (modified) (1 prop)
• visual_studio/vc8/ceguilua.vsprops (modified) (1 prop)
• visual_studio/vc8/core.vsprops (modified) (1 prop)
• visual_studio/vc8/cpptcl.vsprops (modified) (1 prop)
• visual_studio/vc8/debug.vsprops (modified) (1 prop)
• visual_studio/vc8/directories.vsprops (modified) (1 prop)
• visual_studio/vc8/lua.vsprops (modified) (1 prop)
• visual_studio/vc8/network.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/orxonox_vc8.sln (modified) (1 prop)
• visual_studio/vc8/release.vsprops (modified) (1 prop)
• visual_studio/vc8/tinyxml.vcproj (modified) (1 prop)
• visual_studio/vc8/tinyxml.vsprops (modified) (1 prop)
• visual_studio/vc8/tolua.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen.vsprops (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vcproj (modified) (1 prop)
• visual_studio/vc8/toluagen_orxonox.vsprops (modified) (1 prop)
• visual_studio/vc8/util.vsprops (modified) (1 prop)

code/branches/presentation/bin/def_keybindings.ini

@@ -50 +50 @@
 KeyKana=
 KeyKanji=
-KeyL=
+KeyL=dropItems
 KeyLeft=
 KeyLeftAlt=

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

@@ -19 +19 @@
 ADD_SOURCE_DIRECTORY(SRC_FILES infos)
 ADD_SOURCE_DIRECTORY(SRC_FILES items)
-#ADD_SOURCE_DIRECTORY(SRC_FILES pickup)
+ADD_SOURCE_DIRECTORY(SRC_FILES pickup)
 ADD_SOURCE_DIRECTORY(SRC_FILES quest)
 ADD_SOURCE_DIRECTORY(SRC_FILES weaponSystem)

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

@@ -54 +54 @@
     SetConsoleCommand(HumanController, addBots,       true).defaultValues(1);
     SetConsoleCommand(HumanController, killBots,      true).defaultValues(0);
+    SetConsoleCommand(HumanController, dropItems,     true);
 
     CreateUnloadableFactory(HumanController);
@@ -170 +171 @@
             HumanController::localController_s->controllableEntity_->getGametype()->killBots(amount);
     }
+
+    void HumanController::dropItems()
+    {
+        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+            HumanController::localController_s->controllableEntity_->dropItems();
+    }
 }

code/branches/presentation/src/orxonox/objects/controllers/HumanController.h

@@ -59 +59 @@
             static void switchCamera();
             static void mouseLook();
+            static void dropItems();
 
             static void suicide();

code/branches/presentation/src/orxonox/objects/items/Engine.cc

@@ -194 +194 @@
         this->ship_->setAcceleration(this->ship_->getOrientation() * acceleration);
 
-        this->ship_->setBoost(false);
+        if (!this->ship_->getPermanentBoost())
+            this->ship_->setBoost(false);
         this->ship_->setSteeringDirection(Vector3::ZERO);
 

code/branches/presentation/src/orxonox/objects/pickup/CMakeLists.txt

@@ -1 +1 @@
 SET( SRC_FILES
-  ShipEquipmentClasses.cc
-  ShipItem.cc
+  PickupSpawner.cc
+  Item.cc
+  Turbo.cc
+  ShipEquipment.cc
 )
 

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

@@ -1 +1 @@
 #include "PickupSpawner.h"
-#include "Item.h"
+#include "BaseItem.h"
 #include "objects/worldentities/pawns/Pawn.h"
 #include "objects/worldentities/triggers/DistanceTrigger.h"
@@ -11 +11 @@
 CreateFactory(PickupSpawner);
 
-PickupSpawner::PickupSpawner(BaseObject* creator) : PositionableEntity(creator)
+PickupSpawner::PickupSpawner(BaseObject* creator) : StaticEntity(creator)
 {
         RegisterObject(PickupSpawner);
@@ -31 +31 @@
         XMLPortParam(PickupSpawner, "distance", setDistance, getDistance, xmlelement, mode).defaultValues(20.0f);
         XMLPortParam(PickupSpawner, "respawntimer", setRespawnTimer, getRespawnTimer, xmlelement, mode);
-        
+
 }
 
@@ -58 +58 @@
         {
                 COUT(0) << "ITEM PICKED UP" << std::endl;
-                //if(player->isA(itemtemplate_->getPlayerBaseClass())) 
+                //if(player->isA(itemtemplate_->getPlayerBaseClass()))
                 {
                 BaseObject* newobject = this->template_->getBaseclassIdentifier()->fabricate(this);
-                Item* newitem = dynamic_cast<Item*>(newobject);
+                BaseItem* newitem = dynamic_cast<BaseItem*>(newobject);
                 if (newitem)
                 {
@@ -71 +71 @@
                                 this->setActive(false);
                                 this->fireEvent();
-                        }       
+                        }
                         else
                                 delete newobject;
@@ -82 +82 @@
 
 void PickupSpawner::triggerRespawnTimer()
-{       
-        
+{
+
         if(respawntimer_!=0)
         {
@@ -90 +90 @@
                 RespawnTimer_.setTimer(this->respawntimer_, false, (BaseObject*)this, executor);
                 COUT(0) << "TIMER SET" << std::endl;
-        }       
+        }
 }
 void PickupSpawner::changedActivity()
@@ -106 +106 @@
                 COUT(0) << "INvisble!" << std::endl;
         }
-                
+
 */
         SUPER(PickupSpawner, changedActivity);

code/branches/presentation/src/orxonox/objects/pickup/PickupSpawner.h

@@ -3 +3 @@
 
 #include "OrxonoxPrereqs.h"
-#include "Item.h"
+#include "BaseItem.h"
 #include "tools/Timer.h"
-#include "objects/worldentities/PositionableEntity.h"
+#include "objects/worldentities/StaticEntity.h"
 #include "objects/Tickable.h"
 
 namespace orxonox
 {
-        class _OrxonoxExport PickupSpawner : public PositionableEntity, public Tickable
+        class _OrxonoxExport PickupSpawner : public StaticEntity, public Tickable
         {
         public:

code/branches/presentation/src/orxonox/objects/pickup/ShipEquipment.cc

@@ -1 @@
-#include "Item.h"
+#include "BaseItem.h"
 #include "ShipEquipment.h"
 #include "objects/worldentities/pawns/Pawn.h"
@@ -9 +9 @@
 @brief
     Insert a permanent Item to the Equipment. Is usually called by the addTo function in Items.
-    
+
 @param item
     pointer to the item which is to be inserted.
@@ -16 +16 @@
     if new item has sucessfully been added it will return true, in any other case the return value is false.
 */
-        bool ShipEquipment::insert(Item* item)
+        bool ShipEquipment::insert(BaseItem* item)
         {
         if(checkSlot(item)==NULL)
         {
-                Equipment.insert ( std::pair<std::string, Item*>(item->getName(),item) );
+                Equipment.insert ( std::pair<std::string, BaseItem*>(item->getName(),item) );
                 return true;
         }
@@ -26 +26 @@
         {
                 COUT(3) << "SWAP?" <<  endl;
-                //Abfrage- irgendne ifschleife... 
+                //Abfrage- irgendne ifschleife...
                 if((checkSlot(item)->dropped(player))==true);
                 {
-                        Equipment.insert ( std::pair<std::string, Item*>(item->getName(),item) );
+                        Equipment.insert ( std::pair<std::string, BaseItem*>(item->getName(),item) );
                         COUT(3) << "SWAPPED!" <<  endl;
                         return true;
@@ -42 +42 @@
 @brief
     Erases a permanent Item in the Equipment. Is usually called by the remove/dropped function in Items.
-    
+
 @param item
     pointer to the item which is to be erased.
@@ -49 +49 @@
     if new item has sucessfully been erased it will return true, in any other case the return value is false.
 */
-        bool ShipEquipment::erase (Item* item)
+        bool ShipEquipment::erase (BaseItem* item)
         {
-        std::multimap<std::string,Item*>::iterator it = Equipment.find(item->getName());
+        std::multimap<std::string,BaseItem*>::iterator it = Equipment.find(item->getName());
         if(it != Equipment.end())
         {
@@ -59 +59 @@
         return false;
         };
-        /*void print(std::multimap<std::string, Item*> eut)
+        /*void print(std::multimap<std::string, BaseItem*> eut)
         {
-                std::multimap<std::string,Item*>::iterator it;
+                std::multimap<std::string,BaseItem*>::iterator it;
                 COUT(3) << "Liste:" <<  endl;
                 for ( it=eut.begin() ; it != eut.end(); ++it )
@@ -75 +75 @@
         {
                 //print(Equipment);
-                for (std::multimap<std::string,Item*>::iterator it = Equipment.begin(); it != Equipment.end(); )
+                for (std::multimap<std::string,BaseItem*>::iterator it = Equipment.begin(); it != Equipment.end(); )
                 {
 
@@ -83 +83 @@
         }
 
-        Item* ShipEquipment::checkSlot(Item* item)
+        BaseItem* ShipEquipment::checkSlot(BaseItem* item)
         {
-        std::multimap<std::string,Item*>::iterator it;
+        std::multimap<std::string,BaseItem*>::iterator it;
         for ( it= getPlayer()->getPickUp().getEquipment().begin() ; it != getPlayer()->getPickUp().getEquipment().end(); it++ )
         {
@@ -94 +94 @@
         return NULL;
         };
-        
+
 }

code/branches/presentation/src/orxonox/objects/pickup/ShipEquipment.h

@@ -1 @@
-
 #ifndef _ShipEquipment_H__
 #define _ShipEquipment_H__
 #include <string>
-#include <multimap>
+#include <map>
+
+/*
+multimap<std::string, BaseItem*> equipment_;
+equipment_.insert(pair<std::string, BaseItem*>("Weapon", new BaseItem()));*/
 
 
-/*
-multimap<std::string, Item*> equipment_;
-equipment_.insert(pair<std::string, Item*>("Weapon", new Item()));*/
+/*          std::map<std::itemtype, BaseItem*> EQClasses;
+            EQClasses["jacke"] = 0;
+            BaseItem* item = itemMap_["jacke"];
 
-
+           if (itemMap_["jacke"])
+           if (itemMap_.find("jacke") != itemMap_.end()) */
 namespace orxonox
 {
+    class BaseItem;
+/**
+@brief
+    ShipEquipment is the inventory of a player. It's part of the Pawn class.
+
+*/
     class _OrxonoxExport ShipEquipment
     {
         public:
-            void AddItem(Shipitem toAddItem);
-            void RemoveItem(Shipitem toRemoveItem);
-            bool CheckifValid(Shipitem toBeChecked);
-            int
-
+        inline int getSpace()
+        {
+        return Usable.size()+Trunk.size();
+        };
+        bool insert(BaseItem* item);
+        bool erase (BaseItem* item);
+        //void print(std::multimap<std::string, BaseItem*> eut);
+        void eraseAll();
+        //bool checkSlot(BaseItem* item);
+        BaseItem* checkSlot(BaseItem* item);
+//      const std::multimap<std::string, BaseItem*>& getEquipment() const { return this->Equipment; }
+        inline std::multimap<std::string, BaseItem*>& getEquipment() {return this->Equipment;}
+        inline std::multimap<std::string, BaseItem*>& getUsable() {return this->Usable;}
+        inline std::multimap<std::string, BaseItem*>& getTrunk() {return this->Trunk;}
+        inline Pawn* getPlayer() {return this->player ;}
+        inline void setPlayer(Pawn* setplayer)
+        {this->player = setplayer;}
         private:
-            std::multimap<std::string, Item*> Equipment;
+            Pawn* player;//!< Is a pointer to the belonging player
+            std::multimap<std::string, BaseItem*> Equipment;//!< the Equipment for permanent Items
+            std::multimap<std::string, BaseItem*> Usable;//!< Where Usables are stored
+            std::multimap<std::string, BaseItem*> Trunk;//!< Every other Item is stored here
     };
 }
@@ -39 +64 @@
 
 
-
-
-
-
 #endif

code/branches/presentation/src/orxonox/objects/pickup/ShipEquipmentClasses.cc

@@ -57 +57 @@
                 }
                 break;
-            default:;
             }
         case Useable:
             return CheckifSpace();
-        case default:;
         }
         return true;
@@ -67 +65 @@
 
     /*Adds the Item to the Ship*/
-    void ShipEquipment::AddItem(Shipitem* toAddItem)
+    void ShipEquipment::AddItem(ShipItem* toAddItem)
     {
         if(CheckifValid(toAddItem)==true)
@@ -90 +88 @@
         }
     }
+
+    /*Adds the Item to the Ship*/
+    void ShipEquipment::AddItem(Shipitem* toAddItem)
+    {
+        if(CheckifValid(toAddItem)==true)
+        {
+            switch(toAddItem.CheckType()){
+                case Permanent:
+                    Equipment.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
+                    break;
+                case Usable:
+                    Usable.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
+                    break;
+                case Trunk:
+                    Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
+                    break;
+            }
+        }
+        else if(toAddItem.CheckType()==Permanent)
+        {
+            if(CheckifSpace()==true)
+                Trunk.insert ( pair<std::string, ShipItem*>(toAddItem.itemname,toAddItem) );
+        }
+    }
+
+    void ShipEquipment::SwitchItem(Permanent* toSwitchItem)
+    {
+        multimap<string, ShipItem*>::iterator it;
+        string equippedname;
+        equippedname=GetNameofPermanent(toSwitchItem.CheckSubType());
+        it=Equipment.find(equippedname);
+        Trunk.insert (find(equippedname));
+        Equipment.erase (it);
+        Equipment.insert(pair<std::string, ShipItem*>(toSwitchItem.itemname,toSwitchItem)
+    }
+
+    string ShipEquipment::GetNameofPermanent (subItemTypePermanent NametoGet)
+    {
+        multimap<string, ShipItem*>::iterator it;
+        for ( it=Equipment.begin() ; it != Equipment.end(); it++ ){
+            if((*it).second->CheckSubType()==NametoGet){
+                return (*it).first.itemname;
+            }
+        }
+        return 0;
+    }
 }

code/branches/presentation/src/orxonox/objects/pickup/ShipEquipmentClasses.h

@@ -8 +8 @@
 
 /*
-multimap<std::string, Item*> equipment_;
-equipment_.insert(pair<std::string, Item*>("Weapon", new Item()));*/
+multimap<std::string, BaseItem*> equipment_;
+equipment_.insert(pair<std::string, BaseItem*>("Weapon", new BaseItem()));*/
 
 
-/*          std::map<std::itemtype, Item*> EQClasses;
+/*          std::map<std::itemtype, BaseItem*> EQClasses;
             EQClasses["jacke"] = 0;
-            Item* item = itemMap_["jacke"];
+            BaseItem* item = itemMap_["jacke"];
 
            if (itemMap_["jacke"])
@@ -23 +23 @@
     {
         public:
-            void AddItem(Shipitem* toAddItem);
+            /*void AddItem(Shipitem* toAddItem);
             void RemoveItem(Shipitem* toRemoveItem);
             bool CheckifValid(Shipitem* toBeChecked);
             bool CheckifSpace();
+            void SwitchItem(Permanent* toSwitchItem);
+            string GetNameofPermanent (subItemTypePermanent NametoGet);*/ //holt den Namen des getragenen Items im jeweiligen Slot.
 
         private:
-            multimap<std::string, ShipItem*> Equipment;
-            multimap<std::string, ShipItem*> Usable;
-            multimap<std::string, ShipItem*> Trunk;
+            multimap<std::string, BaseItem*> Equipment;
+            multimap<std::string, BaseItem*> Usable;
+            multimap<std::string, BaseItem*> Trunk;
     };
 }

code/branches/presentation/src/orxonox/objects/pickup/ShipItem.cc

@@ -5 +5 @@
     itemtype ShipItem::CheckType()
     {
-        return this.type;
+        return this->type;
     }
 
     subItemTypePermanent CheckSubType()
     {
-        return this.subtype_permanent;
+        return this->subtype_permanent;
     }
+
+    subItemTypePowerups CheckSubType()
+    {
+        return this->subtype_powerups;
+    }
+    subItemTypeUsable CheckSubType()
+    {
+        return this->subtype_usables;
+    }
+
 }

code/branches/presentation/src/orxonox/objects/pickup/ShipItem.h

@@ -21 +21 @@
         public:
             itemType CheckType();
-            virtual
+            //virtual ChecksubType();
 
         private:
@@ -27 +27 @@
             string itemname;
     };
-
 
     /* Useables are Items the Player can choose when to activate and then show an instant action/effect
@@ -37 +36 @@
             Rockets,
             Repairkits,
-            Triggers,           //trigger events usable by the player (Quests f.exp.)
+            Triggers,       //trigger events usable by the player (Quests f.exp.)
             Boosters,
             Shields,

code/branches/presentation/src/orxonox/objects/pickup/Turbo.cc

@@ -8 +8 @@
 namespace orxonox
 {
-        
+
 
         CreateFactory(Turbo);
 
-        Turbo::Turbo(BaseObject* creator) : Item(creator)
+        Turbo::Turbo(BaseObject* creator) : BaseItem(creator)
         {
                 RegisterObject(Turbo);
@@ -33 +33 @@
         XMLPortParam(Turbo, "duration", setDuration, getDuration, xmlelement, mode);
         XMLPortParam(Turbo, "accboost", setAccBoost, getAccBoost, xmlelement, mode);
-        XMLPortParam(Turbo, "rotacc", setRotAcc, getRotAcc, xmlelement, mode);
-        
+        XMLPortParam(Turbo, "rotacc", setRotAcc, getRotAcc, xmlelement, mode);
     }
 
         bool Turbo::pickedUp(Pawn* player)
         {
-                
+
                 if(player-> isA(this->getPlayerBaseClass()))
                         {
                         SpaceShip* ship = dynamic_cast <SpaceShip*>(player);
                         if(duration_==0 )
-                        {       
+                        {
                                 if(addTo(player))
-                                {       
+                                {
                                                 COUT(3)<<"ITEM EQUIPPED"<<std::endl;
                                                 this->setSpeedBoost(ship);
@@ -63 +62 @@
 
         }
-        
-        
+
+
         void Turbo::unsetSpeedBoost(SpaceShip* ship)
         {
+/*
         ship->setMaxSpeed( ship->getMaxSpeed() - this->boost_);
         ship->setTransAcc( ship->getTransAcc()/this->accboost_);
@@ -73 +73 @@
         COUT(3)<<"BOOST UNSET"<<std::endl;
         COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
+*/
+        ship->setPermanentBoost(false);
         }
 
         void Turbo::setSpeedBoost(SpaceShip* ship)
         {
+/*
         COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
         ship->setMaxSpeed( ship->getMaxSpeed() + this->boost_);
@@ -82 +85 @@
         ship->setMaxRotation( ship->getMaxRotation()+this->rotacc_);
         ship->setRotAcc( ship->getRotAcc()+this->rotacc_);
+*/
+    ship->setPermanentBoost(true);
+    ship->setBoost(true);
+
         if( this->duration_ != 0)
         {
@@ -88 +95 @@
                 turbotimer_.setTimer(this->duration_, false, this, executor);
         }
-        COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
+//      COUT(3)<<"Speed:"<< ship->getMaxSpeed()<<std::endl;
         }
         bool Turbo::dropped(Pawn* player)
@@ -99 +106 @@
                         SpaceShip* ship = dynamic_cast <SpaceShip*>(player);
                         this->unsetSpeedBoost(ship);
-                        }       
+                        }
                 }
                 return true;
         }
-        
+
 }
 /*<Template baseclass="Turbo" name=turboitem>
@@ -115 +122 @@
     </PickupSpawner>*/
 
-        
-        
-        
-        
+
+
+
+

code/branches/presentation/src/orxonox/objects/pickup/Turbo.h

@@ -3 +3 @@
 
 #include "tools/Timer.h"
-#include "Item.h"
+#include "BaseItem.h"
 #include "OrxonoxPrereqs.h"
 #include "util/Math.h"
@@ -9 +9 @@
 namespace orxonox
 {
-        class _OrxonoxExport Turbo : public Item
+        class _OrxonoxExport Turbo : public BaseItem
         {
-        
+
         public:
         Turbo(BaseObject* creator);
@@ -39 +39 @@
                 { return this->rotacc_; }
 
-        
+
         inline void setAccBoost(float accboost)
                 { this->accboost_ = accboost; }

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

@@ -88 +88 @@
             virtual void greet() {}
             virtual void use() {}
+            virtual void dropItems() {}
             virtual void switchCamera();
             virtual void mouseLook();

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

@@ -49 +49 @@
 
         PawnManager::touch();
-
+        this->getPickUp().setPlayer(this);
         this->bAlive_ = true;
         this->fire_ = 0x0;
@@ -235 +235 @@
     }
 
+    void Pawn::dropItems()
+    {
+        pickUp.eraseAll();
+    }
+
     void Pawn::setWeaponSlot(WeaponSlot * wSlot)
     {

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-
+#include "objects/pickup/ShipEquipment.h"
 #include "objects/worldentities/ControllableEntity.h"
 #include "objects/RadarViewable.h"
@@ -77 +77 @@
 
             virtual void fire(WeaponMode::Enum fireMode);
-
             virtual void postSpawn();
 
@@ -105 +104 @@
                 { return this->numexplosionchunks_; }
 
+            inline ShipEquipment& getPickUp()
+                {return this->pickUp;}
+
+            virtual void dropItems();
+
         protected:
             virtual void death();
@@ -110 +114 @@
             virtual void spawneffect();
 
+            ShipEquipment pickUp;
             bool bAlive_;
+            
 
             float health_;

code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.cc

@@ -56 +56 @@
         this->localAngularAcceleration_.setValue(0, 0, 0);
         this->bBoost_ = false;
+        this->bPermanentBoost_ = false;
         this->steering_ = Vector3::ZERO;
         this->engine_ = 0;

code/branches/presentation/src/orxonox/objects/worldentities/pawns/SpaceShip.h

@@ -79 +79 @@
                 { return this->enginetemplate_; }
 
+            inline void setPermanentBoost(bool bPermanent)
+                { this->bPermanentBoost_ = bPermanent; }
+            inline bool getPermanentBoost() const
+                { return this->bPermanentBoost_; }
+
         protected:
             bool bInvertYAxis_;
 
             bool bBoost_;
+            bool bPermanentBoost_;
             Vector3 steering_;
             float primaryThrust_;
             float auxilaryThrust_;
             float rotationThrust_;
-
             btVector3 localLinearAcceleration_;
             btVector3 localAngularAcceleration_;

code/branches/presentation/src/orxonox/overlays/notifications/NotificationQueue.cc

@@ -38 +38 @@
 {
     NotificationQueue* NotificationQueue::queue_s = 0;
-    
+
     CreateFactory(NotificationQueue);
 
@@ -53 +53 @@
                 queue_s = this;
         }
-        
+
         this->length_ = 3;
         this->width_ = 50;
+COUT(0) << "added notification queue" << std::endl;
     }
-    
+
     NotificationQueue::~NotificationQueue()
     {
-        
+COUT(0) << "deleted notification queue" << std::endl;
+
     }
-    
+
     void NotificationQueue::XMLPort(Element& xmlElement, XMLPort::Mode mode)
     {
         SUPER(NotificationQueue, XMLPort, xmlElement, mode);
-        
+
         XMLPortParam(NotificationQueue, "length", setLength, getLength, xmlElement, mode);
         XMLPortParam(NotificationQueue, "width", setWidth, getWidth, xmlElement, mode);
     }
-    
+
     void NotificationQueue::tick(float dt)
     {
         NotificationManager::tick(dt);
-        
+
         update();
     }
-    
+
     bool NotificationQueue::setLength(int length)
     {
@@ -87 +89 @@
         return false;
     }
-    
+
     bool NotificationQueue::setWidth(int width)
     {
@@ -97 +99 @@
         return false;
     }
-    
+
     void NotificationQueue::setQueueText(const std::string & text)
     {
+COUT(0) << "queue: " << text << std::endl;
         this->queueText_ = text;
     }
-    
+
     void NotificationQueue::update(void)
     {