summaryrefslogtreecommitdiff
path: root/src/net/manaserv
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/manaserv')
-rw-r--r--src/net/manaserv/loginhandler.cpp4
-rw-r--r--src/net/manaserv/protocol.h4
2 files changed, 3 insertions, 5 deletions
diff --git a/src/net/manaserv/loginhandler.cpp b/src/net/manaserv/loginhandler.cpp
index 1cb9baff..34202411 100644
--- a/src/net/manaserv/loginhandler.cpp
+++ b/src/net/manaserv/loginhandler.cpp
@@ -216,8 +216,6 @@ void LoginHandler::handleMessage(Net::MessageIn &msg)
{
mMinUserNameLength = msg.readInt8();
mMaxUserNameLength = msg.readInt8();
- msg.readInt8();
- msg.readInt8();
std::string captchaURL = msg.readString();
std::string captchaInstructions = msg.readString();
@@ -300,7 +298,7 @@ void LoginHandler::handleRegisterResponse(Net::MessageIn &msg)
case REGISTER_EXISTS_EMAIL:
errorMessage = _("Email address already exists.");
break;
- case REGISTER_FAILED_CAPTCHA:
+ case REGISTER_CAPTCHA_WRONG:
errorMessage = _("You took too long with the captcha or your "
"response was incorrect.");
break;
diff --git a/src/net/manaserv/protocol.h b/src/net/manaserv/protocol.h
index fe38f35c..c0add694 100644
--- a/src/net/manaserv/protocol.h
+++ b/src/net/manaserv/protocol.h
@@ -45,7 +45,7 @@ enum {
PAMSG_UNREGISTER = 0x0003, // -
APMSG_UNREGISTER_RESPONSE = 0x0004, // B error
PAMSG_REQUEST_REGISTER_INFO = 0x0005, //
- APMSG_REGISTER_INFO_RESPONSE = 0x0006, // B byte registrationAllowed, byte minEmailLength, byte maxEmailLength, byte minNameLength, byte maxNameLength, byte minPasswordLength, byte maxPasswordLength, string captchaURL, string captchaInstructions
+ APMSG_REGISTER_INFO_RESPONSE = 0x0006, // B byte registrationAllowed, byte minNameLength, byte maxNameLength, string captchaURL, string captchaInstructions
PAMSG_LOGIN = 0x0010, // L version, S username, S password
APMSG_LOGIN_RESPONSE = 0x0012, // B error [, S updatehost]
PAMSG_LOGOUT = 0x0013, // -
@@ -241,7 +241,7 @@ enum {
REGISTER_INVALID_VERSION = 0x40, // the user is using an incompatible protocol
REGISTER_EXISTS_USERNAME, // there already is an account with this username
REGISTER_EXISTS_EMAIL, // there already is an account with this email address
- REGISTER_FAILED_CAPTCHA // captcha respose is bad
+ REGISTER_CAPTCHA_WRONG // user didn't solve the captcha correctly
};
// Character creation specific return values