From 5eea9883c2c4cc0cf5d5be6fe52644d205a88ca3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Wed, 30 Mar 2022 18:01:24 +0200 Subject: Core/GameObjects: Reduce differences between branches part 3 - gameobject updatefield accessors --- .../scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp | 4 ++-- .../HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp | 2 +- .../HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/server/scripts/Outland/HellfireCitadel') diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp index ea12d36f5fd..6f4cb101c31 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp @@ -132,7 +132,7 @@ class boss_broggok : public CreatureScript instance->SetBossState(DATA_BROGGOK, NOT_STARTED); if (GameObject * lever = instance->GetGameObject(DATA_BROGGOK_LEVER)) { - lever->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE | GO_FLAG_IN_USE); + lever->RemoveFlag(GO_FLAG_NOT_SELECTABLE | GO_FLAG_IN_USE); lever->SetGoState(GO_STATE_READY); } break; @@ -261,7 +261,7 @@ class go_broggok_lever : public GameObjectScript broggok->AI()->DoAction(ACTION_PREPARE_BROGGOK); } - me->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE | GO_FLAG_IN_USE); + me->SetFlag(GO_FLAG_NOT_SELECTABLE | GO_FLAG_IN_USE); me->SetGoState(GO_STATE_ACTIVE); return true; diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp index eddf4d2bff4..839c478b0e0 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp @@ -63,7 +63,7 @@ class instance_ramparts : public InstanceMapScript case DATA_NAZAN: if (GetBossState(DATA_VAZRUDEN) == DONE && GetBossState(DATA_NAZAN) == DONE) if (GameObject* chest = instance->GetGameObject(felIronChestGUID)) - chest->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); + chest->RemoveFlag(GO_FLAG_NOT_SELECTABLE); break; default: break; diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp index daadb13db4d..c6983a0f63f 100644 --- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp @@ -105,9 +105,9 @@ class instance_magtheridons_lair : public InstanceMapScript if (GameObject* cube = instance->GetGameObject(gobGUID)) { if (value == ACTION_ENABLE) - cube->RemoveFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); + cube->RemoveFlag(GO_FLAG_NOT_SELECTABLE); else - cube->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE); + cube->SetFlag(GO_FLAG_NOT_SELECTABLE); } break; case DATA_COLLAPSE: -- cgit v1.2.3