diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 8 | ||||
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index fedad2a592d..6690f565ae5 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -693,7 +693,7 @@ bool Creature::UpdateEntry(uint32 entry, CreatureData const* data /*= nullptr*/, //We must update last scriptId or it looks like we reloaded a script, breaking some things such as gossip temporarily LastUsedScriptID = GetScriptId(); - m_stringIds[0] = cInfo->StringId; + m_stringIds[AsUnderlyingType(StringIdType::Template)] = cInfo->StringId; return true; } @@ -1920,7 +1920,7 @@ bool Creature::LoadFromDB(ObjectGuid::LowType spawnId, Map* map, bool addToMap, // checked at creature_template loading m_defaultMovementType = MovementGeneratorType(data->movementType); - m_stringIds[1] = data->StringId; + m_stringIds[AsUnderlyingType(StringIdType::Spawn)] = data->StringId; if (addToMap && !GetMap()->AddToMap(this)) return false; @@ -3147,12 +3147,12 @@ void Creature::SetScriptStringId(std::string id) if (!id.empty()) { m_scriptStringId.emplace(std::move(id)); - m_stringIds[2] = *m_scriptStringId; + m_stringIds[AsUnderlyingType(StringIdType::Script)] = *m_scriptStringId; } else { m_scriptStringId.reset(); - m_stringIds[2] = {}; + m_stringIds[AsUnderlyingType(StringIdType::Script)] = {}; } } diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index cddafd166c0..b8788e892c0 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1160,7 +1160,7 @@ bool GameObject::Create(uint32 entry, Map* map, Position const& pos, QuaternionD LastUsedScriptID = GetGOInfo()->ScriptId; - m_stringIds[0] = goInfo->StringId; + m_stringIds[AsUnderlyingType(StringIdType::Template)] = goInfo->StringId; AIM_Initialize(); @@ -1980,7 +1980,7 @@ bool GameObject::LoadFromDB(ObjectGuid::LowType spawnId, Map* map, bool addToMap m_goData = data; - m_stringIds[1] = data->StringId; + m_stringIds[AsUnderlyingType(StringIdType::Spawn)] = data->StringId; if (addToMap && !GetMap()->AddToMap(this)) return false; @@ -3507,12 +3507,12 @@ void GameObject::SetScriptStringId(std::string id) if (!id.empty()) { m_scriptStringId.emplace(std::move(id)); - m_stringIds[2] = *m_scriptStringId; + m_stringIds[AsUnderlyingType(StringIdType::Script)] = *m_scriptStringId; } else { m_scriptStringId.reset(); - m_stringIds[2] = {}; + m_stringIds[AsUnderlyingType(StringIdType::Script)] = {}; } } |