From fccf6fb72b60b08dfbe6d5fb17fba55239944fca Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 9 Mar 2024 00:54:27 +0100 Subject: Core/Objects: Implemented vignettes --- src/server/game/Entities/Creature/Creature.cpp | 7 +++++++ src/server/game/Entities/Creature/CreatureData.h | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/server/game/Entities/Creature') diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index c122e51800a..2ceaa8ce7b1 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1820,6 +1820,10 @@ bool Creature::CreateFromProto(ObjectGuid::LowType guidlow, uint32 entry, Creatu if (CreateVehicleKit(vehId, entry, true)) UpdateDisplayPower(); + if (!IsPet()) + if (uint32 vignetteId = GetCreatureTemplate()->VignetteID) + SetVignette(vignetteId); + return true; } @@ -2284,6 +2288,9 @@ void Creature::setDeathState(DeathState s) RemoveUnitFlag(UNIT_FLAG_IN_COMBAT); SetMeleeDamageSchool(SpellSchools(cInfo->dmgschool)); + + if (uint32 vignetteId = cInfo->VignetteID) + SetVignette(vignetteId); } Motion_Initialize(); diff --git a/src/server/game/Entities/Creature/CreatureData.h b/src/server/game/Entities/Creature/CreatureData.h index 1e386ff2da5..976244a8f85 100644 --- a/src/server/game/Entities/Creature/CreatureData.h +++ b/src/server/game/Entities/Creature/CreatureData.h @@ -488,7 +488,7 @@ struct TC_GAME_API CreatureTemplate std::vector GossipMenuIds; std::unordered_map difficultyStore; uint32 RequiredExpansion; - uint32 VignetteID; /// @todo Read Vignette.db2 + uint32 VignetteID; uint32 faction; uint64 npcflag; float speed_walk; -- cgit v1.2.3