Changeset 5929 for code/trunk/src/orxonox/collisionshapes

Timestamp:

Oct 12, 2009, 8:20:07 PM (15 years ago)

Author:

rgrieder

Message:

Merged core5 branch back to the trunk.
Key features include clean level unloading and an extended XML event system.

Two important notes:
Delete your keybindings.ini files! * or you will still get parser errors when loading the key bindings.
Delete build_dir/lib/modules/libgamestates.module! * or orxonox won't start.
Best thing to do is to delete the build folder

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/collisionshapes/CompoundCollisionShape.cc (modified) (1 diff)
• src/orxonox/collisionshapes/WorldEntityCollisionShape.cc (modified) (1 diff)

code/trunk/src/orxonox/collisionshapes/CompoundCollisionShape.cc

@@ -56 +56 @@
                 // make sure that the child doesn't want to detach itself --> speedup because of the missing update
                 it->first->notifyDetached();
-                delete it->first;
+                it->first->destroy();
             }
 

code/trunk/src/orxonox/collisionshapes/WorldEntityCollisionShape.cc

@@ -43 +43 @@
         this->worldEntityOwner_ = creator;
         // suppress synchronisation
-        this->setObjectMode(0x0);
+        this->setSyncMode(0x0);
     }