From 379bc3682cd3c5635bac2f30165539d89102c0c4 Mon Sep 17 00:00:00 2001 From: megamage Date: Wed, 12 Nov 2008 16:21:08 -0600 Subject: [svn] Fix a bug that players cannot hear others talking. Provide script support for type 10 gameobject. Add some missing script sql. --HG-- branch : trunk --- src/game/Player.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/game/Player.cpp') diff --git a/src/game/Player.cpp b/src/game/Player.cpp index cfc8f4d3bbb..7f3747ed1b8 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -5281,7 +5281,7 @@ void Player::SendMessageToSetInRange(WorldPacket *data, float dist, bool self, b MapManager::Instance().GetMap(GetMapId(), this)->MessageDistBroadcast(this, data, dist, self, to_possessor); } -void Player::SendMessageToSetInRange(WorldPacket *data, float dist, bool self, bool own_team_only, bool to_possessor) +void Player::SendMessageToSetInRange(WorldPacket *data, float dist, bool self, bool to_possessor, bool own_team_only) { MapManager::Instance().GetMap(GetMapId(), this)->MessageDistBroadcast(this, data, dist, self, to_possessor, own_team_only); } @@ -8623,7 +8623,6 @@ bool Player::IsValidPos( uint8 bag, uint8 slot ) return false; } - bool Player::HasItemCount( uint32 item, uint32 count, bool inBankAlso ) const { uint32 tempcount = 0; @@ -16605,7 +16604,7 @@ bool Player::ActivateTaxiPathTo(std::vector const& nodes, uint32 mount_i ModifyMoney(-(int32)totalcost); // prevent stealth flight - RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TALK); + //RemoveAurasWithInterruptFlags(AURA_INTERRUPT_FLAG_TALK); WorldPacket data(SMSG_ACTIVATETAXIREPLY, 4); data << uint32(ERR_TAXIOK); -- cgit v1.2.3