Merge branch 'outpost_refactoring'

feature/prepare-cross-merge
Nuno 4 years ago committed by kaetemi
parent 4401db3dc7
commit 9b475fde60
No known key found for this signature in database
GPG Key ID: 9873C4D40BB479BC

@ -2028,7 +2028,7 @@ void CChatManager::sendChat( CChatGroup::TGroupType senderChatMode, const TDataS
void CChatManager::sendFarChat(const string &name, const ucstring& ucstr, const string &chan)
{
const TChanID *chanId = _ChanNames.getA(chan);
if (chanId || chan == "universe")
if (chanId || chan == "universe" || chan.substr(0, 6) == "guild:")
{
string usedlang = "";
@ -2090,6 +2090,12 @@ void CChatManager::sendFarChat(const string &name, const ucstring& ucstr, const
TGroupId grpId = CEntityId(RYZOMID::chatGroup, 0);
farChatInGroup(grpId, 0, ucstr, ucstring("~")+ucstring(name));
}
else if (chan.substr(0, 6) == "guild:")
{
TGroupId groupId = CEntityId::Unknown;
groupId.fromString(chan.substr(6).c_str());
farChatInGroup(groupId, 0, ucstr, ucstring("~")+ucstring(name));
}
else
{

Loading…
Cancel
Save