summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-05-22 00:23:08 +0300
committerAndrei Karas <akaras@inbox.ru>2011-05-22 04:19:02 +0300
commit7c34adebb068549ca6a56bdf1b211398a0b1de11 (patch)
tree04a1e1ba87fa2005fc32c2358b2747390d1cd9d0 /src/net
parent54f8367afe9d30c21bcda057872439199c7dd9c1 (diff)
downloadmv-7c34adebb068549ca6a56bdf1b211398a0b1de11.tar.gz
mv-7c34adebb068549ca6a56bdf1b211398a0b1de11.tar.bz2
mv-7c34adebb068549ca6a56bdf1b211398a0b1de11.tar.xz
mv-7c34adebb068549ca6a56bdf1b211398a0b1de11.zip
Allow show equipment from other players from context menu "show items".
Also allow undress separate items from players locally.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/tmwa/inventoryhandler.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 5f674eab0..c6c680b13 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -25,6 +25,7 @@
#include "equipment.h"
#include "inventory.h"
+#include "log.h"
#include "playerinfo.h"
#include "gui/inventorywindow.h"
@@ -58,9 +59,8 @@ class EquipBackend : public Equipment::Backend
{
int invyIndex = mEquipment[index];
if (invyIndex == -1)
- {
return NULL;
- }
+
return PlayerInfo::getInventory()->getItem(invyIndex);
}
@@ -72,9 +72,7 @@ class EquipBackend : public Equipment::Backend
{
Item* item = PlayerInfo::getInventory()->getItem(i);
if (item)
- {
item->setEquipped(false);
- }
}
mEquipment[i] = -1;