*Merge.

--HG-- branch : trunk
2009-02-04 17:22:43 -06:00
parent 5d4d953055 c745eba4a1
commit d69198732e
373 changed files with 2607 additions and 2215 deletions
@@ -1061,7 +1061,7 @@ class TRINITY_DLL_SPEC Player : public Unit
        Item* GetItemByGuid( uint64 guid ) const;
        Item* GetItemByPos( uint16 pos ) const;
        Item* GetItemByPos( uint8 bag, uint8 slot ) const;
-        inline Item* Player::GetUseableItemByPos( uint8 bag, uint8 slot ) const //Does additional check for disarmed weapons
+        inline Item* GetUseableItemByPos( uint8 bag, uint8 slot ) const //Does additional check for disarmed weapons
        {
            if (!CanUseAttackType(GetAttackBySlot(slot)))
                return NULL;