Changeset 7078 in orxonox.OLD for trunk/src

Timestamp:

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

Author:

patrick

Message:

trunk: player group handling

Location:

trunk/src

Files:

• lib/network/network_game_manager.cc (modified) (2 diffs)
• story_entities/game_world.cc (modified) (1 diff)
• story_entities/multi_player_world_data.cc (modified) (1 diff)
• world_entities/creatures/md2_creature.cc (modified) (1 diff)
• world_entities/playable.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)

trunk/src/lib/network/network_game_manager.cc

@@ -560 +560 @@
         ss->loadModel("models/ships/reap_0.obj");
         ss->toList(OM_GROUP_00);
-        ss->setAbsCoor(-314.450, 40.701, 83.554);
+        ss->setAbsCoor(213.37, 57.71, -47.98);
+        ss->setAbsDir(Quaternion(0.16, 0.98, -0.10));
       }
       else
@@ -566 +567 @@
         ss->loadModel( "models/ships/fighter.obj" );
         ss->toList(OM_GROUP_01);
-        ss->setAbsCoor(213.37, 57.71, -47.98);
-        ss->setAbsDir(Quaternion(0.16, 0.98, -0.10));      }
+        ss->setAbsCoor(-314.450, 40.701, 83.554);
+      }
     }
 

trunk/src/story_entities/game_world.cc

@@ -385 +385 @@
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
       this->dataTank->objectManager->getObjectList(OM_GROUP_00_PROJ));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
+  this->dataTank->objectManager->getObjectList(OM_GROUP_01));
 
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),

trunk/src/story_entities/multi_player_world_data.cc

@@ -212 +212 @@
         playable = dynamic_cast<Playable*>(playableList->front());
         this->localPlayer->setPlayable(playable);
-        playable->toList(OM_GROUP_01);
+        playable->toList(OM_GROUP_00);
         playable->setAbsCoor(213.37, 57.71, -47.98);
         playable->setAbsDir(Quaternion(0.16, 0.98, -0.10));

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);
 }