diff --git a/server/imserver/chatmgr.cc b/server/imserver/chatmgr.cc index c20eb39..9d25694 100644 --- a/server/imserver/chatmgr.cc +++ b/server/imserver/chatmgr.cc @@ -144,6 +144,21 @@ void ChatMgr::ProcGuildChat(Player* hum, const cs::CMSendChatMsg& msg) } } +void ChatMgr::ProcTeamChat(Player* hum, const cs::CMSendChatMsg& msg) +{ + +} + +void ChatMgr::ProcBigHornChat(Player* hum, const cs::CMSendChatMsg& msg) +{ + +} + +void ChatMgr::ProcLoopMsgChat(Player* hum, const cs::CMSendChatMsg& msg) +{ + +} + ChatedUserRec* ChatMgr::GetChatedUser(const std::string& account_id) { auto itr = private_chated_users_.find(account_id); diff --git a/server/imserver/chatmgr.h b/server/imserver/chatmgr.h index da6ecb5..29008e6 100644 --- a/server/imserver/chatmgr.h +++ b/server/imserver/chatmgr.h @@ -50,6 +50,9 @@ class ChatMgr : public a8::Singleton void ProcWorldChat(Player* hum, const cs::CMSendChatMsg& msg); void ProcPrivateChat(Player* hum, const cs::CMSendChatMsg& msg); void ProcGuildChat(Player* hum, const cs::CMSendChatMsg& msg); + void ProcTeamChat(Player* hum, const cs::CMSendChatMsg& msg); + void ProcBigHornChat(Player* hum, const cs::CMSendChatMsg& msg); + void ProcLoopMsgChat(Player* hum, const cs::CMSendChatMsg& msg); void SyncWorldChatMsg(Player* hum); void SyncPrivateChatMsg(Player* hum); @@ -68,4 +71,7 @@ class ChatMgr : public a8::Singleton std::map guild_msgrec_; std::map private_msg_hash_; std::map private_chated_users_; + std::map team_msg_hash_; + ChatMsgRec bighorn_msgrec_; + ChatMsgRec loop_msgrec_; }; diff --git a/server/imserver/player.cc b/server/imserver/player.cc index b944dbc..cf8afb6 100644 --- a/server/imserver/player.cc +++ b/server/imserver/player.cc @@ -576,6 +576,15 @@ void Player::_CMSendChatMsg(f8::MsgHdr& hdr, const cs::CMSendChatMsg& msg) case kCCGuild: ChatMgr::Instance()->ProcGuildChat(this, msg); break; + case kCCTeam: + ChatMgr::Instance()->ProcTeamChat(this, msg); + break; + case kCCBigHorn: + ChatMgr::Instance()->ProcBigHornChat(this, msg); + break; + case kCCLoopMsg: + ChatMgr::Instance()->ProcLoopMsgChat(this, msg); + break; default: return; } @@ -2329,7 +2338,7 @@ void Player::SyncGuildNewApply(long long guild_id) bool Player::IsValidChatChannel(int chat_channel) { - if (chat_channel >= kCCWorld && chat_channel <= kCCGuild) { + if (chat_channel > kCCBegin && chat_channel < kCCEnd) { return true; } else { return false;