mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-01-22 13:16:23 +00:00
converted all tabs to 4 spaces
This commit is contained in:
Yehonal
File diff suppressed because it is too large
Load Diff
@@ -22,8 +22,8 @@
|
||||
#include "PetDefines.h"
|
||||
#include "TemporarySummon.h"
|
||||
|
||||
#define PET_FOCUS_REGEN_INTERVAL 4 * IN_MILLISECONDS
|
||||
#define PET_LOSE_HAPPINES_INTERVAL 7500
|
||||
#define PET_FOCUS_REGEN_INTERVAL 4 * IN_MILLISECONDS
|
||||
#define PET_LOSE_HAPPINES_INTERVAL 7500
|
||||
#define HAPPINESS_LEVEL_SIZE 333000
|
||||
|
||||
struct PetSpell
|
||||
@@ -36,15 +36,15 @@ struct PetSpell
|
||||
|
||||
class AsynchPetSummon
|
||||
{
|
||||
public:
|
||||
AsynchPetSummon(uint32 entry, Position position, PetType petType, uint32 duration, uint32 createdBySpell, uint64 casterGUID) :
|
||||
m_entry(entry), pos(position), m_petType(petType),
|
||||
m_duration(duration), m_createdBySpell(createdBySpell), m_casterGUID(casterGUID) { }
|
||||
|
||||
Position pos;
|
||||
uint32 m_entry, m_createdBySpell, m_duration;
|
||||
PetType m_petType;
|
||||
uint64 m_casterGUID;
|
||||
public:
|
||||
AsynchPetSummon(uint32 entry, Position position, PetType petType, uint32 duration, uint32 createdBySpell, uint64 casterGUID) :
|
||||
m_entry(entry), pos(position), m_petType(petType),
|
||||
m_duration(duration), m_createdBySpell(createdBySpell), m_casterGUID(casterGUID) { }
|
||||
|
||||
Position pos;
|
||||
uint32 m_entry, m_createdBySpell, m_duration;
|
||||
PetType m_petType;
|
||||
uint64 m_casterGUID;
|
||||
};
|
||||
|
||||
typedef UNORDERED_MAP<uint32, PetSpell> PetSpellMap;
|
||||
@@ -74,7 +74,7 @@ class Pet : public Guardian
|
||||
bool CreateBaseAtCreature(Creature* creature);
|
||||
bool CreateBaseAtCreatureInfo(CreatureTemplate const* cinfo, Unit* owner);
|
||||
bool CreateBaseAtTamed(CreatureTemplate const* cinfo, Map* map, uint32 phaseMask);
|
||||
static bool LoadPetFromDB(Player* owner, uint8 asynchLoadType, uint32 petentry = 0, uint32 petnumber = 0, bool current = false, AsynchPetSummon* info = NULL);
|
||||
static bool LoadPetFromDB(Player* owner, uint8 asynchLoadType, uint32 petentry = 0, uint32 petnumber = 0, bool current = false, AsynchPetSummon* info = NULL);
|
||||
bool isBeingLoaded() const { return m_loading;}
|
||||
void SavePetToDB(PetSaveMode mode, bool logout);
|
||||
void Remove(PetSaveMode mode, bool returnreagent = false);
|
||||
@@ -100,7 +100,7 @@ class Pet : public Guardian
|
||||
bool HaveInDiet(ItemTemplate const* item) const;
|
||||
uint32 GetCurrentFoodBenefitLevel(uint32 itemlevel) const;
|
||||
void SetDuration(int32 dur) { m_duration = dur; }
|
||||
int32 GetDuration() const { return m_duration; }
|
||||
int32 GetDuration() const { return m_duration; }
|
||||
|
||||
/*
|
||||
bool UpdateStats(Stats stat);
|
||||
@@ -124,7 +124,7 @@ class Pet : public Guardian
|
||||
void _SaveAuras(SQLTransaction& trans, bool logout);
|
||||
void _SaveSpells(SQLTransaction& trans);
|
||||
|
||||
void _LoadSpellCooldowns(PreparedQueryResult result);
|
||||
void _LoadSpellCooldowns(PreparedQueryResult result);
|
||||
void _LoadAuras(PreparedQueryResult result, uint32 timediff);
|
||||
void _LoadSpells(PreparedQueryResult result);
|
||||
|
||||
@@ -160,11 +160,11 @@ class Pet : public Guardian
|
||||
bool m_removed; // prevent overwrite pet state in DB at next Pet::Update if pet already removed(saved)
|
||||
|
||||
Player* GetOwner() const { return m_owner; }
|
||||
void SetLoading(bool load) { m_loading = load; }
|
||||
void HandleAsynchLoadSucceed();
|
||||
static void HandleAsynchLoadFailed(AsynchPetSummon* info, Player* player, uint8 asynchLoadType, uint8 loadResult);
|
||||
uint8 GetAsynchLoadType() const { return asynchLoadType; }
|
||||
void SetAsynchLoadType(uint8 type) { asynchLoadType = type; }
|
||||
void SetLoading(bool load) { m_loading = load; }
|
||||
void HandleAsynchLoadSucceed();
|
||||
static void HandleAsynchLoadFailed(AsynchPetSummon* info, Player* player, uint8 asynchLoadType, uint8 loadResult);
|
||||
uint8 GetAsynchLoadType() const { return asynchLoadType; }
|
||||
void SetAsynchLoadType(uint8 type) { asynchLoadType = type; }
|
||||
protected:
|
||||
Player* m_owner;
|
||||
int32 m_happinessTimer;
|
||||
@@ -172,10 +172,10 @@ class Pet : public Guardian
|
||||
int32 m_duration; // time until unsummon (used mostly for summoned guardians and not used for controlled pets)
|
||||
uint64 m_auraRaidUpdateMask;
|
||||
bool m_loading;
|
||||
int32 m_petRegenTimer; // xinef: used for focus regeneration
|
||||
int32 m_petRegenTimer; // xinef: used for focus regeneration
|
||||
|
||||
DeclinedName *m_declinedname;
|
||||
uint8 asynchLoadType;
|
||||
uint8 asynchLoadType;
|
||||
|
||||
private:
|
||||
void SaveToDB(uint32, uint8, uint32) // override of Creature::SaveToDB - must not be called
|
||||
|
||||
@@ -77,7 +77,7 @@ enum PetTalk
|
||||
// used at pet loading query list preparing, and later result selection
|
||||
enum PetLoadQueryIndex
|
||||
{
|
||||
PET_LOAD_QUERY_LOADAURAS = 0,
|
||||
PET_LOAD_QUERY_LOADAURAS = 0,
|
||||
PET_LOAD_QUERY_LOADSPELLS = 1,
|
||||
PET_LOAD_QUERY_LOADSPELLCOOLDOWN = 2,
|
||||
MAX_PET_LOAD_QUERY,
|
||||
@@ -85,118 +85,118 @@ enum PetLoadQueryIndex
|
||||
|
||||
enum PetLoadStage
|
||||
{
|
||||
PET_LOAD_DEFAULT = 0,
|
||||
PET_LOAD_HANDLE_UNSTABLE_CALLBACK = 1, // used also in HandleStableSwapPetCallback, uses same error / ok messages
|
||||
PET_LOAD_BG_RESURRECT = 2,
|
||||
PET_LOAD_SUMMON_PET = 3,
|
||||
PET_LOAD_SUMMON_DEAD_PET = 4
|
||||
PET_LOAD_DEFAULT = 0,
|
||||
PET_LOAD_HANDLE_UNSTABLE_CALLBACK = 1, // used also in HandleStableSwapPetCallback, uses same error / ok messages
|
||||
PET_LOAD_BG_RESURRECT = 2,
|
||||
PET_LOAD_SUMMON_PET = 3,
|
||||
PET_LOAD_SUMMON_DEAD_PET = 4
|
||||
};
|
||||
|
||||
enum PetLoadState
|
||||
{
|
||||
PET_LOAD_OK = 0,
|
||||
PET_LOAD_NO_RESULT = 1,
|
||||
PET_LOAD_ERROR = 2
|
||||
PET_LOAD_OK = 0,
|
||||
PET_LOAD_NO_RESULT = 1,
|
||||
PET_LOAD_ERROR = 2
|
||||
};
|
||||
|
||||
enum NPCEntries
|
||||
{
|
||||
// Warlock
|
||||
NPC_INFERNAL = 89,
|
||||
NPC_IMP = 416,
|
||||
NPC_FELHUNTER = 417,
|
||||
NPC_VOIDWALKER = 1860,
|
||||
NPC_SUCCUBUS = 1863,
|
||||
NPC_DOOMGUARD = 11859,
|
||||
NPC_FELGUARD = 17252,
|
||||
// Warlock
|
||||
NPC_INFERNAL = 89,
|
||||
NPC_IMP = 416,
|
||||
NPC_FELHUNTER = 417,
|
||||
NPC_VOIDWALKER = 1860,
|
||||
NPC_SUCCUBUS = 1863,
|
||||
NPC_DOOMGUARD = 11859,
|
||||
NPC_FELGUARD = 17252,
|
||||
|
||||
// Mage
|
||||
NPC_WATER_ELEMENTAL_TEMP = 510,
|
||||
NPC_MIRROR_IMAGE = 31216,
|
||||
NPC_WATER_ELEMENTAL_PERM = 37994,
|
||||
// Mage
|
||||
NPC_WATER_ELEMENTAL_TEMP = 510,
|
||||
NPC_MIRROR_IMAGE = 31216,
|
||||
NPC_WATER_ELEMENTAL_PERM = 37994,
|
||||
|
||||
// Druid
|
||||
NPC_TREANT = 1964,
|
||||
// Druid
|
||||
NPC_TREANT = 1964,
|
||||
|
||||
// Priest
|
||||
NPC_SHADOWFIEND = 19668,
|
||||
// Priest
|
||||
NPC_SHADOWFIEND = 19668,
|
||||
|
||||
// Shaman
|
||||
NPC_FIRE_ELEMENTAL = 15438,
|
||||
NPC_EARTH_ELEMENTAL = 15352,
|
||||
NPC_FERAL_SPIRIT = 29264,
|
||||
// Shaman
|
||||
NPC_FIRE_ELEMENTAL = 15438,
|
||||
NPC_EARTH_ELEMENTAL = 15352,
|
||||
NPC_FERAL_SPIRIT = 29264,
|
||||
|
||||
// Death Knight
|
||||
NPC_RISEN_GHOUL = 26125,
|
||||
NPC_BLOODWORM = 28017,
|
||||
NPC_ARMY_OF_THE_DEAD = 24207,
|
||||
NPC_EBON_GARGOYLE = 27829,
|
||||
// Death Knight
|
||||
NPC_RISEN_GHOUL = 26125,
|
||||
NPC_BLOODWORM = 28017,
|
||||
NPC_ARMY_OF_THE_DEAD = 24207,
|
||||
NPC_EBON_GARGOYLE = 27829,
|
||||
|
||||
// Generic
|
||||
NPC_GENERIC_IMP = 12922,
|
||||
NPC_GENERIC_VOIDWALKER = 8996
|
||||
// Generic
|
||||
NPC_GENERIC_IMP = 12922,
|
||||
NPC_GENERIC_VOIDWALKER = 8996
|
||||
};
|
||||
|
||||
enum PetScalingSpells
|
||||
{
|
||||
SPELL_PET_AVOIDANCE = 32233,
|
||||
SPELL_PET_AVOIDANCE = 32233,
|
||||
|
||||
SPELL_HUNTER_PET_SCALING_01 = 34902,
|
||||
SPELL_HUNTER_PET_SCALING_02 = 34903,
|
||||
SPELL_HUNTER_PET_SCALING_03 = 34904,
|
||||
SPELL_HUNTER_PET_SCALING_04 = 61017, // Hit / Expertise
|
||||
SPELL_HUNTER_PET_SCALING_01 = 34902,
|
||||
SPELL_HUNTER_PET_SCALING_02 = 34903,
|
||||
SPELL_HUNTER_PET_SCALING_03 = 34904,
|
||||
SPELL_HUNTER_PET_SCALING_04 = 61017, // Hit / Expertise
|
||||
|
||||
// Warlock
|
||||
SPELL_WARLOCK_PET_SCALING_01 = 34947,
|
||||
SPELL_WARLOCK_PET_SCALING_02 = 34956,
|
||||
SPELL_WARLOCK_PET_SCALING_03 = 34957,
|
||||
SPELL_WARLOCK_PET_SCALING_04 = 34958,
|
||||
SPELL_WARLOCK_PET_SCALING_05 = 61013, // Hit / Expertise
|
||||
SPELL_GLYPH_OF_FELGUARD = 56246,
|
||||
SPELL_INFERNAL_SCALING_01 = 36186,
|
||||
SPELL_INFERNAL_SCALING_02 = 36188,
|
||||
SPELL_INFERNAL_SCALING_03 = 36189,
|
||||
SPELL_INFERNAL_SCALING_04 = 36190,
|
||||
SPELL_RITUAL_ENSLAVEMENT = 22987,
|
||||
// Warlock
|
||||
SPELL_WARLOCK_PET_SCALING_01 = 34947,
|
||||
SPELL_WARLOCK_PET_SCALING_02 = 34956,
|
||||
SPELL_WARLOCK_PET_SCALING_03 = 34957,
|
||||
SPELL_WARLOCK_PET_SCALING_04 = 34958,
|
||||
SPELL_WARLOCK_PET_SCALING_05 = 61013, // Hit / Expertise
|
||||
SPELL_GLYPH_OF_FELGUARD = 56246,
|
||||
SPELL_INFERNAL_SCALING_01 = 36186,
|
||||
SPELL_INFERNAL_SCALING_02 = 36188,
|
||||
SPELL_INFERNAL_SCALING_03 = 36189,
|
||||
SPELL_INFERNAL_SCALING_04 = 36190,
|
||||
SPELL_RITUAL_ENSLAVEMENT = 22987,
|
||||
|
||||
// Shaman
|
||||
SPELL_FERAL_SPIRIT_SPIRIT_HUNT = 58877,
|
||||
SPELL_FERAL_SPIRIT_SCALING_01 = 35674,
|
||||
SPELL_FERAL_SPIRIT_SCALING_02 = 35675,
|
||||
SPELL_FERAL_SPIRIT_SCALING_03 = 35676,
|
||||
SPELL_FIRE_ELEMENTAL_SCALING_01 = 35665,
|
||||
SPELL_FIRE_ELEMENTAL_SCALING_02 = 35666,
|
||||
SPELL_FIRE_ELEMENTAL_SCALING_03 = 35667,
|
||||
SPELL_FIRE_ELEMENTAL_SCALING_04 = 35668,
|
||||
SPELL_EARTH_ELEMENTAL_SCALING_01 = 65225,
|
||||
SPELL_EARTH_ELEMENTAL_SCALING_02 = 65226,
|
||||
SPELL_EARTH_ELEMENTAL_SCALING_03 = 65227,
|
||||
SPELL_EARTH_ELEMENTAL_SCALING_04 = 65228,
|
||||
// Shaman
|
||||
SPELL_FERAL_SPIRIT_SPIRIT_HUNT = 58877,
|
||||
SPELL_FERAL_SPIRIT_SCALING_01 = 35674,
|
||||
SPELL_FERAL_SPIRIT_SCALING_02 = 35675,
|
||||
SPELL_FERAL_SPIRIT_SCALING_03 = 35676,
|
||||
SPELL_FIRE_ELEMENTAL_SCALING_01 = 35665,
|
||||
SPELL_FIRE_ELEMENTAL_SCALING_02 = 35666,
|
||||
SPELL_FIRE_ELEMENTAL_SCALING_03 = 35667,
|
||||
SPELL_FIRE_ELEMENTAL_SCALING_04 = 35668,
|
||||
SPELL_EARTH_ELEMENTAL_SCALING_01 = 65225,
|
||||
SPELL_EARTH_ELEMENTAL_SCALING_02 = 65226,
|
||||
SPELL_EARTH_ELEMENTAL_SCALING_03 = 65227,
|
||||
SPELL_EARTH_ELEMENTAL_SCALING_04 = 65228,
|
||||
|
||||
// Priest
|
||||
SPELL_SHADOWFIEND_SCALING_01 = 35661,
|
||||
SPELL_SHADOWFIEND_SCALING_02 = 35662,
|
||||
SPELL_SHADOWFIEND_SCALING_03 = 35663,
|
||||
SPELL_SHADOWFIEND_SCALING_04 = 35664,
|
||||
// Priest
|
||||
SPELL_SHADOWFIEND_SCALING_01 = 35661,
|
||||
SPELL_SHADOWFIEND_SCALING_02 = 35662,
|
||||
SPELL_SHADOWFIEND_SCALING_03 = 35663,
|
||||
SPELL_SHADOWFIEND_SCALING_04 = 35664,
|
||||
|
||||
// Druid
|
||||
SPELL_TREANT_SCALING_01 = 35669,
|
||||
SPELL_TREANT_SCALING_02 = 35670,
|
||||
SPELL_TREANT_SCALING_03 = 35671,
|
||||
SPELL_TREANT_SCALING_04 = 35672,
|
||||
// Druid
|
||||
SPELL_TREANT_SCALING_01 = 35669,
|
||||
SPELL_TREANT_SCALING_02 = 35670,
|
||||
SPELL_TREANT_SCALING_03 = 35671,
|
||||
SPELL_TREANT_SCALING_04 = 35672,
|
||||
|
||||
// Mage
|
||||
SPELL_MAGE_PET_SCALING_01 = 35657,
|
||||
SPELL_MAGE_PET_SCALING_02 = 35658,
|
||||
SPELL_MAGE_PET_SCALING_03 = 35659,
|
||||
SPELL_MAGE_PET_SCALING_04 = 35660,
|
||||
// Mage
|
||||
SPELL_MAGE_PET_SCALING_01 = 35657,
|
||||
SPELL_MAGE_PET_SCALING_02 = 35658,
|
||||
SPELL_MAGE_PET_SCALING_03 = 35659,
|
||||
SPELL_MAGE_PET_SCALING_04 = 35660,
|
||||
|
||||
// Death Knight
|
||||
SPELL_ORC_RACIAL_COMMAND = 65221,
|
||||
SPELL_NIGHT_OF_THE_DEAD_AVOIDANCE = 62137,
|
||||
SPELL_DK_PET_SCALING_01 = 51996,
|
||||
SPELL_DK_PET_SCALING_02 = 54566,
|
||||
SPELL_DK_PET_SCALING_03 = 61697
|
||||
// Death Knight
|
||||
SPELL_ORC_RACIAL_COMMAND = 65221,
|
||||
SPELL_NIGHT_OF_THE_DEAD_AVOIDANCE = 62137,
|
||||
SPELL_DK_PET_SCALING_01 = 51996,
|
||||
SPELL_DK_PET_SCALING_02 = 54566,
|
||||
SPELL_DK_PET_SCALING_03 = 61697
|
||||
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user