Changeset 10198 for code/branches/presentationFS14/src/orxonox

Timestamp:

Jan 25, 2015, 3:39:30 PM (10 years ago)

Author:

landauf

Message:

disabled physics for turret → removed attachment-hack in WorldEntity

File:

• code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc (modified) (1 diff)

code/branches/presentationFS14/src/orxonox/worldentities/WorldEntity.cc

@@ -415 +415 @@
             else if (this->isDynamic())
             {
-                //***HACKY HACK (to allow turrets to be attached)***
-                //orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl;
-                //return false;
+                orxout(internal_warning) << "Cannot attach a dynamic object to a WorldEntity." << endl;
+                return false;
             }
             else if (this->isKinematic() && newParent->isDynamic())