Renamed write{Byte,Short,Long} to writeInt{8,16,32}

Mainly for consistency with the client, and the general consensus was
that these numbered versions were clearer.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 63fd8778..7d6de273 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -36,10 +36,10 @@ MessageIn::MessageIn(const char *data, int length):
     mPos(0)
 {
     // Read the message ID
-    mId = readShort();
+    mId = readInt16();
 }
 
-int MessageIn::readByte()
+int MessageIn::readInt8()
 {
     int value = -1;
     if (mPos < mLength)
@@ -51,7 +51,7 @@ int MessageIn::readByte()
     return value;
 }
 
-int MessageIn::readShort()
+int MessageIn::readInt16()
 {
     int value = -1;
     if (mPos + 2 <= mLength)
@@ -65,7 +65,7 @@ int MessageIn::readShort()
     return value;
 }
 
-int MessageIn::readLong()
+int MessageIn::readInt32()
 {
     int value = -1;
     if (mPos + 4 <= mLength)
@@ -87,7 +87,7 @@ double MessageIn::readDouble()
         memcpy(&value, mData + mPos, sizeof(double));
     mPos += sizeof(double);
 #else
-    int length = readByte();
+    int length = readInt8();
     std::istringstream i (readString(length));
     i >> value;
 #endif
@@ -99,7 +99,7 @@ std::string MessageIn::readString(int length)
     // Get string length
     if (length < 0)
     {
-        length = readShort();
+        length = readInt16();
     }
 
     // Make sure the string isn't erroneous