diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-09-17 13:47:36 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-09-17 13:47:36 +0300 |
commit | c1ba61eb566a0a1a2532690ba3bf7e6498bee06b (patch) | |
tree | ade4210a9028e8688ee2794af4bef59e1716e9f4 /src/net/eathena/generalhandler.cpp | |
parent | 3aaebb5b7f1faf46d9f437ba00e7650147453952 (diff) | |
download | manaplus-c1ba61eb566a0a1a2532690ba3bf7e6498bee06b.tar.gz manaplus-c1ba61eb566a0a1a2532690ba3bf7e6498bee06b.tar.bz2 manaplus-c1ba61eb566a0a1a2532690ba3bf7e6498bee06b.tar.xz manaplus-c1ba61eb566a0a1a2532690ba3bf7e6498bee06b.zip |
Remove auto pointers from network code.
Diffstat (limited to 'src/net/eathena/generalhandler.cpp')
-rw-r--r-- | src/net/eathena/generalhandler.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index b5206afcc..9ea481f2c 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -185,28 +185,28 @@ void GeneralHandler::load() if (!mNetwork) return; - mNetwork->registerHandler(mAdminHandler.get()); - mNetwork->registerHandler(mBeingHandler.get()); - mNetwork->registerHandler(mBuySellHandler.get()); - mNetwork->registerHandler(mChatHandler.get()); - mNetwork->registerHandler(mCharServerHandler.get()); - mNetwork->registerHandler(mGameHandler.get()); - mNetwork->registerHandler(mGuildHandler.get()); - mNetwork->registerHandler(mInventoryHandler.get()); - mNetwork->registerHandler(mItemHandler.get()); - mNetwork->registerHandler(mLoginHandler.get()); - mNetwork->registerHandler(mNpcHandler.get()); - mNetwork->registerHandler(mPlayerHandler.get()); - mNetwork->registerHandler(mSkillHandler.get()); - mNetwork->registerHandler(mTradeHandler.get()); - mNetwork->registerHandler(mPartyHandler.get()); - mNetwork->registerHandler(mPetHandler.get()); - mNetwork->registerHandler(mQuestHandler.get()); - mNetwork->registerHandler(mMailHandler.get()); - mNetwork->registerHandler(mAuctionHandler.get()); - mNetwork->registerHandler(mCashShopHandler.get()); - mNetwork->registerHandler(mFamilyHandler.get()); - mNetwork->registerHandler(mBankHandler.get()); + mNetwork->registerHandler(mAdminHandler); + mNetwork->registerHandler(mBeingHandler); + mNetwork->registerHandler(mBuySellHandler); + mNetwork->registerHandler(mChatHandler); + mNetwork->registerHandler(mCharServerHandler); + mNetwork->registerHandler(mGameHandler); + mNetwork->registerHandler(mGuildHandler); + mNetwork->registerHandler(mInventoryHandler); + mNetwork->registerHandler(mItemHandler); + mNetwork->registerHandler(mLoginHandler); + mNetwork->registerHandler(mNpcHandler); + mNetwork->registerHandler(mPlayerHandler); + mNetwork->registerHandler(mSkillHandler); + mNetwork->registerHandler(mTradeHandler); + mNetwork->registerHandler(mPartyHandler); + mNetwork->registerHandler(mPetHandler); + mNetwork->registerHandler(mQuestHandler); + mNetwork->registerHandler(mMailHandler); + mNetwork->registerHandler(mAuctionHandler); + mNetwork->registerHandler(mCashShopHandler); + mNetwork->registerHandler(mFamilyHandler); + mNetwork->registerHandler(mBankHandler); } void GeneralHandler::reload() @@ -214,17 +214,17 @@ void GeneralHandler::reload() if (mNetwork) mNetwork->disconnect(); - static_cast<LoginHandler*>(mLoginHandler.get())->clearWorlds(); + static_cast<LoginHandler*>(mLoginHandler)->clearWorlds(); CharServerHandler *const charHandler = static_cast<CharServerHandler*>( - mCharServerHandler.get()); + mCharServerHandler); charHandler->setCharCreateDialog(nullptr); charHandler->setCharSelectDialog(nullptr); - static_cast<PartyHandler*>(mPartyHandler.get())->reload(); + static_cast<PartyHandler*>(mPartyHandler)->reload(); } void GeneralHandler::reloadPartially() const { - static_cast<PartyHandler*>(mPartyHandler.get())->reload(); + static_cast<PartyHandler*>(mPartyHandler)->reload(); } void GeneralHandler::unload() |