Changeset 2060 for code/branches/weapon/src/orxonox/objects/SpaceShip.cc

Timestamp:

Oct 29, 2008, 4:13:10 PM (16 years ago)

Author:

polakma

Message:

WeaponSystem, Projectile (kompiliert nicht)

File:

• code/branches/weapon/src/orxonox/objects/SpaceShip.cc (modified) (2 diffs)

code/branches/weapon/src/orxonox/objects/SpaceShip.cc

@@ -142 +142 @@
 
         this->radarObject_ = static_cast<WorldEntity*>(this);
+
+        //WeaponSystem
+        weaponSystem_ = new WeaponSystem();
+        WeaponSet * weaponSet1 = new WeaponSet(1);
+        this->weaponSystem_->attachWeaponSet(weaponSet1);
+        this->weaponSystem_->getWeaponSetPointer(0)->getWeaponSlotPointer(0)->setAmmoType(true);
+
     }
 
@@ -474 +481 @@
         if (this->bLMousePressed_ && this->timeToReload_ <= 0)
         {
-
-            BillboardProjectile* projectile = new ParticleProjectile(this);
-            projectile->setColour(this->getProjectileColour());
-            projectile->create();
-            if (projectile->getClassID() == 0)
-            {
-              COUT(3) << "generated projectile with classid 0" <<  std::endl; // TODO: remove this output
-            }
-
-            projectile->setObjectMode(0x3);
+            this->weaponSystem_->fire(0);
             this->timeToReload_ = this->reloadTime_;
         }