pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-10 15:00:25 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Unify chat constants usage

Browse Source
This commit is contained in:
Akkadius
2019-08-11 00:00:55 -05:00
parent 24d2a5723b
commit 57354579aa
50 changed files with 1352 additions and 1432 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/worldserver.cpp
+10 -10
View File
@@ -211,7 +211,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
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);
client->Message_StringID(Chat::EchoTell, TOLD_NOT_ONLINE, scm->to);
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);
@@ -374,15 +374,15 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
switch (ztz->response)
{
case -2: {
entity->CastToClient()->Message(13, "You do not own the required locations to enter this zone.");
entity->CastToClient()->Message(Chat::Red, "You do not own the required locations to enter this zone.");
break;
}
case -1: {
entity->CastToClient()->Message(13, "The zone is currently full, please try again later.");
entity->CastToClient()->Message(Chat::Red, "The zone is currently full, please try again later.");
break;
}
case 0: {
entity->CastToClient()->Message(13, "All zone servers are taken at this time, please try again later.");
entity->CastToClient()->Message(Chat::Red, "All zone servers are taken at this time, please try again later.");
break;
}
}
@@ -414,7 +414,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
Client* client = entity_list.GetClientByID(wars->id);
if (client) {
if (pack->size == 64)//no results
client->Message_StringID(0, WHOALL_NO_RESULTS);
client->Message_StringID(Chat::White, WHOALL_NO_RESULTS);
else {
auto outapp = new EQApplicationPacket(OP_WhoAllResponse, pack->size);
memcpy(outapp->pBuffer, pack->pBuffer, pack->size);
@@ -783,7 +783,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
Client* c = entity_list.GetClientByName(Rezzer);
if (c)
c->Message_StringID(MT_WornOff, REZZ_ALREADY_PENDING);
c->Message_StringID(Chat::SpellWornOff, REZZ_ALREADY_PENDING);
break;
}
@@ -910,7 +910,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
entity_list.AddGroup(group);
if (group->GetID() == 0) {
Inviter->Message(13, "Unable to get new group id. Cannot create group.");
Inviter->Message(Chat::Red, "Unable to get new group id. Cannot create group.");
break;
}
@@ -1485,7 +1485,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
ServerOP_Consent_Struct* s = (ServerOP_Consent_Struct*)pack->pBuffer;
Client* client = entity_list.GetClientByName(s->ownername);
if (client) {
client->Message_StringID(0, s->message_string_id);
client->Message_StringID(Chat::White, s->message_string_id);
}
break;
}
@@ -1729,7 +1729,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (c)
{
c->ClearPendingAdventureDoorClick();
c->Message_StringID(13, 5141);
c->Message_StringID(Chat::Red, 5141);
}
break;
}
@@ -1751,7 +1751,7 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
if (c)
{
c->ClearPendingAdventureLeave();
c->Message(13, "You cannot leave this adventure at this time.");
c->Message(Chat::Red, "You cannot leave this adventure at this time.");
}
break;
}