mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-15 18:39:51 +00:00
Code Issues Projects Releases Wiki Activity

Issue #176: made actor deregistration more robust

Browse Source
This commit is contained in:
Marc Zinnschlag 2012-05-24 13:21:52 +02:00
parent b494533bb2
commit c0ee382c72
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwmechanics/actors.cpp
View File

@ -71,7 +71,10 @@ namespace MWMechanics
void Actors::removeActor (const MWWorld::Ptr& ptr) void Actors::removeActor (const MWWorld::Ptr& ptr)
{ {
mActors.erase (ptr); std::set<MWWorld::Ptr>::iterator iter = mActors.find (ptr);
if (iter!=mActors.end())
mActors.erase (iter);
} }
void Actors::dropActors (const MWWorld::Ptr::CellStore *cellStore) void Actors::dropActors (const MWWorld::Ptr::CellStore *cellStore)

2
apps/openmw/mwmechanics/actors.hpp
View File

@ -32,6 +32,8 @@ namespace MWMechanics
void removeActor (const MWWorld::Ptr& ptr); void removeActor (const MWWorld::Ptr& ptr);
///< Deregister an actor for stats management ///< Deregister an actor for stats management
///
/// \note Ignored, if \a ptr is not a registered actor.
void dropActors (const MWWorld::Ptr::CellStore *cellStore); void dropActors (const MWWorld::Ptr::CellStore *cellStore);
///< Deregister all actors in the given cell. ///< Deregister all actors in the given cell.