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/charserverhandler.cpp | |
| parent | cfe4c893ba4ba30379919636d3c508ebf1594e23 (diff) | |
| download | manaverse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.gz manaverse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.bz2 manaverse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.tar.xz manaverse-35cfd460655878c9a615abc8ea1cb2f7577a7f3b.zip | |
some other fixes from cpplint.
Diffstat (limited to 'src/net/tmwa/charserverhandler.cpp')
| -rw-r--r-- | src/net/tmwa/charserverhandler.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index 3a72ffa03..773a9d060 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -253,8 +253,8 @@ void CharServerHandler::newCharacter(const std::string &name, const int slot, outMsg.writeInt8(static_cast<unsigned char>(stats[i])); outMsg.writeInt8(static_cast<unsigned char>(slot)); - outMsg.writeInt16(static_cast<short>(hairColor)); - outMsg.writeInt16(static_cast<short>(hairstyle)); + outMsg.writeInt16(static_cast<int16_t>(hairColor)); + outMsg.writeInt16(static_cast<int16_t>(hairstyle)); if (serverVersion >= 2) outMsg.writeInt8(race); } @@ -309,7 +309,7 @@ void CharServerHandler::processCharLogin(Net::MessageIn &msg) msg.skip(2); // Length word const int slots = msg.readInt16(); if (slots > 0 && slots < 30) - loginData.characterSlots = static_cast<short unsigned int>(slots); + loginData.characterSlots = static_cast<uint16_t>(slots); const bool version = msg.readInt8() == 1 && serverVersion > 0; msg.skip(17); // 0 Unused |