Changeset 2347 for code/branches/weapon2

Timestamp:

Dec 5, 2008, 11:44:37 AM (16 years ago)

Author:

polakma

Message:

debugging changes

Location:

code/branches/weapon2/src/orxonox/objects/weaponSystem

Files:

• Weapon.cc (modified) (1 diff)
• WeaponPack.cc (modified) (2 diffs)
• weapons/LaserGun.cc (modified) (2 diffs)

code/branches/weapon2/src/orxonox/objects/weaponSystem/Weapon.cc

@@ -107 +107 @@
 
     void Weapon::setMunitionType(std::string munitionType)
-    {   this->munitionType_ = munitionType; }
+    {   
+COUT(0) << "Weapon::setMunitionType (XMLPort) "<< munitionType << std::endl;
+this->munitionType_ = munitionType; }
 
     std::string Weapon::getMunitionType()

code/branches/weapon2/src/orxonox/objects/weaponSystem/WeaponPack.cc

@@ -97 +97 @@
     {
         weapon->setParentWeaponSystem(this->parentWeaponSystem_);
+COUT(0) << "WeaponPack::addWeapon " << weapon->getMunitionType() << std::endl;
         this->weapons_.push_back(weapon);
     }
-    
+
     Weapon * WeaponPack::getWeapon(unsigned int index)
     {
@@ -111 +112 @@
             this->weapons_[i]->setParentWeaponSystem(weaponSystem);
         }
-        
+
     }
 }

code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc

@@ -48 +48 @@
         //this->setLoadingTime(0.5);
 
-        //how could it be loaded by XML
+COUT(0) << "LaserGun::LaserGun" << std::endl;
         this->attachNeededMunition(this->getMunitionType());
     }
@@ -61 +61 @@
         if ( this->getBulletReadyToShoot() && this->getMagazineReadyToShoot() )
         {
-COUT(0) << "LaserGun::fire - ready to shoot" << std::endl;    
+COUT(0) << "LaserGun::fire - ready to shoot" << std::endl;
             //take munition
+            this->setBulletReadyToShoot(false);
+            Weapon::bulletTimer();
             this->getAttachedMunition(this->munitionType_)->removeBullets(1,this);
-            Weapon::bulletTimer();
-            this->setBulletReadyToShoot(false);
 
             //create projectile