Changeset 6966 in orxonox.OLD for trunk

Timestamp:

Feb 1, 2006, 6:43:11 PM (19 years ago)

Author:

patrick

Message:

trunk: deactivated the lenseflare temp

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (1 diff)
• world_entities/playable.cc (modified) (1 diff)
• world_entities/playable.h (modified) (3 diffs)
• world_entities/space_ships/space_ship.cc (modified) (1 diff)

trunk/src/lib/graphics/graphics_engine.cc

@@ -184 +184 @@
   ge->addFlare("pictures/lense_flare/lens3.png");
 
-  ge->activate();
+  //ge->activate();
 }
 

trunk/src/world_entities/playable.cc

@@ -126 +126 @@
 {
   if (entity->isA(CL_PROJECTILE) && !State::isOnline() )
+  {
     this->decreaseHealth(entity->getHealth());
-
-  // EXTREME HACK
-  if (this->getHealth() == 0.0f)
-  {
+    // EXTREME HACK
+    if (this->getHealth() == 0.0f)
+    {
+      this->die();
+    }
+  }
+}
+
+
+void Playable::die()
+{
     //this->deactivateNode();
-    this->emitter->setSystem(explosionParticles);
-    this->setAbsCoor(0, 0, 0);
+  this->toList(OM_DEAD);
+  this->emitter->setSystem(explosionParticles);
+  this->setAbsCoor(0, 0, 0);
     //this->setAbsDir(Vector(1,0,0), 0);
-    this->emitter->setSystem(NULL);
-  }
-}
+  this->emitter->setSystem(NULL);
+
+
+  if( this->getOwner()%2 == 0)
+    this->toList(OM_GROUP_00);
+  else
+    this->toList(OM_GROUP_01);
+}
+
 
 /**

trunk/src/world_entities/playable.h

@@ -31 +31 @@
     virtual void leave() = 0;
 
+    virtual void die();
+
     virtual bool pickup(PowerUp* powerUp);
 
@@ -59 +61 @@
     int       readSync(byte* data, int maxLength );
     bool      needsReadSync();
-    
+
     inline void setScore( int score ) { this->score = score; }
     inline int  getScore() { return this->score; }
@@ -77 +79 @@
     bool                  bFire;              //!< If the Ship is firing.
     int                   oldFlags;           //!< Used for synchronisation
-    
+
     int                   score;
     int                   oldScore;

trunk/src/world_entities/space_ships/space_ship.cc

@@ -796 +796 @@
 {
   this->decreaseHealth( energy );
-}
-
-
-
+  if( this->getHealth() <= 0)
+  {
+    this->die();
+  }
+}
+
+
+