summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2008-11-01 14:55:54 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2008-11-01 14:55:54 +0000
commit55e0ddd7e1d60a56ece679a4c2563bef854e892b (patch)
tree322df9b8661f379990b3b526e5aa41f0e23ec9e2 /src/net
parent3d85803d9a43c779f522a936df068a24ca6f7f2d (diff)
downloadMana-55e0ddd7e1d60a56ece679a4c2563bef854e892b.tar.gz
Mana-55e0ddd7e1d60a56ece679a4c2563bef854e892b.tar.bz2
Mana-55e0ddd7e1d60a56ece679a4c2563bef854e892b.tar.xz
Mana-55e0ddd7e1d60a56ece679a4c2563bef854e892b.zip
Merged revisions 4180-4181 via svnmerge from
https://themanaworld.svn.sourceforge.net/svnroot/themanaworld/tmw/branches/0.0 ........ r4180 | peaveydk | 2008-04-24 22:49:30 +0200 (Thu, 24 Apr 2008) | 1 line Make shortcut container ID based instead of slot based. Fixes items shifting around often causing equipment to be lost. ........ r4181 | peaveydk | 2008-04-25 02:25:59 +0200 (Fri, 25 Apr 2008) | 1 line Document anti-trade function. ........
Diffstat (limited to 'src/net')
-rw-r--r--src/net/inventoryhandler.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/net/inventoryhandler.cpp b/src/net/inventoryhandler.cpp
index d48a77a5..dde6a954 100644
--- a/src/net/inventoryhandler.cpp
+++ b/src/net/inventoryhandler.cpp
@@ -76,7 +76,6 @@ void InventoryHandler::handleMessage(MessageIn &msg)
player_node->setInvItem(slot - 32, id, amount);
}
};
- itemShortcut->load();
break;
}
}