diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-21 16:30:11 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-11-21 16:30:11 +0000 |
| commit | a5e6a44b51d4269ed6812c9a9e0b6a293d959a4d (patch) | |
| tree | f269a803b58b47082156dc74bb0d6e8e2dc6519e /src/net/messagein.cpp | |
| parent | 1f6975d34e2c6fe8404fcbe13da406e624d94b68 (diff) | |
| download | mana-a5e6a44b51d4269ed6812c9a9e0b6a293d959a4d.tar.gz mana-a5e6a44b51d4269ed6812c9a9e0b6a293d959a4d.tar.bz2 mana-a5e6a44b51d4269ed6812c9a9e0b6a293d959a4d.tar.xz mana-a5e6a44b51d4269ed6812c9a9e0b6a293d959a4d.zip | |
Renamed {read,write}{Byte,Short,Long} to {read,write}{Int8,Int16,Int32}. This
is less confusing in 64-bit context and less conflicting with the 0.0 client.
Diffstat (limited to 'src/net/messagein.cpp')
| -rw-r--r-- | src/net/messagein.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp index e90084ff..b5d5b97a 100644 --- a/src/net/messagein.cpp +++ b/src/net/messagein.cpp @@ -33,10 +33,10 @@ MessageIn::MessageIn(const char *data, unsigned int length): mPos(0) { // Read the message ID - mId = readShort(); + mId = readInt16(); } -int MessageIn::readByte() +int MessageIn::readInt8() { int value = -1; if (mPos < mLength) @@ -47,7 +47,7 @@ int MessageIn::readByte() return value; } -int MessageIn::readShort() +int MessageIn::readInt16() { int value = -1; if (mPos + 2 <= mLength) @@ -60,7 +60,7 @@ int MessageIn::readShort() return value; } -int MessageIn::readLong() +int MessageIn::readInt32() { int value = -1; if (mPos + 4 <= mLength) @@ -88,7 +88,7 @@ std::string MessageIn::readString(int length) { // Get string length if (length < 0) { - length = readShort(); + length = readInt16(); } // Make sure the string isn't erroneus |