Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-10-19 00:23:50 +0000
committerStijn Buys <ingar@osirion.org>2010-10-19 00:23:50 +0000
commitedb6d6bb6406020d9e49a1898d23e2709c14196d (patch)
tree385a1d24283e5aac494731c8af49c7ef8a7b2315 /src/core
parent7a373c3f1fb8ea9dbef7690154bbe332fc386eca (diff)
corrects a bullet segfault when deleteing an EntityControlable
Diffstat (limited to 'src/core')
-rw-r--r--src/core/entity.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc
index 1438466..2b37d95 100644
--- a/src/core/entity.cc
+++ b/src/core/entity.cc
@@ -748,6 +748,11 @@ EntityControlable::~EntityControlable()
{
if (entity_owner)
entity_owner->remove_asset(this);
+
+ if (entity_actioninterface) {
+ entity_zone->physics()->removeAction(entity_actioninterface);
+ delete entity_actioninterface;
+ }
}
void EntityControlable::set_owner(Player *owner)