Changeset 10052 for code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc

Timestamp:

May 8, 2014, 4:20:26 PM (11 years ago)

Author:

noep

Message:

Added PartDestructionEvent, possibly fixed one out of two runtimeerrors

File:

• code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc (modified) (2 diffs)

code/branches/modularships/src/orxonox/worldentities/pawns/ModularSpaceShip.cc

@@ -303 +303 @@
         }
         // Remove the part-entity assignment and detach the Entity of this ShipPart
-        for (std::map<StaticEntity*, ShipPart*>::iterator itt = this->partMap_.begin(); itt != this->partMap_.end(); ++itt)
+        for (std::map<StaticEntity*, ShipPart*>::iterator itt = this->partMap_.begin(); itt != this->partMap_.end(); )
         {
             if (itt->second == part)
@@ -314 +314 @@
                 //itt->first->setCollisionType(None);
                 //itt->first->deactivatePhysics();
-                this->partMap_.erase(itt);
+                this->partMap_.erase(itt++);
+            } else {
+                ++itt;
             }
         }