- Timestamp:
- Apr 18, 2009, 6:14:52 PM (15 years ago)
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
code/branches/weapons/src/orxonox/objects/weaponSystem/weapons/LaserFire.cc
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/code/branches/gui/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc merged eligible /code/branches/lodfinal/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc merged eligible /code/branches/pickups/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc merged eligible /code/branches/pickups2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc merged eligible /code/branches/weaponsystem/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc merged eligible /code/branches/buildsystem/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 1874-2276,2278-2400 /code/branches/buildsystem2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2506-2658 /code/branches/buildsystem3/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2662-2708 /code/branches/ceguilua/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 1802-1808 /code/branches/core3/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 1572-1739 /code/branches/gcc43/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 1580 /code/branches/input/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 1629-1636 /code/branches/miniprojects/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2754-2824 /code/branches/network/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2356 /code/branches/network64/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2210-2355 /code/branches/objecthierarchy/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 1911-2085,2100,2110-2169 /code/branches/objecthierarchy2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2171-2479 /code/branches/overlay/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2117-2385 /code/branches/physics/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 1912-2055,2107-2439 /code/branches/physics_merge/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2436-2457 /code/branches/presentation/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2369-2652,2654-2660 /code/branches/questsystem/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 1894-2088 /code/branches/questsystem2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2107-2259 /code/branches/script_trigger/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 1295-1953,1955 /code/branches/weapon/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 1925-2094 /code/branches/weapon2/src/orxonox/objects/weaponSystem/weapons/LaserGun.cc 2107-2488
r2914 r2918 28 28 29 29 #include "OrxonoxStableHeaders.h" 30 #include "Laser Gun.h"30 #include "LaserFire.h" 31 31 32 32 #include "core/CoreIncludes.h" 33 #include "objects/weaponSystem/projectiles/ParticleProjectile.h" 33 34 34 #include "objects/weaponSystem/ Munition.h"35 #include "objects/weaponSystem/ projectiles/ParticleProjectile.h"35 #include "objects/weaponSystem/Weapon.h" 36 #include "objects/weaponSystem/WeaponPack.h" 36 37 #include "objects/weaponSystem/WeaponSystem.h" 37 38 38 39 namespace orxonox 39 40 { 40 CreateFactory(Laser Gun);41 CreateFactory(LaserFire); 41 42 42 Laser Gun::LaserGun(BaseObject* creator) : Weapon(creator)43 LaserFire::LaserFire(BaseObject* creator) : WeaponMode(creator) 43 44 { 44 RegisterObject(Laser Gun);45 RegisterObject(LaserFire); 45 46 47 this->reloadTime_ = 0.25; 48 this->damage_ = 15; 46 49 this->speed_ = 1250; 47 50 51 this->setMunitionName("LaserGunMunition"); 48 52 } 49 53 50 LaserGun::~LaserGun()54 void LaserFire::fire() 51 55 { 52 }56 ParticleProjectile* projectile = new ParticleProjectile(this); 53 57 54 void LaserGun::reloadBullet() 55 { 56 this->bulletTimer(this->bulletLoadingTime_); 57 } 58 projectile->setOrientation(this->getMuzzleOrientation()); 59 projectile->setPosition(this->getMuzzlePosition()); 60 projectile->setVelocity(this->getMuzzleDirection() * this->speed_); 58 61 59 void LaserGun::reloadMagazine() 60 { 61 this->magazineTimer(this->magazineLoadingTime_); 62 } 63 64 void LaserGun::takeBullets() 65 { 66 this->munition_->removeBullets(1); 67 } 68 69 void LaserGun::takeMagazines() 70 { 71 this->munition_->removeMagazines(1); 72 } 73 74 void LaserGun::createProjectile() 75 { 76 BillboardProjectile* projectile = new ParticleProjectile(this); 77 projectile->setOrientation(this->getWorldOrientation()); 78 projectile->setPosition(this->getWorldPosition()); 79 projectile->setVelocity(this->getWorldOrientation() * WorldEntity::FRONT * this->speed_); 80 projectile->setOwner(this->getWeaponSystem()->getPawn()); 62 projectile->setOwner(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()); 63 projectile->setDamage(this->getDamage()); 81 64 } 82 65 } -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.