Got rid of writeSet() calls.

14 files changed, 0 insertions, 34 deletions

diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index c825c82e..185709d1 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -39,7 +39,6 @@
 #include "../resources/itemmanager.h"
 
 #include "../net/messageout.h"
-#include "../net/network.h"
 #include "../net/protocol.h"
 
 
@@ -242,7 +241,6 @@ void BuyDialog::action(const std::string& eventId)
         outMsg.writeShort(8);
         outMsg.writeShort(m_amountItems);
         outMsg.writeShort(shopInventory[selectedItem].id);
-        writeSet(8);
 
         // update money !
         m_money -= m_amountItems * shopInventory[selectedItem].price;
diff --git a/src/gui/buysell.cpp b/src/gui/buysell.cpp
index 47777ca0..1f40e7b5 100644
--- a/src/gui/buysell.cpp
+++ b/src/gui/buysell.cpp
@@ -28,7 +28,6 @@
 #include "../game.h"
 
 #include "../net/messageout.h"
-#include "../net/network.h"
 #include "../net/protocol.h"
 
 BuySellDialog::BuySellDialog():
@@ -86,7 +85,6 @@ void BuySellDialog::action(const std::string& eventId)
         outMsg.writeShort(CMSG_NPC_BUY_SELL_REQUEST);
         outMsg.writeLong(current_npc);
         outMsg.writeByte(actionId);
-        writeSet(7);
     }
 
     setVisible(false);
diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp
index 4b52f49e..9834dcf6 100644
--- a/src/gui/char_select.cpp
+++ b/src/gui/char_select.cpp
@@ -199,7 +199,6 @@ void CharSelectDialog::serverCharDelete()
     outMsg.writeShort(0x0068);
     outMsg.writeLong(char_info[0]->id);
     outMsg.writeString("a@a.com", 40);
-    writeSet(46);
 
     MessageIn msg = get_next_message();
 
@@ -229,7 +228,6 @@ void CharSelectDialog::serverCharSelect()
     MessageOut outMsg;
     outMsg.writeShort(0x0066);
     outMsg.writeByte(0);
-    writeSet(3);
 
     MessageIn msg = get_next_message();
 
@@ -426,7 +424,6 @@ void CharCreateDialog::serverCharCreate()
     outMsg.writeByte(0);
     outMsg.writeShort(playerBox->hairColor + 1);
     outMsg.writeShort(playerBox->hairStyle + 1);
-    writeSet(37);
 
     MessageIn msg = get_next_message();
 
diff --git a/src/gui/char_server.cpp b/src/gui/char_server.cpp
index 3b6312e4..c368727b 100644
--- a/src/gui/char_server.cpp
+++ b/src/gui/char_server.cpp
@@ -157,7 +157,6 @@ void server_char_server(int serverIndex)
     outMsg.writeLong(session_ID2);
     outMsg.writeShort(0); // unknown
     outMsg.writeByte(sex);
-    writeSet(17);
 
     // Skipping a mysterious 4 bytes
     while ((in_size < 4) || (out_size > 0)) flush();
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 3ef6703c..70b39ae3 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -34,7 +34,6 @@
 #include "../log.h"
 
 #include "../net/messageout.h"
-#include "../net/network.h"
 #include "../net/protocol.h"
 
 ChatWindow::ChatWindow(const std::string &logfile):
@@ -222,7 +221,6 @@ char *ChatWindow::chat_send(std::string nick, std::string msg)
     outMsg.writeShort(packetId);
     outMsg.writeShort(msg.length() + 4);
     outMsg.writeString(msg, msg.length());
-    writeSet(msg.length() + 4);
 
     return "";
 }
diff --git a/src/gui/login.cpp b/src/gui/login.cpp
index bb762843..f5dc4f1e 100644
--- a/src/gui/login.cpp
+++ b/src/gui/login.cpp
@@ -343,8 +343,6 @@ int attemptLogin(const std::string& user, const std::string& pass)
     outMsg.writeString(user, 24);
     outMsg.writeString(pass, 24);
     outMsg.writeByte(0); // unknown
-    // TODO: still have to use writeSet as skip for reading
-    writeSet(55);
 
     // Receive reply
     MessageIn msg = get_next_message();
diff --git a/src/gui/npc.cpp b/src/gui/npc.cpp
index 122cffa6..16641916 100644
--- a/src/gui/npc.cpp
+++ b/src/gui/npc.cpp
@@ -30,7 +30,6 @@
 #include "../game.h"
 
 #include "../net/messageout.h"
-#include "../net/network.h"
 #include "../net/protocol.h"
 
 NpcListDialog::NpcListDialog():
@@ -133,7 +132,6 @@ NpcListDialog::action(const std::string& eventId)
         outMsg.writeShort(CMSG_NPC_LIST_CHOICE);
         outMsg.writeLong(current_npc);
         outMsg.writeByte(choice);
-        writeSet(7);
         setVisible(false);
         reset();
         current_npc = 0;
diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp
index 8596796f..9896f08e 100644
--- a/src/gui/npc_text.cpp
+++ b/src/gui/npc_text.cpp
@@ -30,7 +30,6 @@
 #include "../game.h"
 
 #include "../net/messageout.h"
-#include "../net/network.h"
 #include "../net/protocol.h"
 
 NpcTextDialog::NpcTextDialog():
@@ -84,7 +83,6 @@ NpcTextDialog::action(const std::string& eventId)
     MessageOut outMsg;
     outMsg.writeShort(CMSG_NPC_NEXT_REQUEST);
     outMsg.writeLong(current_npc);
-    writeSet(6);
     setText("");
     setVisible(false);
     current_npc = 0;
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 29b599aa..7f72702e 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -41,7 +41,6 @@
 #include "../item.h"
 
 #include "../net/messageout.h"
-#include "../net/network.h"
 #include "../net/protocol.h"
 
 #include "../resources/iteminfo.h"
@@ -136,7 +135,6 @@ void PopupMenu::handleLink(const std::string& link)
         outMsg.writeShort(CMSG_NPC_TALK);
         outMsg.writeLong(being->getId());
         outMsg.writeByte(0);
-        writeSet(7);
         current_npc = being->getId();
     }
 
@@ -146,7 +144,6 @@ void PopupMenu::handleLink(const std::string& link)
         MessageOut outMsg;
         outMsg.writeShort(CMSG_TRADE_REQUEST);
         outMsg.writeLong(being->getId());
-        writeSet(6);
         //tradePartner.flush();
         //tradePartner << "Trade: You and " << being->name<< "";
         tradePartnerName = being->getName();
@@ -182,7 +179,6 @@ void PopupMenu::handleLink(const std::string& link)
         MessageOut outMsg;
         outMsg.writeShort(CMSG_ITEM_PICKUP);
         outMsg.writeLong(floorItem->getId());
-        writeSet(6);
     }
 
     // Look To action
diff --git a/src/gui/requesttrade.cpp b/src/gui/requesttrade.cpp
index 992b0c0f..e4423c59 100644
--- a/src/gui/requesttrade.cpp
+++ b/src/gui/requesttrade.cpp
@@ -29,7 +29,6 @@
 #include "button.h"
 
 #include "../net/messageout.h"
-#include "../net/network.h"
 #include "../net/protocol.h"
 
 bool requestTradeDialogOpen = false;
@@ -99,6 +98,5 @@ void RequestTradeDialog::action(const std::string& eventId)
     MessageOut outMsg;
     outMsg.writeShort(CMSG_TRADE_RESPONSE);
     outMsg.writeByte(choice);
-    writeSet(3);
     scheduleDelete();
 }
diff --git a/src/gui/sell.cpp b/src/gui/sell.cpp
index c3596503..73880861 100644
--- a/src/gui/sell.cpp
+++ b/src/gui/sell.cpp
@@ -41,7 +41,6 @@
 #include "../resources/itemmanager.h"
 
 #include "../net/messageout.h"
-#include "../net/network.h"
 #include "../net/protocol.h"
 
 
@@ -237,7 +236,6 @@ void SellDialog::action(const std::string& eventId)
         outMsg.writeShort(8);
         outMsg.writeShort(shopInventory[selectedItem].index);
         outMsg.writeShort(m_amountItems);
-        writeSet(8);
 
         m_maxItems -= m_amountItems;
         m_amountItems = 0;
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index 0059ec25..58eea2e7 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -32,7 +32,6 @@
 #include "../playerinfo.h"
 
 #include "../net/messageout.h"
-#include "../net/network.h"
 #include "../net/protocol.h"
 
 char *skill_db[] = {
@@ -129,7 +128,6 @@ void SkillDialog::action(const std::string& eventId)
             MessageOut outMsg;
             outMsg.writeShort(CMSG_SKILL_LEVELUP_REQUEST);
             outMsg.writeShort(skillList[selectedSkill]->id);
-            writeSet(4);
         }
     }
     else if (eventId == "skill")
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index f1eadafc..a601ff59 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -32,7 +32,6 @@
 #include "../playerinfo.h"
 
 #include "../net/messageout.h"
-#include "../net/network.h"
 #include "../net/protocol.h"
 
 StatusWindow::StatusWindow():
@@ -448,6 +447,5 @@ void StatusWindow::action(const std::string& eventId)
             outMsg.writeShort(0x0012);
         }
         outMsg.writeByte(1);
-        writeSet(5);
     }
 }
diff --git a/src/gui/trade.cpp b/src/gui/trade.cpp
index d4c91d19..19aaab9e 100644
--- a/src/gui/trade.cpp
+++ b/src/gui/trade.cpp
@@ -39,7 +39,6 @@
 #include "../item.h"
 
 #include "../net/messageout.h"
-#include "../net/network.h"
 #include "../net/protocol.h"
 
 #include "../resources/iteminfo.h"
@@ -246,7 +245,6 @@ void TradeWindow::tradeItem(Item *item, int quantity)
     outMsg.writeShort(CMSG_TRADE_ITEM_ADD_REQUEST);
     outMsg.writeShort(item->getInvIndex());
     outMsg.writeLong(quantity);
-    writeSet(8);
 }
 
 void TradeWindow::mouseClick(int x, int y, int button, int count)
@@ -317,7 +315,6 @@ void TradeWindow::action(const std::string &eventId)
     {
         MessageOut outMsg;
         outMsg.writeShort(CMSG_TRADE_CANCEL_REQUEST);
-        writeSet(2);
     }
     else if (eventId == "ok")
     {
@@ -333,19 +330,16 @@ void TradeWindow::action(const std::string &eventId)
             outMsg.writeShort(CMSG_TRADE_ITEM_ADD_REQUEST);
             outMsg.writeShort(0);
             outMsg.writeLong(tempInt);
-            writeSet(8);
         } else {
             moneyField->setText("");
         }
         moneyField->setEnabled(false);
         MessageOut outMsg;
         outMsg.writeShort(CMSG_TRADE_ADD_COMPLETE);
-        writeSet(2);
     }
     else if (eventId == "trade")
     {
         MessageOut outMsg;
         outMsg.writeShort(CMSG_TRADE_OK);
-        writeSet(2);
     }
 }