diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index e2ffdf422..cd1358753 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -1691,8 +1691,8 @@ bool Creature::LoadCreaturesAddon(bool reload) if (cainfo->emote != 0) SetUInt32Value(UNIT_NPC_EMOTESTATE, cainfo->emote); - if (cainfo->move_flags != 0) - SetSplineFlags(SplineFlags(cainfo->move_flags)); + if (cainfo->splineFlags != 0) + SetSplineFlags(SplineFlags(cainfo->splineFlags)); if(cainfo->auras) { diff --git a/src/game/Creature.h b/src/game/Creature.h index fd3428fe3..6bba03dbe 100644 --- a/src/game/Creature.h +++ b/src/game/Creature.h @@ -217,7 +217,7 @@ struct CreatureDataAddon uint32 bytes1; uint32 bytes2; uint32 emote; - uint32 move_flags; + uint32 splineFlags; CreatureDataAddonAura const* auras; // loaded as char* "spell1 eff1 spell2 eff2 ... " }; diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 977a3d4e5..300511d1c 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -855,10 +855,10 @@ void ObjectMgr::LoadCreatureAddons(SQLStorage& creatureaddons, char const* entry if (!sEmotesStore.LookupEntry(addon->emote)) sLog.outErrorDb("Creature (%s %u) have invalid emote (%u) defined in `%s`.", entryName, addon->guidOrEntry, addon->emote, creatureaddons.GetTableName()); - if (addon->move_flags & (SPLINEFLAG_TRAJECTORY|SPLINEFLAG_UNKNOWN3)) + if (addon->splineFlags & (SPLINEFLAG_TRAJECTORY|SPLINEFLAG_UNKNOWN3)) { - sLog.outErrorDb("Creature (%s %u) movement flags mask defined in `%s` include forbidden flags (" I32FMT ") that can crash client, cleanup at load.", entryName, addon->guidOrEntry, creatureaddons.GetTableName(), (SPLINEFLAG_TRAJECTORY|SPLINEFLAG_UNKNOWN3)); - const_cast(addon)->move_flags &= ~(SPLINEFLAG_TRAJECTORY|SPLINEFLAG_UNKNOWN3); + sLog.outErrorDb("Creature (%s %u) spline flags mask defined in `%s` include forbidden flags (" I32FMT ") that can crash client, cleanup at load.", entryName, addon->guidOrEntry, creatureaddons.GetTableName(), (SPLINEFLAG_TRAJECTORY|SPLINEFLAG_UNKNOWN3)); + const_cast(addon)->splineFlags &= ~(SPLINEFLAG_TRAJECTORY|SPLINEFLAG_UNKNOWN3); } ConvertCreatureAddonAuras(const_cast(addon), creatureaddons.GetTableName(), entryName); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b26c7acaf..bd5331ef6 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9334" + #define REVISION_NR "9335" #endif // __REVISION_NR_H__