Show
Ignore:
Timestamp:
11/19/08 13:48:34 (17 years ago)
Author:
yumileroy
Message:

[svn] *** Source: MaNGOS ***
* Fixed build extractor at Windows Vista. Author: Vladimir
* Fixed comment text and code indentifiers spelling. Author: Vladimir & Paradox.
* Access cached member lists in guild handlers instead of querying the DB. Author: Hunuza
* Small fixes in send/received packet and simple code cleanup also. Author: Vladimir
* Not output error at loading empty character_ticket table. Author: Vladimir
* Not reset display model at shapeshift aura remove if it not set at apply. Author: Arthorius
* Applied props to few files.

Original author: visagalis
Date: 2008-11-14 16:28:45-06:00

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/game/Player.cpp

    r221 r229  
    798798} 
    799799 
    800 void Player::EnvironmentalDamage(uint64 guid, EnviromentalDamage type, uint32 damage) 
     800void Player::EnvironmentalDamage(uint64 guid, EnvironmentalDamageType type, uint32 damage) 
    801801{ 
    802802    WorldPacket data(SMSG_ENVIRONMENTALDAMAGELOG, (21)); 
     
    15451545        ((Player*)GetCharmer())->RemovePossess(); 
    15461546 
    1547     // The player was ported to another map and looses the duel immediatly. 
     1547    // The player was ported to another map and looses the duel immediately. 
    15481548    // We have to perform this check before the teleport, otherwise the 
    15491549    // ObjectAccessor won't find the flag. 
     
    66916691    } 
    66926692 
    6693     if(!IsUseEquipedWeapon(slot==EQUIPMENT_SLOT_MAINHAND)) 
     6693    if(!IsUseEquippedWeapon(slot==EQUIPMENT_SLOT_MAINHAND)) 
    66946694        return; 
    66956695 
     
    84698469        return item; 
    84708470 
    8471     if( item->IsBroken() || !IsUseEquipedWeapon(attackType==BASE_ATTACK) ) 
     8471    if( item->IsBroken() || !IsUseEquippedWeapon(attackType==BASE_ATTACK) ) 
    84728472        return NULL; 
    84738473 
     
    1013910139        if( pItem->GetProto()->Bonding == BIND_WHEN_PICKED_UP || 
    1014010140            pItem->GetProto()->Bonding == BIND_QUEST_ITEM || 
    10141             pItem->GetProto()->Bonding == BIND_WHEN_EQUIPED && IsBagPos(pos) ) 
     10141            pItem->GetProto()->Bonding == BIND_WHEN_EQUIPPED && IsBagPos(pos) ) 
    1014210142            pItem->SetBinding( true ); 
    1014310143 
     
    1018510185        if( pItem2->GetProto()->Bonding == BIND_WHEN_PICKED_UP || 
    1018610186            pItem2->GetProto()->Bonding == BIND_QUEST_ITEM || 
    10187             pItem2->GetProto()->Bonding == BIND_WHEN_EQUIPED && IsBagPos(pos) ) 
     10187            pItem2->GetProto()->Bonding == BIND_WHEN_EQUIPPED && IsBagPos(pos) ) 
    1018810188            pItem2->SetBinding( true ); 
    1018910189 
     
    1037010370 
    1037110371    // 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_EQUIPED || 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 ) 
    1037310373        pItem->SetBinding( true ); 
    1037410374 
     
    1733217332    if(u->GetVisibility() == VISIBILITY_GROUP_STEALTH) 
    1733317333    { 
    17334         // if player is dead then he can't detect anyone in anycases 
     17334        // if player is dead then he can't detect anyone in any cases 
    1733517335        //do not know what is the use of this detect 
    1733617336        // stealth and detected and visible for some seconds