From b3d17866a3c5700b52c2b0b954fce132a52c1dbf Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 16 Nov 2015 22:35:17 +0300 Subject: Convert State enum into strong typed. --- src/net/ea/charserverrecv.cpp | 2 +- src/net/ea/gamerecv.cpp | 2 +- src/net/ea/loginhandler.cpp | 4 ++-- src/net/ea/loginrecv.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/net/ea') diff --git a/src/net/ea/charserverrecv.cpp b/src/net/ea/charserverrecv.cpp index 7b04c05b0..e3b0a0ffd 100644 --- a/src/net/ea/charserverrecv.cpp +++ b/src/net/ea/charserverrecv.cpp @@ -59,7 +59,7 @@ void CharServerRecv::processCharLoginError(Net::MessageIn &msg) errorMessage = _("Unknown char-server failure."); break; } - client->setState(STATE_ERROR); + client->setState(State::ERROR); BLOCK_END("CharServerRecv::processCharLoginError") } diff --git a/src/net/ea/gamerecv.cpp b/src/net/ea/gamerecv.cpp index 3a85e54a9..8689345e9 100644 --- a/src/net/ea/gamerecv.cpp +++ b/src/net/ea/gamerecv.cpp @@ -55,7 +55,7 @@ void GameRecv::processWhoAnswer(Net::MessageIn &msg) void GameRecv::processCharSwitchResponse(Net::MessageIn &msg) { if (msg.readUInt8("response")) - client->setState(STATE_SWITCH_CHARACTER); + client->setState(State::SWITCH_CHARACTER); } void GameRecv::processMapQuitResponse(Net::MessageIn &msg) diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index bf3621c53..581cb6713 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -61,7 +61,7 @@ bool LoginHandler::isRegistrationEnabled() const void LoginHandler::getRegistrationDetails() const { // Not supported, so move on - client->setState(STATE_REGISTER); + client->setState(State::REGISTER); } void LoginHandler::loginAccount(LoginData *const loginData1) const @@ -97,7 +97,7 @@ void LoginHandler::chooseServer(const unsigned int server, charServer->port = LoginRecv::mWorlds[server]->port; } - client->setState(STATE_UPDATE); + client->setState(State::UPDATE); } void LoginHandler::registerAccount(const LoginData *const loginData1) const diff --git a/src/net/ea/loginrecv.cpp b/src/net/ea/loginrecv.cpp index 37cc96b8b..7a0cff90b 100644 --- a/src/net/ea/loginrecv.cpp +++ b/src/net/ea/loginrecv.cpp @@ -103,7 +103,7 @@ void LoginRecv::processLoginData(Net::MessageIn &msg) mWorlds.push_back(world); } - client->setState(STATE_WORLD_SELECT); + client->setState(State::WORLD_SELECT); } void LoginRecv::processLoginError(Net::MessageIn &msg) @@ -171,7 +171,7 @@ void LoginRecv::processLoginError(Net::MessageIn &msg) errorMessage = _("Unknown error."); break; } - client->setState(STATE_ERROR); + client->setState(State::ERROR); } } // namespace Ea -- cgit v1.2.3-60-g2f50