Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jun 20, 2007, 10:10:43 PM (17 years ago)
Author:
nicolasc
Message:

cleaned out origList

Location:
branches/presentation/src/world_entities/projectiles
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/presentation/src/world_entities/projectiles/acid_splash.cc

    r10740 r10747  
    9090void AcidSplash::activate()
    9191{
    92   this->origList = this->getOMListNumber();
    93   this->toList(OM_ENVIRON);
     92//   this->origList = this->getOMListNumber();
     93//   this->toList(OM_ENVIRON);
    9494 // this->unhide();
    9595  this->grid->setVisibility(true);

  • branches/presentation/src/world_entities/projectiles/hbolt.cc

    r10740 r10747  
    4848  this->loadModel("models/projectiles/hbolt.obj",1.1);
    4949
    50   this->setMinEnergy(10);
     50  this->setMinEnergy(7);
    5151  this->setHealthMax(0);
    5252  this->lifeSpan = 3.0;
    … …  
    9696{
    9797  this->halo->setVisibility(true);
    98   this->origList = this->getOMListNumber();
     98//   this->origList = this->getOMListNumber();
    9999  //this->toList(OM_ENVIRON);
    100100  if (unlikely(HBolt::explosionParticles == NULL))

  • branches/presentation/src/world_entities/projectiles/lbolt.cc

    r10740 r10747  
    9999{
    100100  this->halo->setVisibility(true);
    101   this->origList = this->getOMListNumber();
    102   this->toList(OM_ENVIRON);
     101//   this->origList = this->getOMListNumber();
     102//   this->toList(OM_ENVIRON);
    103103  if (unlikely(LBolt::explosionParticles == NULL))
    104104  {

  • branches/presentation/src/world_entities/projectiles/mbolt.cc

    r10740 r10747  
    117117void MBolt::activate()
    118118{
    119   this->origList = this->getOMListNumber();
    120   this->toList(OM_ENVIRON);
     119//   this->origList = this->getOMListNumber();
     120//   this->toList(OM_ENVIRON);
    121121  if (unlikely(MBolt::explosionParticles == NULL))
    122122  {

  • branches/presentation/src/world_entities/projectiles/nadion_blast.cc

    r10743 r10747  
    1010
    1111   ### File Specific
    12    main-programmer: Marc Schaerrer
    13    co-programmer: Benjamin Grauer
     12   main-programmer: Nicolas Schlumbegrer
     13   co-programmer: ..
    1414
    1515*/

  • branches/presentation/src/world_entities/projectiles/plasma_pulse.cc

    r10746 r10747  
    1010
    1111   ### File Specific
    12    main-programmer: Marc Schaerrer
    13    co-programmer: Benjamin Grauer, Nicolas Schlumberger
     12   main-programmer: Nicolas Schlumberger
     13   co-programmer:
    1414
    1515*/
    … …  
    4040
    4141
    42   this->setMinEnergy(1);
     42  this->setMinEnergy(2);
    4343  this->setHealthMax(0);
    4444  this->lifeSpan = 2.0;
    … …  
    8080void PlasmaPulse::activate()
    8181{
    82   this->origList = this->getOMListNumber();
     82//   this->origList = this->getOMListNumber();
    8383  this->grid->setVisibility(true);
    8484//   this->blink->setVisibility(true);

  • branches/presentation/src/world_entities/projectiles/projectile.h

    r10368 r10747  
    6767  protected:
    6868    // energy
    69     int                origList;                        //!< FIXME currently a fix around the collision seg fault
     69    //int                      origList;                        //!< FIXME currently a fix around the collision seg fault
    7070    float                   energyMin;                //!< The minimal Energy a Projectile needs to be emitted.
    7171    bool                    bChargeable;              //!< if the Projectile is Charegeable

  • branches/presentation/src/world_entities/projectiles/swarm_projectile.cc

    r10698 r10747  
    6969
    7070
    71   this->origList = this->getOMListNumber();
    72   this->toList(OM_ENVIRON);
     71//   this->origList = this->getOMListNumber();
     72//   this->toList(OM_ENVIRON);
    7373}
    7474
    … …  
    9797void SwarmProjectile::activate()
    9898{
    99   this->toList(OM_ENVIRON);
     99//   this->toList(OM_ENVIRON);
    100100  if (unlikely(SwarmProjectile::explosionParticles == NULL))
    101101  {
Note: See TracChangeset for help on using the changeset viewer.