summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2006-07-26 07:12:55 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2006-07-26 07:12:55 +0000
commit285b40d1cb768e235aed894f4704e1013cb054ea (patch)
treea63200f641967c6381154693f39d1ae59f209d0b /src
parent3a0d4dbc71e4db8c999e3511c3c9a9182ab27395 (diff)
downloadmanaserv-285b40d1cb768e235aed894f4704e1013cb054ea.tar.gz
manaserv-285b40d1cb768e235aed894f4704e1013cb054ea.tar.bz2
manaserv-285b40d1cb768e235aed894f4704e1013cb054ea.tar.xz
manaserv-285b40d1cb768e235aed894f4704e1013cb054ea.zip
Send some character's infos after a successful login, removed a useless byte, added Code::Blocks project file.
Diffstat (limited to 'src')
-rw-r--r--src/accounthandler.cpp19
-rw-r--r--src/client.cpp9
2 files changed, 16 insertions, 12 deletions
diff --git a/src/accounthandler.cpp b/src/accounthandler.cpp
index 7d49c3df..885fd7ff 100644
--- a/src/accounthandler.cpp
+++ b/src/accounthandler.cpp
@@ -224,15 +224,15 @@ void AccountHandler::processMessage(NetComputer *comp, MessageIn &message)
result.writeByte(chars.size());
LOG_INFO(username << "'s account has " << chars.size() << " character(s).", 1);
- std::string charNames = "";
for (unsigned int i = 0; i < chars.size(); i++)
{
result.writeString(chars[i]->getName());
- if (i >0) charNames += ", ";
- charNames += chars[i]->getName();
+ result.writeByte(unsigned(short(chars[i]->getGender())));
+ result.writeByte(chars[i]->getHairStyle());
+ result.writeByte(chars[i]->getHairColor());
+ result.writeByte(chars[i]->getLevel());
+ result.writeShort(chars[i]->getMoney());
}
- charNames += ".";
- LOG_INFO(charNames.c_str(), 1);
}
break;
@@ -445,7 +445,7 @@ void AccountHandler::processMessage(NetComputer *comp, MessageIn &message)
newPassword.length() > MAX_PASSWORD_LENGTH )
{
result.writeByte(ERRMSG_INVALID_ARGUMENT);
- LOG_INFO(computer.getAccount()->getName() <<
+ LOG_INFO(computer.getAccount()->getName() <<
": New password too long or too short.", 1);
}
else if (stringFilter->findDoubleQuotes(newPassword))
@@ -456,14 +456,14 @@ void AccountHandler::processMessage(NetComputer *comp, MessageIn &message)
else if ( oldPassword != computer.getAccount()->getPassword() )
{
result.writeByte(ERRMSG_FAILURE);
- LOG_INFO(computer.getAccount()->getName() <<
+ LOG_INFO(computer.getAccount()->getName() <<
": Old password is wrong.", 1);
}
else
{
computer.getAccount()->setPassword(newPassword);
result.writeByte(ERRMSG_OK);
- LOG_INFO(computer.getAccount()->getName() <<
+ LOG_INFO(computer.getAccount()->getName() <<
": The password was changed.", 1);
}
}
@@ -627,7 +627,7 @@ void AccountHandler::processMessage(NetComputer *comp, MessageIn &message)
(int)config.getValue("startY", 0));
computer.getAccount()->addCharacter(newCharacter);
- LOG_INFO("Character " << name << " was created for "
+ LOG_INFO("Character " << name << " was created for "
<< computer.getAccount()->getName() << "'s account.", 1);
store.flush(); // flush changes
@@ -738,7 +738,6 @@ void AccountHandler::processMessage(NetComputer *comp, MessageIn &message)
std::string mapName;
for (unsigned int i = 0; i < chars.size(); i++)
{
- result.writeByte(i);
result.writeString(chars[i]->getName());
if (i > 0) charStats += ", ";
charStats += chars[i]->getName();
diff --git a/src/client.cpp b/src/client.cpp
index 4ee33385..34a050ab 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -446,7 +446,13 @@ void parsePacket(char *data, int recvLength) {
std::cout << "Account has " << int(charNumber) << " characters." << std::endl;
for (unsigned int i = 0; i < charNumber; i++) {
if (i >0) std::cout << ", ";
+ // Write name, ignore other values
std::cout << msg.readString();
+ msg.readByte();
+ msg.readByte();
+ msg.readByte();
+ msg.readByte();
+ msg.readShort();
}
std::cout << "." << std::endl;
break;
@@ -636,8 +642,7 @@ void parsePacket(char *data, int recvLength) {
<< std::endl;
char charID;
for (unsigned int i = 0; i < charNumber; i++) {
- charID = msg.readByte();
- std::cout << int(charID) << ". "
+ std::cout << int(i) << ". "
<< msg.readString() << ":" << std::endl;
std::cout << "Gender: " << int(msg.readByte()) << ", ";
std::cout << "Hair Style: " << int(msg.readByte()) << ", ";