Changeset 2288 for code/branches/weapon2/src/orxonox/objects/worldentities

Timestamp:

Nov 26, 2008, 7:42:29 PM (16 years ago)

Author:

polakma

Message:

added WeaponPack

Location:

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

Files:

• Pawn.cc (modified) (5 diffs)
• Pawn.h (modified) (1 diff)
• Spectator.cc (modified) (1 diff)
• Spectator.h (modified) (1 diff)

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

@@ -52 +52 @@
 
         this->lastHitOriginator_ = 0;
-        this->weaponSystem_ = 0;
 
         //WeaponSystem
@@ -58 +57 @@
         WeaponSet * weaponSet1 = new WeaponSet(this,1);
         this->weaponSystem_->attachWeaponSet(weaponSet1);
+        //totally bad solution...
+        weaponSet1->setParentWeaponSystem(weaponSystem_);
 
 
@@ -74 +75 @@
         XMLPortParam(Pawn, "maxhealth", setMaxHealth, getMaxHealth, xmlelement, mode).defaultValues(200);
         XMLPortParam(Pawn, "initialhealth", setInitialHealth, getInitialHealth, xmlelement, mode).defaultValues(100);
-    }
+
+        XMLPortObject(Pawn, WeaponSlot, "weaponslots", setWeaponSlot, getWeaponSlot, xmlelement, mode);
+        //XMLPortObject(Pawn, WeaponPack, "weapons", setWeaponPack, getWeaponPack, xmlelement, mode);
+
+        }
 
     void Pawn::registerVariables()
@@ -137 +142 @@
     void Pawn::fire(WeaponMode::Enum fireMode)
     {
+COUT(0) << "Pawn::fire" << std::endl;
         if (this->weaponSystem_)
             this->weaponSystem_->fire(fireMode);
@@ -146 +152 @@
         this->spawn();
     }
+
+    void Pawn::setWeaponSlot(WeaponSlot * wSlot)
+    {
+        this->weaponSystem_->attachWeaponSlot(wSlot);
+    }
+
+    WeaponSlot * Pawn::getWeaponSlot(unsigned int index) const
+    {
+        return this->weaponSystem_->getWeaponSlotPointer(index);
+    }
+
 }

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

@@ -79 +79 @@
             virtual void postSpawn();
 
+            void setWeaponSlot(WeaponSlot * wSlot);
+            WeaponSlot * getWeaponSlot(unsigned int index) const;
+
         protected:
             virtual void spawn();

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

@@ -169 +169 @@
     }
 
-    void Spectator::fire()
+    void Spectator::fire(WeaponMode::Enum fireMode)
     {
         if (this->getPlayer())

code/branches/weapon2/src/orxonox/objects/worldentities/pawns/Spectator.h

@@ -56 +56 @@
             virtual void rotateRoll(const Vector2& value);
 
-            virtual void fire();
+            virtual void fire(WeaponMode::Enum fireMode);
             virtual void greet();