Changeset 8839 in orxonox.OLD

Timestamp:

Jun 28, 2006, 1:04:04 AM (18 years ago)

Author:

patrick

Message:

muliplayer: collisions with all entities expect the ones from player_proj seem to work

Location:

branches/multi_player_map/src

Files:

• story_entities/multi_player_world.cc (modified) (2 diffs)
• world_entities/space_ships/space_ship.cc (modified) (2 diffs)

branches/multi_player_map/src/story_entities/multi_player_world.cc

@@ -99 +99 @@
     this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
 
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
+  this->dataTank->objectManager->getObjectList(OM_GROUP_00));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
+  this->dataTank->objectManager->getObjectList(OM_GROUP_01));
+
   PRINTF(5)("\n-----------------------------------------\nchecking OM_PLAYERS vs OM_GROUP_01_PROJ\n\n");
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
@@ -112 +117 @@
   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_01),
+  this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
+  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
+  this->dataTank->objectManager->getObjectList(OM_PLAYERS_PROJ));
   PRINTF(5)("\n-----------------------------------------\nchecking OM_GROUP_00 vs OM_GROUP_01\n\n");
   CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
     this->dataTank->objectManager->getObjectList(OM_GROUP_01));
 
-  PRINTF(5)("\n-----------------------------------------\nchecking OM_COMMON vs OM_GROUP_00\n\n");
-  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_00),
-    this->dataTank->objectManager->getObjectList(OM_COMMON));
-  PRINTF(5)("\n-----------------------------------------\nchecking OM_COMMON vs OM_GROUP_01\n\n");
-  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_GROUP_01),
-    this->dataTank->objectManager->getObjectList(OM_COMMON));
-  PRINTF(5)("\n-----------------------------------------\nchecking OM_COMMON vs OM_PLAYER\n\n");
-  CDEngine::getInstance()->checkCollisions(this->dataTank->objectManager->getObjectList(OM_PLAYERS),
-  this->dataTank->objectManager->getObjectList(OM_COMMON));
 
 }

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

@@ -384 +384 @@
   this->shiftCoor(move);
 
+  PRINTF(0)("id of %s is: %i\n", this->getName(), this->getOMListNumber());
 
 }
@@ -511 +512 @@
 void SpaceShip::respawn( )
 {
-  if( this->uniqueID %2)
-  toList( OM_GROUP_00 );
-  else
-    toList(OM_GROUP_01);
-}
-
-
-
-
+  toList( OM_PLAYERS );
+}
+
+
+
+