josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-16 19:04:31 -06:00
parent 91e640d14e 5ded6c8df4
commit 00ba699d6f
19 changed files with 102 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/Unit.h
+7 -6
View File
@@ -1192,10 +1192,10 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
CharmInfo* GetCharmInfo() { return m_charmInfo; }
CharmInfo* InitCharmInfo(Unit* charm);
SharedVisionList const& GetSharedVisionList() { return m_sharedVision; }
void RemoveBindSightAuras();
void RemoveCharmAuras();
void AddPlayerToVision(Player* plr);
void RemovePlayerFromVision(Player* plr);
void RemoveAllFromVision();
void UncharmSelf();
Pet* CreateTamedPetFrom(Creature* creatureTarget,uint32 spell_id = 0);
@@ -1481,10 +1481,6 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
void SetUnitMovementFlags(uint32 f) { m_unit_movement_flags = f; }
void SetControlled(bool apply, UnitState state);
void SetFeared(bool apply/*, uint64 casterGUID = 0, uint32 spellID = 0*/);
void SetConfused(bool apply/*, uint64 casterGUID = 0, uint32 spellID = 0*/);
void SetStunned(bool apply);
void SetRooted(bool apply);
void AddComboPointHolder(uint32 lowguid) { m_ComboPointHolders.insert(lowguid); }
void RemoveComboPointHolder(uint32 lowguid) { m_ComboPointHolders.erase(lowguid); }
@@ -1591,6 +1587,11 @@ class TRINITY_DLL_SPEC Unit : public WorldObject
bool HandleOverrideClassScriptAuraProc(Unit *pVictim, uint32 damage, Aura* triggredByAura, SpellEntry const *procSpell, uint32 cooldown);
bool HandleMeandingAuraProc(Aura* triggeredByAura);
void SetFeared(bool apply);
void SetConfused(bool apply);
void SetStunned(bool apply);
void SetRooted(bool apply);
uint32 m_state; // Even derived shouldn't modify
uint32 m_CombatTimer;
uint32 m_lastManaUse; // msecs