aboutsummaryrefslogtreecommitdiff
path: root/src/game/GameObject.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-03-28 16:04:37 -0600
committermegamage <none@none>2009-03-28 16:04:37 -0600
commiteb894f39e8e05cfe2f266107da4410d19558ff80 (patch)
tree744f14294cf8ee616f894f93842ee8d02139261a /src/game/GameObject.cpp
parent3c624f7c630305b4409a205af580c711f06cc33c (diff)
*First remove object from world then unregister it. This may fix some crashes.
--HG-- branch : trunk
Diffstat (limited to 'src/game/GameObject.cpp')
-rw-r--r--src/game/GameObject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index f75122d888f..eb0dd10b7d4 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -93,8 +93,8 @@ void GameObject::RemoveFromWorld()
///- Remove the gameobject from the accessor
if(IsInWorld())
{
- ObjectAccessor::Instance().RemoveObject(this);
WorldObject::RemoveFromWorld();
+ ObjectAccessor::Instance().RemoveObject(this);
}
}