From 3da609588ad6fe7eb0581e4678a2ec8c6c1c4a18 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Thu, 31 Jul 2008 12:43:43 +0000 Subject: more heisenbugs fixes --- src/core/entity.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/core/entity.cc') diff --git a/src/core/entity.cc b/src/core/entity.cc index 98fef0e..20e1b05 100644 --- a/src/core/entity.cc +++ b/src/core/entity.cc @@ -56,6 +56,7 @@ void Entity::erase(unsigned int id) Registry::iterator it = entity_registry.find(id); if (it != entity_registry.end()) { delete((*it).second); + (*it).second = 0; entity_registry.erase(it); } else { con_warn << "Could not erase entity " << id << "!\n"; @@ -171,8 +172,10 @@ Entity::Entity(std::istream & is) Entity::~Entity() { - if (entity_clientstate) + if (entity_clientstate) { delete entity_clientstate; + entity_clientstate = 0; + } if (entity_zone) entity_zone->remove(this); -- cgit v1.2.3