diff options
| author | megamage <none@none> | 2009-02-22 17:03:01 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-22 17:03:01 -0600 |
| commit | 9bb780793556fc82e45fd56a6f59c27d4050eb94 (patch) | |
| tree | 93f5d41903ddbb936754c695f7f8e0c302d218b0 /src/game/Object.cpp | |
| parent | c9707d3c7f769b85a2e190c4ad395f34b76747cf (diff) | |
*Check IsInWorld() when calling GetMap() in RemoveFromWorld(). This may fix some crash bugs.
--HG--
branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
| -rw-r--r-- | src/game/Object.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp index 7ec15d40d7c..6c65667c9aa 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1101,7 +1101,7 @@ void WorldObject::AddToWorld() void WorldObject::RemoveFromWorld() { - if(m_isActive && !isType(TYPEMASK_PLAYER)) + if(m_isActive && IsInWorld() && !isType(TYPEMASK_PLAYER)) GetMap()->RemoveActiveObject(this); Object::RemoveFromWorld(); } |