mirror of
https://github.com/mangosfour/server.git
synced 2025-12-30 10:37:12 +00:00
Merge remote branch 'origin/master' into 330
This commit is contained in:
tomrus88
commit
97177cb517
9 changed files with 197 additions and 182 deletions
|
|
@ -17055,17 +17055,17 @@ void Player::UpdateDuelFlag(time_t currTime)
|
|||
|
||||
void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
|
||||
{
|
||||
if(!pet)
|
||||
if (!pet)
|
||||
pet = GetPet();
|
||||
|
||||
if(!pet || pet->GetOwnerGUID()!=GetGUID())
|
||||
if (!pet || pet->GetOwnerGUID() != GetGUID())
|
||||
return;
|
||||
|
||||
// not save secondary permanent pet as current
|
||||
if (pet && m_temporaryUnsummonedPetNumber != pet->GetCharmInfo()->GetPetNumber() && mode == PET_SAVE_AS_CURRENT)
|
||||
if (pet && m_temporaryUnsummonedPetNumber && m_temporaryUnsummonedPetNumber != pet->GetCharmInfo()->GetPetNumber() && mode == PET_SAVE_AS_CURRENT)
|
||||
mode = PET_SAVE_NOT_IN_SLOT;
|
||||
|
||||
if(returnreagent && pet && mode != PET_SAVE_AS_CURRENT)
|
||||
if (returnreagent && pet && mode != PET_SAVE_AS_CURRENT)
|
||||
{
|
||||
//returning of reagents only for players, so best done here
|
||||
uint32 spellId = pet ? pet->GetUInt32Value(UNIT_CREATED_BY_SPELL) : m_oldpetspell;
|
||||
|
|
@ -17100,7 +17100,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
|
|||
RemoveGuardian(pet);
|
||||
break;
|
||||
default:
|
||||
if(GetPetGUID() == pet->GetGUID())
|
||||
if (GetPetGUID() == pet->GetGUID())
|
||||
SetPet(NULL);
|
||||
break;
|
||||
}
|
||||
|
|
@ -17112,7 +17112,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
|
|||
pet->AddObjectToRemoveList();
|
||||
pet->m_removed = true;
|
||||
|
||||
if(pet->isControlled())
|
||||
if (pet->isControlled())
|
||||
{
|
||||
RemovePetActionBar();
|
||||
|
||||
|
|
@ -17123,7 +17123,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
|
|||
|
||||
void Player::RemoveMiniPet()
|
||||
{
|
||||
if(Pet* pet = GetMiniPet())
|
||||
if (Pet* pet = GetMiniPet())
|
||||
{
|
||||
pet->Remove(PET_SAVE_AS_DELETED);
|
||||
m_miniPet = 0;
|
||||
|
|
@ -17132,8 +17132,9 @@ void Player::RemoveMiniPet()
|
|||
|
||||
Pet* Player::GetMiniPet()
|
||||
{
|
||||
if(!m_miniPet)
|
||||
if (!m_miniPet)
|
||||
return NULL;
|
||||
|
||||
return GetMap()->GetPet(m_miniPet);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1383,171 +1383,181 @@ enum TextEmotes
|
|||
|
||||
enum Emote
|
||||
{
|
||||
EMOTE_ONESHOT_NONE = 0,
|
||||
EMOTE_ONESHOT_TALK = 1,
|
||||
EMOTE_ONESHOT_BOW = 2,
|
||||
EMOTE_ONESHOT_WAVE = 3,
|
||||
EMOTE_ONESHOT_CHEER = 4,
|
||||
EMOTE_ONESHOT_EXCLAMATION = 5,
|
||||
EMOTE_ONESHOT_QUESTION = 6,
|
||||
EMOTE_ONESHOT_EAT = 7,
|
||||
EMOTE_STATE_DANCE = 10,
|
||||
EMOTE_ONESHOT_LAUGH = 11,
|
||||
EMOTE_STATE_SLEEP = 12,
|
||||
EMOTE_STATE_SIT = 13,
|
||||
EMOTE_ONESHOT_RUDE = 14,
|
||||
EMOTE_ONESHOT_ROAR = 15,
|
||||
EMOTE_ONESHOT_KNEEL = 16,
|
||||
EMOTE_ONESHOT_KISS = 17,
|
||||
EMOTE_ONESHOT_CRY = 18,
|
||||
EMOTE_ONESHOT_CHICKEN = 19,
|
||||
EMOTE_ONESHOT_BEG = 20,
|
||||
EMOTE_ONESHOT_APPLAUD = 21,
|
||||
EMOTE_ONESHOT_SHOUT = 22,
|
||||
EMOTE_ONESHOT_FLEX = 23,
|
||||
EMOTE_ONESHOT_SHY = 24,
|
||||
EMOTE_ONESHOT_POINT = 25,
|
||||
EMOTE_STATE_STAND = 26,
|
||||
EMOTE_STATE_READYUNARMED = 27,
|
||||
EMOTE_STATE_WORK_SHEATHED = 28,
|
||||
EMOTE_STATE_POINT = 29,
|
||||
EMOTE_STATE_NONE = 30,
|
||||
EMOTE_ONESHOT_WOUND = 33,
|
||||
EMOTE_ONESHOT_WOUNDCRITICAL = 34,
|
||||
EMOTE_ONESHOT_ATTACKUNARMED = 35,
|
||||
EMOTE_ONESHOT_ATTACK1H = 36,
|
||||
EMOTE_ONESHOT_ATTACK2HTIGHT = 37,
|
||||
EMOTE_ONESHOT_ATTACK2HLOOSE = 38,
|
||||
EMOTE_ONESHOT_PARRYUNARMED = 39,
|
||||
EMOTE_ONESHOT_PARRYSHIELD = 43,
|
||||
EMOTE_ONESHOT_READYUNARMED = 44,
|
||||
EMOTE_ONESHOT_READY1H = 45,
|
||||
EMOTE_ONESHOT_READYBOW = 48,
|
||||
EMOTE_ONESHOT_SPELLPRECAST = 50,
|
||||
EMOTE_ONESHOT_SPELLCAST = 51,
|
||||
EMOTE_ONESHOT_BATTLEROAR = 53,
|
||||
EMOTE_ONESHOT_SPECIALATTACK1H = 54,
|
||||
EMOTE_ONESHOT_KICK = 60,
|
||||
EMOTE_ONESHOT_ATTACKTHROWN = 61,
|
||||
EMOTE_STATE_STUN = 64,
|
||||
EMOTE_STATE_DEAD = 65,
|
||||
EMOTE_ONESHOT_SALUTE = 66,
|
||||
EMOTE_STATE_KNEEL = 68,
|
||||
EMOTE_STATE_USESTANDING = 69,
|
||||
EMOTE_ONESHOT_WAVE_NOSHEATHE = 70,
|
||||
EMOTE_ONESHOT_CHEER_NOSHEATHE = 71,
|
||||
EMOTE_ONESHOT_EAT_NOSHEATHE = 92,
|
||||
EMOTE_STATE_STUN_NOSHEATHE = 93,
|
||||
EMOTE_ONESHOT_DANCE = 94,
|
||||
EMOTE_ONESHOT_SALUTE_NOSHEATH = 113,
|
||||
EMOTE_STATE_USESTANDING_NOSHEATHE = 133,
|
||||
EMOTE_ONESHOT_LAUGH_NOSHEATHE = 153,
|
||||
EMOTE_STATE_WORK = 173,
|
||||
EMOTE_STATE_SPELLPRECAST = 193,
|
||||
EMOTE_ONESHOT_READYRIFLE = 213,
|
||||
EMOTE_STATE_READYRIFLE = 214,
|
||||
EMOTE_STATE_WORK_MINING = 233,
|
||||
EMOTE_STATE_WORK_CHOPWOOD = 234,
|
||||
EMOTE_STATE_APPLAUD = 253,
|
||||
EMOTE_ONESHOT_LIFTOFF = 254,
|
||||
EMOTE_ONESHOT_YES = 273,
|
||||
EMOTE_ONESHOT_NO = 274,
|
||||
EMOTE_ONESHOT_TRAIN = 275,
|
||||
EMOTE_ONESHOT_LAND = 293,
|
||||
EMOTE_STATE_AT_EASE = 313,
|
||||
EMOTE_STATE_READY1H = 333,
|
||||
EMOTE_STATE_SPELLKNEELSTART = 353,
|
||||
EMOTE_STATE_SUBMERGED = 373,
|
||||
EMOTE_ONESHOT_SUBMERGE = 374,
|
||||
EMOTE_STATE_READY2H = 375,
|
||||
EMOTE_STATE_READYBOW = 376,
|
||||
EMOTE_ONESHOT_MOUNTSPECIAL = 377,
|
||||
EMOTE_STATE_TALK = 378,
|
||||
EMOTE_STATE_FISHING = 379,
|
||||
EMOTE_ONESHOT_FISHING = 380,
|
||||
EMOTE_ONESHOT_LOOT = 381,
|
||||
EMOTE_STATE_WHIRLWIND = 382,
|
||||
EMOTE_STATE_DROWNED = 383,
|
||||
EMOTE_STATE_HOLD_BOW = 384,
|
||||
EMOTE_STATE_HOLD_RIFLE = 385,
|
||||
EMOTE_STATE_HOLD_THROWN = 386,
|
||||
EMOTE_ONESHOT_DROWN = 387,
|
||||
EMOTE_ONESHOT_STOMP = 388,
|
||||
EMOTE_ONESHOT_ATTACKOFF = 389,
|
||||
EMOTE_ONESHOT_ATTACKOFFPIERCE = 390,
|
||||
EMOTE_STATE_ROAR = 391,
|
||||
EMOTE_STATE_LAUGH = 392,
|
||||
EMOTE_ONESHOT_CREATURE_SPECIAL = 393,
|
||||
EMOTE_ONESHOT_JUMPLANDRUN = 394,
|
||||
EMOTE_ONESHOT_JUMPEND = 395,
|
||||
EMOTE_ONESHOT_TALK_NOSHEATHE = 396,
|
||||
EMOTE_ONESHOT_POINT_NOSHEATHE = 397,
|
||||
EMOTE_STATE_CANNIBALIZE = 398,
|
||||
EMOTE_ONESHOT_JUMPSTART = 399,
|
||||
EMOTE_STATE_DANCESPECIAL = 400,
|
||||
EMOTE_ONESHOT_DANCESPECIAL = 401,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL01 = 402,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL02 = 403,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL03 = 404,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL04 = 405,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL05 = 406,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL06 = 407,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL07 = 408,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL08 = 409,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL09 = 410,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL10 = 411,
|
||||
EMOTE_STATE_EXCLAIM = 412,
|
||||
EMOTE_STATE_DANCE_CUSTOM = 413,
|
||||
EMOTE_STATE_SIT_CHAIR_MED = 415,
|
||||
EMOTE_STATE_CUSTOM_SPELL_01 = 416,
|
||||
EMOTE_STATE_CUSTOM_SPELL_02 = 417,
|
||||
EMOTE_STATE_EAT = 418,
|
||||
EMOTE_STATE_CUSTOM_SPELL_04 = 419,
|
||||
EMOTE_STATE_CUSTOM_SPELL_03 = 420,
|
||||
EMOTE_STATE_CUSTOM_SPELL_05 = 421,
|
||||
EMOTE_STATE_SPELLEFFECT_HOLD = 422,
|
||||
EMOTE_STATE_EAT_NO_SHEATHE = 423,
|
||||
EMOTE_STATE_MOUNT = 424,
|
||||
EMOTE_STATE_READY2HL = 425,
|
||||
EMOTE_STATE_SIT_CHAIR_HIGH = 426,
|
||||
EMOTE_STATE_FALL = 427,
|
||||
EMOTE_STATE_LOOT = 428,
|
||||
EMOTE_STATE_SUBMERGED_NEW = 429,
|
||||
EMOTE_ONESHOT_COWER = 430,
|
||||
EMOTE_STATE_COWER = 431,
|
||||
EMOTE_ONESHOT_USESTANDING = 432,
|
||||
EMOTE_STATE_STEALTH_STAND = 433,
|
||||
EMOTE_ONESHOT_OMNICAST_GHOUL = 434,
|
||||
EMOTE_ONESHOT_ATTACKBOW = 435,
|
||||
EMOTE_ONESHOT_ATTACKRIFLE = 436,
|
||||
EMOTE_STATE_SWIM_IDLE = 437,
|
||||
EMOTE_STATE_ATTACK_UNARMED = 438,
|
||||
EMOTE_ONESHOT_SPELLCAST_W_SOUND = 439,
|
||||
EMOTE_ONESHOT_DODGE = 440,
|
||||
EMOTE_ONESHOT_PARRY1H = 441,
|
||||
EMOTE_ONESHOT_PARRY2H = 442,
|
||||
EMOTE_ONESHOT_PARRY2HL = 443,
|
||||
EMOTE_STATE_FLYFALL = 444,
|
||||
EMOTE_ONESHOT_FLYDEATH = 445,
|
||||
EMOTE_STATE_FLY_FALL = 446,
|
||||
EMOTE_ONESHOT_FLY_SIT_GROUND_DOWN = 447,
|
||||
EMOTE_ONESHOT_FLY_SIT_GROUND_UP = 448,
|
||||
EMOTE_ONESHOT_EMERGE = 449,
|
||||
EMOTE_ONESHOT_DRAGONSPIT = 450,
|
||||
EMOTE_STATE_SPECIALUNARMED = 451,
|
||||
EMOTE_ONESHOT_FLYGRAB = 452,
|
||||
EMOTE_STATE_FLYGRABCLOSED = 453,
|
||||
EMOTE_ONESHOT_FLYGRABTHROWN = 454,
|
||||
EMOTE_STATE_FLY_SIT_GROUND = 455,
|
||||
EMOTE_STATE_WALKBACKWARDS = 456,
|
||||
EMOTE_ONESHOT_FLYTALK = 457,
|
||||
EMOTE_ONESHOT_FLYATTACK1H = 458,
|
||||
EMOTE_STATE_CUSTOMSPELL08 = 459,
|
||||
EMOTE_ONESHOT_FLY_DRAGONSPIT = 460,
|
||||
EMOTE_STATE_SIT_CHAIR_LOW = 461,
|
||||
EMOTE_ONE_SHOT_STUN = 462,
|
||||
EMOTE_ONESHOT_SPELLCAST_OMNI = 463,
|
||||
EMOTE_STATE_READYTHROWN = 464
|
||||
EMOTE_ONESHOT_NONE = 0,
|
||||
EMOTE_ONESHOT_TALK = 1,
|
||||
EMOTE_ONESHOT_BOW = 2,
|
||||
EMOTE_ONESHOT_WAVE = 3,
|
||||
EMOTE_ONESHOT_CHEER = 4,
|
||||
EMOTE_ONESHOT_EXCLAMATION = 5,
|
||||
EMOTE_ONESHOT_QUESTION = 6,
|
||||
EMOTE_ONESHOT_EAT = 7,
|
||||
EMOTE_STATE_DANCE = 10,
|
||||
EMOTE_ONESHOT_LAUGH = 11,
|
||||
EMOTE_STATE_SLEEP = 12,
|
||||
EMOTE_STATE_SIT = 13,
|
||||
EMOTE_ONESHOT_RUDE = 14,
|
||||
EMOTE_ONESHOT_ROAR = 15,
|
||||
EMOTE_ONESHOT_KNEEL = 16,
|
||||
EMOTE_ONESHOT_KISS = 17,
|
||||
EMOTE_ONESHOT_CRY = 18,
|
||||
EMOTE_ONESHOT_CHICKEN = 19,
|
||||
EMOTE_ONESHOT_BEG = 20,
|
||||
EMOTE_ONESHOT_APPLAUD = 21,
|
||||
EMOTE_ONESHOT_SHOUT = 22,
|
||||
EMOTE_ONESHOT_FLEX = 23,
|
||||
EMOTE_ONESHOT_SHY = 24,
|
||||
EMOTE_ONESHOT_POINT = 25,
|
||||
EMOTE_STATE_STAND = 26,
|
||||
EMOTE_STATE_READYUNARMED = 27,
|
||||
EMOTE_STATE_WORK_SHEATHED = 28,
|
||||
EMOTE_STATE_POINT = 29,
|
||||
EMOTE_STATE_NONE = 30,
|
||||
EMOTE_ONESHOT_WOUND = 33,
|
||||
EMOTE_ONESHOT_WOUNDCRITICAL = 34,
|
||||
EMOTE_ONESHOT_ATTACKUNARMED = 35,
|
||||
EMOTE_ONESHOT_ATTACK1H = 36,
|
||||
EMOTE_ONESHOT_ATTACK2HTIGHT = 37,
|
||||
EMOTE_ONESHOT_ATTACK2HLOOSE = 38,
|
||||
EMOTE_ONESHOT_PARRYUNARMED = 39,
|
||||
EMOTE_ONESHOT_PARRYSHIELD = 43,
|
||||
EMOTE_ONESHOT_READYUNARMED = 44,
|
||||
EMOTE_ONESHOT_READY1H = 45,
|
||||
EMOTE_ONESHOT_READYBOW = 48,
|
||||
EMOTE_ONESHOT_SPELLPRECAST = 50,
|
||||
EMOTE_ONESHOT_SPELLCAST = 51,
|
||||
EMOTE_ONESHOT_BATTLEROAR = 53,
|
||||
EMOTE_ONESHOT_SPECIALATTACK1H = 54,
|
||||
EMOTE_ONESHOT_KICK = 60,
|
||||
EMOTE_ONESHOT_ATTACKTHROWN = 61,
|
||||
EMOTE_STATE_STUN = 64,
|
||||
EMOTE_STATE_DEAD = 65,
|
||||
EMOTE_ONESHOT_SALUTE = 66,
|
||||
EMOTE_STATE_KNEEL = 68,
|
||||
EMOTE_STATE_USESTANDING = 69,
|
||||
EMOTE_ONESHOT_WAVE_NOSHEATHE = 70,
|
||||
EMOTE_ONESHOT_CHEER_NOSHEATHE = 71,
|
||||
EMOTE_ONESHOT_EAT_NOSHEATHE = 92,
|
||||
EMOTE_STATE_STUN_NOSHEATHE = 93,
|
||||
EMOTE_ONESHOT_DANCE = 94,
|
||||
EMOTE_ONESHOT_SALUTE_NOSHEATH = 113,
|
||||
EMOTE_STATE_USESTANDING_NOSHEATHE = 133,
|
||||
EMOTE_ONESHOT_LAUGH_NOSHEATHE = 153,
|
||||
EMOTE_STATE_WORK = 173,
|
||||
EMOTE_STATE_SPELLPRECAST = 193,
|
||||
EMOTE_ONESHOT_READYRIFLE = 213,
|
||||
EMOTE_STATE_READYRIFLE = 214,
|
||||
EMOTE_STATE_WORK_MINING = 233,
|
||||
EMOTE_STATE_WORK_CHOPWOOD = 234,
|
||||
EMOTE_STATE_APPLAUD = 253,
|
||||
EMOTE_ONESHOT_LIFTOFF = 254,
|
||||
EMOTE_ONESHOT_YES = 273,
|
||||
EMOTE_ONESHOT_NO = 274,
|
||||
EMOTE_ONESHOT_TRAIN = 275,
|
||||
EMOTE_ONESHOT_LAND = 293,
|
||||
EMOTE_STATE_AT_EASE = 313,
|
||||
EMOTE_STATE_READY1H = 333,
|
||||
EMOTE_STATE_SPELLKNEELSTART = 353,
|
||||
EMOTE_STATE_SUBMERGED = 373,
|
||||
EMOTE_ONESHOT_SUBMERGE = 374,
|
||||
EMOTE_STATE_READY2H = 375,
|
||||
EMOTE_STATE_READYBOW = 376,
|
||||
EMOTE_ONESHOT_MOUNTSPECIAL = 377,
|
||||
EMOTE_STATE_TALK = 378,
|
||||
EMOTE_STATE_FISHING = 379,
|
||||
EMOTE_ONESHOT_FISHING = 380,
|
||||
EMOTE_ONESHOT_LOOT = 381,
|
||||
EMOTE_STATE_WHIRLWIND = 382,
|
||||
EMOTE_STATE_DROWNED = 383,
|
||||
EMOTE_STATE_HOLD_BOW = 384,
|
||||
EMOTE_STATE_HOLD_RIFLE = 385,
|
||||
EMOTE_STATE_HOLD_THROWN = 386,
|
||||
EMOTE_ONESHOT_DROWN = 387,
|
||||
EMOTE_ONESHOT_STOMP = 388,
|
||||
EMOTE_ONESHOT_ATTACKOFF = 389,
|
||||
EMOTE_ONESHOT_ATTACKOFFPIERCE = 390,
|
||||
EMOTE_STATE_ROAR = 391,
|
||||
EMOTE_STATE_LAUGH = 392,
|
||||
EMOTE_ONESHOT_CREATURE_SPECIAL = 393,
|
||||
EMOTE_ONESHOT_JUMPLANDRUN = 394,
|
||||
EMOTE_ONESHOT_JUMPEND = 395,
|
||||
EMOTE_ONESHOT_TALK_NOSHEATHE = 396,
|
||||
EMOTE_ONESHOT_POINT_NOSHEATHE = 397,
|
||||
EMOTE_STATE_CANNIBALIZE = 398,
|
||||
EMOTE_ONESHOT_JUMPSTART = 399,
|
||||
EMOTE_STATE_DANCESPECIAL = 400,
|
||||
EMOTE_ONESHOT_DANCESPECIAL = 401,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL01 = 402,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL02 = 403,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL03 = 404,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL04 = 405,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL05 = 406,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL06 = 407,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL07 = 408,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL08 = 409,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL09 = 410,
|
||||
EMOTE_ONESHOT_CUSTOMSPELL10 = 411,
|
||||
EMOTE_STATE_EXCLAIM = 412,
|
||||
EMOTE_STATE_DANCE_CUSTOM = 413,
|
||||
EMOTE_STATE_SIT_CHAIR_MED = 415,
|
||||
EMOTE_STATE_CUSTOM_SPELL_01 = 416,
|
||||
EMOTE_STATE_CUSTOM_SPELL_02 = 417,
|
||||
EMOTE_STATE_EAT = 418,
|
||||
EMOTE_STATE_CUSTOM_SPELL_04 = 419,
|
||||
EMOTE_STATE_CUSTOM_SPELL_03 = 420,
|
||||
EMOTE_STATE_CUSTOM_SPELL_05 = 421,
|
||||
EMOTE_STATE_SPELLEFFECT_HOLD = 422,
|
||||
EMOTE_STATE_EAT_NO_SHEATHE = 423,
|
||||
EMOTE_STATE_MOUNT = 424,
|
||||
EMOTE_STATE_READY2HL = 425,
|
||||
EMOTE_STATE_SIT_CHAIR_HIGH = 426,
|
||||
EMOTE_STATE_FALL = 427,
|
||||
EMOTE_STATE_LOOT = 428,
|
||||
EMOTE_STATE_SUBMERGED_NEW = 429,
|
||||
EMOTE_ONESHOT_COWER = 430,
|
||||
EMOTE_STATE_COWER = 431,
|
||||
EMOTE_ONESHOT_USESTANDING = 432,
|
||||
EMOTE_STATE_STEALTH_STAND = 433,
|
||||
EMOTE_ONESHOT_OMNICAST_GHOUL = 434,
|
||||
EMOTE_ONESHOT_ATTACKBOW = 435,
|
||||
EMOTE_ONESHOT_ATTACKRIFLE = 436,
|
||||
EMOTE_STATE_SWIM_IDLE = 437,
|
||||
EMOTE_STATE_ATTACK_UNARMED = 438,
|
||||
EMOTE_ONESHOT_SPELLCAST_W_SOUND = 439,
|
||||
EMOTE_ONESHOT_DODGE = 440,
|
||||
EMOTE_ONESHOT_PARRY1H = 441,
|
||||
EMOTE_ONESHOT_PARRY2H = 442,
|
||||
EMOTE_ONESHOT_PARRY2HL = 443,
|
||||
EMOTE_STATE_FLYFALL = 444,
|
||||
EMOTE_ONESHOT_FLYDEATH = 445,
|
||||
EMOTE_STATE_FLY_FALL = 446,
|
||||
EMOTE_ONESHOT_FLY_SIT_GROUND_DOWN = 447,
|
||||
EMOTE_ONESHOT_FLY_SIT_GROUND_UP = 448,
|
||||
EMOTE_ONESHOT_EMERGE = 449,
|
||||
EMOTE_ONESHOT_DRAGONSPIT = 450,
|
||||
EMOTE_STATE_SPECIALUNARMED = 451,
|
||||
EMOTE_ONESHOT_FLYGRAB = 452,
|
||||
EMOTE_STATE_FLYGRABCLOSED = 453,
|
||||
EMOTE_ONESHOT_FLYGRABTHROWN = 454,
|
||||
EMOTE_STATE_FLY_SIT_GROUND = 455,
|
||||
EMOTE_STATE_WALKBACKWARDS = 456,
|
||||
EMOTE_ONESHOT_FLYTALK = 457,
|
||||
EMOTE_ONESHOT_FLYATTACK1H = 458,
|
||||
EMOTE_STATE_CUSTOMSPELL08 = 459,
|
||||
EMOTE_ONESHOT_FLY_DRAGONSPIT = 460,
|
||||
EMOTE_STATE_SIT_CHAIR_LOW = 461,
|
||||
EMOTE_ONE_SHOT_STUN = 462,
|
||||
EMOTE_ONESHOT_SPELLCAST_OMNI = 463,
|
||||
EMOTE_STATE_READYTHROWN = 465,
|
||||
EMOTE_ONESHOT_WORK_CHOPWOOD = 466,
|
||||
EMOTE_ONESHOT_WORK_MINING = 467,
|
||||
EMOTE_STATE_SPELL_CHANNEL_OMNI = 468,
|
||||
EMOTE_STATE_SPELL_CHANNEL_DIRECTED = 469,
|
||||
EMOTE_STAND_STATE_NONE = 470,
|
||||
EMOTE_STATE_READYJOUST = 471,
|
||||
EMOTE_STATE_STRANGULATE = 473,
|
||||
EMOTE_STATE_READYSPELLOMNI = 474,
|
||||
EMOTE_STATE_HOLD_JOUST = 475,
|
||||
EMOTE_ONESHOT_CRY_JAINA = 476
|
||||
};
|
||||
|
||||
enum Anim
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ enum UnitStandFlags
|
|||
enum UnitBytes1_Flags
|
||||
{
|
||||
UNIT_BYTE1_FLAG_ALWAYS_STAND = 0x01,
|
||||
UNIT_BYTE1_FLAG_UNK_2 = 0x02,
|
||||
UNIT_BYTE1_FLAG_UNK_2 = 0x02, // Creature that can fly and are not on the ground appear to have this flag. If they are on the ground, flag is not present.
|
||||
UNIT_BYTE1_FLAG_UNTRACKABLE = 0x04,
|
||||
UNIT_BYTE1_FLAG_ALL = 0xFF
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue