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/ea/inventoryhandler.cpp | |
| parent | 47cc515695fcd0b16467506e4984d2ec38fad4e4 (diff) | |
| download | ManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.gz ManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.bz2 ManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.tar.xz ManaVerse-0c35dab0ba366f85b40ef1795125521f1df8c264.zip | |
simplify variables cleanup.
Diffstat (limited to 'src/net/ea/inventoryhandler.cpp')
| -rw-r--r-- | src/net/ea/inventoryhandler.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp index 2262a79f9..f3c8040e1 100644 --- a/src/net/ea/inventoryhandler.cpp +++ b/src/net/ea/inventoryhandler.cpp @@ -33,6 +33,8 @@ #include "net/ea/eaprotocol.h" +#include "utils/delete2.h" + #include "debug.h" extern int serverVersion; @@ -95,14 +97,12 @@ InventoryHandler::~InventoryHandler() mStorageWindow = nullptr; } - delete mStorage; - mStorage = nullptr; + delete2(mStorage); } void InventoryHandler::clear() { - delete mStorage; - mStorage = nullptr; + delete2(mStorage); } bool InventoryHandler::canSplit(const Item *const item A_UNUSED) const @@ -491,8 +491,7 @@ void InventoryHandler::processPlayerStorageClose(Net::MessageIn &msg A_UNUSED) if (mStorage) mStorage->clear(); - delete mStorage; - mStorage = nullptr; + delete2(mStorage); } void InventoryHandler::processPlayerEquipment(Net::MessageIn &msg) |