diff options
| author | Blue <bluesansdouze@gmail.com> | 2009-05-12 20:46:56 +0200 |
|---|---|---|
| committer | Blue <bluesansdouze@gmail.com> | 2009-05-12 20:46:56 +0200 |
| commit | 9071a692116745f2cafd8556cbff28095910730e (patch) | |
| tree | 6fbc96a1cb00558c4015d1eff25f45b2c6ccdcb8 /src/itemshortcut.cpp | |
| parent | 2e94f4e92821bad6ebb328d00b2bd918c4b1b99e (diff) | |
| parent | 0257eaf4d3945eac7cb3e50ccf8dfef18fa29698 (diff) | |
| download | mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.gz mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.bz2 mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.xz mana-client-9071a692116745f2cafd8556cbff28095910730e.zip | |
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/itemshortcut.cpp')
| -rw-r--r-- | src/itemshortcut.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp index bd247300..6024e67a 100644 --- a/src/itemshortcut.cpp +++ b/src/itemshortcut.cpp @@ -25,6 +25,9 @@ #include "itemshortcut.h" #include "localplayer.h" +#include "net/inventoryhandler.h" +#include "net/net.h" + #include "utils/stringutils.h" ItemShortcut::ItemShortcut *itemShortcut; @@ -72,16 +75,14 @@ void ItemShortcut::useItem(int index) { if (item->isEquipment()) { -#ifdef EATHENA_SUPPORT if (item->isEquipped()) - player_node->unequipItem(item); + Net::getInventoryHandler()->unequipItem(item); else -#endif - player_node->equipItem(item); + Net::getInventoryHandler()->equipItem(item); } else { - player_node->useItem(item); + Net::getInventoryHandler()->useItem(item); } } } |