Changeset 7954 in orxonox.OLD for trunk/src/story_entities

Timestamp:

May 29, 2006, 3:28:41 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk.

Location:

trunk/src/story_entities

Files:

• multi_player_world.cc (modified) (1 diff)
• multi_player_world_data.cc (modified) (1 diff)

trunk/src/story_entities/multi_player_world.cc

@@ -81 +81 @@
 void MultiPlayerWorld::synchronize()
 {
-  NetworkManager::getInstance()->synchronize();
+  NetworkManager::getInstance()->synchronize(this->dtS);
 }
 

trunk/src/story_entities/multi_player_world_data.cc

@@ -226 +226 @@
     PNode::getNullParent()->init();
   }
+    // Fill the EntityLists. Tick then Draw:
+  this->tickLists.push_back(OM_DEAD_TICK);
+  this->tickLists.push_back(OM_ENVIRON);
+  this->tickLists.push_back(OM_COMMON);
+  this->tickLists.push_back(OM_GROUP_00);
+  this->tickLists.push_back(OM_GROUP_00_PROJ);
+  this->tickLists.push_back(OM_GROUP_01);
+  this->tickLists.push_back(OM_GROUP_01_PROJ);
+
+  this->drawLists.push_back(OM_ENVIRON_NOTICK);
+  this->drawLists.push_back(OM_ENVIRON);
+  this->drawLists.push_back(OM_COMMON);
+  this->drawLists.push_back(OM_GROUP_00);
+  this->drawLists.push_back(OM_GROUP_00_PROJ);
+  this->drawLists.push_back(OM_GROUP_01);
+  this->drawLists.push_back(OM_GROUP_01_PROJ);
+  
   State::setPlayer(this->localPlayer);
 }