diff options
| author | megamage <none@none> | 2009-02-04 10:56:45 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-02-04 10:56:45 -0600 |
| commit | c745eba4a1d122b4184b27a982674c86ff193c23 (patch) | |
| tree | b36f9fecbdfd9a51a12df1188df8cf8c7f0d8899 /src | |
| parent | fa26941f5497a08d4be29c41c36bec060be2f36d (diff) | |
| parent | 3554ce14cdfc8acb7ff22680aa22fdf5dc107208 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/Player.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/Player.h b/src/game/Player.h index f7858f3419b..239d3d4eb02 100644 --- a/src/game/Player.h +++ b/src/game/Player.h @@ -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; |