diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-11-03 23:15:47 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-11-03 23:27:30 +0100 |
commit | b7f58023d6596d96c36b904c02a81e0b52fc28f1 (patch) | |
tree | 7a10a72c7e8fa9ca99e98a913704c76fe5bfe5f9 /src/net/messageout.cpp | |
parent | 0de400f87b7ecc4bcbdbd1f3dfd552c60c5e927b (diff) | |
download | manaserv-b7f58023d6596d96c36b904c02a81e0b52fc28f1.tar.gz manaserv-b7f58023d6596d96c36b904c02a81e0b52fc28f1.tar.bz2 manaserv-b7f58023d6596d96c36b904c02a81e0b52fc28f1.tar.xz manaserv-b7f58023d6596d96c36b904c02a81e0b52fc28f1.zip |
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.
Diffstat (limited to 'src/net/messageout.cpp')
-rw-r--r-- | src/net/messageout.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/net/messageout.cpp b/src/net/messageout.cpp index 950da5f3..c8310c55 100644 --- a/src/net/messageout.cpp +++ b/src/net/messageout.cpp @@ -49,7 +49,7 @@ MessageOut::MessageOut(int id): mData = (char*) malloc(INITIAL_DATA_CAPACITY); mDataSize = INITIAL_DATA_CAPACITY; - writeShort(id); + writeInt16(id); } MessageOut::~MessageOut() @@ -79,14 +79,14 @@ MessageOut::expand(size_t bytes) } } -void MessageOut::writeByte(int value) +void MessageOut::writeInt8(int value) { expand(mPos + 1); mData[mPos] = value; mPos += 1; } -void MessageOut::writeShort(int value) +void MessageOut::writeInt16(int value) { expand(mPos + 2); uint16_t t = ENET_HOST_TO_NET_16(value); @@ -94,7 +94,7 @@ void MessageOut::writeShort(int value) mPos += 2; } -void MessageOut::writeLong(int value) +void MessageOut::writeInt32(int value) { expand(mPos + 4); uint32_t t = ENET_HOST_TO_NET_32(value); @@ -116,7 +116,7 @@ void MessageOut::writeDouble(double value) o.precision(std::numeric_limits< double >::digits10); o << value; std::string str = o.str(); - writeByte(str.size()); + writeInt8(str.size()); writeString(str, str.size()); #endif } @@ -138,7 +138,7 @@ MessageOut::writeString(const std::string &string, int length) if (length < 0) { // Write the length at the start if not fixed - writeShort(stringLength); + writeInt16(stringLength); length = stringLength; } else if (length < stringLength) |