diff --git a/src/game/Camera.cpp b/src/game/Camera.cpp index 8eb2093d4..a11056137 100644 --- a/src/game/Camera.cpp +++ b/src/game/Camera.cpp @@ -65,7 +65,7 @@ void Camera::SetView(WorldObject *obj, bool update_far_sight_field /*= true*/) return; } - if (!obj->isType(TYPEMASK_DYNAMICOBJECT | TYPEMASK_UNIT)) + if (!obj->isType(TypeMask(TYPEMASK_DYNAMICOBJECT | TYPEMASK_UNIT))) { sLog.outError("Camera::SetView, viewpoint type is not available for client"); return; diff --git a/src/game/Object.h b/src/game/Object.h index 072b9baf5..a2f583bf5 100644 --- a/src/game/Object.h +++ b/src/game/Object.h @@ -154,7 +154,7 @@ class MANGOS_DLL_SPEC Object void SetObjectScale(float newScale); uint8 GetTypeId() const { return m_objectTypeId; } - bool isType(uint16 mask) const { return (mask & m_objectType); } + bool isType(TypeMask mask) const { return (mask & m_objectType); } virtual void BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const; void SendCreateUpdateToPlayer(Player* player); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 94b0d0db6..7d326fa21 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -13737,7 +13737,7 @@ void Player::AddQuest( Quest const *pQuest, Object *questGiver ) } // remove start item if not need - if (questGiver && questGiver->isType(TYPEID_ITEM)) + if (questGiver && questGiver->isType(TYPEMASK_ITEM)) { // destroy not required for quest finish quest starting item bool notRequiredItem = true; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index e7b818bf4..b0e1e2dff 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 "11447" + #define REVISION_NR "11448" #endif // __REVISION_NR_H__