diff options
Diffstat (limited to 'src/net/tmwa')
-rw-r--r-- | src/net/tmwa/buysellrecv.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/generalhandler.cpp | 82 | ||||
-rw-r--r-- | src/net/tmwa/guildmanager.cpp | 8 |
3 files changed, 46 insertions, 46 deletions
diff --git a/src/net/tmwa/buysellrecv.cpp b/src/net/tmwa/buysellrecv.cpp index b30ebc501..17568c756 100644 --- a/src/net/tmwa/buysellrecv.cpp +++ b/src/net/tmwa/buysellrecv.cpp @@ -117,7 +117,7 @@ void BuySellRecv::processNpcBuyResponse(Net::MessageIn &msg) default: NotifyManager::notify(NotifyTypes::BUY_FAILED); break; - }; + } } } // namespace TmwAthena diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 99865f61d..57509a717 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -125,46 +125,46 @@ GeneralHandler::GeneralHandler() : GeneralHandler::~GeneralHandler() { - 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(mAuctionHandler); - delete2(mAchievementHandler); - delete2(mAttendanceHandler); - delete2(mBankHandler); - delete2(mBattleGroundHandler); - delete2(mBuyingStoreHandler); - delete2(mCashShopHandler); - delete2(mElementalHandler); - delete2(mFamilyHandler); - delete2(mFriendsHandler); - delete2(mHomunculusHandler); - delete2(mMail2Handler); - delete2(mMailHandler); - delete2(mMapHandler); - delete2(mMarketHandler); - delete2(mMercenaryHandler); - delete2(mRouletteHandler); - delete2(mSearchStoreHandler); - delete2(mVendingHandler); + 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(mAuctionHandler) + delete2(mAchievementHandler) + delete2(mAttendanceHandler) + delete2(mBankHandler) + delete2(mBattleGroundHandler) + delete2(mBuyingStoreHandler) + delete2(mCashShopHandler) + delete2(mElementalHandler) + delete2(mFamilyHandler) + delete2(mFriendsHandler) + delete2(mHomunculusHandler) + delete2(mMail2Handler) + delete2(mMailHandler) + delete2(mMapHandler) + delete2(mMarketHandler) + delete2(mMercenaryHandler) + delete2(mRouletteHandler) + delete2(mSearchStoreHandler) + delete2(mVendingHandler) } void GeneralHandler::load() const @@ -249,7 +249,7 @@ void GeneralHandler::gameEnded() const if (socialWindow != nullptr) socialWindow->removeTab(Ea::taParty); - delete2(partyTab); + delete2(partyTab) } } // namespace TmwAthena diff --git a/src/net/tmwa/guildmanager.cpp b/src/net/tmwa/guildmanager.cpp index b491b250d..aaf8562ac 100644 --- a/src/net/tmwa/guildmanager.cpp +++ b/src/net/tmwa/guildmanager.cpp @@ -66,7 +66,7 @@ GuildManager::GuildManager() : GuildManager::~GuildManager() { - delete2(mTab); + delete2(mTab) } void GuildManager::init() @@ -90,7 +90,7 @@ void GuildManager::init() } else if (guildManager != nullptr) { - delete2(guildManager); + delete2(guildManager) } } @@ -112,7 +112,7 @@ void GuildManager::reload() if ((guild != nullptr) && (socialWindow != nullptr)) socialWindow->removeTab(guild); } - delete2(mTab); + delete2(mTab) } void GuildManager::send(const std::string &msg) @@ -528,7 +528,7 @@ bool GuildManager::afterRemove() localPlayer->clearGuilds(); } NotifyManager::notify(NotifyTypes::GUILD_LEFT); - delete2(mTab); + delete2(mTab) if (socialWindow != nullptr) socialWindow->removeTab(guild); |