Changeset 9667 for code/trunk/src/modules/weapons/weaponmodes/HsW01.cc
- Timestamp:
- Aug 25, 2013, 9:08:42 PM (12 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/HsW01.cc
r9526 r9667 50 50 namespace orxonox 51 51 { 52 CreateFactory(HsW01);52 RegisterClass(HsW01); 53 53 54 HsW01::HsW01( BaseObject* creator) : WeaponMode(creator)54 HsW01::HsW01(Context* context) : WeaponMode(context) 55 55 { 56 56 RegisterObject(HsW01); … … 111 111 112 112 // Create the projectile. 113 Projectile* projectile = new Projectile(this );114 Model* model = new Model(projectile );113 Projectile* projectile = new Projectile(this->getContext()); 114 Model* model = new Model(projectile->getContext()); 115 115 model->setMeshSource(mesh_); 116 116 model->setCastShadows(false); … … 138 138 void HsW01::muzzleflash() 139 139 { 140 MuzzleFlash *muzzleFlash = new MuzzleFlash(this );140 MuzzleFlash *muzzleFlash = new MuzzleFlash(this->getContext()); 141 141 this->getWeapon()->attach(muzzleFlash); 142 142 muzzleFlash->setPosition(this->getMuzzleOffset());
Note: See TracChangeset
for help on using the changeset viewer.