Changeset 10213 for code/branches/presentationFS14/src

Timestamp:

Jan 31, 2015, 4:21:49 PM (10 years ago)

Author:

landauf

Message:

removed attach() from ModularSpaceShip because it shadows the non-virtual function WorldEntity::attach(). chances are this does not behave as expected (and at the moment we don't really need this anyway)

Location:

code/branches/presentationFS14/src/orxonox/worldentities/pawns

Files:

• ModularSpaceShip.cc (modified) (1 diff)
• ModularSpaceShip.h (modified) (1 diff)

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

@@ -110 +110 @@
             }
         }
-    }
-
-    void ModularSpaceShip::attach(WorldEntity* object)
-    {
-        SpaceShip::attach(object);
-        this->updatePartAssignment();
     }
 

code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h

@@ -106 +106 @@
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void attach(WorldEntity* object);
-
             void addPartEntityAssignment(StaticEntity* entity, ShipPart* part);
             ShipPart* getPartOfEntity(StaticEntity* entity) const;