diff options
author | Andrew <47818697+Nyeriah@users.noreply.github.com> | 2025-02-08 14:07:04 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-02-08 14:07:04 -0300 |
commit | 79cbb00075d44efe7857a0140c40d602893da842 (patch) | |
tree | 8bb2646432c17160517bd91a18161148124a5e9a /src/server/game/Globals/ObjectMgr.cpp | |
parent | 31529db2828f99666481497b593307373f4c9ad9 (diff) |
feat(Core/Creature): Implement HasFlagsExtra() helper to creature (#21362)
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 208a5ccbfc..aa39808ce4 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -1651,7 +1651,7 @@ CreatureModel const* ObjectMgr::ChooseDisplayId(CreatureTemplate const* cinfo, C if (CreatureModel const* model = cinfo->GetModelWithDisplayId(data->displayid)) return model; - if (!(cinfo->flags_extra & CREATURE_FLAG_EXTRA_TRIGGER)) + if (!cinfo->HasFlagsExtra(CREATURE_FLAG_EXTRA_TRIGGER)) if (CreatureModel const* model = cinfo->GetRandomValidModel()) return model; @@ -2233,7 +2233,7 @@ void ObjectMgr::LoadCreatures() data.equipmentId = 0; } } - if ((cInfo->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND) || (data.id2 && cInfo2->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND) || (data.id3 && cInfo3->flags_extra & CREATURE_FLAG_EXTRA_INSTANCE_BIND)) + if (cInfo->HasFlagsExtra(CREATURE_FLAG_EXTRA_INSTANCE_BIND) || (data.id2 && cInfo2->HasFlagsExtra(CREATURE_FLAG_EXTRA_INSTANCE_BIND)) || (data.id3 && cInfo3->HasFlagsExtra(CREATURE_FLAG_EXTRA_INSTANCE_BIND))) { if (!mapEntry->IsDungeon()) LOG_ERROR("sql.sql", "Table `creature` have creature (SpawnId: {} Entries: {}, {}, {}) with a `creature_template`.`flags_extra` in one or more entries including CREATURE_FLAG_EXTRA_INSTANCE_BIND but creature are not in instance.", |