Changeset 10239 in orxonox.OLD for branches/mount_points/src/world_entities/world_entity.cc

Timestamp:

Jan 16, 2007, 10:52:55 PM (18 years ago)

Author:

patrick

Message:

found a bug in the object information resources file. fixed

File:

• branches/mount_points/src/world_entities/world_entity.cc (modified) (4 diffs)

branches/mount_points/src/world_entities/world_entity.cc

@@ -12 +12 @@
 
    ### File Specific:
-   main-programmer: Patrick Boenzli, Benjamin Grauer
-   co-programmer: Christian Meier
+   main-programmer: Patrick Boenzli
+   main-programmer: Benjamin Grauer
+   co-programmer:   Christian Meier
 */
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WORLD_ENTITY
@@ -73 +74 @@
   this->scaling = 1.0f;
   this->oiFile = NULL;
+  // add 10 members to this array
+  this->mountPoints.reserve(10);
 
   /* OSOLETE */
@@ -298 +301 @@
 
     // now fill the mount point
-    this->oiFile->initMountPoint(mp);
+    mp->initMountPoint( this->oiFile->getMountPointDescription());
   }
 
@@ -364 +367 @@
 void WorldEntity::addMountPoint(int slot, MountPoint* mountPoint)
 {
-  if( this->mountPoints[slot] != NULL)
-  {
-    PRINTF(0)("adding a mount point to a slot, that already is occupied! ignoring - maybe some object do not get connected well (object: %s)\n", this->getClassCName());
+  if( this->mountPoints.capacity() < (unsigned int)slot)
+  {
+    // reserve 5 more slots than needed so this function is called as rare as possible
+    this->mountPoints.reserve(slot + 5);
+  }
+  else if( this->mountPoints[slot] != NULL)
+  {
+    PRINTF(0)("adding a mount point to a slot, that already is occupied! ignoring - maybe some object did not get connected well (object: %s)\n", this->getClassCName());
   }