Changeset 229 for trunk/src/game/Player.cpp
- Timestamp:
- 11/19/08 13:48:34 (17 years ago)
- Files:
-
- 1 modified
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/game/Player.cpp
r221 r229 798 798 } 799 799 800 void Player::EnvironmentalDamage(uint64 guid, Enviro mentalDamage type, uint32 damage)800 void Player::EnvironmentalDamage(uint64 guid, EnvironmentalDamageType type, uint32 damage) 801 801 { 802 802 WorldPacket data(SMSG_ENVIRONMENTALDAMAGELOG, (21)); … … 1545 1545 ((Player*)GetCharmer())->RemovePossess(); 1546 1546 1547 // The player was ported to another map and looses the duel immediat ly.1547 // The player was ported to another map and looses the duel immediately. 1548 1548 // We have to perform this check before the teleport, otherwise the 1549 1549 // ObjectAccessor won't find the flag. … … 6691 6691 } 6692 6692 6693 if(!IsUseEquip edWeapon(slot==EQUIPMENT_SLOT_MAINHAND))6693 if(!IsUseEquippedWeapon(slot==EQUIPMENT_SLOT_MAINHAND)) 6694 6694 return; 6695 6695 … … 8469 8469 return item; 8470 8470 8471 if( item->IsBroken() || !IsUseEquip edWeapon(attackType==BASE_ATTACK) )8471 if( item->IsBroken() || !IsUseEquippedWeapon(attackType==BASE_ATTACK) ) 8472 8472 return NULL; 8473 8473 … … 10139 10139 if( pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP || 10140 10140 pItem->GetProto()->Bonding == BIND_QUEST_ITEM || 10141 pItem->GetProto()->Bonding == BIND_WHEN_EQUIP ED && IsBagPos(pos) )10141 pItem->GetProto()->Bonding == BIND_WHEN_EQUIPPED && IsBagPos(pos) ) 10142 10142 pItem->SetBinding( true ); 10143 10143 … … 10185 10185 if( pItem2->GetProto()->Bonding == BIND_WHEN_PICKED_UP || 10186 10186 pItem2->GetProto()->Bonding == BIND_QUEST_ITEM || 10187 pItem2->GetProto()->Bonding == BIND_WHEN_EQUIP ED && IsBagPos(pos) )10187 pItem2->GetProto()->Bonding == BIND_WHEN_EQUIPPED && IsBagPos(pos) ) 10188 10188 pItem2->SetBinding( true ); 10189 10189 … … 10370 10370 10371 10371 // check also BIND_WHEN_PICKED_UP and BIND_QUEST_ITEM for .additem or .additemset case by GM (not binded at adding to inventory) 10372 if( pItem->GetProto()->Bonding == BIND_WHEN_EQUIP ED || pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP || pItem->GetProto()->Bonding == BIND_QUEST_ITEM )10372 if( pItem->GetProto()->Bonding == BIND_WHEN_EQUIPPED || pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP || pItem->GetProto()->Bonding == BIND_QUEST_ITEM ) 10373 10373 pItem->SetBinding( true ); 10374 10374 … … 17332 17332 if(u->GetVisibility() == VISIBILITY_GROUP_STEALTH) 17333 17333 { 17334 // if player is dead then he can't detect anyone in any cases17334 // if player is dead then he can't detect anyone in any cases 17335 17335 //do not know what is the use of this detect 17336 17336 // stealth and detected and visible for some seconds