summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-18 22:17:34 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-19 15:12:22 +0300
commit43c3aff88f86612b44e1f4789f4f35b2599df84f (patch)
tree1585f6db85dbccc767918282c5d16824c3a2d7e3 /src
parent78c28d368c383ef3705f9128b0ed0a5b36996da4 (diff)
downloadmv-43c3aff88f86612b44e1f4789f4f35b2599df84f.tar.gz
mv-43c3aff88f86612b44e1f4789f4f35b2599df84f.tar.bz2
mv-43c3aff88f86612b44e1f4789f4f35b2599df84f.tar.xz
mv-43c3aff88f86612b44e1f4789f4f35b2599df84f.zip
move virtual member calls from shopwindow constuctor into postInit.
Diffstat (limited to 'src')
-rw-r--r--src/game.cpp1
-rw-r--r--src/gui/windows/shopwindow.cpp5
-rw-r--r--src/gui/windows/shopwindow.h2
3 files changed, 7 insertions, 1 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 5ed8481a9..71d3ff4ff 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -222,6 +222,7 @@ static void createGuiWindows()
inventoryWindow = new InventoryWindow(PlayerInfo::getInventory());
inventoryWindow->postInit();
shopWindow = new ShopWindow;
+ shopWindow->postInit();
skillDialog = new SkillDialog;
minimap = new Minimap;
debugWindow = new DebugWindow;
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 97edec99d..aceb872fc 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -183,9 +183,12 @@ ShopWindow::ShopWindow():
loadWindowState();
instances.push_back(this);
+}
+
+void ShopWindow::postInit()
+{
setVisible(false);
enableVisibleSound(true);
-
updateButtonsAndLabels();
}
diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h
index bf7a61c4a..52d85c9e5 100644
--- a/src/gui/windows/shopwindow.h
+++ b/src/gui/windows/shopwindow.h
@@ -67,6 +67,8 @@ class ShopWindow final : public Window,
*/
~ShopWindow();
+ void postInit();
+
/**
* Called when receiving actions from the widgets.
*/