From 460468224ed9bd4ffe9912841c60540e12109143 Mon Sep 17 00:00:00 2001 From: regneq Date: Sun, 14 Jul 2019 20:03:30 -0700 Subject: [PATCH] various changed to chatchannel and using language / language skills derived from takp code. --- common/eq_constants.h | 21 ++++++++++++ common/servertalk.h | 5 ++- world/zoneserver.cpp | 7 ++-- zone/client.cpp | 75 ++++++++++++++++++++++-------------------- zone/client.h | 1 - zone/client_packet.cpp | 7 +++- zone/command.cpp | 2 +- zone/entity.cpp | 30 +++++------------ zone/entity.h | 3 +- zone/groups.cpp | 4 +-- zone/net.cpp | 2 +- zone/raids.cpp | 10 ++++-- zone/raids.h | 4 +-- zone/worldserver.cpp | 31 ++++++++++------- zone/worldserver.h | 2 +- 15 files changed, 116 insertions(+), 88 deletions(-) diff --git a/common/eq_constants.h b/common/eq_constants.h index d20bfdf4a..faa0ab247 100644 --- a/common/eq_constants.h +++ b/common/eq_constants.h @@ -523,4 +523,25 @@ static const uint8 SkillDamageTypes[EQEmu::skills::HIGHEST_SKILL + 1] = // chang static const uint32 MAX_SPELL_DB_ID_VAL = 65535; +enum ChatChannelNames : uint16 +{ + ChatChannel_Guild = 0, + ChatChannel_Group = 2, + ChatChannel_Shout = 3, + ChatChannel_Auction = 4, + ChatChannel_OOC = 5, + ChatChannel_Broadcast = 6, + ChatChannel_Tell = 7, + ChatChannel_Say = 8, + ChatChannel_Petition = 10, + ChatChannel_GMSAY = 11, + ChatChannel_TellEcho = 14, + ChatChannel_Raid = 15, + + ChatChannel_UNKNOWN_Guild = 17, + ChatChannel_UNKNOWN_GMSAY = 18, + ChatChannel_UCSRelay = 20, + ChatChannel_Emotes = 22 +}; + #endif /*COMMON_EQ_CONSTANTS_H*/ diff --git a/common/servertalk.h b/common/servertalk.h index c5cd149d7..94eece8ca 100644 --- a/common/servertalk.h +++ b/common/servertalk.h @@ -352,7 +352,8 @@ struct ServerChannelMessage_Struct { bool noreply; uint16 chan_num; uint32 guilddbid; - uint16 language; + uint8 language; + uint8 lang_skill; uint8 queued; // 0 = not queued, 1 = queued, 2 = queue full, 3 = offline char message[0]; }; @@ -865,6 +866,8 @@ struct ServerRaidGroupAction_Struct { //add / remove depends on opcode. struct ServerRaidMessage_Struct { uint32 rid; uint32 gid; + uint8 language; + uint8 lang_skill; char from[64]; char message[0]; }; diff --git a/world/zoneserver.cpp b/world/zoneserver.cpp index f3c6aebfc..0d0ba2f5d 100644 --- a/world/zoneserver.cpp +++ b/world/zoneserver.cpp @@ -409,12 +409,12 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) { if (pack->size < sizeof(ServerChannelMessage_Struct)) break; ServerChannelMessage_Struct* scm = (ServerChannelMessage_Struct*)pack->pBuffer; - if (scm->chan_num == 20) + if (scm->chan_num == ChatChannel_UCSRelay) { UCSLink.SendMessage(scm->from, scm->message); break; } - if (scm->chan_num == 7 || scm->chan_num == 14) { + if (scm->chan_num == ChatChannel_Tell || scm->chan_num == ChatChannel_TellEcho) { if (scm->deliverto[0] == '*') { if (console) { @@ -486,7 +486,8 @@ void ZoneServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) { cle->Server()->SendPacket(pack); } else { - if (scm->chan_num == 5 || scm->chan_num == 6 || scm->chan_num == 11) { + if (scm->chan_num == ChatChannel_OOC || scm->chan_num == ChatChannel_Broadcast + || scm->chan_num == ChatChannel_GMSAY) { if (console) { console->SendChannelMessage(scm, [&scm]() { auto pack = new ServerPacket(ServerOP_ChannelMessage, diff --git a/zone/client.cpp b/zone/client.cpp index 2d126598f..fd2df48bc 100644 --- a/zone/client.cpp +++ b/zone/client.cpp @@ -823,7 +823,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s { if(strcmp(targetname, "discard") != 0) { - if(chan_num == 3 || chan_num == 4 || chan_num == 5 || chan_num == 7) + if(chan_num == ChatChannel_Shout || chan_num == ChatChannel_Auction || chan_num == ChatChannel_OOC || chan_num == ChatChannel_Tell) { if(GlobalChatLimiterTimer) { @@ -869,7 +869,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s auto pack = new ServerPacket(ServerOP_Speech, sizeof(Server_Speech_Struct) + strlen(message) + 1); Server_Speech_Struct* sem = (Server_Speech_Struct*) pack->pBuffer; - if(chan_num == 0) + if(chan_num == ChatChannel_Guild) sem->guilddbid = GuildID(); else sem->guilddbid = 0; @@ -892,30 +892,38 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s if(!mod_client_message(message, chan_num)) { return; } // Garble the message based on drunkness - if (m_pp.intoxication > 0) { + if (m_pp.intoxication > 0 && !(RuleB(Chat, ServerWideOOC) && chan_num == ChatChannel_OOC) && !GetGM()) { GarbleMessage(message, (int)(m_pp.intoxication / 3)); language = 0; // No need for language when drunk + lang_skill = 100; + } + + // some channels don't use languages + if (chan_num == ChatChannel_OOC || chan_num == ChatChannel_GMSAY || chan_num == ChatChannel_Broadcast || chan_num == ChatChannel_Petition) + { + language = 0; + lang_skill = 100; } // Censor the message - if (EQEmu::ProfanityManager::IsCensorshipActive() && (chan_num != 8)) + if (EQEmu::ProfanityManager::IsCensorshipActive() && (chan_num != ChatChannel_Say)) EQEmu::ProfanityManager::RedactMessage(message); switch(chan_num) { - case 0: { /* Guild Chat */ + case ChatChannel_Guild: { /* Guild Chat */ if (!IsInAGuild()) Message_StringID(MT_DefaultText, GUILD_NOT_MEMBER2); //You are not a member of any guild. else if (!guild_mgr.CheckPermission(GuildID(), GuildRank(), GUILD_SPEAK)) Message(0, "Error: You dont have permission to speak to the guild."); - else if (!worldserver.SendChannelMessage(this, targetname, chan_num, GuildID(), language, message)) + else if (!worldserver.SendChannelMessage(this, targetname, chan_num, GuildID(), language, lang_skill, message)) Message(0, "Error: World server disconnected"); break; } - case 2: { /* Group Chat */ + case ChatChannel_Group: { /* Group Chat */ Raid* raid = entity_list.GetRaidByClient(this); if(raid) { - raid->RaidGroupSay((const char*) message, this); + raid->RaidGroupSay((const char*) message, this, language, lang_skill); break; } @@ -925,14 +933,14 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } break; } - case 15: { /* Raid Say */ + case ChatChannel_Raid: { /* Raid Say */ Raid* raid = entity_list.GetRaidByClient(this); if(raid){ - raid->RaidSay((const char*) message, this); + raid->RaidSay((const char*) message, this, language, lang_skill); } break; } - case 3: { /* Shout */ + case ChatChannel_Shout: { /* Shout */ Mob *sender = this; if (GetPet() && GetTarget() == GetPet() && GetPet()->FindType(SE_VoiceGraft)) sender = GetPet(); @@ -940,13 +948,13 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message); break; } - case 4: { /* Auction */ + case ChatChannel_Auction: { /* Auction */ if(RuleB(Chat, ServerWideAuction)) { if(!global_channel_timer.Check()) { if(strlen(targetname) == 0) - ChannelMessageReceived(5, language, lang_skill, message, "discard"); //Fast typer or spammer?? + ChannelMessageReceived(chan_num, language, lang_skill, message, "discard"); //Fast typer or spammer?? else return; } @@ -966,7 +974,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } } - if (!worldserver.SendChannelMessage(this, 0, 4, 0, language, message)) + if (!worldserver.SendChannelMessage(this, 0, chan_num, 0, language, lang_skill, message)) Message(0, "Error: World server disconnected"); } else if(!RuleB(Chat, ServerWideAuction)) { @@ -975,17 +983,17 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s if (GetPet() && GetTarget() == GetPet() && GetPet()->FindType(SE_VoiceGraft)) sender = GetPet(); - entity_list.ChannelMessage(sender, chan_num, language, message); + entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message); } break; } - case 5: { /* OOC */ + case ChatChannel_OOC: { /* OOC */ if(RuleB(Chat, ServerWideOOC)) { if(!global_channel_timer.Check()) { if(strlen(targetname) == 0) - ChannelMessageReceived(5, language, lang_skill, message, "discard"); //Fast typer or spammer?? + ChannelMessageReceived(chan_num, language, lang_skill, message, "discard"); //Fast typer or spammer?? else return; } @@ -1010,7 +1018,7 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } } - if (!worldserver.SendChannelMessage(this, 0, 5, 0, language, message)) + if (!worldserver.SendChannelMessage(this, 0, chan_num, 0, language, lang_skill, message)) { Message(0, "Error: World server disconnected"); } @@ -1022,19 +1030,19 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s if (GetPet() && GetTarget() == GetPet() && GetPet()->FindType(SE_VoiceGraft)) sender = GetPet(); - entity_list.ChannelMessage(sender, chan_num, language, message); + entity_list.ChannelMessage(sender, chan_num, language, lang_skill, message); } break; } - case 6: /* Broadcast */ - case 11: { /* GM Say */ + case ChatChannel_Broadcast: /* Broadcast */ + case ChatChannel_GMSAY: { /* GM Say */ if (!(admin >= 80)) Message(0, "Error: Only GMs can use this channel"); - else if (!worldserver.SendChannelMessage(this, targetname, chan_num, 0, language, message)) + else if (!worldserver.SendChannelMessage(this, targetname, chan_num, 0, language, lang_skill, message)) Message(0, "Error: World server disconnected"); break; } - case 7: { /* Tell */ + case ChatChannel_Tell: { /* Tell */ if(!global_channel_timer.Check()) { if(strlen(targetname) == 0) @@ -1078,11 +1086,11 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s target_name[x] = '\0'; } - if(!worldserver.SendChannelMessage(this, target_name, chan_num, 0, language, message)) + if(!worldserver.SendChannelMessage(this, target_name, chan_num, 0, language, lang_skill, message)) Message(0, "Error: World server disconnected"); break; } - case 8: { /* Say */ + case ChatChannel_Say: { /* Say */ if(message[0] == COMMAND_CHAR) { if(command_dispatch(this, message) == -2) { if(parse->PlayerHasQuestSub(EVENT_COMMAND)) { @@ -1158,14 +1166,14 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } break; } - case 20: + case ChatChannel_UCSRelay: { // UCS Relay for Underfoot and later. - if(!worldserver.SendChannelMessage(this, 0, chan_num, 0, language, message)) + if(!worldserver.SendChannelMessage(this, 0, chan_num, 0, language, lang_skill, message)) Message(0, "Error: World server disconnected"); break; } - case 22: + case ChatChannel_Emotes: { // Emotes for Underfoot and later. // crash protection -- cheater @@ -1189,11 +1197,6 @@ void Client::ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_s } } -// if no language skill is specified, call the function with a skill of 100. -void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num, uint8 language, const char* message, ...) { - ChannelMessageSend(from, to, chan_num, language, 100, message); -} - void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num, uint8 language, uint8 lang_skill, const char* message, ...) { if ((chan_num==11 && !(this->GetGM())) || (chan_num==10 && this->Admin()<80)) // dont need to send /pr & /petition to everybody return; @@ -1218,7 +1221,7 @@ void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num } if (to != 0) strcpy((char *) cm->targetname, to); - else if (chan_num == 7) + else if (chan_num == ChatChannel_Tell) strcpy(cm->targetname, m_pp.name); else cm->targetname[0] = 0; @@ -1227,7 +1230,7 @@ void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num if (language < MAX_PP_LANGUAGE) { ListenerSkill = m_pp.languages[language]; - if (ListenerSkill == 0) { + if (ListenerSkill < 24) { cm->language = (MAX_PP_LANGUAGE - 1); // in an unknown tongue } else { @@ -1253,7 +1256,7 @@ void Client::ChannelMessageSend(const char* from, const char* to, uint8 chan_num bool weAreNotSender = strcmp(this->GetCleanName(), cm->sender); if (senderCanTrainSelf || weAreNotSender) { - if ((chan_num == 2) && (ListenerSkill < 100)) { // group message in unmastered language, check for skill up + if ((chan_num == ChatChannel_Group) && (ListenerSkill < 100)) { // group message in unmastered language, check for skill up if (m_pp.languages[language] <= lang_skill) CheckLanguageSkillIncrease(language, lang_skill); } diff --git a/zone/client.h b/zone/client.h index 2adc2ea21..a44e83087 100644 --- a/zone/client.h +++ b/zone/client.h @@ -338,7 +338,6 @@ public: void QueuePacket(const EQApplicationPacket* app, bool ack_req = true, CLIENT_CONN_STATUS = CLIENT_CONNECTINGALL, eqFilterType filter=FilterNone); void FastQueuePacket(EQApplicationPacket** app, bool ack_req = true, CLIENT_CONN_STATUS = CLIENT_CONNECTINGALL); void ChannelMessageReceived(uint8 chan_num, uint8 language, uint8 lang_skill, const char* orig_message, const char* targetname=nullptr); - void ChannelMessageSend(const char* from, const char* to, uint8 chan_num, uint8 language, const char* message, ...); void ChannelMessageSend(const char* from, const char* to, uint8 chan_num, uint8 language, uint8 lang_skill, const char* message, ...); void Message(uint32 type, const char* message, ...); void FilteredMessage(Mob *sender, uint32 type, eqFilterType filter, const char* message, ...); diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 5cf36c946..6cc05a65f 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -4181,7 +4181,12 @@ void Client::Handle_OP_ChannelMessage(const EQApplicationPacket *app) return; } - ChannelMessageReceived(cm->chan_num, cm->language, cm->skill_in_language, cm->message, cm->targetname); + uint8 skill_in_language = 100; + if (cm->language < MAX_PP_LANGUAGE) + { + skill_in_language = m_pp.languages[cm->language]; + } + ChannelMessageReceived(cm->chan_num, cm->language, skill_in_language, cm->message, cm->targetname); return; } diff --git a/zone/command.cpp b/zone/command.cpp index 1675be8b8..debf0d90f 100755 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -887,7 +887,7 @@ void command_chat(Client *c, const Seperator *sep) if (sep->arg[2][0] == 0) c->Message(0, "Usage: #chat [channum] [message]"); else - if (!worldserver.SendChannelMessage(0, 0, (uint8) atoi(sep->arg[1]), 0, 0, sep->argplus[2])) + if (!worldserver.SendChannelMessage(0, 0, (uint8) atoi(sep->arg[1]), 0, 0, 100, sep->argplus[2])) c->Message(0, "Error: World server disconnected"); } diff --git a/zone/entity.cpp b/zone/entity.cpp index d1ecfc990..0ed696327 100644 --- a/zone/entity.cpp +++ b/zone/entity.cpp @@ -1235,33 +1235,19 @@ void EntityList::ChannelMessage(Mob *from, uint8 chan_num, uint8 language, while(it != client_list.end()) { Client *client = it->second; eqFilterType filter = FilterNone; - if (chan_num == 3) //shout + if (chan_num == ChatChannel_Shout) //shout filter = FilterShouts; - else if (chan_num == 4) //auction + else if (chan_num == ChatChannel_Auction) //auction filter = FilterAuctions; // // Only say is limited in range - if (chan_num != 8 || Distance(client->GetPosition(), from->GetPosition()) < 200) + if (chan_num != ChatChannel_Say || Distance(client->GetPosition(), from->GetPosition()) < 200) if (filter == FilterNone || client->GetFilter(filter) != FilterHide) client->ChannelMessageSend(from->GetName(), 0, chan_num, language, lang_skill, buffer); ++it; } } -void EntityList::ChannelMessageSend(Mob *to, uint8 chan_num, uint8 language, const char *message, ...) -{ - if (!to->IsClient()) - return; - va_list argptr; - char buffer[4096]; - - va_start(argptr, message); - vsnprintf(buffer, 4096, message, argptr); - va_end(argptr); - - to->CastToClient()->ChannelMessageSend(0, 0, chan_num, language, buffer); -} - void EntityList::SendZoneSpawns(Client *client) { EQApplicationPacket *app; @@ -1995,22 +1981,22 @@ Client *EntityList::GetClientByAccID(uint32 accid) } void EntityList::ChannelMessageFromWorld(const char *from, const char *to, - uint8 chan_num, uint32 guild_id, uint8 language, const char *message) + uint8 chan_num, uint32 guild_id, uint8 language, uint8 lang_skill, const char *message) { for (auto it = client_list.begin(); it != client_list.end(); ++it) { Client *client = it->second; - if (chan_num == 0) { + if (chan_num == ChatChannel_Guild) { if (!client->IsInGuild(guild_id)) continue; if (!guild_mgr.CheckPermission(guild_id, client->GuildRank(), GUILD_HEAR)) continue; if (client->GetFilter(FilterGuildChat) == FilterHide) continue; - } else if (chan_num == 5) { + } else if (chan_num == ChatChannel_OOC) { if (client->GetFilter(FilterOOC) == FilterHide) continue; } - client->ChannelMessageSend(from, to, chan_num, language, message); + client->ChannelMessageSend(from, to, chan_num, language, lang_skill, message); } } @@ -3880,7 +3866,7 @@ void EntityList::GroupMessage(uint32 gid, const char *from, const char *message) g = it->second->GetGroup(); if (g) { if (g->GetID() == gid) - it->second->ChannelMessageSend(from, it->second->GetName(), 2, 0, message); + it->second->ChannelMessageSend(from, it->second->GetName(), ChatChannel_Group, 0, 100, message); } } ++it; diff --git a/zone/entity.h b/zone/entity.h index fb9b1f09b..084cf6f01 100644 --- a/zone/entity.h +++ b/zone/entity.h @@ -323,10 +323,9 @@ public: void FilteredMessage_StringID(Mob *sender, bool skipsender, uint32 type, eqFilterType filter, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0); void MessageClose_StringID(Mob *sender, bool skipsender, float dist, uint32 type, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0); void FilteredMessageClose_StringID(Mob *sender, bool skipsender, float dist, uint32 type, eqFilterType filter, uint32 string_id, const char* message1=0,const char* message2=0,const char* message3=0,const char* message4=0,const char* message5=0,const char* message6=0,const char* message7=0,const char* message8=0,const char* message9=0); - void ChannelMessageFromWorld(const char* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, const char* message); + void ChannelMessageFromWorld(const char* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, uint8 lang_skill, const char* message); void ChannelMessage(Mob* from, uint8 chan_num, uint8 language, const char* message, ...); void ChannelMessage(Mob* from, uint8 chan_num, uint8 language, uint8 lang_skill, const char* message, ...); - void ChannelMessageSend(Mob* to, uint8 chan_num, uint8 language, const char* message, ...); void SendZoneSpawns(Client*); void SendZonePVPUpdates(Client *); void SendZoneSpawnsBulk(Client* client); diff --git a/zone/groups.cpp b/zone/groups.cpp index a7e05bf49..2f0c5e854 100644 --- a/zone/groups.cpp +++ b/zone/groups.cpp @@ -910,7 +910,7 @@ void Group::GroupMessage(Mob* sender, uint8 language, uint8 lang_skill, const ch continue; if (members[i]->IsClient() && members[i]->CastToClient()->GetFilter(FilterGroupChat)!=0) - members[i]->CastToClient()->ChannelMessageSend(sender->GetName(),members[i]->GetName(),2,language,lang_skill,message); + members[i]->CastToClient()->ChannelMessageSend(sender->GetName(),members[i]->GetName(),ChatChannel_Group,language,lang_skill,message); } auto pack = @@ -2493,4 +2493,4 @@ void Group::QueueClients(Mob *sender, const EQApplicationPacket *app, bool ack_r } } } -} \ No newline at end of file +} diff --git a/zone/net.cpp b/zone/net.cpp index 9fe8a7d50..4b4859e5e 100644 --- a/zone/net.cpp +++ b/zone/net.cpp @@ -514,7 +514,7 @@ int main(int argc, char** argv) { } else { if (worldwasconnected && is_zone_loaded) { - entity_list.ChannelMessageFromWorld(0, 0, 6, 0, 0, "WARNING: World server connection lost"); + entity_list.ChannelMessageFromWorld(0, 0, ChatChannel_Broadcast, 0, 0, 100, "WARNING: World server connection lost"); worldwasconnected = false; } } diff --git a/zone/raids.cpp b/zone/raids.cpp index 2bbd83064..e4c5b3552 100644 --- a/zone/raids.cpp +++ b/zone/raids.cpp @@ -446,7 +446,7 @@ uint32 Raid::GetGroup(Client *c) return 0xFFFFFFFF; } -void Raid::RaidSay(const char *msg, Client *c) +void Raid::RaidSay(const char *msg, Client *c, uint8 language, uint8 lang_skill) { if(!c) return; @@ -455,6 +455,8 @@ void Raid::RaidSay(const char *msg, Client *c) ServerRaidMessage_Struct *rga = (ServerRaidMessage_Struct*)pack->pBuffer; rga->rid = GetID(); rga->gid = 0xFFFFFFFF; + rga->language = language; + rga->lang_skill = lang_skill; strn0cpy(rga->from, c->GetName(), 64); strcpy(rga->message, msg); // this is safe because we are allocating enough space for the entire msg above @@ -463,7 +465,7 @@ void Raid::RaidSay(const char *msg, Client *c) safe_delete(pack); } -void Raid::RaidGroupSay(const char *msg, Client *c) +void Raid::RaidGroupSay(const char *msg, Client *c, uint8 language, uint8 lang_skill) { if(!c) return; @@ -477,6 +479,8 @@ void Raid::RaidGroupSay(const char *msg, Client *c) ServerRaidMessage_Struct *rga = (ServerRaidMessage_Struct*)pack->pBuffer; rga->rid = GetID(); rga->gid = groupToUse; + rga->language = language; + rga->lang_skill = lang_skill; strn0cpy(rga->from, c->GetName(), 64); strcpy(rga->message, msg); // this is safe because we are allocating enough space for the entire msg above @@ -1821,4 +1825,4 @@ void Raid::QueueClients(Mob *sender, const EQApplicationPacket *app, bool ack_re } } } -} \ No newline at end of file +} diff --git a/zone/raids.h b/zone/raids.h index 9ed9bc11c..26f5a0880 100644 --- a/zone/raids.h +++ b/zone/raids.h @@ -177,8 +177,8 @@ public: void SendHPManaEndPacketsFrom(Mob *mob); void SendManaPacketFrom(Mob *mob); void SendEndurancePacketFrom(Mob *mob); - void RaidSay(const char *msg, Client *c); - void RaidGroupSay(const char *msg, Client *c); + void RaidSay(const char *msg, Client *c, uint8 language, uint8 lang_skill); + void RaidGroupSay(const char *msg, Client *c, uint8 language, uint8 lang_skill); //Packet Functions void SendRaidCreate(Client *to); diff --git a/zone/worldserver.cpp b/zone/worldserver.cpp index 497d6711a..94be0eb14 100644 --- a/zone/worldserver.cpp +++ b/zone/worldserver.cpp @@ -200,29 +200,35 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) break; ServerChannelMessage_Struct* scm = (ServerChannelMessage_Struct*)pack->pBuffer; if (scm->deliverto[0] == 0) { - entity_list.ChannelMessageFromWorld(scm->from, scm->to, scm->chan_num, scm->guilddbid, scm->language, scm->message); + entity_list.ChannelMessageFromWorld(scm->from, scm->to, scm->chan_num, scm->guilddbid, scm->language, scm->lang_skill, scm->message); } else { Client* client = entity_list.GetClientByName(scm->deliverto); - if (client) { - if (client->Connected()) { + if (client && client->Connected()) { + if (scm->chan_num == ChatChannel_TellEcho) { if (scm->queued == 1) // tell was queued client->Tell_StringID(QUEUED_TELL, scm->to, scm->message); else if (scm->queued == 2) // tell queue was full client->Tell_StringID(QUEUE_TELL_FULL, scm->to, scm->message); else if (scm->queued == 3) // person was offline client->Message_StringID(MT_TellEcho, TOLD_NOT_ONLINE, scm->to); - else // normal stuff - client->ChannelMessageSend(scm->from, scm->to, scm->chan_num, scm->language, scm->message); - if (!scm->noreply && scm->chan_num != 2) { //dont echo on group chat - // if it's a tell, echo back so it shows up - scm->noreply = true; - scm->chan_num = 14; + else // normal tell echo "You told Soanso, 'something'" + // tell echo doesn't use language, so it looks normal to you even if nobody can understand your tells + client->ChannelMessageSend(scm->from, scm->to, scm->chan_num, 0, 100, scm->message); + } + else if (scm->chan_num == ChatChannel_Tell) { + client->ChannelMessageSend(scm->from, scm->to, scm->chan_num, scm->language, scm->lang_skill, scm->message); + if (scm->queued == 0) { // this is not a queued tell + // if it's a tell, echo back to acknowledge it and make it show on the sender's client + scm->chan_num = ChatChannel_TellEcho; memset(scm->deliverto, 0, sizeof(scm->deliverto)); strcpy(scm->deliverto, scm->from); SendPacket(pack); } } + else { + client->ChannelMessageSend(scm->from, scm->to, scm->chan_num, scm->language, scm->lang_skill, scm->message); + } } } break; @@ -1352,7 +1358,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) if (r->members[x].GroupNumber == rmsg->gid) { if (r->members[x].member->GetFilter(FilterGroupChat) != 0) { - r->members[x].member->ChannelMessageSend(rmsg->from, r->members[x].member->GetName(), 2, 0, rmsg->message); + r->members[x].member->ChannelMessageSend(rmsg->from, r->members[x].member->GetName(), ChatChannel_Group, rmsg->language, rmsg->lang_skill, rmsg->message); } } } @@ -1377,7 +1383,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) { if (r->members[x].member->GetFilter(FilterGroupChat) != 0) { - r->members[x].member->ChannelMessageSend(rmsg->from, r->members[x].member->GetName(), 15, 0, rmsg->message); + r->members[x].member->ChannelMessageSend(rmsg->from, r->members[x].member->GetName(), ChatChannel_Raid, rmsg->language, rmsg->lang_skill, rmsg->message); } } } @@ -1950,7 +1956,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p) } } -bool WorldServer::SendChannelMessage(Client* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, const char* message, ...) { +bool WorldServer::SendChannelMessage(Client* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, uint8 lang_skill, const char* message, ...) { if (!worldserver.Connected()) return false; va_list argptr; @@ -1984,6 +1990,7 @@ bool WorldServer::SendChannelMessage(Client* from, const char* to, uint8 chan_nu scm->chan_num = chan_num; scm->guilddbid = guilddbid; scm->language = language; + scm->lang_skill = lang_skill; scm->queued = 0; strcpy(scm->message, buffer); diff --git a/zone/worldserver.h b/zone/worldserver.h index 7dc6b02f8..4c1b9ab12 100644 --- a/zone/worldserver.h +++ b/zone/worldserver.h @@ -38,7 +38,7 @@ public: void HandleMessage(uint16 opcode, const EQ::Net::Packet &p); - bool SendChannelMessage(Client* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, const char* message, ...); + bool SendChannelMessage(Client* from, const char* to, uint8 chan_num, uint32 guilddbid, uint8 language, uint8 lang_skill, const char* message, ...); bool SendEmoteMessage(const char* to, uint32 to_guilddbid, uint32 type, const char* message, ...); bool SendEmoteMessage(const char* to, uint32 to_guilddbid, int16 to_minstatus, uint32 type, const char* message, ...); bool SendVoiceMacro(Client* From, uint32 Type, char* Target, uint32 MacroNumber, uint32 GroupOrRaidID = 0);