Changeset 7078 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Feb 7, 2006, 4:13:01 PM (18 years ago)

Author:

patrick

Message:

trunk: player group handling

Location:

trunk/src/world_entities

Files:

• creatures/md2_creature.cc (modified) (1 diff)
• playable.cc (modified) (1 diff)
• test_entity.cc (modified) (1 diff)

trunk/src/world_entities/creatures/md2_creature.cc

@@ -64 +64 @@
 
   this->loadParams(doc.RootElement());
-  this->toList(OM_GROUP_03);
+  this->toList(OM_GROUP_01);
 }
 

trunk/src/world_entities/playable.cc

@@ -163 +163 @@
   if (State::isOnline())
   {
-  if( this == State::getPlayer()->getPlayable())
-    State::getGameRules()->onPlayerDeath();
-
-  this->toList(OM_DEAD);
-  //.HACK: moves the entity to an unknown place far far away: in the future, GameRules will look for that
-  this->setAbsCoor(-2000.0, -2000.0, -2000.0);
+    if( this == State::getPlayer()->getPlayable())
+      State::getGameRules()->onPlayerDeath();
+
+
+    this->toList(OM_DEAD);
+  //HACK: moves the entity to an unknown place far far away: in the future, GameRules will look for that
+    this->setAbsCoor(-2000.0, -2000.0, -2000.0);
 
   //explosion hack
-  this->emitter->setSystem(explosionParticles);
-  this->setAbsCoor(0, 0, 0);
-  this->emitter->setSystem(NULL);
+    this->emitter->setSystem(explosionParticles);
+    this->setAbsCoor(0, 0, 0);
+    this->emitter->setSystem(NULL);
   }
 }

trunk/src/world_entities/test_entity.cc

@@ -58 +58 @@
 {
   this->setClassID(CL_TEST_ENTITY, "TestEntity");
-  this->toList(OM_COMMON);
+  this->toList(OM_GROUP_00);
 }