Changeset 2098 for code/trunk/src/orxonox/objects/worldentities/pawns

Timestamp:

Nov 1, 2008, 11:17:22 PM (16 years ago)

Author:

landauf

Message:

• added a WeaponSystem to Pawn
• initialized values in weapon classes and fixed some vector limit conditions

Location:

code/trunk/src/orxonox/objects/worldentities/pawns

Files:

• Pawn.cc (modified) (3 diffs)
• Pawn.h (modified) (2 diffs)

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -35 +35 @@
 #include "objects/infos/PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"
+#include "objects/WeaponSystem.h"
 
 namespace orxonox
@@ -51 +52 @@
 
         this->lastHitOriginator_ = 0;
+        this->weaponSystem_ = 0;
+
+        /*
+        //WeaponSystem
+        weaponSystem_ = new WeaponSystem();
+        WeaponSet * weaponSet1 = new WeaponSet(1);
+        this->weaponSystem_->attachWeaponSet(weaponSet1);
+        this->weaponSystem_->getWeaponSetPointer(0)->getWeaponSlotPointer(0)->setAmmoType(true);
+        */
 
         this->registerVariables();
@@ -127 +137 @@
     }
 
+    void Pawn::fire()
+    {
+        if (this->weaponSystem_)
+            this->weaponSystem_->fire();
+    }
+
     void Pawn::postSpawn()
     {

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -74 +74 @@
             virtual void kill();
 
+            virtual void fire();
+
             virtual void postSpawn();
 
@@ -87 +89 @@
 
             Pawn* lastHitOriginator_;
+
+            WeaponSystem* weaponSystem_;
     };
 }