9 files changed, 0 insertions, 20 deletions
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 6c24954b7..9f1bdabe0 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -233,8 +233,6 @@ void Network::receive()
 
     while (mState == CONNECTED)
     {
-        // TODO Try to get this to block all the time while still being able
-        // to escape the loop
         const int numReady = TcpNet::checkSockets(
             set, (static_cast<uint32_t>(500)));
         switch (numReady)
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 51e006779..93bc990f5 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -39,17 +39,14 @@ void NpcHandler::sendLetter(const int npcId A_UNUSED,
                             const std::string &recipient A_UNUSED,
                             const std::string &text A_UNUSED) const
 {
-    // TODO
 }
 
 void NpcHandler::startShopping(const int beingId A_UNUSED) const
 {
-    // TODO
 }
 
 void NpcHandler::endShopping(const int beingId A_UNUSED) const
 {
-    // TODO
 }
 
 void NpcHandler::clearDialogs()
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index e7b6c69b2..3c8627f4b 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -48,7 +48,6 @@ extern int weightNoticeTime;
 // everything beyond will reset the port hard.
 static const int MAP_TELEPORT_SCROLL_DISTANCE = 8;
 
-// TODO Move somewhere else
 namespace
 {
     /**
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index aa6952b65..91bd4de69 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -70,7 +70,6 @@ TradeHandler::TradeHandler()
 void TradeHandler::removeItem(const int slotNum A_UNUSED,
                               const int amount A_UNUSED) const
 {
-    // TODO
 }
 
 void TradeHandler::processTradeRequest(Net::MessageIn &msg)
@@ -185,7 +184,6 @@ void TradeHandler::processTradeItemAdd(Net::MessageIn &msg)
     const int refine = msg.readInt8();  // refine
     msg.skip(8);     // card (4 shorts)
 
-    // TODO: handle also identified, etc
     if (tradeWindow)
     {
         if (type == 0)
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 8785fd83c..5deb326fa 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -277,7 +277,6 @@ void GuildHandler::chat(const int guildId A_UNUSED,
 
 void GuildHandler::memberList(const int guildId A_UNUSED) const
 {
-    // TODO four types of info requests:
     // 0 = basic info + alliance info
     // 1 = position name list + member list
     // 2 = position name list + position info list
@@ -290,7 +289,6 @@ void GuildHandler::memberList(const int guildId A_UNUSED) const
 
 void GuildHandler::info(const int guildId A_UNUSED)
 {
-    // TODO four types of info requests:
     // 0 = basic info + alliance info
     // 1 = position name list + member list
     // 2 = position name list + position info list
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index b19419407..11eb7fcf0 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -172,7 +172,6 @@ void InventoryHandler::dropItem(const Item *const item, const int amount) const
     if (!item)
         return;
 
-    // TODO: Fix wrong coordinates of drops, serverside? (what's wrong here?)
     MessageOut outMsg(CMSG_PLAYER_INVENTORY_DROP);
     outMsg.writeInt16(static_cast<int16_t>(
         item->getInvIndex() + INVENTORY_OFFSET));
diff --git a/src/net/net.cpp b/src/net/net.cpp
index bb3160cda..f22a87695 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -149,12 +149,6 @@ ServerInfo::Type networkType = ServerInfo::UNKNOWN;
 
 void connectToServer(const ServerInfo &server)
 {
-    if (server.type == ServerInfo::UNKNOWN)
-    {
-        // TODO: Query the server about itself and choose the netcode based on
-        // that
-    }
-
     if (networkType == server.type && getGeneralHandler())
     {
         getGeneralHandler()->reload();
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 69d5f0e41..59756e2c9 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -278,7 +278,6 @@ void GuildHandler::chat(const int guildId A_UNUSED,
 
 void GuildHandler::memberList(const int guildId A_UNUSED) const
 {
-    // TODO four types of info requests:
     // 0 = basic info + alliance info
     // 1 = position name list + member list
     // 2 = position name list + position info list
@@ -291,7 +290,6 @@ void GuildHandler::memberList(const int guildId A_UNUSED) const
 
 void GuildHandler::info(const int guildId A_UNUSED)
 {
-    // TODO four types of info requests:
     // 0 = basic info + alliance info
     // 1 = position name list + member list
     // 2 = position name list + position info list
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 561f3ec90..d1cfc7136 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -174,7 +174,6 @@ void InventoryHandler::dropItem(const Item *const item, const int amount) const
     if (!item)
         return;
 
-    // TODO: Fix wrong coordinates of drops, serverside? (what's wrong here?)
     MessageOut outMsg(CMSG_PLAYER_INVENTORY_DROP);
     outMsg.writeInt16(static_cast<int16_t>(
         item->getInvIndex() + INVENTORY_OFFSET));