Changeset 9008 in orxonox.OLD for trunk/src/story_entities/multi_player_world_data.cc

Timestamp:

Jul 2, 2006, 2:22:19 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the network bak to the trunk
merged with command:
svn merge -r8804:HEAD ​https://svn.orxonox.net/orxonox/branches/multi_player_map .

conflicts all resolved in favour of the branche

File:

• trunk/src/story_entities/multi_player_world_data.cc (modified) (2 diffs)

trunk/src/story_entities/multi_player_world_data.cc

@@ -233 +233 @@
   this->tickLists.push_back(OM_ENVIRON);
   this->tickLists.push_back(OM_COMMON);
+  this->tickLists.push_back(OM_PLAYERS);
+  this->tickLists.push_back(OM_PLAYERS_PROJ);
   this->tickLists.push_back(OM_GROUP_00);
   this->tickLists.push_back(OM_GROUP_00_PROJ);
@@ -241 +243 @@
   this->drawLists.push_back(OM_ENVIRON);
   this->drawLists.push_back(OM_COMMON);
+  this->drawLists.push_back(OM_PLAYERS);
+  this->drawLists.push_back(OM_PLAYERS_PROJ);
   this->drawLists.push_back(OM_GROUP_00);
   this->drawLists.push_back(OM_GROUP_00_PROJ);