Changeset 6135 in orxonox.OLD for branches/objectmanager/src/world_entities

Timestamp:

Dec 16, 2005, 6:01:26 PM (19 years ago)

Author:

bensch

Message:

om: safer collision-test

Location:

branches/objectmanager/src/world_entities

Files:

• npcs/npc.cc (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)
• weapons/laser.cc (modified) (2 diffs)

branches/objectmanager/src/world_entities/npcs/npc.cc

@@ -50 +50 @@
       WorldEntity* powerUp = new TurretPowerUp();
       powerUp->setAbsCoor(this->getAbsCoor());
-      powerUp->toList(OM_COMMON);
+//      powerUp->toList(OM_COMMON);
     }
     else if ((float)rand()/RAND_MAX < .3)

branches/objectmanager/src/world_entities/space_ships/space_ship.cc

@@ -112 +112 @@
   PRINTF(4)("SPACESHIP INIT\n");
 
-  EventHandler::getInstance()->grabEvents(false);
+  EventHandler::getInstance()->grabEvents(true);
 
   bUp = bDown = bLeft = bRight = bAscend = bDescend = bRollL = bRollR = false;

branches/objectmanager/src/world_entities/weapons/laser.cc

@@ -96 +96 @@
   ParticleEngine::getInstance()->breakConnections(this->emitter);
   this->lifeCycle = 0.0;
+
   this->toList(OM_NULL);
-
-  this->toList(OM_DEAD);
   this->removeNode();
   Laser::fastFactory->kill(this);
@@ -133 +132 @@
   this->lifeCycle = .95; //!< @todo calculate this usefully.
   ParticleEngine::getInstance()->addConnection(this->emitter, Laser::explosionParticles);
-
 }