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-17 21:53:09 +0000
committerStijn Buys <ingar@osirion.org>2010-10-17 21:53:09 +0000
commitf406891947a175f3309db0facd7882afe5471508 (patch)
tree9e0fcbf1a4dc1ea9844631b412f4883a4a9337f2 /src/core
parent1032161366da1b2153de8d804465061e6bcc4fce (diff)
corrects segfault in ~Entity
Diffstat (limited to 'src/core')
-rw-r--r--src/core/entity.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/entity.cc b/src/core/entity.cc
index 2f8b8a5..7ff9d7b 100644
--- a/src/core/entity.cc
+++ b/src/core/entity.cc
@@ -146,7 +146,7 @@ Entity::Entity() :
entity_model = 0;
entity_body = 0;
- entity_body = 0;
+ entity_body_info = 0;
entity_motionstate = 0;
entity_collision_shape = 0;
@@ -185,7 +185,7 @@ Entity::Entity(std::istream & is)
entity_model = 0;
entity_body = 0;
- entity_body = 0;
+ entity_body_info = 0;
entity_motionstate = 0;
entity_collision_shape = 0;
@@ -236,8 +236,6 @@ Entity::~Entity()
if (entity_body_info)
delete entity_body_info;
-
-
}
void Entity::die()