summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-16 17:21:24 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-16 17:21:24 +0300
commit396b3e298b21677ebe3c6f5c2f5b837ac25625f2 (patch)
tree01cfca3609db046afebe5c9e11ba0a5a803e378f /src/net
parente50013d92b22faeffb8711d07a8f344ab71e9e57 (diff)
downloadmanaplus-396b3e298b21677ebe3c6f5c2f5b837ac25625f2.tar.gz
manaplus-396b3e298b21677ebe3c6f5c2f5b837ac25625f2.tar.bz2
manaplus-396b3e298b21677ebe3c6f5c2f5b837ac25625f2.tar.xz
manaplus-396b3e298b21677ebe3c6f5c2f5b837ac25625f2.zip
Move dialog type into separate file.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/ea/charserverhandler.cpp5
-rw-r--r--src/net/ea/gamehandler.cpp5
-rw-r--r--src/net/ea/playerhandler.cpp6
3 files changed, 10 insertions, 6 deletions
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 849fe15e1..067d9119f 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -199,7 +199,7 @@ void CharServerHandler::processCharCreateFailed(Net::MessageIn &msg)
break;
}
// TRANSLATORS: error message header
- new OkDialog(_("Error"), errorMessage, DIALOG_ERROR);
+ new OkDialog(_("Error"), errorMessage, DialogType::ERROR);
if (mCharCreateDialog)
mCharCreateDialog->unlock();
BLOCK_END("CharServerHandler::processCharCreateFailed")
@@ -223,7 +223,8 @@ void CharServerHandler::processCharDeleteFailed(Net::MessageIn &msg A_UNUSED)
BLOCK_START("CharServerHandler::processCharDeleteFailed")
unlockCharSelectDialog();
// TRANSLATORS: error message
- new OkDialog(_("Error"), _("Failed to delete character."), DIALOG_ERROR);
+ new OkDialog(_("Error"), _("Failed to delete character."),
+ DialogType::ERROR);
BLOCK_END("CharServerHandler::processCharDeleteFailed")
}
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index b0be76ac6..3d7da6247 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -85,7 +85,10 @@ void GameHandler::processCharSwitchResponse(Net::MessageIn &msg) const
void GameHandler::processMapQuitResponse(Net::MessageIn &msg) const
{
if (msg.readInt8())
- new OkDialog(_("Game"), _("Request to quit denied!"), DIALOG_ERROR);
+ {
+ new OkDialog(_("Game"), _("Request to quit denied!"),
+ DialogType::ERROR);
+ }
}
void GameHandler::clear()
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index efaee8857..065ac6365 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -305,7 +305,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
// TRANSLATORS: weight message
_("You are carrying more than "
"half your weight. You are "
- "unable to regain health."), DIALOG_OK, false);
+ "unable to regain health."), DialogType::OK, false);
weightNotice->addActionListener(
&weightListener);
}
@@ -317,7 +317,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
// TRANSLATORS: weight message
_("You are carrying less than "
"half your weight. You "
- "can regain health."), DIALOG_OK, false);
+ "can regain health."), DialogType::OK, false);
weightNotice->addActionListener(
&weightListener);
}
@@ -398,7 +398,7 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
{
// TRANSLATORS: message header
deathNotice = new OkDialog(_("Message"),
- DeadDB::getRandomString(), DIALOG_OK, false);
+ DeadDB::getRandomString(), DialogType::OK, false);
deathNotice->addActionListener(&deathListener);
if (player_node->getCurrentAction() != BeingAction::DEAD)
{