diff options
author | Andrei Karas <akaras@inbox.ru> | 2018-10-29 02:02:04 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2018-10-29 02:02:04 +0300 |
commit | a6d18b282ab916c6536dc25516affeb9200043b6 (patch) | |
tree | 9980735a47cb2118999fb4f4dceaa52bf9f4fae7 /src/net/eathena | |
parent | 98c74738f21d7ae256f1273b6c1614ee64e2a3ad (diff) | |
download | mv-s20181102.tar.gz mv-s20181102.tar.bz2 mv-s20181102.tar.xz mv-s20181102.zip |
Fix code style.s20181102
Diffstat (limited to 'src/net/eathena')
-rw-r--r-- | src/net/eathena/beingrecv.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/chatrecv.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/inventoryrecv.cpp | 8 | ||||
-rw-r--r-- | src/net/eathena/mailrecv.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index a214dda39..f145bb17b 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -762,7 +762,7 @@ void BeingRecv::processBeingMove(Net::MessageIn &msg) { d = dstBeing->calcDirection(dstX, dstY); } - if ((d != 0u) && dstBeing->getDirection() != d) + if ((d != 0U) && dstBeing->getDirection() != d) dstBeing->setDirection(d); const int level = CAST_S32(msg.readInt16("level")); diff --git a/src/net/eathena/chatrecv.cpp b/src/net/eathena/chatrecv.cpp index 092fc0589..87fc6b63e 100644 --- a/src/net/eathena/chatrecv.cpp +++ b/src/net/eathena/chatrecv.cpp @@ -589,7 +589,7 @@ void ChatRecv::processBeingChat(Net::MessageIn &msg) // because ignorePlayer' side effects are triggered // right below for Being::IGNORE_SPEECH_FLOAT. if ((playerRelations.checkPermissionSilently(sender_name, - PlayerRelation::SPEECH_LOG) != 0u) && (chatWindow != nullptr)) + PlayerRelation::SPEECH_LOG) != 0U) && (chatWindow != nullptr)) { allow = chatWindow->resortChatLog( removeColors(sender_name).append(" : ").append(chatMsg), diff --git a/src/net/eathena/inventoryrecv.cpp b/src/net/eathena/inventoryrecv.cpp index 7547d03c7..9d9707735 100644 --- a/src/net/eathena/inventoryrecv.cpp +++ b/src/net/eathena/inventoryrecv.cpp @@ -271,7 +271,7 @@ void InventoryRecv::processPlayerInventoryAdd(Net::MessageIn &msg) Ea::InventoryRecv::mSentPickups.pop(); } - if (err != 0u) + if (err != 0U) { PickupT pickup; switch (err) @@ -570,7 +570,7 @@ void InventoryRecv::processPlayerUnEquip(Net::MessageIn &msg) equipType = msg.readInt16("wear location"); const uint8_t flag = msg.readUInt8("result"); - if (flag != 0u) + if (flag != 0U) { NotifyManager::notify(NotifyTypes::UNEQUIP_FAILED); } @@ -834,7 +834,7 @@ void InventoryRecv::processPlayerInsertCard(Net::MessageIn &msg) { const int itemIndex = msg.readInt16("item index") - INVENTORY_OFFSET; const int cardIndex = msg.readInt16("card index") - INVENTORY_OFFSET; - if (msg.readUInt8("flag") != 0u) + if (msg.readUInt8("flag") != 0U) { NotifyManager::notify(NotifyTypes::CARD_INSERT_FAILED); } @@ -1424,7 +1424,7 @@ int InventoryRecv::getSlot(const int eAthenaSlot) unsigned int mask = 1; int position = 0; - while ((eAthenaSlot & mask) == 0u) + while ((eAthenaSlot & mask) == 0U) { mask <<= 1; position++; diff --git a/src/net/eathena/mailrecv.cpp b/src/net/eathena/mailrecv.cpp index 434745386..94e6c6fb9 100644 --- a/src/net/eathena/mailrecv.cpp +++ b/src/net/eathena/mailrecv.cpp @@ -86,7 +86,7 @@ void MailRecv::processMailList(Net::MessageIn &msg) MailMessage *const mail = new MailMessage; mail->id = msg.readInt32("message id"); mail->title = msg.readString(40, "title"); - mail->read = msg.readUInt8("unread flag") != 0u ? true : false; + mail->read = msg.readUInt8("unread flag") != 0U ? true : false; mail->sender = msg.readString(24, "sender name"); mail->time = msg.readInt32("time stamp"); mail->strTime = timeToStr(mail->time); |