From af4cf28fa2280e8acc3684c3117d73b216adc28a Mon Sep 17 00:00:00 2001 From: Xfurry Date: Fri, 31 May 2013 12:19:54 +0100 Subject: [PATCH] [c12620] GO_FLAG_INTERACT_COND should not reset in instances --- src/game/GameObject.cpp | 6 +++--- src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp index 1a0f5cc33..f2fb619f6 100644 --- a/src/game/GameObject.cpp +++ b/src/game/GameObject.cpp @@ -460,9 +460,9 @@ void GameObject::Update(uint32 update_diff, uint32 p_time) // reset flags if (GetMap()->Instanceable()) { - // In Instances GO_FLAG_LOCKED or GO_FLAG_NO_INTERACT are not changed - uint32 currentLockOrInteractFlags = GetUInt32Value(GAMEOBJECT_FLAGS) & (GO_FLAG_LOCKED | GO_FLAG_NO_INTERACT); - SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags & ~(GO_FLAG_LOCKED | GO_FLAG_NO_INTERACT) | currentLockOrInteractFlags); + // In Instances GO_FLAG_LOCKED, GO_FLAG_INTERACT_COND or GO_FLAG_NO_INTERACT are not changed + uint32 currentLockOrInteractFlags = GetUInt32Value(GAMEOBJECT_FLAGS) & (GO_FLAG_LOCKED | GO_FLAG_INTERACT_COND | GO_FLAG_NO_INTERACT); + SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags & ~(GO_FLAG_LOCKED | GO_FLAG_INTERACT_COND | GO_FLAG_NO_INTERACT) | currentLockOrInteractFlags); } else SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index ac78ef79d..ad31c57f6 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12619" + #define REVISION_NR "12620" #endif // __REVISION_NR_H__