diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp index b1e85d522..b6bfa245c 100644 --- a/src/game/Creature.cpp +++ b/src/game/Creature.cpp @@ -495,7 +495,7 @@ void Creature::Update(uint32 update_diff, uint32 diff) CreatureInfo const *cinfo = GetCreatureInfo(); SelectLevel(cinfo); - SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0); + SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE); if (m_isDeadByDefault) { SetDeathState(JUST_DIED); diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp index 36e795d1d..e11374857 100644 --- a/src/game/Pet.cpp +++ b/src/game/Pet.cpp @@ -503,8 +503,8 @@ void Pet::SetDeathState(DeathState s) // overwrite virtual else { // pet corpse non lootable and non skinnable - SetUInt32Value( UNIT_DYNAMIC_FLAGS, 0x00 ); - RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); + SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE); + RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); //lose happiness when died and not in BG/Arena MapEntry const* mapEntry = sMapStore.LookupEntry(GetMapId()); diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 687a22eaa..4baa41978 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -4564,7 +4564,7 @@ void Player::KillPlayer() SetDeathState(CORPSE); //SetFlag( UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_IN_PVP ); - SetFlag(UNIT_DYNAMIC_FLAGS, 0x00); + SetFlag(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE); ApplyModByteFlag(PLAYER_FIELD_BYTES, 0, PLAYER_FIELD_BYTE_RELEASE_TIMER, !sMapStore.LookupEntry(GetMapId())->Instanceable()); // 6 minutes until repop at graveyard diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp index 21ba60b76..abe907960 100644 --- a/src/game/SpellEffects.cpp +++ b/src/game/SpellEffects.cpp @@ -8262,8 +8262,9 @@ void Spell::EffectSummonDeadPet(SpellEffectIndex /*eff_idx*/) return; if(damage < 0) return; - pet->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0); - pet->RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); + + pet->SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE); + pet->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); pet->SetDeathState( ALIVE ); pet->clearUnitState(UNIT_STAT_ALL_STATE); pet->SetHealth( uint32(pet->GetMaxHealth()*(float(damage)/100))); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 8569b7bde..247ea93df 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 "11356" + #define REVISION_NR "11357" #endif // __REVISION_NR_H__