From d4ab165888cafeb6c568fbd9eb8306e30c9228bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Borz=C3=AC?= Date: Tue, 12 Feb 2019 08:06:05 +0100 Subject: [PATCH] refactor(Scripts/SpellGeneric): use modern C++ array instead of C array (#1436) --- src/server/scripts/Spells/spell_generic.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 3450f3373..62bf4269d 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -45,7 +45,6 @@ public: bool Load() { - memset(_itemId, 0, sizeof(_itemId)); _modelId = 0; _hasFlag = false; return true; @@ -56,7 +55,7 @@ public: _modelId = GetUnitOwner()->GetDisplayId(); _hasFlag = GetUnitOwner()->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); for (uint8 i = 0; i < 3; ++i) - _itemId[i] = GetUnitOwner()->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i); + _itemId.at(i) = GetUnitOwner()->GetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i); GetUnitOwner()->SetDisplayId(11686); GetUnitOwner()->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); @@ -70,7 +69,7 @@ public: if (!_hasFlag) GetUnitOwner()->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); for (uint8 i = 0; i < 3; ++i) - GetUnitOwner()->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i, _itemId[i]); + GetUnitOwner()->SetUInt32Value(UNIT_VIRTUAL_ITEM_SLOT_ID + i, _itemId.at(i)); } void Register() @@ -80,7 +79,7 @@ public: } private: - uint32 _itemId[3]; + std::array _itemId = { {0, 0, 0} }; uint32 _modelId; bool _hasFlag; };