Changeset 6142 in orxonox.OLD for trunk/src/world_entities/playable.cc

Timestamp:

Dec 16, 2005, 7:13:57 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/

conflicts resolution was easy this time
but specially merged the world to network_world

File:

• trunk/src/world_entities/playable.cc (modified) (1 diff)

trunk/src/world_entities/playable.cc

@@ -46 +46 @@
   PRINTF(4)("PLAYABLE INIT\n");
 
+  this->toList(OM_GROUP_01);
   this->weaponMan = new WeaponManager(this);