diff options
| author | Stijn Buys <ingar@osirion.org> | 2012-10-20 16:35:26 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2012-10-20 16:35:26 +0000 |
| commit | 75274ebd6ba90784f5aa837b7e5ea97fc6bfb720 (patch) | |
| tree | a5d51a87bf3f20833df18bc40a3254b946716afb /src/core/gameserver.cc | |
| parent | f01629dc14b1ee05b44d2e38b3dffbc1441fd85f (diff) | |
Item id based inventory, support for weapon dealers.
Diffstat (limited to 'src/core/gameserver.cc')
| -rw-r--r-- | src/core/gameserver.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc index 579f65d..796b99f 100644 --- a/src/core/gameserver.cc +++ b/src/core/gameserver.cc @@ -717,11 +717,11 @@ void GameServer::frame(const unsigned long timestamp) // send network updates server_network->frame(this->timestamp()); } - + // remove deleted entities and mark remaining entities as updated for (Entity::Registry::iterator it = Entity::registry().begin(); it != Entity::registry().end();) { // remove deleted entities - if ((*it).second->entity_destroyed) { + if ((*it).second->destroyed()) { delete (*it).second; (*it).second = 0; Entity::registry().erase(it++); |