From 0c35dab0ba366f85b40ef1795125521f1df8c264 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 28 Mar 2014 00:39:12 +0300 Subject: simplify variables cleanup. --- src/net/tmwa/generalhandler.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/net/tmwa/generalhandler.cpp') diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 46d1d490f..3848fcdd6 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -56,6 +56,7 @@ #include "net/tmwa/skillhandler.h" #include "net/tmwa/questhandler.h" +#include "utils/delete2.h" #include "utils/gettext.h" #include "debug.h" @@ -115,8 +116,7 @@ GeneralHandler::GeneralHandler() : GeneralHandler::~GeneralHandler() { - delete mNetwork; - mNetwork = nullptr; + delete2(mNetwork); } void GeneralHandler::handleMessage(Net::MessageIn &msg) @@ -320,11 +320,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 TmwAthena -- cgit v1.2.3-70-g09d2