summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-19 12:02:45 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-19 12:02:45 +0300
commit389f3a580e6641d8486a44f25d3443829f42408f (patch)
treee61e7e636287a9cade0d0760c456ed0712fdc4e6
parentb5c7e137032d78a70c737cb390c6d729f95c72a2 (diff)
downloadmv-389f3a580e6641d8486a44f25d3443829f42408f.tar.gz
mv-389f3a580e6641d8486a44f25d3443829f42408f.tar.bz2
mv-389f3a580e6641d8486a44f25d3443829f42408f.tar.xz
mv-389f3a580e6641d8486a44f25d3443829f42408f.zip
Fix virtual overload function closeStorage.
-rw-r--r--src/gui/dialogsmanager.cpp2
-rw-r--r--src/net/ea/inventoryhandler.cpp2
-rw-r--r--src/net/ea/inventoryhandler.h2
-rw-r--r--src/net/inventoryhandler.h2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/dialogsmanager.cpp b/src/gui/dialogsmanager.cpp
index 1f5a95c1b..f415e2cd2 100644
--- a/src/gui/dialogsmanager.cpp
+++ b/src/gui/dialogsmanager.cpp
@@ -78,7 +78,7 @@ void DialogsManager::closeDialogs()
NpcDialog::closeAll();
SellDialog::closeAll();
if (inventoryHandler)
- inventoryHandler->closeStorage();
+ inventoryHandler->destroyStorage();
if (deathNotice)
{
deathNotice->scheduleDelete();
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 026359d76..e9bc4e236 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -317,7 +317,7 @@ void InventoryHandler::processPlayerArrowEquip(Net::MessageIn &msg)
BLOCK_END("InventoryHandler::processPlayerArrowEquip")
}
-void InventoryHandler::closeStorage()
+void InventoryHandler::destroyStorage()
{
BLOCK_START("InventoryHandler::closeStorage")
if (storageWindow)
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 9b2e85287..77cf40a56 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -85,7 +85,7 @@ class InventoryHandler notfinal : public Net::InventoryHandler
static void processPlayerArrowEquip(Net::MessageIn &msg);
- void closeStorage() override final;
+ void destroyStorage() override final;
void forgotStorage() override final;
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 8e6cf6f14..d22bcd4e1 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -69,7 +69,7 @@ class InventoryHandler notfinal
virtual Inventory *getStorage() const = 0;
- virtual void closeStorage() = 0;
+ virtual void destroyStorage() = 0;
virtual void forgotStorage() = 0;