diff options
author | Andrei Karas <akaras@inbox.ru> | 2018-11-26 00:51:57 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2018-11-27 20:33:15 +0300 |
commit | 0c20db8d108c4123fcc3ecb343759e68567a4d4e (patch) | |
tree | f577edeae7b4866d68c084a1eaa229e98c80ea8f /src/net/eathena | |
parent | 2be4fc5b4eee97938657c9c8be73c4b91c8b9826 (diff) | |
download | manaverse-0c20db8d108c4123fcc3ecb343759e68567a4d4e.tar.gz manaverse-0c20db8d108c4123fcc3ecb343759e68567a4d4e.tar.bz2 manaverse-0c20db8d108c4123fcc3ecb343759e68567a4d4e.tar.xz manaverse-0c20db8d108c4123fcc3ecb343759e68567a4d4e.zip |
Remove extra ; from different code.
Diffstat (limited to 'src/net/eathena')
-rw-r--r-- | src/net/eathena/beingrecv.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/buysellrecv.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/clanrecv.cpp | 6 | ||||
-rw-r--r-- | src/net/eathena/elementalrecv.cpp | 4 | ||||
-rw-r--r-- | src/net/eathena/generalhandler.cpp | 84 | ||||
-rw-r--r-- | src/net/eathena/guildhandler.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/guildrecv.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/mail2handler.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/mail2recv.cpp | 28 | ||||
-rw-r--r-- | src/net/eathena/mailrecv.cpp | 6 | ||||
-rw-r--r-- | src/net/eathena/mercenaryrecv.cpp | 4 | ||||
-rw-r--r-- | src/net/eathena/network.cpp | 4 | ||||
-rw-r--r-- | src/net/eathena/partyrecv.cpp | 2 | ||||
-rw-r--r-- | src/net/eathena/playerrecv.cpp | 4 |
14 files changed, 76 insertions, 76 deletions
diff --git a/src/net/eathena/beingrecv.cpp b/src/net/eathena/beingrecv.cpp index ec7f4dc09..dc6a503bf 100644 --- a/src/net/eathena/beingrecv.cpp +++ b/src/net/eathena/beingrecv.cpp @@ -189,7 +189,7 @@ static void setBasicFields(Being *restrict const dstBeing, case ActorType::Avatar: case ActorType::Unknown: reportAlways("Wrong being type detected: %d", - CAST_S32(actorType)); + CAST_S32(actorType)) break; } } diff --git a/src/net/eathena/buysellrecv.cpp b/src/net/eathena/buysellrecv.cpp index 9bb91520b..7f71a41ab 100644 --- a/src/net/eathena/buysellrecv.cpp +++ b/src/net/eathena/buysellrecv.cpp @@ -137,7 +137,7 @@ void BuySellRecv::processNpcBuyResponse(Net::MessageIn &msg) default: NotifyManager::notify(NotifyTypes::BUY_FAILED); break; - }; + } } } // namespace EAthena diff --git a/src/net/eathena/clanrecv.cpp b/src/net/eathena/clanrecv.cpp index c2c5680db..e84ac7d3d 100644 --- a/src/net/eathena/clanrecv.cpp +++ b/src/net/eathena/clanrecv.cpp @@ -66,7 +66,7 @@ void ClanRecv::processClanInfo(Net::MessageIn &msg) if (info == nullptr) { reportAlways("missing clan %d in clandb", - localClan.id); + localClan.id) } else { @@ -85,7 +85,7 @@ void ClanRecv::processClanOnlineCount(Net::MessageIn &msg) void ClanRecv::processClanLeave(Net::MessageIn &msg A_UNUSED) { - delete2(clanTab); + delete2(clanTab) localClan.clear(); clanWindow->resetClan(); } @@ -99,7 +99,7 @@ void ClanRecv::processClanChat(Net::MessageIn &msg) std::string chatMsg = msg.readString(chatMsgLength, "message"); if (clanTab == nullptr) { - reportAlways("received clan chat messages without clan."); + reportAlways("received clan chat messages without clan.") return; } const size_t pos = chatMsg.find(" : ", 0); diff --git a/src/net/eathena/elementalrecv.cpp b/src/net/eathena/elementalrecv.cpp index 9d97b10b7..071a74c79 100644 --- a/src/net/eathena/elementalrecv.cpp +++ b/src/net/eathena/elementalrecv.cpp @@ -38,7 +38,7 @@ namespace EAthena PlayerInfo::setStatBase(stat, \ val, \ Notify_true); \ - break; + break void ElementalRecv::processElementalUpdateStatus(Net::MessageIn &msg) { @@ -52,7 +52,7 @@ void ElementalRecv::processElementalUpdateStatus(Net::MessageIn &msg) setElementalStat(Sp::MAXSP, Attributes::ELEMENTAL_MAX_MP); default: reportAlways("Unknown elemental stat %d", - sp); + sp) break; } } diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 940a27fd8..8c1063b84 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -126,46 +126,46 @@ GeneralHandler::GeneralHandler() : GeneralHandler::~GeneralHandler() { - delete2(Network::mInstance); + delete2(Network::mInstance) - delete2(mAdminHandler); - delete2(mBeingHandler); - delete2(mBuySellHandler); - delete2(mCharServerHandler); - delete2(mChatHandler); - delete2(mClanHandler); - delete2(mGameHandler); - delete2(mGuildHandler); - delete2(mInventoryHandler); - delete2(mItemHandler); - delete2(mLoginHandler); - delete2(mNpcHandler); - delete2(mPartyHandler); - delete2(mPetHandler); - delete2(mPlayerHandler); - delete2(mSkillHandler); - delete2(mTradeHandler); - delete2(mQuestHandler); - delete2(mServerFeatures); - delete2(mMail2Handler); - delete2(mMailHandler); - delete2(mAuctionHandler); - delete2(mAchievementHandler); - delete2(mAttendanceHandler); - delete2(mCashShopHandler); - delete2(mFamilyHandler); - delete2(mBankHandler); - delete2(mBattleGroundHandler); - delete2(mMercenaryHandler); - delete2(mBuyingStoreHandler); - delete2(mHomunculusHandler); - delete2(mFriendsHandler); - delete2(mElementalHandler); - delete2(mMapHandler); - delete2(mMarketHandler); - delete2(mVendingHandler); - delete2(mRouletteHandler); - delete2(mSearchStoreHandler); + delete2(mAdminHandler) + delete2(mBeingHandler) + delete2(mBuySellHandler) + delete2(mCharServerHandler) + delete2(mChatHandler) + delete2(mClanHandler) + delete2(mGameHandler) + delete2(mGuildHandler) + delete2(mInventoryHandler) + delete2(mItemHandler) + delete2(mLoginHandler) + delete2(mNpcHandler) + delete2(mPartyHandler) + delete2(mPetHandler) + delete2(mPlayerHandler) + delete2(mSkillHandler) + delete2(mTradeHandler) + delete2(mQuestHandler) + delete2(mServerFeatures) + delete2(mMail2Handler) + delete2(mMailHandler) + delete2(mAuctionHandler) + delete2(mAchievementHandler) + delete2(mAttendanceHandler) + delete2(mCashShopHandler) + delete2(mFamilyHandler) + delete2(mBankHandler) + delete2(mBattleGroundHandler) + delete2(mMercenaryHandler) + delete2(mBuyingStoreHandler) + delete2(mHomunculusHandler) + delete2(mFriendsHandler) + delete2(mElementalHandler) + delete2(mMapHandler) + delete2(mMarketHandler) + delete2(mVendingHandler) + delete2(mRouletteHandler) + delete2(mSearchStoreHandler) } void GeneralHandler::load() const @@ -249,9 +249,9 @@ void GeneralHandler::gameEnded() const socialWindow->removeTab(Ea::taParty); } - delete2(guildTab); - delete2(partyTab); - delete2(clanTab); + delete2(guildTab) + delete2(partyTab) + delete2(clanTab) } } // namespace EAthena diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index 3cd3c2fba..320894d22 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -52,7 +52,7 @@ GuildHandler::GuildHandler() : GuildHandler::~GuildHandler() { - delete2(guildTab); + delete2(guildTab) guildHandler = nullptr; taGuild = nullptr; } diff --git a/src/net/eathena/guildrecv.cpp b/src/net/eathena/guildrecv.cpp index b5450e1aa..81010a230 100644 --- a/src/net/eathena/guildrecv.cpp +++ b/src/net/eathena/guildrecv.cpp @@ -208,7 +208,7 @@ void GuildRecv::processGuildMemberList(Net::MessageIn &msg) if (msg.getVersion() >= 20161026) { guildSize = 34; - reportAlways("missing guild member names"); + reportAlways("missing guild member names") } else { diff --git a/src/net/eathena/mail2handler.cpp b/src/net/eathena/mail2handler.cpp index 7097333bc..3a0c99ac0 100644 --- a/src/net/eathena/mail2handler.cpp +++ b/src/net/eathena/mail2handler.cpp @@ -108,7 +108,7 @@ void Mail2Handler::sendMail(const std::string &to, int32_t sz = 2 + 2 + 24 + 24 + 8 + 2 + 2 + titleSz + bodySz; if (sz > 32767 - 4) { - reportAlways("Mail message too big"); + reportAlways("Mail message too big") return; } if (packetVersion >= 20160600) diff --git a/src/net/eathena/mail2recv.cpp b/src/net/eathena/mail2recv.cpp index d22bc211e..2cb585829 100644 --- a/src/net/eathena/mail2recv.cpp +++ b/src/net/eathena/mail2recv.cpp @@ -104,14 +104,14 @@ void Mail2Recv::processAddItemResult(Net::MessageIn &msg) if (mailEditWindow == nullptr) { - reportAlways("Mail edit window not created"); + reportAlways("Mail edit window not created") delete options; return; } Inventory *const inventory = mailEditWindow->getInventory(); if (inventory == nullptr) { - reportAlways("Mail edit window inventory not exists"); + reportAlways("Mail edit window inventory not exists") delete options; return; } @@ -189,7 +189,7 @@ void Mail2Recv::processRemoveItemResult(Net::MessageIn &msg) const Inventory *const inv = PlayerInfo::getInventory(); if (inv == nullptr) { - reportAlways("Player inventory not exists"); + reportAlways("Player inventory not exists") return; } std::string itemName; @@ -211,25 +211,25 @@ void Mail2Recv::processRemoveItemResult(Net::MessageIn &msg) } if (mailEditWindow == nullptr) { - reportAlways("Mail edit window not created"); + reportAlways("Mail edit window not created") return; } Inventory *const inventory = mailEditWindow->getInventory(); if (inventory == nullptr) { - reportAlways("Mail edit window inventory not exists"); + reportAlways("Mail edit window inventory not exists") return; } const int index2 = inventory->findIndexByTag(index); if (index2 == -1) { - reportAlways("Item not exists in mail edit window."); + reportAlways("Item not exists in mail edit window.") return; } Item *const item = inventory->getItem(index2); if (item == nullptr) { - reportAlways("Item not exists."); + reportAlways("Item not exists.") return; } @@ -248,7 +248,7 @@ void Mail2Recv::processCheckNameResult(Net::MessageIn &msg) if (mMailQueue.empty()) { reportAlways("Mail2Recv::processCheckNameResult no names in queue." - "Char id: %d", charId); + "Char id: %d", charId) return; } MailQueue *const mail = mMailQueue.front(); @@ -272,7 +272,7 @@ void Mail2Recv::processCheckNameResult(Net::MessageIn &msg) case MailQueueType::EditMail: if (mailWindow == nullptr) { - reportAlways("Mail window not created"); + reportAlways("Mail window not created") } else { @@ -282,7 +282,7 @@ void Mail2Recv::processCheckNameResult(Net::MessageIn &msg) case MailQueueType::ValidateTo: if (mailEditWindow == nullptr) { - reportAlways("Mail edit window not created"); + reportAlways("Mail edit window not created") } else { @@ -291,7 +291,7 @@ void Mail2Recv::processCheckNameResult(Net::MessageIn &msg) break; case MailQueueType::Unknown: default: - reportAlways("Not implemented yet."); + reportAlways("Not implemented yet.") break; } delete mail; @@ -329,7 +329,7 @@ void Mail2Recv::processMailListPage(Net::MessageIn &msg) { if (mailWindow == nullptr) { - reportAlways("mail window not created"); + reportAlways("mail window not created") return; } msg.readInt16("len"); @@ -405,7 +405,7 @@ void Mail2Recv::processReadMail(Net::MessageIn &msg) if (mail == nullptr) { - reportAlways("Mail message not found"); + reportAlways("Mail message not found") for (int f = 0; f < itemsCount; f ++) { msg.readInt16("amount"); @@ -490,7 +490,7 @@ void Mail2Recv::processMailDelete(Net::MessageIn &msg) const int64_t mailId = msg.readInt64("mail id"); if (mailWindow == nullptr) { - reportAlways("Mail window not created."); + reportAlways("Mail window not created.") return; } mailWindow->removeMail(mailId); diff --git a/src/net/eathena/mailrecv.cpp b/src/net/eathena/mailrecv.cpp index 94e6c6fb9..d759e0fa3 100644 --- a/src/net/eathena/mailrecv.cpp +++ b/src/net/eathena/mailrecv.cpp @@ -122,21 +122,21 @@ void MailRecv::processReadMail(Net::MessageIn &msg) mail->strTime = timeToStr(mail->time); if (mailWindow == nullptr) { - reportAlways("Mail window not created"); + reportAlways("Mail window not created") delete mail; return; } mailWindow->showMessage(mail, itemId != 0 ? 1 : 0); if (mailViewWindow == nullptr) { - reportAlways("Mail view window not created"); + reportAlways("Mail view window not created") return; } Inventory *const inventory = mailViewWindow->getInventory(); if (inventory == nullptr) { - reportAlways("Mail view window missing inventory"); + reportAlways("Mail view window missing inventory") return; } diff --git a/src/net/eathena/mercenaryrecv.cpp b/src/net/eathena/mercenaryrecv.cpp index bd4579c83..e9d351b37 100644 --- a/src/net/eathena/mercenaryrecv.cpp +++ b/src/net/eathena/mercenaryrecv.cpp @@ -47,7 +47,7 @@ namespace EAthena PlayerInfo::setStatBase(stat, \ val, \ Notify_true); \ - break; + break void MercenaryRecv::processMercenaryUpdate(Net::MessageIn &msg) { @@ -71,7 +71,7 @@ void MercenaryRecv::processMercenaryUpdate(Net::MessageIn &msg) setMercStat(Sp::MERCFAITH, Attributes::MERC_FAITH); default: reportAlways("Unknown mercenary stat %d", - sp); + sp) break; } } diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp index c183d842c..9fcccb378 100644 --- a/src/net/eathena/network.cpp +++ b/src/net/eathena/network.cpp @@ -133,7 +133,7 @@ void Network::registerFakeHandlers() const size_t id = (*it).first; if (id >= packet_lengths_size) { - reportAlways("Wrong fake packet id %d", CAST_S32(id)); + reportAlways("Wrong fake packet id %d", CAST_S32(id)) continue; } if (mPackets[id].len != 0 || @@ -159,7 +159,7 @@ void Network::registerFakeHandlers() const size_t id = *it; if (id >= packet_lengths_size) { - reportAlways("Wrong remove packet id %d", CAST_S32(id)); + reportAlways("Wrong remove packet id %d", CAST_S32(id)) continue; } if (mPackets[id].len == 0 && diff --git a/src/net/eathena/partyrecv.cpp b/src/net/eathena/partyrecv.cpp index 21b97dfad..026dafbfc 100644 --- a/src/net/eathena/partyrecv.cpp +++ b/src/net/eathena/partyrecv.cpp @@ -117,7 +117,7 @@ void PartyRecv::processPartyMemberJobLevel(Net::MessageIn &msg) } else { - reportAlways("processPartyMemberJobLevel: party member not exists."); + reportAlways("processPartyMemberJobLevel: party member not exists.") } } diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp index 32336249d..da3e35a0d 100644 --- a/src/net/eathena/playerrecv.cpp +++ b/src/net/eathena/playerrecv.cpp @@ -507,7 +507,7 @@ void PlayerRecv::processKilledBy(Net::MessageIn &msg) { debugMsg( // TRANSLATORS: player killed message - _("You were killed by unknown source.")); + _("You were killed by unknown source.")) } else { @@ -519,7 +519,7 @@ void PlayerRecv::processKilledBy(Net::MessageIn &msg) debugMsg(strprintf( // TRANSLATORS: player killed message _("You were killed by %s."), - name.c_str())); + name.c_str())) } } |