summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/adminhandler.h1
-rw-r--r--src/net/beinghandler.h5
-rw-r--r--src/net/download.cpp2
-rw-r--r--src/net/ea/adminhandler.cpp6
-rw-r--r--src/net/ea/adminhandler.h2
-rw-r--r--src/net/ea/beinghandler.cpp2
-rw-r--r--src/net/ea/charserverhandler.cpp2
-rw-r--r--src/net/ea/chathandler.cpp2
-rw-r--r--src/net/ea/gamehandler.cpp2
-rw-r--r--src/net/ea/gui/guildtab.cpp2
-rw-r--r--src/net/ea/gui/partytab.cpp2
-rw-r--r--src/net/ea/guildhandler.cpp2
-rw-r--r--src/net/ea/inventoryhandler.cpp10
-rw-r--r--src/net/ea/inventoryhandler.h2
-rw-r--r--src/net/ea/loginhandler.cpp2
-rw-r--r--src/net/ea/partyhandler.cpp2
-rw-r--r--src/net/ea/playerhandler.cpp2
-rw-r--r--src/net/ea/specialhandler.cpp2
-rw-r--r--src/net/ea/tradehandler.cpp2
-rw-r--r--src/net/manaserv/adminhandler.cpp5
-rw-r--r--src/net/manaserv/adminhandler.h2
-rw-r--r--src/net/manaserv/attributes.cpp2
-rw-r--r--src/net/manaserv/beinghandler.cpp2
-rw-r--r--src/net/manaserv/charhandler.cpp2
-rw-r--r--src/net/manaserv/connection.cpp2
-rw-r--r--src/net/manaserv/effecthandler.cpp2
-rw-r--r--src/net/manaserv/guildhandler.cpp2
-rw-r--r--src/net/manaserv/inventoryhandler.cpp2
-rw-r--r--src/net/manaserv/itemhandler.cpp2
-rw-r--r--src/net/manaserv/loginhandler.cpp2
-rw-r--r--src/net/manaserv/network.cpp2
-rw-r--r--src/net/manaserv/partyhandler.cpp2
-rw-r--r--src/net/manaserv/playerhandler.cpp2
-rw-r--r--src/net/messagein.cpp2
-rw-r--r--src/net/messageout.cpp2
-rw-r--r--src/net/tmwa/adminhandler.cpp2
-rw-r--r--src/net/tmwa/beinghandler.cpp4
-rw-r--r--src/net/tmwa/charserverhandler.cpp2
-rw-r--r--src/net/tmwa/chathandler.cpp2
-rw-r--r--src/net/tmwa/gamehandler.cpp2
-rw-r--r--src/net/tmwa/generalhandler.cpp2
-rw-r--r--src/net/tmwa/gui/guildtab.cpp2
-rw-r--r--src/net/tmwa/gui/partytab.cpp2
-rw-r--r--src/net/tmwa/guildhandler.cpp2
-rw-r--r--src/net/tmwa/inventoryhandler.cpp2
-rw-r--r--src/net/tmwa/inventoryhandler.h2
-rw-r--r--src/net/tmwa/loginhandler.cpp2
-rw-r--r--src/net/tmwa/messagein.cpp2
-rw-r--r--src/net/tmwa/messageout.cpp2
-rw-r--r--src/net/tmwa/network.cpp2
-rw-r--r--src/net/tmwa/partyhandler.cpp2
-rw-r--r--src/net/tmwa/playerhandler.cpp2
-rw-r--r--src/net/tmwa/specialhandler.cpp2
-rw-r--r--src/net/tmwa/tradehandler.cpp2
54 files changed, 72 insertions, 55 deletions
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index 2d7eccebf..d063c4eb1 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -53,6 +53,7 @@ class AdminHandler
virtual void mute(int playerId, int type, int limit) = 0;
+ virtual void warp(std::string map, int x, int y) = 0;
// TODO
};
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 89f972e6d..07279b148 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -1,8 +1,9 @@
/*
- * The Mana World
+ * The ManaPlus Client
* Copyright (C) 2004 The Mana World Development Team
+ * Copyright (C) 2011 ManaPlus developers
*
- * This file is part of The Mana World.
+ * This file is part of The ManaPlus Client.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/net/download.cpp b/src/net/download.cpp
index c93f33c21..93417197e 100644
--- a/src/net/download.cpp
+++ b/src/net/download.cpp
@@ -22,7 +22,7 @@
#include "net/download.h"
#include "configuration.h"
-#include "log.h"
+#include "logger.h"
#include "main.h"
#include "utils/stringutils.h"
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"
diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp
index 72e7c7ca8..2c76e99a3 100644
--- a/src/net/manaserv/adminhandler.cpp
+++ b/src/net/manaserv/adminhandler.cpp
@@ -91,4 +91,9 @@ void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED,
// TODO
}
+void AdminHandler::warp(std::string map, int x, int y)
+{
+ // TODO
+}
+
} // namespace ManaServ
diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h
index a91841085..65e9ea2b0 100644
--- a/src/net/manaserv/adminhandler.h
+++ b/src/net/manaserv/adminhandler.h
@@ -58,6 +58,8 @@ class AdminHandler : public Net::AdminHandler
void unban(const std::string &name);
void mute(int playerId, int type, int limit);
+
+ void warp(std::string map, int x, int y);
};
} // namespace ManaServ
diff --git a/src/net/manaserv/attributes.cpp b/src/net/manaserv/attributes.cpp
index b48cc9eff..25c75f9d8 100644
--- a/src/net/manaserv/attributes.cpp
+++ b/src/net/manaserv/attributes.cpp
@@ -21,7 +21,7 @@
#include "net/manaserv/attributes.h"
-#include "log.h"
+#include "logger.h"
#include "playerinfo.h"
#include "gui/statuswindow.h"
diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index 23aae1f56..d14cdcadf 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -27,7 +27,7 @@
#include "client.h"
#include "game.h"
#include "localplayer.h"
-#include "log.h"
+#include "logger.h"
#include "particle.h"
#include "gui/okdialog.h"
diff --git a/src/net/manaserv/charhandler.cpp b/src/net/manaserv/charhandler.cpp
index c2611c64b..3b2306feb 100644
--- a/src/net/manaserv/charhandler.cpp
+++ b/src/net/manaserv/charhandler.cpp
@@ -24,7 +24,7 @@
#include "client.h"
#include "localplayer.h"
-#include "log.h"
+#include "logger.h"
#include "gui/charcreatedialog.h"
#include "gui/okdialog.h"
diff --git a/src/net/manaserv/connection.cpp b/src/net/manaserv/connection.cpp
index 7f51aeb98..33d6f28cf 100644
--- a/src/net/manaserv/connection.cpp
+++ b/src/net/manaserv/connection.cpp
@@ -22,7 +22,7 @@
#include "net/manaserv/connection.h"
-#include "log.h"
+#include "logger.h"
#include "net/manaserv/internal.h"
#include "net/manaserv/messageout.h"
diff --git a/src/net/manaserv/effecthandler.cpp b/src/net/manaserv/effecthandler.cpp
index 3979a0fde..92cf66302 100644
--- a/src/net/manaserv/effecthandler.cpp
+++ b/src/net/manaserv/effecthandler.cpp
@@ -24,7 +24,7 @@
#include "actorspritemanager.h"
#include "effectmanager.h"
-#include "log.h"
+#include "logger.h"
#include "net/messagein.h"
diff --git a/src/net/manaserv/guildhandler.cpp b/src/net/manaserv/guildhandler.cpp
index dc3dbc616..306a15be4 100644
--- a/src/net/manaserv/guildhandler.cpp
+++ b/src/net/manaserv/guildhandler.cpp
@@ -24,7 +24,7 @@
#include "event.h"
#include "guild.h"
-#include "log.h"
+#include "logger.h"
#include "localplayer.h"
#include "channel.h"
#include "channelmanager.h"
diff --git a/src/net/manaserv/inventoryhandler.cpp b/src/net/manaserv/inventoryhandler.cpp
index 5e38354fb..ce837b5e1 100644
--- a/src/net/manaserv/inventoryhandler.cpp
+++ b/src/net/manaserv/inventoryhandler.cpp
@@ -38,7 +38,7 @@
#include "resources/iteminfo.h"
-#include "log.h" // <<< REMOVE ME!
+#include "logger.h" // <<< REMOVE ME!
extern Net::InventoryHandler *inventoryHandler;
diff --git a/src/net/manaserv/itemhandler.cpp b/src/net/manaserv/itemhandler.cpp
index 0afd12d21..89826a33f 100644
--- a/src/net/manaserv/itemhandler.cpp
+++ b/src/net/manaserv/itemhandler.cpp
@@ -29,7 +29,7 @@
#include "game.h"
#include "map.h"
-#include "log.h"
+#include "logger.h"
namespace ManaServ
{
diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp
index e6109ca28..bf823562f 100644
--- a/src/net/manaserv/loginhandler.cpp
+++ b/src/net/manaserv/loginhandler.cpp
@@ -23,7 +23,7 @@
#include "net/manaserv/loginhandler.h"
#include "client.h"
-#include "log.h"
+#include "logger.h"
#include "net/logindata.h"
diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp
index e0ab7af78..53e83e4ec 100644
--- a/src/net/manaserv/network.cpp
+++ b/src/net/manaserv/network.cpp
@@ -22,7 +22,7 @@
#include "net/manaserv/network.h"
-#include "log.h"
+#include "logger.h"
#include "net/manaserv/connection.h"
#include "net/manaserv/internal.h"
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index 0e6af4578..987a40dc5 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -23,7 +23,7 @@
#include "net/manaserv/partyhandler.h"
#include "event.h"
-#include "log.h"
+#include "logger.h"
#include "localplayer.h"
#include "gui/socialwindow.h"
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index ca7fe511f..3dfddb436 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -27,7 +27,7 @@
#include "effectmanager.h"
#include "game.h"
#include "localplayer.h"
-#include "log.h"
+#include "logger.h"
#include "particle.h"
#include "playerinfo.h"
#include "configuration.h"
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 8b5f2eee3..5bfeefdb6 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -24,7 +24,7 @@
#include "net/packetcounters.h"
-#include "log.h"
+#include "logger.h"
#include "net.h"
#include "utils/stringutils.h"
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp
index 3cdcb42e0..a8b66f5ae 100644
--- a/src/net/messageout.cpp
+++ b/src/net/messageout.cpp
@@ -24,7 +24,7 @@
#include "net/packetcounters.h"
-#include "log.h"
+#include "logger.h"
#include "utils/stringutils.h"
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index a0d996dbf..a332b04fa 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -28,7 +28,7 @@
#include "being.h"
#include "event.h"
#include "game.h"
-#include "log.h"
+#include "logger.h"
#include "playerrelations.h"
#include "net/chathandler.h"
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index d6f67f716..5016b2f8c 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -29,7 +29,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"
@@ -552,7 +552,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
dstBeing->setTileCoords(srcX, srcY);
dstBeing->setDestination(dstX, dstY);
- // because server dont send direction in move packet,
+ // because server don't send direction in move packet,
// we fixing it
if (srcX != dstX || srcY != dstY)
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index fe803dc62..7aa68e617 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -24,7 +24,7 @@
#include "client.h"
#include "configuration.h"
-#include "log.h"
+#include "logger.h"
#include "gui/charcreatedialog.h"
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 0f23f6412..90acf0f90 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -29,7 +29,7 @@
#include "game.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/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index cc0a37c57..242e9f9de 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -26,7 +26,7 @@
#include "event.h"
#include "game.h"
#include "localplayer.h"
-#include "log.h"
+#include "logger.h"
#include "net/messagein.h"
#include "net/messageout.h"
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 3e46fa66b..746cb6620 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -24,7 +24,7 @@
#include "client.h"
#include "configuration.h"
-#include "log.h"
+#include "logger.h"
#include "gui/charselectdialog.h"
#include "gui/inventorywindow.h"
diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp
index 99b775089..05a93bff8 100644
--- a/src/net/tmwa/gui/guildtab.cpp
+++ b/src/net/tmwa/gui/guildtab.cpp
@@ -22,7 +22,7 @@
#include "net/tmwa/gui/guildtab.h"
-#include "chatlog.h"
+#include "chatlogger.h"
#include "commandhandler.h"
#include "guild.h"
#include "localplayer.h"
diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp
index d15f4754f..373fcca31 100644
--- a/src/net/tmwa/gui/partytab.cpp
+++ b/src/net/tmwa/gui/partytab.cpp
@@ -22,7 +22,7 @@
#include "net/tmwa/gui/partytab.h"
-#include "chatlog.h"
+#include "chatlogger.h"
#include "commandhandler.h"
#include "localplayer.h"
#include "party.h"
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 43583971f..640a6fd78 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -23,7 +23,7 @@
#include "actorspritemanager.h"
#include "localplayer.h"
-#include "log.h"
+#include "logger.h"
#include "playerinfo.h"
#include "net/tmwa/messagein.h"
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index ae79f6842..14a15e59f 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -22,7 +22,7 @@
#include "net/tmwa/inventoryhandler.h"
-#include "log.h"
+#include "logger.h"
#include "net/messagein.h"
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index 405bacc43..9a0978bd0 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -23,7 +23,7 @@
#ifndef NET_TA_INVENTORYHANDLER_H
#define NET_TA_INVENTORYHANDLER_H
-#include "log.h"
+#include "logger.h"
#include "net/net.h"
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 15ed2f27c..029c379a0 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -23,7 +23,7 @@
#include "net/tmwa/loginhandler.h"
#include "client.h"
-#include "log.h"
+#include "logger.h"
#include "configuration.h"
#include "net/messagein.h"
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index 6e2fcc187..fb1986597 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -24,7 +24,7 @@
#include "net/packetcounters.h"
-#include "log.h"
+#include "logger.h"
#include "utils/stringutils.h"
diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp
index a904b6bbb..6071e0ab6 100644
--- a/src/net/tmwa/messageout.cpp
+++ b/src/net/tmwa/messageout.cpp
@@ -26,7 +26,7 @@
#include "net/tmwa/network.h"
-#include "log.h"
+#include "logger.h"
#include "utils/stringutils.h"
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index c2049d3cc..8ecf04d36 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -22,7 +22,7 @@
#include "net/tmwa/network.h"
-#include "log.h"
+#include "logger.h"
#include "net/messagehandler.h"
#include "net/messagein.h"
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 5bbf8baf3..7f942a206 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -22,7 +22,7 @@
#include "actorspritemanager.h"
#include "localplayer.h"
-#include "log.h"
+#include "logger.h"
#include "net/messagein.h"
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index f20ea64a0..c34c661e8 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -22,7 +22,7 @@
#include "net/tmwa/playerhandler.h"
-#include "log.h"
+#include "logger.h"
#include "net/messagein.h"
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp
index b175368bd..509c5ecd1 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/specialhandler.cpp
@@ -22,7 +22,7 @@
#include "net/tmwa/specialhandler.h"
-#include "log.h"
+#include "logger.h"
#include "net/messagein.h"
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 108b544a0..2280079ea 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -23,7 +23,7 @@
#include "net/tmwa/tradehandler.h"
#include "item.h"
-#include "log.h"
+#include "logger.h"
#include "playerinfo.h"
#include "net/messagein.h"