mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 16:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11357] Replace some 0-values with UNIT_DYNFLAG_NONE

Browse source 
Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
NoFantasy 2011-04-15 11:07:27 +02:00
parent 520f420aed
commit 2c09c11091
5 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/game/Creature.cpp
View file

@ -495,7 +495,7 @@ void Creature::Update(uint32 update_diff, uint32 diff)
CreatureInfo const *cinfo = GetCreatureInfo(); CreatureInfo const *cinfo = GetCreatureInfo();
SelectLevel(cinfo); SelectLevel(cinfo);
SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0); SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE);
if (m_isDeadByDefault) if (m_isDeadByDefault)
{ {
SetDeathState(JUST_DIED); SetDeathState(JUST_DIED);

4
src/game/Pet.cpp
View file

@ -503,8 +503,8 @@ void Pet::SetDeathState(DeathState s) // overwrite virtual
else else
{ {
// pet corpse non lootable and non skinnable // pet corpse non lootable and non skinnable
SetUInt32Value( UNIT_DYNAMIC_FLAGS, 0x00 ); SetUInt32Value(UNIT_DYNAMIC_FLAGS, UNIT_DYNFLAG_NONE);
RemoveFlag (UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE); RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_SKINNABLE);
//lose happiness when died and not in BG/Arena //lose happiness when died and not in BG/Arena
MapEntry const* mapEntry = sMapStore.LookupEntry(GetMapId()); MapEntry const* mapEntry = sMapStore.LookupEntry(GetMapId());

2
src/game/Player.cpp
View file

@ -4564,7 +4564,7 @@ void Player::KillPlayer()
SetDeathState(CORPSE); SetDeathState(CORPSE);
//SetFlag( UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_IN_PVP ); //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()); ApplyModByteFlag(PLAYER_FIELD_BYTES, 0, PLAYER_FIELD_BYTE_RELEASE_TIMER, !sMapStore.LookupEntry(GetMapId())->Instanceable());
// 6 minutes until repop at graveyard // 6 minutes until repop at graveyard

5
src/game/SpellEffects.cpp
View file

@ -8262,8 +8262,9 @@ void Spell::EffectSummonDeadPet(SpellEffectIndex /*eff_idx*/)
return; return;
if(damage < 0) if(damage < 0)
return; 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->SetDeathState( ALIVE );
pet->clearUnitState(UNIT_STAT_ALL_STATE); pet->clearUnitState(UNIT_STAT_ALL_STATE);
pet->SetHealth( uint32(pet->GetMaxHealth()*(float(damage)/100))); pet->SetHealth( uint32(pet->GetMaxHealth()*(float(damage)/100)));

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11356" #define REVISION_NR "11357"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__