From d5beb2bbe97afa0e50df8a2cef49bcac4a607f4a Mon Sep 17 00:00:00 2001 From: KingPin Date: Sun, 2 Nov 2008 16:53:46 -0600 Subject: [svn] *Implement new player conditions CONDITION_NO_AURA, CONDITION_ACTIVE_EVENT * Default behaviour of pets for creatures changed to REACT_DEFENSIVE * Disallowed sending wrapped items as COD * Prevent loading and saving single target auras for pet in same way as already implemented for player * Correctly limit use some flask types to zones. * Fixed extracting common.MPQ under *nix * Many small xleanups and fixes. ** mangos merge rev. TEST REV so be careful of creepy crawly bugs! --HG-- branch : trunk --- src/game/Player.cpp | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) (limited to 'src/game/Player.cpp') diff --git a/src/game/Player.cpp b/src/game/Player.cpp index c6e7b65249e..8b2edce2895 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -3257,6 +3257,8 @@ void Player::InitVisibleBits() { updateVisualBits.SetCount(PLAYER_END); + // TODO: really implement OWNER_ONLY and GROUP_ONLY. Flags can be found in UpdateFields.h + updateVisualBits.SetBit(OBJECT_FIELD_GUID); updateVisualBits.SetBit(OBJECT_FIELD_TYPE); updateVisualBits.SetBit(OBJECT_FIELD_SCALE_X); @@ -3268,6 +3270,7 @@ void Player::InitVisibleBits() updateVisualBits.SetBit(UNIT_FIELD_SUMMON+1); updateVisualBits.SetBit(UNIT_FIELD_CHARMEDBY); + updateVisualBits.SetBit(UNIT_FIELD_CHARMEDBY+1); updateVisualBits.SetBit(UNIT_FIELD_TARGET); updateVisualBits.SetBit(UNIT_FIELD_TARGET+1); @@ -3299,12 +3302,10 @@ void Player::InitVisibleBits() updateVisualBits.SetBit(UNIT_FIELD_AURASTATE); updateVisualBits.SetBit(UNIT_FIELD_BASEATTACKTIME); updateVisualBits.SetBit(UNIT_FIELD_BASEATTACKTIME + 1); - updateVisualBits.SetBit(UNIT_FIELD_RANGEDATTACKTIME); updateVisualBits.SetBit(UNIT_FIELD_BOUNDINGRADIUS); updateVisualBits.SetBit(UNIT_FIELD_COMBATREACH); updateVisualBits.SetBit(UNIT_FIELD_DISPLAYID); updateVisualBits.SetBit(UNIT_FIELD_NATIVEDISPLAYID); - updateVisualBits.SetBit(UNIT_FIELD_MOUNTDISPLAYID); updateVisualBits.SetBit(UNIT_FIELD_BYTES_1); updateVisualBits.SetBit(UNIT_FIELD_MOUNTDISPLAYID); updateVisualBits.SetBit(UNIT_FIELD_PETNUMBER); @@ -3314,16 +3315,16 @@ void Player::InitVisibleBits() updateVisualBits.SetBit(UNIT_MOD_CAST_SPEED); updateVisualBits.SetBit(UNIT_FIELD_BYTES_2); + updateVisualBits.SetBit(PLAYER_DUEL_ARBITER); + updateVisualBits.SetBit(PLAYER_DUEL_ARBITER+1); updateVisualBits.SetBit(PLAYER_FLAGS); + updateVisualBits.SetBit(PLAYER_GUILDID); + updateVisualBits.SetBit(PLAYER_GUILDRANK); updateVisualBits.SetBit(PLAYER_BYTES); updateVisualBits.SetBit(PLAYER_BYTES_2); updateVisualBits.SetBit(PLAYER_BYTES_3); - updateVisualBits.SetBit(PLAYER_GUILDID); - updateVisualBits.SetBit(PLAYER_GUILDRANK); - updateVisualBits.SetBit(PLAYER_GUILD_TIMESTAMP); updateVisualBits.SetBit(PLAYER_DUEL_TEAM); - updateVisualBits.SetBit(PLAYER_DUEL_ARBITER); - updateVisualBits.SetBit(PLAYER_DUEL_ARBITER+1); + updateVisualBits.SetBit(PLAYER_GUILD_TIMESTAMP); // PLAYER_QUEST_LOG_x also visible bit on official (but only on party/raid)... for(uint16 i = PLAYER_QUEST_LOG_1_1; i < PLAYER_QUEST_LOG_25_2; i+=4) @@ -3352,16 +3353,6 @@ void Player::InitVisibleBits() } updateVisualBits.SetBit(PLAYER_CHOSEN_TITLE); - - updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_DISPLAY); - updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_DISPLAY + 1); - updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_SLOT_DISPLAY + 2); - updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO); - updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO + 1); - updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO + 2); - updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO + 3); - updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO + 4); - updateVisualBits.SetBit(UNIT_VIRTUAL_ITEM_INFO + 5); } void Player::BuildCreateUpdateBlockForPlayer( UpdateData *data, Player *target ) const -- cgit v1.2.3