From 8039544940b6145dcc8c63bcd4e06073ed61801e Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 10 Nov 2013 22:23:50 +0000 Subject: Renamed entity_destroyed to entity_died to prevent confusion with the Entity::Destroyed state, fixed a potential memory leak. --- src/core/netserver.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/netserver.cc') diff --git a/src/core/netserver.cc b/src/core/netserver.cc index 84ed76c..17fef86 100644 --- a/src/core/netserver.cc +++ b/src/core/netserver.cc @@ -356,7 +356,7 @@ void NetServer::client_frame(NetClient *client, unsigned long timestamp) for (Zone::Content::iterator it = zone->content().begin(); it != zone->content().end(); ++it) { Entity *entity = (*it); - if (!entity->entity_destroyed) { + if (!entity->died()) { send_entity_create(client, entity); } } @@ -381,7 +381,7 @@ void NetServer::client_frame(NetClient *client, unsigned long timestamp) Entity *entity = (*it).second; if (entity->zone() == zone) { - if (entity->entity_destroyed) { + if (entity->died()) { if (!entity->entity_created) { send_entity_delete(client, entity); } -- cgit v1.2.3