diff options
author | Ramusik <nikson.91@mail.ru> | 2011-05-30 21:30:52 +0300 |
---|---|---|
committer | click <clickvd@gonnamakeyou.com> | 2011-05-31 01:18:50 +0200 |
commit | d1307ee47baa1f4bd95905c8d94ff7fd847d5923 (patch) | |
tree | 3fc22bfd45292648261a697ca1502d1f8b368264 /src | |
parent | 600cc16c9496ec74d66e4d6b77fba085a71fd293 (diff) |
Core: use UNIT_DYNFLAG_NONE instead of 0-value. Also fixed typo in reset UNIT_DYNAMIC_FLAGS at player death
Signed-off-by: click <clickvd@gonnamakeyou.com>
Diffstat (limited to 'src')
-rwxr-xr-x | src/server/game/Entities/Pet/Pet.cpp | 4 | ||||
-rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 2 | ||||
-rwxr-xr-x | src/server/game/Spells/SpellEffects.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp index 4eab03aad33..58c80c966f2 100755 --- a/src/server/game/Entities/Pet/Pet.cpp +++ b/src/server/game/Entities/Pet/Pet.cpp @@ -465,8 +465,8 @@ void Pet::setDeathState(DeathState s) // overwrite virtual if (getPetType() == HUNTER_PET) { // 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/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 0a468c6ac06..a4a051e39ce 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -5159,7 +5159,7 @@ void Player::KillPlayer() setDeathState(CORPSE); //SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_IN_PVP); - SetFlag(UNIT_DYNAMIC_FLAGS, 0x00); + SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE); ApplyModFlag(PLAYER_FIELD_BYTES, PLAYER_FIELD_BYTE_RELEASE_TIMER, !sMapStore.LookupEntry(GetMapId())->Instanceable()); // 6 minutes until repop at graveyard diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 58023ff9e52..e5846e21a1f 100755 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -6187,8 +6187,8 @@ void Spell::EffectSummonDeadPet(SpellEffIndex /*effIndex*/) _player->GetPosition(x, y, z); _player->GetMap()->CreatureRelocation(pet, x, y, z, _player->GetOrientation()); - 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(uint32(UNIT_STAT_ALL_STATE)); pet->SetHealth(pet->CountPctFromMaxHealth(damage)); |