summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-18 12:22:01 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-19 15:12:19 +0300
commit6438e784344924eb9ace561ec7fcc2b723dcb0dd (patch)
tree98f117f99807591f13ff371c942b23c2e1e49f29
parent8319916c8521b2611d8b877167c3fb612c22b37d (diff)
downloadmanaplus-6438e784344924eb9ace561ec7fcc2b723dcb0dd.tar.gz
manaplus-6438e784344924eb9ace561ec7fcc2b723dcb0dd.tar.bz2
manaplus-6438e784344924eb9ace561ec7fcc2b723dcb0dd.tar.xz
manaplus-6438e784344924eb9ace561ec7fcc2b723dcb0dd.zip
move virtual member calls from equipmentwindow constuctor into postInit.
-rw-r--r--src/game.cpp2
-rw-r--r--src/gui/windows/equipmentwindow.cpp3
-rw-r--r--src/gui/windows/equipmentwindow.h2
3 files changed, 7 insertions, 0 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 7b65147e4..3e2b1859d 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -212,7 +212,9 @@ static void createGuiWindows()
tradeWindow = new TradeWindow;
equipmentWindow = new EquipmentWindow(PlayerInfo::getEquipment(),
player_node);
+ equipmentWindow->postInit();
beingEquipmentWindow = new EquipmentWindow(nullptr, nullptr, true);
+ beingEquipmentWindow->postInit();
beingEquipmentWindow->setVisible(false);
statusWindow = new StatusWindow;
miniStatusWindow = new MiniStatusWindow;
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 1fe0387e4..43391e611 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -113,7 +113,10 @@ EquipmentWindow::EquipmentWindow(Equipment *const equipment,
recalcSize();
loadWindowState();
+}
+void EquipmentWindow::postInit()
+{
const gcn::Rectangle &area = getChildrenArea();
mUnequip->setPosition(area.width - mUnequip->getWidth() - mButtonPadding,
area.height - mUnequip->getHeight() - mButtonPadding);
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index 4100206ed..1a2b9467f 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -76,6 +76,8 @@ class EquipmentWindow final : public Window, public gcn::ActionListener
*/
~EquipmentWindow();
+ void postInit();
+
/**
* Draws the equipment window.
*/