- Timestamp:
- Aug 25, 2013, 9:08:42 PM (11 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/core6 merged: 9552-9554,9556-9574,9577-9579,9585-9593,9596-9612,9626-9662
- Property svn:mergeinfo changed
-
code/trunk/src/modules/weapons/weaponmodes/LightningGun.cc
r9016 r9667 44 44 namespace orxonox 45 45 { 46 CreateFactory(LightningGun);46 RegisterClass(LightningGun); 47 47 48 LightningGun::LightningGun( BaseObject* creator) : WeaponMode(creator)48 LightningGun::LightningGun(Context* context) : WeaponMode(context) 49 49 { 50 50 RegisterObject(LightningGun); … … 68 68 void LightningGun::fire() 69 69 { 70 LightningGunProjectile* projectile = new LightningGunProjectile(this );70 LightningGunProjectile* projectile = new LightningGunProjectile(this->getContext()); 71 71 projectile->setMaterial("Flares/LightningBall_"); 72 72
Note: See TracChangeset
for help on using the changeset viewer.