diff options
author | Andrei Karas <akaras@inbox.ru> | 2013-04-21 18:57:48 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2013-04-21 18:57:48 +0300 |
commit | 35cfd460655878c9a615abc8ea1cb2f7577a7f3b (patch) | |
tree | 2b4cb899f7f442912f89de30f4a5ab0add0727ce /src/net/tmwa/messageout.cpp | |
parent | cfe4c893ba4ba30379919636d3c508ebf1594e23 (diff) | |
download | mv-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.gz mv-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.bz2 mv-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.xz mv-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.zip |
some other fixes from cpplint.
Diffstat (limited to 'src/net/tmwa/messageout.cpp')
-rw-r--r-- | src/net/tmwa/messageout.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp index b0fff0292..2fc0ff2d9 100644 --- a/src/net/tmwa/messageout.cpp +++ b/src/net/tmwa/messageout.cpp @@ -39,7 +39,7 @@ namespace TmwAthena { -MessageOut::MessageOut(const short id): +MessageOut::MessageOut(const int16_t id): Net::MessageOut(id), mNetwork(TmwAthena::Network::instance()) { @@ -85,10 +85,10 @@ void MessageOut::writeInt32(const int32_t value) #define LOBYTE(w) (static_cast<unsigned char>(w)) #define HIBYTE(w) (static_cast<unsigned char>(( \ -static_cast<unsigned short>(w)) >> 8)) +static_cast<uint16_t>(w)) >> 8)) -void MessageOut::writeCoordinates(const unsigned short x, - const unsigned short y, +void MessageOut::writeCoordinates(const uint16_t x, + const uint16_t y, unsigned char direction) { DEBUGLOG(strprintf("writeCoordinates: %u,%u %u", @@ -98,7 +98,7 @@ void MessageOut::writeCoordinates(const unsigned short x, mNetwork->mOutSize += 3; mPos += 3; - short temp = x; + int16_t temp = x; temp <<= 6; data[0] = 0; data[1] = 1; |