Changeset 9667 for code/trunk/src/modules/weapons/weaponmodes/FusionFire.cc
- 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/FusionFire.cc
r8855 r9667 46 46 namespace orxonox 47 47 { 48 CreateFactory(FusionFire);48 RegisterClass(FusionFire); 49 49 50 FusionFire::FusionFire( BaseObject* creator) : WeaponMode(creator)50 FusionFire::FusionFire(Context* context) : WeaponMode(context) 51 51 { 52 52 RegisterObject(FusionFire); … … 66 66 void FusionFire::fire() 67 67 { 68 BillboardProjectile* projectile = new BillboardProjectile(this );68 BillboardProjectile* projectile = new BillboardProjectile(this->getContext()); 69 69 70 70 projectile->setOrientation(this->getMuzzleOrientation());
Note: See TracChangeset
for help on using the changeset viewer.