Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
May 16, 2011, 5:25:00 PM (13 years ago)
Author:
simonmie
Message:

New Shield effect added (from tibork), first working BasicProjectile class, changes in weapon classes to fit new BasicProjectile system, some spam messages in Pawn.cc removed

Location:
code/branches/gameimmersion/src/modules/weapons/weaponmodes
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • code/branches/gameimmersion/src/modules/weapons/weaponmodes/EnergyDrink.cc

    r7284 r8492  
    112112        projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
    113113        projectile->setDamage(this->getDamage());
     114        projectile->setShieldDamage(this->getShieldDamage());
     115        projectile->setHealthDamage(this->getHealthDamage());
    114116
    115117        EnergyDrink::muendungsfeuer();

  • code/branches/gameimmersion/src/modules/weapons/weaponmodes/FusionFire.cc

    r6732 r8492  
    6565        projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
    6666        projectile->setDamage(this->getDamage());
     67        projectile->setShieldDamage(this->getShieldDamage());
     68        projectile->setHealthDamage(this->getHealthDamage());
     69
    6770        projectile->setColour(ColourValue(1.0f, 0.7f, 0.3f, 1.0f));
    6871    }

  • code/branches/gameimmersion/src/modules/weapons/weaponmodes/HsW01.cc

    r7284 r8492  
    126126        projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
    127127        projectile->setDamage(this->getDamage());
     128        projectile->setShieldDamage(this->getShieldDamage());
     129        projectile->setHealthDamage(this->getHealthDamage());
    128130
    129131        HsW01::muendungsfeuer();

  • code/branches/gameimmersion/src/modules/weapons/weaponmodes/LaserFire.cc

    r6732 r8492  
    6161        projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
    6262        projectile->setDamage(this->getDamage());
     63        projectile->setShieldDamage(this->getShieldDamage());
     64        projectile->setHealthDamage(this->getHealthDamage());
    6365    }
    6466}

  • code/branches/gameimmersion/src/modules/weapons/weaponmodes/LightningGun.cc

    r8386 r8492  
    7070        projectile->setDamage(this->getDamage());
    7171        projectile->setShieldDamage(this->getShieldDamage());
     72        projectile->setHealthDamage(this->getHealthDamage());
    7273    }
    7374}

  • code/branches/gameimmersion/src/modules/weapons/weaponmodes/RocketFire.cc

    r7846 r8492  
    7171        rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
    7272        rocket->setDamage(this->getDamage());
     73//        rocket->setShieldDamage(this->getShieldDamage());
     74//        rocket->setHealthDamage(this->getHealthDamage());
    7375    }
    7476}

  • code/branches/gameimmersion/src/modules/weapons/weaponmodes/SimpleRocketFire.cc

    r7846 r8492  
    7171        rocket->setVelocity(this->getMuzzleDirection()*this->speed_);
    7272        rocket->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn());
     73
    7374        rocket->setDamage(this->damage_);
     75//        rocket->setShieldDamage(this->getShieldDamage());
     76//        rocket->setHealthDamage(this->getHealthDamage());
     77
    7478        WorldEntity* pawnn=static_cast<ControllableEntity*>(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn())->getTarget();
    7579        if (pawnn) con->setTarget(pawnn);
Note: See TracChangeset for help on using the changeset viewer.