Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Aug 9, 2013, 9:26:46 PM (11 years ago)
Author:
landauf
Message:

BaseObject now requires a Context instead of a creator (BaseObject*) in its constructor.
Namespace, Level, and Scene inherit from Context

Location:
code/branches/core6/src/modules/weapons/weaponmodes
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r8855 r9629  
    5151    CreateFactory(EnergyDrink);
    5252
    53     EnergyDrink::EnergyDrink(BaseObject* creator) : WeaponMode(creator)
     53    EnergyDrink::EnergyDrink(Context* context) : WeaponMode(context)
    5454    {
    5555        RegisterObject(EnergyDrink);
    … …  
    101101    {
    102102        // Create the projectile
    103         Projectile* projectile = new Projectile(this);
    104         Model* model = new Model(projectile);
     103        Projectile* projectile = new Projectile(this->getContext());
     104        Model* model = new Model(projectile->getContext());
    105105        model->setMeshSource("can.mesh");
    106106        model->setCastShadows(false);
    … …  
    127127    void EnergyDrink::muzzleflash()
    128128    {
    129         MuzzleFlash *muzzleFlash = new MuzzleFlash(this);
     129        MuzzleFlash *muzzleFlash = new MuzzleFlash(this->getContext());
    130130        this->getWeapon()->attach(muzzleFlash);
    131131        muzzleFlash->setPosition(this->getMuzzleOffset());

  • code/branches/core6/src/modules/weapons/weaponmodes/EnergyDrink.h

    r8855 r9629  
    5454    {
    5555        public:
    56             EnergyDrink(BaseObject* creator);
     56            EnergyDrink(Context* context);
    5757            virtual ~EnergyDrink() {}
    5858

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

    r8855 r9629  
    4848    CreateFactory(FusionFire);
    4949
    50     FusionFire::FusionFire(BaseObject* creator) : WeaponMode(creator)
     50    FusionFire::FusionFire(Context* context) : WeaponMode(context)
    5151    {
    5252        RegisterObject(FusionFire);
    … …  
    6666    void FusionFire::fire()
    6767    {
    68         BillboardProjectile* projectile = new BillboardProjectile(this);
     68        BillboardProjectile* projectile = new BillboardProjectile(this->getContext());
    6969
    7070        projectile->setOrientation(this->getMuzzleOrientation());

  • code/branches/core6/src/modules/weapons/weaponmodes/FusionFire.h

    r8855 r9629  
    5151    {
    5252        public:
    53             FusionFire(BaseObject* creator);
     53            FusionFire(Context* context);
    5454            virtual ~FusionFire() {}
    5555

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

    r9526 r9629  
    5252    CreateFactory(HsW01);
    5353
    54     HsW01::HsW01(BaseObject* creator) : WeaponMode(creator)
     54    HsW01::HsW01(Context* context) : WeaponMode(context)
    5555    {
    5656        RegisterObject(HsW01);
    … …  
    111111
    112112        // 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());
    115115        model->setMeshSource(mesh_);
    116116        model->setCastShadows(false);
    … …  
    138138    void HsW01::muzzleflash()
    139139    {
    140         MuzzleFlash *muzzleFlash = new MuzzleFlash(this);
     140        MuzzleFlash *muzzleFlash = new MuzzleFlash(this->getContext());
    141141        this->getWeapon()->attach(muzzleFlash);
    142142        muzzleFlash->setPosition(this->getMuzzleOffset());

  • code/branches/core6/src/modules/weapons/weaponmodes/HsW01.h

    r9526 r9629  
    5353    {
    5454        public:
    55             HsW01(BaseObject* creator);
     55            HsW01(Context* context);
    5656            virtual ~HsW01();
    5757

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

    r8855 r9629  
    4747    CreateFactory(LaserFire);
    4848
    49     LaserFire::LaserFire(BaseObject* creator) : WeaponMode(creator)
     49    LaserFire::LaserFire(Context* context) : WeaponMode(context)
    5050    {
    5151        RegisterObject(LaserFire);
    … …  
    6464    void LaserFire::fire()
    6565    {
    66         ParticleProjectile* projectile = new ParticleProjectile(this);
     66        ParticleProjectile* projectile = new ParticleProjectile(this->getContext());
    6767
    6868        projectile->setOrientation(this->getMuzzleOrientation());

  • code/branches/core6/src/modules/weapons/weaponmodes/LaserFire.h

    r8855 r9629  
    5151    {
    5252        public:
    53             LaserFire(BaseObject* creator);
     53            LaserFire(Context* context);
    5454            virtual ~LaserFire() {}
    5555

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

    r9016 r9629  
    4646    CreateFactory(LightningGun);
    4747
    48     LightningGun::LightningGun(BaseObject* creator) : WeaponMode(creator)
     48    LightningGun::LightningGun(Context* context) : WeaponMode(context)
    4949    {
    5050        RegisterObject(LightningGun);
    … …  
    6868    void LightningGun::fire()
    6969    {
    70         LightningGunProjectile* projectile = new LightningGunProjectile(this);
     70        LightningGunProjectile* projectile = new LightningGunProjectile(this->getContext());
    7171        projectile->setMaterial("Flares/LightningBall_");
    7272

  • code/branches/core6/src/modules/weapons/weaponmodes/LightningGun.h

    r8855 r9629  
    5151    {
    5252        public:
    53             LightningGun(BaseObject* creator);
     53            LightningGun(Context* context);
    5454            virtual ~LightningGun();
    5555

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

    r8855 r9629  
    4848    CreateFactory(RocketFire);
    4949
    50     RocketFire::RocketFire(BaseObject* creator) : WeaponMode(creator)
     50    RocketFire::RocketFire(Context* context) : WeaponMode(context)
    5151    {
    5252        RegisterObject(RocketFire);
    … …  
    7171    void RocketFire::fire()
    7272    {
    73         Rocket* rocket = new Rocket(this);
     73        Rocket* rocket = new Rocket(this->getContext());
    7474
    7575        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());

  • code/branches/core6/src/modules/weapons/weaponmodes/RocketFire.h

    r8855 r9629  
    5151    {
    5252        public:
    53             RocketFire(BaseObject* creator);
     53            RocketFire(Context* context);
    5454            virtual ~RocketFire();
    5555

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

    r8855 r9629  
    5252    CreateFactory(SimpleRocketFire);
    5353
    54     SimpleRocketFire::SimpleRocketFire(BaseObject* creator) : WeaponMode(creator)
     54    SimpleRocketFire::SimpleRocketFire(Context* context) : WeaponMode(context)
    5555    {
    5656        RegisterObject(SimpleRocketFire);
    … …  
    7676    void SimpleRocketFire::fire()
    7777    {
    78         RocketController* controller = new RocketController(this);
     78        RocketController* controller = new RocketController(this->getContext());
    7979        SimpleRocket* rocket = controller->getRocket();
    8080        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());

  • code/branches/core6/src/modules/weapons/weaponmodes/SimpleRocketFire.h

    r8855 r9629  
    5050    {
    5151        public:
    52             SimpleRocketFire(BaseObject* creator);
     52            SimpleRocketFire(Context* context);
    5353            virtual ~SimpleRocketFire();
    5454            void deactivateFire();
Note: See TracChangeset for help on using the changeset viewer.