aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <none@none>2010-12-08 14:51:50 +0100
committerShauren <none@none>2010-12-08 14:51:50 +0100
commit611dc153b05a7098daa7dd255524cd996645e6f0 (patch)
tree185190b874b9bcfb00adf79f14131e8b7323dae4
parentcebf8590e39129fdd8526eaa4302d143340a1cff (diff)
Core/Units: Corrected PLAYER_FIELD_BYTES2 invisibility/stealth flags, by VladimirMangos
--HG-- branch : trunk
-rwxr-xr-xsrc/server/game/Entities/Player/Player.h5
-rwxr-xr-xsrc/server/game/Spells/Auras/SpellAuraEffects.cpp8
2 files changed, 7 insertions, 6 deletions
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index 05c1f45199f..570e6c6e15f 100755
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -445,8 +445,9 @@ enum PlayerFieldByteFlags
// used in PLAYER_FIELD_BYTES2 values
enum PlayerFieldByte2Flags
{
- PLAYER_FIELD_BYTE2_NONE = 0x0000,
- PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW = 0x4000
+ PLAYER_FIELD_BYTE2_NONE = 0x00,
+ PLAYER_FIELD_BYTE2_STEALTH = 0x20,
+ PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW = 0x40
};
enum ActivateTaxiReplies
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 9704ff48a45..c97600feb10 100755
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -2764,7 +2764,7 @@ void AuraEffect::HandleModInvisibility(AuraApplication const * aurApp, uint8 mod
// apply glow vision
if (target->GetTypeId() == TYPEID_PLAYER)
- target->SetFlag(PLAYER_FIELD_BYTES2,PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW);
+ target->SetByteFlag(PLAYER_FIELD_BYTES2, 3, PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW);
target->m_invisibility.AddFlag(type);
target->m_invisibility.AddValue(type, GetAmount());
@@ -2776,7 +2776,7 @@ void AuraEffect::HandleModInvisibility(AuraApplication const * aurApp, uint8 mod
// if not have different invisibility auras.
// remove glow vision
if (target->GetTypeId() == TYPEID_PLAYER)
- target->RemoveFlag(PLAYER_FIELD_BYTES2,PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW);
+ target->RemoveByteFlag(PLAYER_FIELD_BYTES2, 3, PLAYER_FIELD_BYTE2_INVISIBILITY_GLOW);
target->m_invisibility.DelFlag(type);
}
@@ -2832,7 +2832,7 @@ void AuraEffect::HandleModStealth(AuraApplication const * aurApp, uint8 mode, bo
target->SetStandFlags(UNIT_STAND_FLAGS_CREEP);
if (target->GetTypeId() == TYPEID_PLAYER)
- target->SetFlag(PLAYER_FIELD_BYTES2, 0x2000);
+ target->SetByteFlag(PLAYER_FIELD_BYTES2, 3, PLAYER_FIELD_BYTE2_STEALTH);
}
else
{
@@ -2844,7 +2844,7 @@ void AuraEffect::HandleModStealth(AuraApplication const * aurApp, uint8 mode, bo
target->RemoveStandFlags(UNIT_STAND_FLAGS_CREEP);
if (target->GetTypeId() == TYPEID_PLAYER)
- target->RemoveFlag(PLAYER_FIELD_BYTES2, 0x2000);
+ target->RemoveByteFlag(PLAYER_FIELD_BYTES2, 3, PLAYER_FIELD_BYTE2_STEALTH);
}
}