Changeset 2324 for code/branches/pickups2/src

Timestamp:

Dec 3, 2008, 4:07:49 PM (16 years ago)

Author:

dsommer

Message:

Aufnehmen von festen Item und wieder ablegen

Location:

code/branches/pickups2/src/orxonox

Files:

• CMakeLists.txt (modified) (1 diff)
• objects/controllers/HumanController.cc (modified) (2 diffs)
• objects/controllers/HumanController.h (modified) (1 diff)
• objects/pickup/Item.cc (modified) (3 diffs)
• objects/pickup/Item.h (modified) (1 diff)
• objects/pickup/ShipEquipment.cc (modified) (2 diffs)
• objects/pickup/ShipEquipment.h (modified) (3 diffs)
• objects/pickup/Turbo.cc (modified) (2 diffs)
• objects/worldentities/ControllableEntity.h (modified) (1 diff)
• objects/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• objects/worldentities/pawns/Pawn.h (modified) (1 diff)

code/branches/pickups2/src/orxonox/CMakeLists.txt

@@ -72 +72 @@
   objects/pickup/Item.cc
   objects/pickup/Turbo.cc
+  objects/pickup/ShipEquipment.cc
 
   objects/quest/AddQuest.cc

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

@@ -47 +47 @@
     SetConsoleCommand(HumanController, use,           true);
     SetConsoleCommand(HumanController, switchCamera,  true);
+    SetConsoleCommand(HumanController, dropItems,     true);
 
     CreateUnloadableFactory(HumanController);
@@ -129 +130 @@
             HumanController::localController_s->controllableEntity_->switchCamera();
     }
+
+    void HumanController::dropItems()
+    {
+        if (HumanController::localController_s && HumanController::localController_s->controllableEntity_)
+            HumanController::localController_s->controllableEntity_->dropItems();
+    }
 }

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

@@ -57 +57 @@
             static void use();
             static void switchCamera();
+            static void dropItems();
 
         private:

code/branches/pickups2/src/orxonox/objects/pickup/Item.cc

@@ -8 +8 @@
 #include "util/String.h"
 #include "objects/worldentities/pawns/Pawn.h"
+
 
 namespace orxonox
@@ -30 +31 @@
 bool Item::addTo (Pawn* player)
 {
+        
+        return player->getPickUp().insert(this);
         /*if(checkSlot(player)==true)
         player->pickUp.Equipment.insert ( std::pair<std::string, Item*>(this->getName(),this) );
         else
         COUT(3) << "swap?" << std::endl;*/
-        return player->getPickUp().insert(this);
 }
 bool Item::remove(Pawn* player)
@@ -51 +53 @@
 bool Item::checkSlot(Pawn* player)
 {
-        /*std::multimap<std::string,Item*>::iterator it;
-        for ( it=player->pickUp.Equipment.begin() ; it != player->pickUp.Equipment.end(); it++ )
+        std::multimap<std::string,Item*>::iterator it;
+        for ( it=player->getPickUp().getEquipment().begin() ; it != player->getPickUp().getEquipment().end(); it++ )
         {
         if((*it).second->playerBaseClass_==this->playerBaseClass_)
         return false;
         }
-        return true;*/
-        return player->getPickUp().checkSlot(this);
+        return true;
+        //return player->getPickUp().checkSlot(player);
 }
 void Item::setPlayerBaseClassName(const std::string& name)

code/branches/pickups2/src/orxonox/objects/pickup/Item.h

@@ -4 +4 @@
 #include "core/BaseObject.h"
 #include "OrxonoxPrereqs.h"
-#include "ShipEquipment.h"
 
 namespace orxonox
 {
+        class ShipEquipment;
+
         class _OrxonoxExport Item : public BaseObject
         {

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

@@ -1 +1 @@
 #include "Item.h"
 #include "ShipEquipment.h"
+#include "objects/worldentities/pawns/Pawn.h"
 
 
 namespace orxonox
 {
+
         bool ShipEquipment::insert(Item* item)
         {
-        if(checkSlot(player)==true)
+        if(checkSlot(item)==true)
+        {
                 Equipment.insert ( std::pair<std::string, Item*>(item->getName(),item) );
-        else
+                return true;
+        }
                 COUT(3) << "swap?" << std::endl;
+                return false;
         
+        return false;
         };
         bool ShipEquipment::erase (Item* item)
         {
-        if(Equipment.find(item->getName())!= Equipment.end())
+        std::multimap<std::string,Item*>::iterator it = Equipment.find(item->getName());
+        if(it != Equipment.end())
         {
-                std::multimap<std::string,Item*>::iterator it;
-                it=Equipment.find(item->getName());
+                //it->second->dropped(this->getPlayer());
                 Equipment.erase (it);
                 return true;
@@ -25 +31 @@
                 return false;
         };
-        bool ShipEquipment::checkSlot(Item* item) const
+
+        void ShipEquipment::eraseAll()
+        {
+                
+                for (std::multimap<std::string,Item*>::iterator it = Equipment.begin(); it != Equipment.end(); )
+                {
+                
+                        (it++)->second->dropped(this->getPlayer());
+                }
+        }
+
+        bool ShipEquipment::checkSlot(Item* item)
         {
         std::multimap<std::string,Item*>::iterator it;
-        for ( it=Equipment.begin() ; it != Equipment.end(); it++ )
+        for ( it= getPlayer()->getPickUp().getEquipment().begin() ; it != getPlayer()->getPickUp().getEquipment().end(); it++ )
         {
-                if((*it).second->playerBaseClass_==item->playerBaseClass_)
+                if((*it).second->getPlayerBaseClass()==item->getPlayerBaseClass())
                 return false;
         }

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

@@ -3 +3 @@
 #include <string>
 #include <map>
-#include "Item.h"
 
 /*
@@ -18 +17 @@
 namespace orxonox
 {
+    class Item;
+
     class _OrxonoxExport ShipEquipment
     {
@@ -27 +28 @@
         bool insert(Item* item);
         bool erase (Item* item);
-        const bool checkSlot(Item* item) const;
+        void eraseAll();
+        bool checkSlot(Item* item);
 //      const std::multimap<std::string, Item*>& getEquipment() const { return this->Equipment; }
+        inline std::multimap<std::string, Item*>& getEquipment() {return this->Equipment;}
+        inline std::multimap<std::string, Item*>& getUsable() {return this->Usable;}
+        inline std::multimap<std::string, Item*>& getTrunk() {return this->Trunk;}
+        inline Pawn* getPlayer() {return this->player ;}
+        inline void setPlayer(Pawn* setplayer)
+        {this->player = setplayer;}
 
         private:
+            Pawn* player;
             std::multimap<std::string, Item*> Equipment;
             std::multimap<std::string, Item*> Usable;

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

@@ -42 +42 @@
                         {
                         SpaceShip* ship = dynamic_cast <SpaceShip*>(player);
-                        this->setSpeedBoost(ship);
-                        if(duration_==0)
-                        addTo(player);
-                        return true;
+                        if(duration_==0 )
+                        {       if(addTo(player))
+                                        {
+                                                this->setSpeedBoost(ship);
+                                                return true;
+                                        }
+                        }
+                        else
+                        {
+                                this->setSpeedBoost(ship);
+                                return true;
+                        }
+                        return false;
                         }
                 return false;
@@ -79 +88 @@
                 if (this->duration_ == 0)
                 {
+                        COUT(0) << "dropped" << std::endl;
                         if(remove(player)==true);
                         {

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

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

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

@@ -46 +46 @@
 
         this->bAlive_ = false;
-
+        this->getPickUp().setPlayer(this);
         this->health_ = 0;
         this->maxHealth_ = 0;
@@ -148 +148 @@
         this->spawn();
     }
+
+    void Pawn::dropItems()
+    {
+        pickUp.eraseAll();
+    }
 }

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

@@ -75 +75 @@
 
             virtual void fire();
+            virtual void postSpawn();
+
             inline ShipEquipment& getPickUp()
                 {return this->pickUp;}
-            virtual void postSpawn();
+
+            virtual void dropItems();
 
         protected: