diff options
| author | megamage <none@none> | 2009-02-22 17:35:14 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-22 17:35:14 -0600 |
| commit | 107218fe44c5a45023950f11ee3562abfcdd2c95 (patch) | |
| tree | 5a3aae5c74723b26cd016596199674af81fa1355 /src/game/Object.cpp | |
| parent | 7190332fcea1dcc6ed8ce59c6bfb542522775e35 (diff) | |
| parent | 90d5e05aafff0f3dabd294811b4f82b024317a4a (diff) | |
*Merge.
--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 4e000184763..a9534723354 100644 --- a/src/game/Object.cpp +++ b/src/game/Object.cpp @@ -1134,7 +1134,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(); } |