diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-18 12:18:44 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-18 14:52:11 +0300 |
| commit | bb9ed14fc1bf7dc20f1e951e67bb359c273033a3 (patch) | |
| tree | c46e7e5708d3a2058233a41a08995e6c861703ea /src/net/ea | |
| parent | 10273bc94e90fefcfe3fc215aaaaafe7e0e96bd4 (diff) | |
| download | plus-bb9ed14fc1bf7dc20f1e951e67bb359c273033a3.tar.gz plus-bb9ed14fc1bf7dc20f1e951e67bb359c273033a3.tar.bz2 plus-bb9ed14fc1bf7dc20f1e951e67bb359c273033a3.tar.xz plus-bb9ed14fc1bf7dc20f1e951e67bb359c273033a3.zip | |
fix code style.
Diffstat (limited to 'src/net/ea')
| -rw-r--r-- | src/net/ea/beinghandler.cpp | 8 | ||||
| -rw-r--r-- | src/net/ea/chathandler.cpp | 10 | ||||
| -rw-r--r-- | src/net/ea/loginhandler.cpp | 8 | ||||
| -rw-r--r-- | src/net/ea/token.h | 4 |
4 files changed, 16 insertions, 14 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp index c983cfd9d..8366d1dc4 100644 --- a/src/net/ea/beinghandler.cpp +++ b/src/net/ea/beinghandler.cpp @@ -280,16 +280,16 @@ void BeingHandler::processBeingVisibleOrMove(Net::MessageIn &msg, switch (gender) { case 2: - dstBeing->setGender(GENDER_FEMALE); + dstBeing->setGender(Gender::FEMALE); break; case 3: - dstBeing->setGender(GENDER_MALE); + dstBeing->setGender(Gender::MALE); break; case 4: - dstBeing->setGender(GENDER_OTHER); + dstBeing->setGender(Gender::OTHER); break; default: - dstBeing->setGender(GENDER_UNSPECIFIED); + dstBeing->setGender(Gender::UNSPECIFIED); break; } } diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp index c880de0f6..40dc15a15 100644 --- a/src/net/ea/chathandler.cpp +++ b/src/net/ea/chathandler.cpp @@ -106,8 +106,9 @@ void ChatHandler::processWhisperResponse(Net::MessageIn &msg) { chatWindow->addWhisper(nick, // TRANSLATORS: chat message - strprintf(_("Whisper could not be " - "sent, %s is offline."), nick.c_str()), ChatMsgType::BY_SERVER); + strprintf(_("Whisper could not be sent, %s is offline."), + nick.c_str()), + ChatMsgType::BY_SERVER); } break; case 0x02: @@ -328,8 +329,9 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg, if (player_relations.checkPermissionSilently(sender_name, PlayerRelation::SPEECH_LOG) && chatWindow) { - allow = chatWindow->resortChatLog(removeColors(sender_name) - .append(" : ").append(chatMsg), ChatMsgType::BY_OTHER, channel, false, true); + allow = chatWindow->resortChatLog( + removeColors(sender_name).append(" : ").append(chatMsg), + ChatMsgType::BY_OTHER, channel, false, true); } if (allow && player_relations.hasPermission(sender_name, diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp index 25ad6d916..c53cdb773 100644 --- a/src/net/ea/loginhandler.cpp +++ b/src/net/ea/loginhandler.cpp @@ -102,16 +102,16 @@ void LoginHandler::registerAccount(const LoginData *const loginData1) const std::string username = loginData1->username; switch (loginData1->gender) { - case GENDER_FEMALE: + case Gender::FEMALE: username.append("_F"); break; - case GENDER_MALE: + case Gender::MALE: username.append("_M"); break; - case GENDER_OTHER: + case Gender::OTHER: username.append("_O"); break; - case GENDER_UNSPECIFIED: + case Gender::UNSPECIFIED: default: break; } diff --git a/src/net/ea/token.h b/src/net/ea/token.h index dadc341c7..35aadd02c 100644 --- a/src/net/ea/token.h +++ b/src/net/ea/token.h @@ -30,14 +30,14 @@ struct Token int account_ID; int session_ID1; int session_ID2; - Gender sex; + Gender::Type sex; void clear() { account_ID = 0; session_ID1 = 0; session_ID2 = 0; - sex = GENDER_UNSPECIFIED; + sex = Gender::UNSPECIFIED; } }; |