Changeset 5929 for code/trunk/src/orxonox/pickup/items

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/pickup/items/HealthImmediate.cc (modified) (1 diff)
• src/orxonox/pickup/items/HealthUsable.cc (modified) (1 diff)
• src/orxonox/pickup/items/Jump.cc (modified) (1 diff)

code/trunk/src/orxonox/pickup/items/HealthImmediate.cc

@@ -67 +67 @@
         {
             pawn->addHealth(this->recoveredHealth_);
-            delete this;
+            this->destroy();
         }
 

code/trunk/src/orxonox/pickup/items/HealthUsable.cc

@@ -82 +82 @@
 
             this->removeFrom(pawn);
-            delete this;
+            this->destroy();
         }
     }

code/trunk/src/orxonox/pickup/items/Jump.cc

@@ -84 +84 @@
         {
             this->removeFrom(pawn);
-            delete this;
+            this->destroy();
         }
     }