From a5c3439bd5f07921fd46913184281092051faf86 Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Sat, 21 Jan 2006 00:04:20 +0000 Subject: Very little corrections. --- ChangeLog | 2 ++ src/accounthandler.cpp | 9 ++++++--- src/client.cpp | 19 ++++++++++++++----- src/dalstorage.cpp | 8 ++------ src/defines.h | 1 + 5 files changed, 25 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index c83a4b9b..734b3823 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-01-21 Yohann Ferreira + * src/accounthandler.cpp, src/client.cpp, src/defines.h, + src/dalstorage.cpp: Very little corrections. * src/chatchannelmanager.h, src/chatchannelmanager.cpp, src/chatchannel.h, src/chatchannel.cpp, src/dalstorage.cpp, src/dalstorage.h, src/storage.h, src/chathandler.cpp, diff --git a/src/accounthandler.cpp b/src/accounthandler.cpp index 6aa66018..ccd79a4a 100644 --- a/src/accounthandler.cpp +++ b/src/accounthandler.cpp @@ -544,16 +544,18 @@ void AccountHandler::receiveMessage(NetComputer &computer, MessageIn &message) } // set character + // TODO: Handle reset character's map when the server can't load + // it. And SELECT_NO_MAPS error return value when the default map couldn't + // be loaded in setCharacter(). Not implemented yet for tests purpose... computer.setCharacter(chars[charNum]); tmwserv::BeingPtr selectedChar = computer.getCharacter(); - int mapId = selectedChar->getMapId(); result.writeByte(SELECT_OK); - std::string mapName = store.getMapNameFromId(mapId); + std::string mapName = store.getMapNameFromId(selectedChar->getMapId()); result.writeString(mapName); result.writeShort(selectedChar->getX()); result.writeShort(selectedChar->getY()); LOG_INFO("Selected Character " << int(charNum) - << " : " << + << ": " << selectedChar->getName(), 1); } break; @@ -628,6 +630,7 @@ void AccountHandler::receiveMessage(NetComputer &computer, MessageIn &message) std::string charStats = ""; 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 d5e7f1fe..a58cd3d9 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -582,9 +582,11 @@ int main(int argc, char *argv[]) { case SELECT_OK: { - std::cout << "Character selected: "; - std::cout << msg.readString() << " ("; - std::cout << (int)msg.readShort() << ","; + std::cout << "Character selected successfully."; + std::cout << std::endl; + std::cout << "Current Map: "; + std::cout << msg.readString() << " (X:"; + std::cout << (int)msg.readShort() << ", Y:"; std::cout << (int)msg.readShort() << ")" << std::endl; } break; @@ -598,6 +600,10 @@ int main(int argc, char *argv[]) case SELECT_NO_CHARACTERS: std::cout << "Character Selection: No character to select." << std::endl; break; + case SELECT_NO_MAPS: + std::cout << "Character Selection: Can't load default map for character." + << std::endl; + break; default: case SELECT_UNKNOWN: std::cout << "Character Selection: Unknown error." << std::endl; @@ -615,11 +621,14 @@ int main(int argc, char *argv[]) charNumber = msg.readByte(); std::cout << "Character List:" << std::endl << "---------------" << std::endl; - std::cout << int(charNumber) << " characters in the account." + std::cout << int(charNumber) << " character(s) in the account." << std::endl; + char charID; for (unsigned int i = 0; i < charNumber; i++) { - std::cout << msg.readString() << ":" << std::endl; + charID = msg.readByte(); + std::cout << int(charID) << ". " + << msg.readString() << ":" << std::endl; std::cout << "Gender: " << int(msg.readByte()) << ", "; std::cout << "Hair Style: " << int(msg.readByte()) << ", "; std::cout << "Hair Color: " << int(msg.readByte()) << ", " diff --git a/src/dalstorage.cpp b/src/dalstorage.cpp index 4fb245fd..fa2c4920 100644 --- a/src/dalstorage.cpp +++ b/src/dalstorage.cpp @@ -544,10 +544,6 @@ DALStorage::getChannelList() return channels; } - // We use this to handle correctly empty lines - std::string channelName; - std::string channelAnnouncement; - std::string channelPassword; for ( unsigned int i = 0; i < channelInfo.rows(); ++i) { channels.insert(std::make_pair(toShort(channelInfo(0,0)), @@ -588,8 +584,8 @@ DALStorage::updateChannels(std::map& channelList) mDb->execSql(sql.str()); - // TODO: See if ' don't make the SQL query fail. - for ( std::map::iterator i = channelList.begin(); + //TODO: See if the ' don't make the SQL queries fail. + for (std::map::iterator i = channelList.begin(); i != channelList.end();) { // insert registered channel if id < MAX_PUBLIC_CHANNELS_RANGE; diff --git a/src/defines.h b/src/defines.h index 41ac64a8..7c5d1ca7 100644 --- a/src/defines.h +++ b/src/defines.h @@ -244,6 +244,7 @@ enum { SELECT_INVALID, SELECT_NO_CHARACTERS, SELECT_NOLOGIN, + SELECT_NO_MAPS, SELECT_UNKNOWN }; -- cgit v1.2.3-60-g2f50