summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-28 21:29:43 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-28 21:45:47 +0300
commit0b7ef18ac3c7fb4e3717f6311d4e21a31ff440d5 (patch)
tree6ed783279483538799567c38c2818c5dd136e302 /src/gui/windows
parentbb87f2911b63eaf80e49d689bf52ecf2042ae098 (diff)
downloadManaVerse-0b7ef18ac3c7fb4e3717f6311d4e21a31ff440d5.tar.gz
ManaVerse-0b7ef18ac3c7fb4e3717f6311d4e21a31ff440d5.tar.bz2
ManaVerse-0b7ef18ac3c7fb4e3717f6311d4e21a31ff440d5.tar.xz
ManaVerse-0b7ef18ac3c7fb4e3717f6311d4e21a31ff440d5.zip
Move dialogs related function into separate file.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/quitdialog.cpp9
-rw-r--r--src/gui/windows/updaterwindow.cpp2
2 files changed, 7 insertions, 4 deletions
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index 20c194360..6981936e3 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -32,6 +32,7 @@
#include "input/inputaction.h"
+#include "gui/dialogsmanager.h"
#include "gui/viewport.h"
#include "gui/widgets/containerplacer.h"
@@ -165,7 +166,7 @@ void QuitDialog::action(const ActionEvent &event)
}
else if (mLogoutQuit->isSelected())
{
- Game::closeDialogs();
+ DialogsManager::closeDialogs();
client->setState(STATE_EXIT);
}
else if (mRate && mRate->isSelected())
@@ -179,14 +180,14 @@ void QuitDialog::action(const ActionEvent &event)
}
else
{
- Game::closeDialogs();
+ DialogsManager::closeDialogs();
client->setState(STATE_EXIT);
}
}
else if (Net::getGameHandler()->isConnected()
&& mSwitchAccountServer->isSelected())
{
- Game::closeDialogs();
+ DialogsManager::closeDialogs();
client->setState(STATE_SWITCH_SERVER);
}
else if (mSwitchCharacter->isSelected())
@@ -194,7 +195,7 @@ void QuitDialog::action(const ActionEvent &event)
if (client->getState() == STATE_GAME)
{
Net::getCharServerHandler()->switchCharacter();
- Game::closeDialogs();
+ DialogsManager::closeDialogs();
serverConfig.write();
}
}
diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp
index 49b2e986f..3248a3920 100644
--- a/src/gui/windows/updaterwindow.cpp
+++ b/src/gui/windows/updaterwindow.cpp
@@ -59,6 +59,8 @@
#include "debug.h"
+UpdaterWindow *updaterWindow = nullptr;
+
const std::string xmlUpdateFile("resources.xml");
const std::string txtUpdateFile("resources2.txt");
const std::string updateServer2