Rename {read,write}{Byte,Short,Long} to {read,write}Int{8,16,32}.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 6bb57f60..e6d3b402 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -135,9 +135,9 @@ void PopupMenu::handleLink(const std::string& link)
         current_npc == 0)
     {
         MessageOut outMsg;
-        outMsg.writeShort(CMSG_NPC_TALK);
-        outMsg.writeLong(mBeing->getId());
-        outMsg.writeByte(0);
+        outMsg.writeInt16(CMSG_NPC_TALK);
+        outMsg.writeInt32(mBeing->getId());
+        outMsg.writeInt8(0);
         current_npc = mBeing->getId();
     }
 
@@ -147,8 +147,8 @@ void PopupMenu::handleLink(const std::string& link)
              mBeing->getType() == Being::PLAYER)
     {
         MessageOut outMsg;
-        outMsg.writeShort(CMSG_TRADE_REQUEST);
-        outMsg.writeLong(mBeing->getId());
+        outMsg.writeInt16(CMSG_TRADE_REQUEST);
+        outMsg.writeInt32(mBeing->getId());
         //tradePartner.flush();
         //tradePartner << "Trade: You and " << being->name<< "";
         tradePartnerName = mBeing->getName();
@@ -183,8 +183,8 @@ void PopupMenu::handleLink(const std::string& link)
     else if ((link == "pickup") && mFloorItem != NULL)
     {
         MessageOut outMsg;
-        outMsg.writeShort(CMSG_ITEM_PICKUP);
-        outMsg.writeLong(mFloorItem->getId());
+        outMsg.writeInt16(CMSG_ITEM_PICKUP);
+        outMsg.writeInt32(mFloorItem->getId());
     }
 
     // Look To action