Backed out changeset: ad4f100c0a9d
--HG-- branch : trunk
This commit is contained in:
+41
-100
@@ -149,7 +149,6 @@ enum ShapeshiftForm
|
||||
FORM_BERSERKERSTANCE = 0x13,
|
||||
FORM_TEST = 0x14,
|
||||
FORM_ZOMBIE = 0x15,
|
||||
FORM_METAMORPHOSIS = 0x16,
|
||||
FORM_FLIGHT_EPIC = 0x1B,
|
||||
FORM_SHADOW = 0x1C,
|
||||
FORM_FLIGHT = 0x1D,
|
||||
@@ -169,14 +168,14 @@ enum SheathState
|
||||
// byte (1 from 0..3) of UNIT_FIELD_BYTES_2
|
||||
enum UnitBytes2_Flags
|
||||
{
|
||||
UNIT_BYTE2_FLAG_PVP = 0x01,
|
||||
UNIT_BYTE2_FLAG_UNK1 = 0x02,
|
||||
UNIT_BYTE2_FLAG_FFA_PVP = 0x04,
|
||||
UNIT_BYTE2_FLAG_SANCTUARY = 0x08,
|
||||
UNIT_BYTE2_FLAG_UNK4 = 0x10,
|
||||
UNIT_BYTE2_FLAG_UNK5 = 0x20,
|
||||
UNIT_BYTE2_FLAG_UNK6 = 0x40,
|
||||
UNIT_BYTE2_FLAG_UNK7 = 0x80
|
||||
UNIT_BYTE2_FLAG_UNK0 = 0x01,
|
||||
UNIT_BYTE2_FLAG_UNK1 = 0x02,
|
||||
UNIT_BYTE2_FLAG_UNK2 = 0x04,
|
||||
UNIT_BYTE2_FLAG_UNK3 = 0x08,
|
||||
UNIT_BYTE2_FLAG_AURAS = 0x10, // show possitive auras as positive, and allow its dispel
|
||||
UNIT_BYTE2_FLAG_UNK5 = 0x20,
|
||||
UNIT_BYTE2_FLAG_UNK6 = 0x40,
|
||||
UNIT_BYTE2_FLAG_UNK7 = 0x80
|
||||
};
|
||||
|
||||
// byte (2 from 0..3) of UNIT_FIELD_BYTES_2
|
||||
@@ -214,27 +213,16 @@ enum HitInfo
|
||||
HITINFO_UNK1 = 0x00000001, // req correct packet structure
|
||||
HITINFO_NORMALSWING2 = 0x00000002,
|
||||
HITINFO_LEFTSWING = 0x00000004,
|
||||
HITINFO_UNK2 = 0x00000008,
|
||||
HITINFO_MISS = 0x00000010,
|
||||
HITINFO_ABSORB = 0x00000020, // absorbed damage
|
||||
HITINFO_ABSORB2 = 0x00000040, // absorbed damage
|
||||
HITINFO_RESIST = 0x00000080, // resisted atleast some damage
|
||||
HITINFO_RESIST2 = 0x00000100, // resisted atleast some damage
|
||||
HITINFO_CRITICALHIT = 0x00000200, // critical hit
|
||||
// 0x00000400
|
||||
// 0x00000800
|
||||
// 0x00001000
|
||||
HITINFO_BLOCK = 0x00002000, // blocked damage
|
||||
// 0x00004000
|
||||
// 0x00008000
|
||||
HITINFO_GLANCING = 0x00010000,
|
||||
HITINFO_CRUSHING = 0x00020000,
|
||||
HITINFO_NOACTION = 0x00040000, // guessed
|
||||
// 0x00080000
|
||||
// 0x00100000
|
||||
HITINFO_SWINGNOHITSOUND = 0x00200000, // guessed
|
||||
// 0x00400000
|
||||
HITINFO_UNK3 = 0x00800000
|
||||
HITINFO_ABSORB = 0x00000020, // plays absorb sound
|
||||
HITINFO_RESIST = 0x00000040, // resisted at least some damage
|
||||
HITINFO_CRITICALHIT = 0x00000080,
|
||||
HITINFO_UNK2 = 0x00000100, // wotlk?
|
||||
HITINFO_UNK3 = 0x00002000, // wotlk?
|
||||
HITINFO_GLANCING = 0x00004000,
|
||||
HITINFO_CRUSHING = 0x00008000,
|
||||
HITINFO_NOACTION = 0x00010000,
|
||||
HITINFO_SWINGNOHITSOUND = 0x00080000
|
||||
};
|
||||
|
||||
//i would like to remove this: (it is defined in item.h
|
||||
@@ -306,13 +294,11 @@ enum UnitMods
|
||||
UNIT_MOD_STAT_INTELLECT,
|
||||
UNIT_MOD_STAT_SPIRIT,
|
||||
UNIT_MOD_HEALTH,
|
||||
UNIT_MOD_MANA, // UNIT_MOD_MANA..UNIT_MOD_RUNIC_POWER must be in existed order, it's accessed by index values of Powers enum.
|
||||
UNIT_MOD_MANA, // UNIT_MOD_MANA..UNIT_MOD_HAPPINESS must be in existed order, it's accessed by index values of Powers enum.
|
||||
UNIT_MOD_RAGE,
|
||||
UNIT_MOD_FOCUS,
|
||||
UNIT_MOD_ENERGY,
|
||||
UNIT_MOD_HAPPINESS,
|
||||
UNIT_MOD_RUNE,
|
||||
UNIT_MOD_RUNIC_POWER,
|
||||
UNIT_MOD_ARMOR, // UNIT_MOD_ARMOR..UNIT_MOD_RESISTANCE_ARCANE must be in existed order, it's accessed by index values of SpellSchools enum.
|
||||
UNIT_MOD_RESISTANCE_HOLY,
|
||||
UNIT_MOD_RESISTANCE_FIRE,
|
||||
@@ -332,7 +318,7 @@ enum UnitMods
|
||||
UNIT_MOD_RESISTANCE_START = UNIT_MOD_ARMOR,
|
||||
UNIT_MOD_RESISTANCE_END = UNIT_MOD_RESISTANCE_ARCANE + 1,
|
||||
UNIT_MOD_POWER_START = UNIT_MOD_MANA,
|
||||
UNIT_MOD_POWER_END = UNIT_MOD_RUNIC_POWER + 1
|
||||
UNIT_MOD_POWER_END = UNIT_MOD_HAPPINESS + 1
|
||||
};
|
||||
|
||||
enum BaseModGroup
|
||||
@@ -397,10 +383,9 @@ enum UnitMoveType
|
||||
MOVE_TURN_RATE = 5,
|
||||
MOVE_FLIGHT = 6,
|
||||
MOVE_FLIGHT_BACK = 7,
|
||||
MOVE_PITCH_RATE = 8
|
||||
};
|
||||
|
||||
#define MAX_MOVE_TYPE 9
|
||||
#define MAX_MOVE_TYPE 8
|
||||
|
||||
extern float baseMoveSpeed[MAX_MOVE_TYPE];
|
||||
|
||||
@@ -438,11 +423,10 @@ enum CombatRating
|
||||
CR_WEAPON_SKILL_MAINHAND = 20,
|
||||
CR_WEAPON_SKILL_OFFHAND = 21,
|
||||
CR_WEAPON_SKILL_RANGED = 22,
|
||||
CR_EXPERTISE = 23,
|
||||
CR_ARMOR_PENETRATION = 24
|
||||
CR_EXPERTISE = 23
|
||||
};
|
||||
|
||||
#define MAX_COMBAT_RATING 25
|
||||
#define MAX_COMBAT_RATING 24
|
||||
|
||||
enum DamageEffectType
|
||||
{
|
||||
@@ -476,19 +460,19 @@ enum UnitFlags
|
||||
UNIT_FLAG_UNKNOWN9 = 0x00000040,
|
||||
UNIT_FLAG_NOT_ATTACKABLE_1 = 0x00000080, // ?? (UNIT_FLAG_PVP_ATTACKABLE | UNIT_FLAG_NOT_ATTACKABLE_1) is NON_PVP_ATTACKABLE
|
||||
UNIT_FLAG_NOT_ATTACKABLE_2 = 0x00000100, // 2.0.8
|
||||
UNIT_FLAG_UNKNOWN11 = 0x00000200, // 3.0.3 - makes you unable to attack everything
|
||||
UNIT_FLAG_UNKNOWN11 = 0x00000200,
|
||||
UNIT_FLAG_LOOTING = 0x00000400, // loot animation
|
||||
UNIT_FLAG_PET_IN_COMBAT = 0x00000800, // in combat?, 2.0.8
|
||||
UNIT_FLAG_PVP = 0x00001000, // changed in 3.0.3
|
||||
UNIT_FLAG_PVP = 0x00001000,
|
||||
UNIT_FLAG_SILENCED = 0x00002000, // silenced, 2.1.1
|
||||
UNIT_FLAG_UNKNOWN4 = 0x00004000, // 2.0.8
|
||||
UNIT_FLAG_UNKNOWN13 = 0x00008000,
|
||||
UNIT_FLAG_UNKNOWN14 = 0x00010000,
|
||||
UNIT_FLAG_PACIFIED = 0x00020000, // 3.0.3 ok
|
||||
UNIT_FLAG_STUNNED = 0x00040000, // 3.0.3 ok
|
||||
UNIT_FLAG_PACIFIED = 0x00020000,
|
||||
UNIT_FLAG_DISABLE_ROTATE = 0x00040000, // stunned, 2.1.1
|
||||
UNIT_FLAG_IN_COMBAT = 0x00080000,
|
||||
UNIT_FLAG_TAXI_FLIGHT = 0x00100000, // disable casting at client side spell not allowed by taxi flight (mounted?), probably used with 0x4 flag
|
||||
UNIT_FLAG_DISARMED = 0x00200000, // 3.0.3, disable melee spells casting..., "Required melee weapon" added to melee spells tooltip.
|
||||
UNIT_FLAG_DISARMED = 0x00200000, // disable melee spells casting..., "Required melee weapon" added to melee spells tooltip.
|
||||
UNIT_FLAG_CONFUSED = 0x00400000,
|
||||
UNIT_FLAG_FLEEING = 0x00800000,
|
||||
UNIT_FLAG_UNKNOWN5 = 0x01000000, // used in spell Eyes of the Beast for pet...
|
||||
@@ -503,10 +487,9 @@ enum UnitFlags
|
||||
// Value masks for UNIT_FIELD_FLAGS_2
|
||||
enum UnitFlags2
|
||||
{
|
||||
UNIT_FLAG2_FEIGN_DEATH = 0x00000001,
|
||||
UNIT_FLAG2_COMPREHEND_LANG = 0x00000008,
|
||||
UNIT_FLAG2_FORCE_MOVE = 0x00000040,
|
||||
UNIT_FLAG2_REGENERATE_POWER = 0x00000800
|
||||
UNIT_FLAG2_FEIGN_DEATH = 0x00000001,
|
||||
UNIT_FLAG2_COMPREHEND_LANG= 0x00000008,
|
||||
UNIT_FLAG2_FORCE_MOVE = 0x00000040
|
||||
};
|
||||
|
||||
/// Non Player Character flags
|
||||
@@ -652,18 +635,8 @@ uint32 createProcExtendMask(SpellNonMeleeDamage *damageInfo, SpellMissInfo missC
|
||||
|
||||
struct UnitActionBarEntry
|
||||
{
|
||||
union
|
||||
{
|
||||
struct
|
||||
{
|
||||
uint16 SpellOrAction;
|
||||
uint16 Type;
|
||||
};
|
||||
struct
|
||||
{
|
||||
uint32 Raw;
|
||||
};
|
||||
};
|
||||
uint32 Type;
|
||||
uint32 SpellOrAction;
|
||||
};
|
||||
|
||||
#define MAX_DECLINED_NAME_CASES 5
|
||||
@@ -685,12 +658,13 @@ enum CurrentSpellTypes
|
||||
|
||||
enum ActiveStates
|
||||
{
|
||||
ACT_PASSIVE = 0x0100, // 0x0100 - passive
|
||||
ACT_DISABLED = 0x8100, // 0x8000 - castable
|
||||
ACT_ENABLED = 0xC100, // 0x4000 | 0x8000 - auto cast + castable
|
||||
ACT_COMMAND = 0x0700, // 0x0100 | 0x0200 | 0x0400
|
||||
ACT_REACTION = 0x0600, // 0x0200 | 0x0400
|
||||
ACT_DECIDE = 0x0001 // what is it?
|
||||
ACT_ENABLED = 0xC100,
|
||||
ACT_DISABLED = 0x8100,
|
||||
ACT_COMMAND = 0x0700,
|
||||
ACT_REACTION = 0x0600,
|
||||
ACT_CAST = 0x0100,
|
||||
ACT_PASSIVE = 0x0000,
|
||||
ACT_DECIDE = 0x0001
|
||||
};
|
||||
|
||||
enum ReactStates
|
||||
@@ -780,7 +754,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
|
||||
typedef std::list<DiminishingReturn> Diminishing;
|
||||
typedef std::set<AuraType> AuraTypeSet;
|
||||
typedef std::set<uint32> ComboPointHolderSet;
|
||||
typedef std::map<uint8, uint32> VisibleAuraMap;
|
||||
|
||||
virtual ~Unit ( );
|
||||
|
||||
@@ -911,14 +884,8 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
|
||||
|
||||
return false;
|
||||
}
|
||||
bool IsPvP() const { return HasByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP); }
|
||||
void SetPvP(bool state)
|
||||
{
|
||||
if(state)
|
||||
SetByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP);
|
||||
else
|
||||
RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_PVP);
|
||||
}
|
||||
bool IsPvP() const { return HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP); }
|
||||
void SetPvP(bool state) { if(state) SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP); else RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PVP); }
|
||||
uint32 GetCreatureType() const;
|
||||
uint32 GetCreatureTypeMask() const
|
||||
{
|
||||
@@ -1288,30 +1255,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
|
||||
void removeHatedBy(HostilReference* /*pHostilReference*/ ) { /* nothing to do yet */ }
|
||||
HostilRefManager& getHostilRefManager() { return m_HostilRefManager; }
|
||||
|
||||
uint32 GetVisibleAura(uint8 slot)
|
||||
{
|
||||
VisibleAuraMap::iterator itr = m_visibleAuras.find(slot);
|
||||
if(itr != m_visibleAuras.end())
|
||||
return itr->second;
|
||||
return 0;
|
||||
}
|
||||
void SetVisibleAura(uint8 slot, uint32 spellid)
|
||||
{
|
||||
if(spellid == 0)
|
||||
{
|
||||
VisibleAuraMap::iterator itr = m_visibleAuras.find(slot);
|
||||
if(itr != m_visibleAuras.end())
|
||||
{
|
||||
m_visibleAuras.erase(itr);
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
m_visibleAuras[slot] = spellid;
|
||||
}
|
||||
VisibleAuraMap const *GetVisibleAuras() { return &m_visibleAuras; }
|
||||
uint8 GetVisibleAurasCount() { return m_visibleAuras.size(); }
|
||||
|
||||
Aura* GetAura(uint32 spellId, uint32 effindex);
|
||||
AuraMap & GetAuras() { return m_Auras; }
|
||||
AuraMap const& GetAuras() const { return m_Auras; }
|
||||
@@ -1503,7 +1446,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
|
||||
float m_weaponDamage[MAX_ATTACK][2];
|
||||
bool m_canModifyStats;
|
||||
//std::list< spellEffectPair > AuraSpells[TOTAL_AURAS]; // TODO: use this if ok for mem
|
||||
VisibleAuraMap m_visibleAuras;
|
||||
|
||||
float m_speed_rate[MAX_MOVE_TYPE];
|
||||
|
||||
@@ -1517,7 +1459,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
|
||||
uint32 m_unit_movement_flags;
|
||||
|
||||
uint32 m_reactiveTimer[MAX_REACTIVE];
|
||||
uint32 m_regenTimer;
|
||||
|
||||
private:
|
||||
void SendAttackStop(Unit* victim); // only from AttackStop(Unit*)
|
||||
|
||||
Reference in New Issue
Block a user