Changeset 6087 for code/branches/particles2/src/orxonox/Scene.cc

Timestamp:

Nov 18, 2009, 1:34:14 PM (14 years ago)

Author:

scheusso

Message:

changes in PlayerInfo and Rocket (and scene)
not yet working in network though

File:

• code/branches/particles2/src/orxonox/Scene.cc (modified) (1 diff)

code/branches/particles2/src/orxonox/Scene.cc

@@ -334 +334 @@
     {
         // get the WorldEntity pointers
-        WorldEntity* object0 = static_cast<WorldEntity*>(colObj0->getUserPointer());
-        assert(orxonox_cast<WorldEntity*>(object0));
-        WorldEntity* object1 = static_cast<WorldEntity*>(colObj1->getUserPointer());
-        assert(orxonox_cast<WorldEntity*>(object1));
+        SmartPtr<WorldEntity> object0 = static_cast<WorldEntity*>(colObj0->getUserPointer());
+        SmartPtr<WorldEntity> object1 = static_cast<WorldEntity*>(colObj1->getUserPointer());
 
         // false means that bullet will assume we didn't modify the contact