Merge branch 'master' of gitorious.org:manaplus/manaplus

1 files changed, 5 insertions, 5 deletions

diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index acd674d12..01000f8f1 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -24,9 +24,9 @@
 
 #include "inventory.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
-#include "gui/ministatus.h"
+#include "gui/ministatuswindow.h"
 
 #include "net/messagein.h"
 
@@ -275,7 +275,7 @@ void InventoryHandler::processPlayerStorageEquip(Net::MessageIn &msg)
 void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
 {
     int index, amount, itemId, equipType, refine;
-    int cards[4], itemType;
+//    int cards[4], itemType;
     unsigned char identified;
     int floorId;
 
@@ -296,9 +296,9 @@ void InventoryHandler::processPlayerInventoryAdd(Net::MessageIn &msg)
     msg.readInt8();  // attribute
     refine = msg.readInt8();
     for (int i = 0; i < 4; i++)
-        cards[i] = msg.readInt16();
+        msg.readInt16(); // cards[i]
     equipType = msg.readInt16();
-    itemType = msg.readInt8();
+    msg.readInt8(); // itemType
 
     const ItemInfo &itemInfo = ItemDB::get(itemId);