Changeset 10540 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Jan 31, 2007, 5:04:11 AM (18 years ago)

Author:

patrick

Message:

mounting point rewritten partially, for weapon slots

File:

• trunk/src/world_entities/world_entity.cc (modified) (3 diffs)

trunk/src/world_entities/world_entity.cc

@@ -416 +416 @@
 {
   // add the mount point at the last position
-  this->mountPoints.push_back(mountPoint);
+//   this->mountPointMap[](mountPoint);
+  assert(false);
 }
 
@@ -425 +426 @@
 void WorldEntity::addMountPoint(int slot, MountPoint* mountPoint)
 {
-  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(4)("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());
+  if( this->mountPointMap.find(slot) == this->mountPointMap.end())
+  {
+    PRINTF(2)("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());
   }
 
   // just connect the mount point
-  this->mountPoints[slot] = mountPoint;
+  this->mountPointMap[slot] = mountPoint;
 }
 
@@ -446 +442 @@
 void WorldEntity::mount(int slot, WorldEntity* entity)
 {
-  if( this->mountPoints[slot] == NULL)
+  if( this->mountPointMap.find(slot) == this->mountPointMap.end())
   {
     PRINTF(0)("you tried to add an entity to a mount point that doesn't exist (slot %i)\n", slot);