summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-10-18 17:28:44 +0300
committerAndrei Karas <akaras@inbox.ru>2013-10-19 15:12:21 +0300
commit85eebe87172021e63267515c6a7964efccb6015c (patch)
tree327af5e352a875fe3eaf9202a88e6038a06aa083
parent1389a0367d37c07ddd4105651a82fa30b407d08a (diff)
downloadmv-85eebe87172021e63267515c6a7964efccb6015c.tar.gz
mv-85eebe87172021e63267515c6a7964efccb6015c.tar.bz2
mv-85eebe87172021e63267515c6a7964efccb6015c.tar.xz
mv-85eebe87172021e63267515c6a7964efccb6015c.zip
move virtual member calls from mpcdialog constuctor into postInit.
-rw-r--r--src/gui/windows/npcdialog.cpp4
-rw-r--r--src/gui/windows/npcdialog.h2
-rw-r--r--src/net/eathena/npchandler.cpp1
-rw-r--r--src/net/tmwa/npchandler.cpp1
4 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index ba8754482..e8caa0722 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -184,6 +184,10 @@ NpcDialog::NpcDialog(const int npcId) :
loadWindowState();
instances.push_back(this);
+}
+
+void NpcDialog::postInit()
+{
setVisible(true);
requestFocus();
enableVisibleSound(true);
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index f48e782d9..4e907e325 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -72,6 +72,8 @@ class NpcDialog final : public Window,
~NpcDialog();
+ void postInit();
+
/**
* Called when receiving actions from the widgets.
*/
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index 8ca545adf..05d6bb0b1 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -222,6 +222,7 @@ int NpcHandler::getNpc(Net::MessageIn &msg, const bool haveLength)
else
{
mDialog = new NpcDialog(npcId);
+ mDialog->postInit();
mDialog->saveCamera();
if (player_node)
player_node->stopWalking(false);
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index d03cd4fb5..7dc926c73 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -235,6 +235,7 @@ int NpcHandler::getNpc(Net::MessageIn &msg, const bool haveLength)
else
{
mDialog = new NpcDialog(npcId);
+ mDialog->postInit();
mDialog->saveCamera();
if (player_node)
player_node->stopWalking(false);