diff options
| -rw-r--r-- | src/gui/windows/charselectdialog.cpp | 6 | ||||
| -rw-r--r-- | src/net/eathena/loginrecv.cpp | 4 | ||||
| -rw-r--r-- | src/net/logindata.h | 3 | ||||
| -rw-r--r-- | src/net/tmwa/loginrecv.cpp | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 39112dfd2..77e224f7a 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -62,9 +62,9 @@ static const int SLOTS_PER_ROW = 5; CharSelectDialog::CharSelectDialog(LoginData &data) : - // TRANSLATORS: char select dialog name - Window(strprintf(_("Account %s (last login time %s)"), - data.username.c_str(), data.lastLogin.c_str()), + Window( + // TRANSLATORS: char select dialog name + strprintf(_("Account %s"), data.username.c_str()), Modal_false, nullptr, "char.xml"), diff --git a/src/net/eathena/loginrecv.cpp b/src/net/eathena/loginrecv.cpp index 41af09fa8..c387bd0c0 100644 --- a/src/net/eathena/loginrecv.cpp +++ b/src/net/eathena/loginrecv.cpp @@ -264,8 +264,10 @@ void LoginRecv::processLoginData(Net::MessageIn &msg) Ea::LoginRecv::mToken.session_ID1 = msg.readInt32("session id1"); Ea::LoginRecv::mToken.account_ID = msg.readBeingId("accound id"); Ea::LoginRecv::mToken.session_ID2 = msg.readInt32("session id2"); + // old IP and last login(time) fields have been removed from both TMWA + // and hercules over a decade ago. msg.readInt32("old ip"); - loginData.lastLogin = msg.readString(24, "last login"); + msg.readString(24, "last login"); msg.readInt16("unused"); // reserve bits for future usage diff --git a/src/net/logindata.h b/src/net/logindata.h index 0c1cd51fd..aa568fa3d 100644 --- a/src/net/logindata.h +++ b/src/net/logindata.h @@ -41,7 +41,6 @@ class LoginData final newPassword(), updateHost(), updateHosts(), - lastLogin(), updateType(UpdateType::Normal), email(), captchaResponse(), @@ -61,7 +60,6 @@ class LoginData final std::string newPassword; std::string updateHost; StringVect updateHosts; - std::string lastLogin; UpdateTypeT updateType; std::string email; @@ -89,7 +87,6 @@ class LoginData final registerUrl.clear(); gender = Gender::UNSPECIFIED; packetVersion = 0; - lastLogin.clear(); resetCharacterSlots(); } diff --git a/src/net/tmwa/loginrecv.cpp b/src/net/tmwa/loginrecv.cpp index 41b662bb4..a11888b9d 100644 --- a/src/net/tmwa/loginrecv.cpp +++ b/src/net/tmwa/loginrecv.cpp @@ -146,8 +146,10 @@ void LoginRecv::processLoginData(Net::MessageIn &msg) Ea::LoginRecv::mToken.session_ID1 = msg.readInt32("session id1"); Ea::LoginRecv::mToken.account_ID = msg.readBeingId("accound id"); Ea::LoginRecv::mToken.session_ID2 = msg.readInt32("session id2"); + // old IP and last login(time) fields have been removed from both TMWA + // and hercules over a decade ago. msg.readInt32("old ip"); - loginData.lastLogin = msg.readString(24, "last login"); + msg.readString(24, "last login"); msg.readInt16("unused"); // reserve bits for future usage |