diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-03-28 00:39:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-03-28 11:04:23 +0300 |
| commit | 0c35dab0ba366f85b40ef1795125521f1df8c264 (patch) | |
| tree | dde6abde3288f543ae96a2468b2275af8a03e704 /src/net/eathena/generalhandler.cpp | |
| parent | 47cc515695fcd0b16467506e4984d2ec38fad4e4 (diff) | |
| download | manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.gz manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.bz2 manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.xz manaplus-0c35dab0ba366f85b40ef1795125521f1df8c264.zip | |
simplify variables cleanup.
Diffstat (limited to 'src/net/eathena/generalhandler.cpp')
| -rw-r--r-- | src/net/eathena/generalhandler.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 3a18dede9..6243a3878 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -54,6 +54,7 @@ #include "net/eathena/tradehandler.h" #include "net/eathena/skillhandler.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "debug.h" @@ -105,8 +106,7 @@ GeneralHandler::GeneralHandler() : GeneralHandler::~GeneralHandler() { - delete mNetwork; - mNetwork = nullptr; + delete2(mNetwork); } void GeneralHandler::handleMessage(Net::MessageIn &msg) @@ -272,11 +272,8 @@ void GeneralHandler::gameEnded() const socialWindow->removeTab(Ea::taParty); } - delete Ea::guildTab; - Ea::guildTab = nullptr; - - delete Ea::partyTab; - Ea::partyTab = nullptr; + delete2(Ea::guildTab); + delete2(Ea::partyTab); } } // namespace EAthena |