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/tmwa | |
parent | 98c74738f21d7ae256f1273b6c1614ee64e2a3ad (diff) | |
download | manaplus-a6d18b282ab916c6536dc25516affeb9200043b6.tar.gz manaplus-a6d18b282ab916c6536dc25516affeb9200043b6.tar.bz2 manaplus-a6d18b282ab916c6536dc25516affeb9200043b6.tar.xz manaplus-a6d18b282ab916c6536dc25516affeb9200043b6.zip |
Fix code style.s20181102
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/beingrecv.cpp | 6 | ||||
-rw-r--r-- | src/net/tmwa/chatrecv.cpp | 4 | ||||
-rw-r--r-- | src/net/tmwa/inventoryrecv.cpp | 8 | ||||
-rw-r--r-- | src/net/tmwa/loginrecv.cpp | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp index f4b533891..69744946b 100644 --- a/src/net/tmwa/beingrecv.cpp +++ b/src/net/tmwa/beingrecv.cpp @@ -280,7 +280,7 @@ void BeingRecv::processPlayerUpdate1(Net::MessageIn &msg) } uint8_t dir = dstBeing->getDirectionDelayed(); - if (dir != 0u) + if (dir != 0U) { if (dir != dstBeing->getDirection()) dstBeing->setDirection(dir); @@ -425,7 +425,7 @@ void BeingRecv::processPlayerUpdate2(Net::MessageIn &msg) } uint8_t dir = dstBeing->getDirectionDelayed(); - if (dir != 0u) + if (dir != 0U) { if (dir != dstBeing->getDirection()) dstBeing->setDirection(dir); @@ -566,7 +566,7 @@ void BeingRecv::processPlayerMove(Net::MessageIn &msg) } const uint8_t dir = dstBeing->getDirectionDelayed(); - if (dir != 0u) + if (dir != 0U) { if (dir != dstBeing->getDirection()) dstBeing->setDirection(dir); diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp index 83078bee9..e044d5877 100644 --- a/src/net/tmwa/chatrecv.cpp +++ b/src/net/tmwa/chatrecv.cpp @@ -77,7 +77,7 @@ void ChatRecv::processChatContinue(std::string chatMsg) } const std::string senseStr("You sense the following: "); - if ((actorManager != nullptr) && (chatMsg.find(senseStr) == 0u)) + if ((actorManager != nullptr) && (chatMsg.find(senseStr) == 0U)) { actorManager->parseLevels( chatMsg.substr(senseStr.size())); @@ -372,7 +372,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) && + PlayerRelation::SPEECH_LOG) != 0U) && (chatWindow != nullptr)) { allow = chatWindow->resortChatLog( diff --git a/src/net/tmwa/inventoryrecv.cpp b/src/net/tmwa/inventoryrecv.cpp index 68521bfa4..2c0c51471 100644 --- a/src/net/tmwa/inventoryrecv.cpp +++ b/src/net/tmwa/inventoryrecv.cpp @@ -171,7 +171,7 @@ void InventoryRecv::processPlayerInventoryAdd(Net::MessageIn &msg) Ea::InventoryRecv::mSentPickups.pop(); } - if (err != 0u) + if (err != 0U) { PickupT pickup; switch (err) @@ -381,7 +381,7 @@ void InventoryRecv::processPlayerEquip(Net::MessageIn &msg) const int equipType = msg.readInt16("equip type"); const uint8_t flag = msg.readUInt8("flag"); - if (flag == 0u) + if (flag == 0U) { NotifyManager::notify(NotifyTypes::EQUIP_FAILED); } @@ -401,7 +401,7 @@ void InventoryRecv::processPlayerUnEquip(Net::MessageIn &msg) const int equipType = msg.readInt16("equip type"); const uint8_t flag = msg.readUInt8("flag"); - if (flag != 0u) + if (flag != 0U) { Ea::InventoryRecv::mEquips.setEquipment( InventoryRecv::getSlot(equipType), @@ -550,7 +550,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/tmwa/loginrecv.cpp b/src/net/tmwa/loginrecv.cpp index 91d11b05e..43db7b99a 100644 --- a/src/net/tmwa/loginrecv.cpp +++ b/src/net/tmwa/loginrecv.cpp @@ -65,7 +65,7 @@ void LoginRecv::processServerVersion(Net::MessageIn &msg) { // old TMWA const unsigned int options = msg.readInt32("options"); Ea::LoginRecv::mRegistrationEnabled = - ((options & FLAG_REGISTRATION) != 0u); + ((options & FLAG_REGISTRATION) != 0U); serverVersion = 0; tmwServerVersion = 0; } @@ -73,7 +73,7 @@ void LoginRecv::processServerVersion(Net::MessageIn &msg) { // new TMWA const unsigned int options = msg.readInt32("options"); Ea::LoginRecv::mRegistrationEnabled = - ((options & FLAG_REGISTRATION) != 0u); + ((options & FLAG_REGISTRATION) != 0U); serverVersion = 0; tmwServerVersion = (b1 << 16) | (b2 << 8) | b3; } @@ -81,7 +81,7 @@ void LoginRecv::processServerVersion(Net::MessageIn &msg) { // eAthena const unsigned int options = msg.readInt32("options"); Ea::LoginRecv::mRegistrationEnabled = - ((options & FLAG_REGISTRATION) != 0u); + ((options & FLAG_REGISTRATION) != 0U); serverVersion = 0; tmwServerVersion = 0; } |