[Orxonox-commit 5550] r10213 - code/branches/presentationFS14/src/orxonox/worldentities/pawns

[landauf at orxonox.net]

Author: landauf
Date: 2015-01-31 16:21:49 +0100 (Sat, 31 Jan 2015)
New Revision: 10213

Modified:
   code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc
   code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h
Log:
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)

Modified: code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc
===================================================================
--- code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc	2015-01-31 15:14:57 UTC (rev 10212)
+++ code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.cc	2015-01-31 15:21:49 UTC (rev 10213)
@@ -111,12 +111,6 @@
         }
     }
 
-    void ModularSpaceShip::attach(WorldEntity* object)
-    {
-        SpaceShip::attach(object);
-        this->updatePartAssignment();
-    }
-
     /**
     @brief
         Creates a new assignment for the given StaticEntity and ShipPart in the partMap_

Modified: code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h
===================================================================
--- code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h	2015-01-31 15:14:57 UTC (rev 10212)
+++ code/branches/presentationFS14/src/orxonox/worldentities/pawns/ModularSpaceShip.h	2015-01-31 15:21:49 UTC (rev 10213)
@@ -105,8 +105,6 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
 
-            void attach(WorldEntity* object);
-
             void addPartEntityAssignment(StaticEntity* entity, ShipPart* part);
             ShipPart* getPartOfEntity(StaticEntity* entity) const;