16 files changed, 26 insertions, 18 deletions
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 5440d14d0..bdd43b3f8 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -63,4 +63,10 @@ void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED,
     return; // Still looking into this
 }
 
+void AdminHandler::warp(std::string map, int x, int y)
+{
+    Net::getChatHandler()->talk(strprintf(
+        "@warp %s %d %d", map.c_str(), x, y));
+}
+
 } // namespace Ea
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index 6f77c0e18..fcf1e25b2 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -51,6 +51,8 @@ class AdminHandler : public Net::AdminHandler
         virtual void unban(const std::string &name);
 
         virtual void mute(int playerId, int type, int limit);
+
+        virtual void warp(std::string map, int x, int y);
 };
 
 } // namespace Ea
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index ee070593f..06e86f8a4 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -31,7 +31,7 @@
 #include "guild.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "configuration.h"
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index c69d8a5be..a0e5b392a 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -23,7 +23,7 @@
 #include "net/ea/charserverhandler.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/charcreatedialog.h"
 #include "gui/okdialog.h"
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index ea9d17798..c188a2204 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -27,7 +27,7 @@
 #include "configuration.h"
 #include "localplayer.h"
 #include "playerrelations.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/chatwindow.h"
 #include "gui/shopwindow.h"
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 0b6b8a040..04c13572f 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -26,7 +26,7 @@
 #include "event.h"
 #include "game.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/okdialog.h"
 
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 037885fd1..ab030be83 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -22,7 +22,7 @@
 
 #include "net/ea/gui/guildtab.h"
 
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "commandhandler.h"
 #include "guild.h"
 #include "localplayer.h"
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index 02e0910a7..23eab361c 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -22,7 +22,7 @@
 
 #include "net/ea/gui/partytab.h"
 
-#include "chatlog.h"
+#include "chatlogger.h"
 #include "commandhandler.h"
 #include "localplayer.h"
 #include "party.h"
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index bb5cbe94b..0210a76ff 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -25,7 +25,7 @@
 #include "guild.h"
 #include "event.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/socialwindow.h"
 
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);
 
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 1f1f8d296..4be4ddaa6 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -25,7 +25,7 @@
 
 #include "equipment.h"
 #include "inventory.h"
-#include "log.h"
+#include "logger.h"
 #include "playerinfo.h"
 
 #include "gui/inventorywindow.h"
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 51502895c..9f7a5f07d 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -23,7 +23,7 @@
 #include "net/ea/loginhandler.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 #include "configuration.h"
 
 #include "utils/dtor.h"
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index f720f9f96..045a2332b 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -22,7 +22,7 @@
 
 #include "actorspritemanager.h"
 #include "localplayer.h"
-#include "log.h"
+#include "logger.h"
 
 #include "gui/socialwindow.h"
 
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 05b6cf9e3..4198c14ad 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/ea/playerhandler.h"
 
-#include "log.h"
+#include "logger.h"
 #include "party.h"
 #include "playerinfo.h"
 #include "units.h"
diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp
index 33fea3b27..4f0f22aed 100644
--- a/src/net/ea/specialhandler.cpp
+++ b/src/net/ea/specialhandler.cpp
@@ -22,7 +22,7 @@
 
 #include "net/ea/specialhandler.h"
 
-#include "log.h"
+#include "logger.h"
 #include "localplayer.h"
 #include "playerinfo.h"
 
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 36a5f8811..a03782db2 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -25,7 +25,7 @@
 #include "event.h"
 #include "inventory.h"
 #include "item.h"
-#include "log.h"
+#include "logger.h"
 #include "playerinfo.h"
 #include "playerrelations.h"