From a7f6c4f558653ecca0c2c51c18bd0852f983c8e8 Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 12 Feb 2012 08:41:59 -0500 Subject: [PATCH] Fixed the logic on my last commit --- src/server/game/Entities/GameObject/GameObject.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 1dd84a0860..41e0b8e054 100755 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -133,10 +133,11 @@ void GameObject::AddToWorld() sObjectAccessor->AddObject(this); bool startOpen = (GetGoType() == GAMEOBJECT_TYPE_DOOR || GetGoType() == GAMEOBJECT_TYPE_BUTTON ? GetGOInfo()->door.startOpen : false); bool toggledState = (GetGOData() ? GetGOData()->go_state == GO_STATE_ACTIVE : false); - if (m_model/* && (GetGoType() == GAMEOBJECT_TYPE_DOOR || GetGoType() == GAMEOBJECT_TYPE_BUTTON ? !GetGOInfo()->door.startOpen : true)*/) + if (m_model) GetMap()->Insert(*m_model); - if (startOpen || toggledState) + if ((startOpen && !toggledState) || (!startOpen && toggledState)) EnableCollision(false); + WorldObject::AddToWorld(); } }