diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-16 22:30:31 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-01-16 22:33:13 +0300 |
| commit | f9ba5f70016e5422eb20f0ad3c0e61ca66e448c8 (patch) | |
| tree | b8bdc4d2da97ff76987313f22ad63eb3c8df4058 /src/net | |
| parent | 1781049dee0da16fdd7148f36a699523cd08ecaf (diff) | |
| download | mv-f9ba5f70016e5422eb20f0ad3c0e61ca66e448c8.tar.gz mv-f9ba5f70016e5422eb20f0ad3c0e61ca66e448c8.tar.bz2 mv-f9ba5f70016e5422eb20f0ad3c0e61ca66e448c8.tar.xz mv-f9ba5f70016e5422eb20f0ad3c0e61ca66e448c8.zip | |
fix code style.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/eathena/beinghandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/eathena/charserverhandler.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index c2804586f..f74a51fc4 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -448,7 +448,7 @@ void BeingHandler::processBeingChangeLookContinue(Being *const dstBeing, SPRITE_HAIR_COLOR)).getDyeColorsString(id)); break; case 7: // Clothes color. Now used as look - dstBeing->setLook(id); + dstBeing->setLook(static_cast<uint8_t>(id)); break; case 8: // eAthena LOOK_SHIELD if (!mHideShield) diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index d629be708..21306b659 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -200,7 +200,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, data.mAttributes[Attributes::MAX_MP] = msg.readInt16("max mp/sp"); msg.readInt16("speed"); - const int race = msg.readInt16("class"); + const uint16_t race = msg.readInt16("class"); // tempPlayer->setSubtype(race, 0); const int hairStyle = msg.readInt16("hair style"); const int weapon = msg.readInt32("weapon"); @@ -219,7 +219,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg, ItemDB::get(-hairStyle).getDyeColorsString( msg.readInt16("hair color"))); - const int look = msg.readInt16("clothes color"); + const uint8_t look = msg.readInt16("clothes color"); tempPlayer->setSubtype(race, look); tempPlayer->setName(msg.readString(24, "name")); @@ -272,8 +272,8 @@ void CharServerHandler::chooseCharacter(Net::Character *const character) void CharServerHandler::newCharacter(const std::string &name, const int slot, const Gender::Type gender, const int hairstyle, const int hairColor, - const unsigned char race A_UNUSED, - const unsigned char look A_UNUSED, + const unsigned char race, + const unsigned char look, const std::vector<int> &stats A_UNUSED) const { |