diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-07-17 23:10:05 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-07-18 11:45:33 -0600 |
| commit | 81d8168bb5796ccb1704bcce9f5327c35e55d281 (patch) | |
| tree | 3e7e111eb956757f49579bb4366c24c94712387d /src/gui/widgets/itemshortcutcontainer.cpp | |
| parent | 2ae96bdc5517b2147662f19ff6d700657c0d0d42 (diff) | |
| download | mana-81d8168bb5796ccb1704bcce9f5327c35e55d281.tar.gz mana-81d8168bb5796ccb1704bcce9f5327c35e55d281.tar.bz2 mana-81d8168bb5796ccb1704bcce9f5327c35e55d281.tar.xz mana-81d8168bb5796ccb1704bcce9f5327c35e55d281.zip | |
Move more from LocalPlayer to PlayerInfo
Also cleanup PlayerInfo a bit.
Reviewed-by: Chuck Miller
Diffstat (limited to 'src/gui/widgets/itemshortcutcontainer.cpp')
| -rw-r--r-- | src/gui/widgets/itemshortcutcontainer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp index 83efd4d4..b3cefc5f 100644 --- a/src/gui/widgets/itemshortcutcontainer.cpp +++ b/src/gui/widgets/itemshortcutcontainer.cpp @@ -27,7 +27,7 @@ #include "item.h" #include "itemshortcut.h" #include "keyboardconfig.h" -#include "localplayer.h" +#include "playerinfo.h" #include "gui/inventorywindow.h" #include "gui/itempopup.h" @@ -94,7 +94,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics) continue; Item *item = - player_node->getInventory()->findItem(itemShortcut->getItem(i)); + PlayerInfo::getInventory()->findItem(itemShortcut->getItem(i)); if (item) { @@ -151,7 +151,7 @@ void ItemShortcutContainer::mouseDragged(gcn::MouseEvent &event) if (itemId < 0) return; - Item *item = player_node->getInventory()->findItem(itemId); + Item *item = PlayerInfo::getInventory()->findItem(itemId); if (item) { @@ -187,7 +187,7 @@ void ItemShortcutContainer::mousePressed(gcn::MouseEvent &event) } else if (event.getButton() == gcn::MouseEvent::RIGHT) { - Item *item = player_node->getInventory()-> + Item *item = PlayerInfo::getInventory()-> findItem(itemShortcut->getItem(index)); if (!item) @@ -240,7 +240,7 @@ void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event) if (itemId < 0) return; - Item *item = player_node->getInventory()->findItem(itemId); + Item *item = PlayerInfo::getInventory()->findItem(itemId); if (item) { |