Changeset 2919 for code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.cc

Timestamp:

Apr 18, 2009, 6:41:00 PM (16 years ago)

Author:

landauf

Message:

removed some debug output, cleanup in WeaponMode

File:

• code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.cc (modified) (2 diffs)

code/branches/weapons/src/orxonox/objects/weaponSystem/WeaponMode.cc

@@ -63 +63 @@
         this->damage_ = 0;
         this->muzzleOffset_ = Vector3::ZERO;
-
-COUT(0) << "+WeaponMode" << std::endl;
     }
 
     WeaponMode::~WeaponMode()
     {
-COUT(0) << "~WeaponMode" << std::endl;
     }
 
@@ -221 +218 @@
             return WorldEntity::FRONT;
     }
-
-/*
-    WeaponMode::WeaponMode(BaseObject* creator) : StaticEntity(creator)
-    {
-        RegisterObject(WeaponMode);
-
-        this->bulletReadyToShoot_ = true;
-        this->magazineReadyToShoot_ = true;
-        this->weaponSystem_ = 0;
-        this->weaponPack_ = 0;
-        this->weaponSlot_ = 0;
-        this->bulletLoadingTime_ = 0;
-        this->magazineLoadingTime_ = 0;
-        this->bReloading_ = false;
-        this->bulletAmount_= 0;
-        this->magazineAmount_ = 0;
-        this->munition_ = 0;
-        this->unlimitedMunition_ = false;
-        this->setObjectMode(0x0);
-COUT(0) << "+WeaponMode" << std::endl;
-    }
-
-    WeaponMode::~WeaponMode()
-    {
-COUT(0) << "~WeaponMode" << std::endl;
-        if (this->isInitialized() && this->weaponPack_)
-            this->weaponPack_->removeWeapon(this);
-    }
-
-    void WeaponMode::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(WeaponMode, XMLPort, xmlelement, mode);
-
-        XMLPortParam(WeaponMode, "munitionType", setMunitionType, getMunitionType, xmlelement, mode);
-        XMLPortParam(WeaponMode, "bulletLoadingTime", setBulletLoadingTime, getBulletLoadingTime, xmlelement, mode);
-        XMLPortParam(WeaponMode, "magazineLoadingTime", setMagazineLoadingTime, getMagazineLoadingTime, xmlelement, mode);
-        XMLPortParam(WeaponMode, "bullets", setBulletAmount, getBulletAmount, xmlelement, mode);
-        XMLPortParam(WeaponMode, "magazines", setMagazineAmount, getMagazineAmount, xmlelement, mode);
-        XMLPortParam(WeaponMode, "unlimitedMunition", setUnlimitedMunition, getUnlimitedMunition, xmlelement, mode);
-    }
-
-    void WeaponMode::setWeapon()
-    {
-        this->munition_->fillBullets();
-        this->munition_->fillMagazines();
-    }
-
-    void WeaponMode::setMunition()
-    {
-        this->munition_->setMaxBullets(this->bulletAmount_);
-        this->munition_->setMaxMagazines(this->magazineAmount_);
-    }
-
-    void WeaponMode::fire()
-    {
-        if ( this->bulletReadyToShoot_ && this->magazineReadyToShoot_ && !this->bReloading_)
-        {
-            this->bulletReadyToShoot_ = false;
-            if ( this->unlimitedMunition_== true )
-            {
-                //shoot
-                this->reloadBullet();
-                this->createProjectile();
-            }
-            else
-            {
-                if ( this->munition_->bullets() > 0)
-                {
-                    //shoot and reload
-                    this->takeBullets();
-                    this->reloadBullet();
-                    this->createProjectile();
-                }
-                //if there are no bullets, but magazines
-                else if ( this->munition_->magazines() > 0 && this->munition_->bullets() == 0 )
-                {
-                    //reload magazine
-                    this->takeMagazines();
-                    this->reloadMagazine();
-                }
-                else
-                {
-                    //no magazines
-                }
-            }
-        }
-        else
-        {
-            //weapon not reloaded
-        }
-    }
-
-
-    //weapon reloading
-    void WeaponMode::bulletTimer(float bulletLoadingTime)
-    {
-        this->bReloading_ = true;
-        this->bulletReloadTimer_.setTimer( bulletLoadingTime , false , this , createExecutor(createFunctor(&WeaponMode::bulletReloaded)));
-    }
-    void WeaponMode::magazineTimer(float magazineLoadingTime)
-    {
-        this->bReloading_ = true;
-        this->magazineReloadTimer_.setTimer( magazineLoadingTime , false , this , createExecutor(createFunctor(&WeaponMode::magazineReloaded)));
-    }
-
-    void WeaponMode::bulletReloaded()
-    {
-        this->bReloading_ = false;
-        this->bulletReadyToShoot_ = true;
-    }
-
-    void WeaponMode::magazineReloaded()
-    {
-        this->bReloading_ = false;
-        this->munition_->fillBullets();
-    }
-
-
-
-    void WeaponMode::attachNeededMunition(const std::string& munitionName)
-    {
-        //  if munition type already exists attach it, else create a new one of this type and attach it to the weapon and to the WeaponSystem
-        if (this->weaponSystem_)
-        {
-            //getMunitionType returns 0 if there is no such munitionType
-            Munition* munition = this->weaponSystem_->getMunitionType(munitionName);
-            if ( munition )
-            {
-                this->munition_ = munition;
-                this->setMunition();
-            }
-            else
-            {
-                //create new munition with identifier because there is no such munitionType
-                this->munitionIdentifier_ = ClassByString(munitionName);
-                this->munition_ = this->munitionIdentifier_.fabricate(this);
-                this->weaponSystem_->setNewMunition(munitionName, this->munition_);
-                this->setMunition();
-            }
-        }
-    }
-
-
-    Munition * WeaponMode::getAttachedMunition(const std::string& munitionType)
-    {
-        this->munition_ = this->weaponSystem_->getMunitionType(munitionType);
-        return this->munition_;
-    }
-*/
 }