diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-07-25 00:56:06 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-07-25 00:56:06 +0000 |
commit | 6ba73b56b72bf53d4976fd1423490e682542b6d2 (patch) | |
tree | 5ab36dd3285df1a8788776f853e530ce34a91c0c /src/account-server | |
parent | 81ed0d28acd85a8af6221ad5c542ad21a075bc2d (diff) | |
download | manaserv-6ba73b56b72bf53d4976fd1423490e682542b6d2.tar.gz manaserv-6ba73b56b72bf53d4976fd1423490e682542b6d2.tar.bz2 manaserv-6ba73b56b72bf53d4976fd1423490e682542b6d2.tar.xz manaserv-6ba73b56b72bf53d4976fd1423490e682542b6d2.zip |
Removed a host of unnecessary methods from ChatChannelManager.
Diffstat (limited to 'src/account-server')
-rw-r--r-- | src/account-server/dalstorage.cpp | 21 | ||||
-rw-r--r-- | src/account-server/serverhandler.cpp | 39 |
2 files changed, 34 insertions, 26 deletions
diff --git a/src/account-server/dalstorage.cpp b/src/account-server/dalstorage.cpp index 01b6ea6d..a4506846 100644 --- a/src/account-server/dalstorage.cpp +++ b/src/account-server/dalstorage.cpp @@ -718,16 +718,19 @@ DALStorage::getChannelList() return channels; } - for ( unsigned int i = 0; i < channelInfo.rows(); ++i) + for (unsigned int i = 0; i < channelInfo.rows(); ++i) { - channels.insert(std::make_pair(toShort(channelInfo(i,0)), - ChatChannel(channelInfo(i,1), - channelInfo(i,2), - channelInfo(i,3), - toBool(channelInfo(i,4))))); - - LOG_DEBUG("Channel (" << channelInfo(i,0) << ") loaded: " << channelInfo(i,1) - << ": " << channelInfo(i,2)); + short channelId = toShort(channelInfo(i, 0)); + channels.insert( + std::make_pair(channelId, + ChatChannel(channelId, + channelInfo(i, 1), + channelInfo(i, 2), + channelInfo(i, 3), + toBool(channelInfo(i, 4))))); + + LOG_DEBUG("Channel (" << channelId << ") loaded: " + << channelInfo(i, 1) << ": " << channelInfo(i, 2)); } return channels; diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp index ad6bb446..5ef3403d 100644 --- a/src/account-server/serverhandler.cpp +++ b/src/account-server/serverhandler.cpp @@ -364,31 +364,35 @@ void ServerHandler::processMessage(NetComputer *comp, MessageIn &msg) comp->send(result); } -void ServerHandler::enterChannel(const std::string &name, CharacterData *player) +void ServerHandler::enterChannel(const std::string &name, + CharacterData *player) { MessageOut result(CPMSG_ENTER_CHANNEL_RESPONSE); + short channelId = chatChannelManager->getChannelId(name); - if (!chatChannelManager->channelExists(channelId)) + ChatChannel *channel = chatChannelManager->getChannel(channelId); + + if (!channel) { // Channel doesn't exist yet so create one - channelId = chatChannelManager->registerPrivateChannel( - name, - "Guild Channel", - ""); + channelId = chatChannelManager->registerPrivateChannel(name, + "Guild Channel", + ""); + channel = chatChannelManager->getChannel(channelId); } - if (chatChannelManager->addUserInChannel(player->getName(), channelId)) + if (channel && channel->addUser(player->getName())) { result.writeByte(ERRMSG_OK); - // The user entered the channel, now give him the channel id, the announcement string - // and the user list. + // The user entered the channel, now give him the channel id, the + // announcement string and the user list. result.writeShort(channelId); result.writeString(name); - result.writeString(chatChannelManager->getChannelAnnouncement(channelId)); - std::vector< std::string > const &userList = - chatChannelManager->getUserListInChannel(channelId); - for (std::vector< std::string >::const_iterator i = userList.begin(), + result.writeString(channel->getAnnouncement()); + const ChatChannel::ChannelUsers &userList = channel->getUserList(); + + for (ChatChannel::ChannelUsers::const_iterator i = userList.begin(), i_end = userList.end(); i != i_end; ++i) { @@ -397,16 +401,17 @@ void ServerHandler::enterChannel(const std::string &name, CharacterData *player) // Send an CPMSG_UPDATE_CHANNEL to warn other clients a user went // in the channel. - chatHandler->warnUsersAboutPlayerEventInChat(channelId, - player->getName(), - CHAT_EVENT_NEW_PLAYER); + chatHandler->warnUsersAboutPlayerEventInChat(channel, + player->getName(), + CHAT_EVENT_NEW_PLAYER); } chatHandler->sendGuildEnterChannel(result, player->getName()); } -void ServerHandler::sendInvite(const std::string &invitedName, const std::string &inviterName, +void ServerHandler::sendInvite(const std::string &invitedName, + const std::string &inviterName, const std::string &guildName) { // TODO: Separate account and chat server |