pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 18:52:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Feature] Add Strings::BeginsWith() and Strings::EndsWith() (#3471)

Browse Source 
* [Strings] Add Strings::BeginsWith() and Strings::EndsWith()

# Notes
- These are useful so that we don't have to manually calculate size or perform a substring.

* Update questmgr.cpp

* Update client.cpp
This commit is contained in:
Alex King
2023-07-03 09:40:44 -04:00
committed by GitHub
parent 2717fcc339
commit ee14aed8de
7 changed files with 73 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/client.cpp
+32 -58
View File
@@ -5939,90 +5939,64 @@ void Client::AdventureFinish(bool win, int theme, int points)
FastQueuePacket(&outapp);
}
void Client::CheckLDoNHail(Mob *target)
void Client::CheckLDoNHail(NPC* n)
{
if(!zone->adv_data)
{
if (!zone->adv_data || !n || n->GetOwnerID()) {
return;
}
if(!target || !target->IsNPC())
{
auto* ds = (ServerZoneAdventureDataReply_Struct*) zone->adv_data;
if (ds->type != Adventure_Rescue || ds->data_id != n->GetNPCTypeID()) {
return;
}
if(target->GetOwnerID() != 0)
{
if (entity_list.CheckNPCsClose(n)) {
n->Say(
"You're here to save me? I couldn't possibly risk leaving yet. There are "
"far too many of those horrid things out there waiting to recapture me! Please get "
"rid of some more of those vermin and then we can try to leave."
);
return;
}
ServerZoneAdventureDataReply_Struct* ds = (ServerZoneAdventureDataReply_Struct*)zone->adv_data;
if(ds->type != Adventure_Rescue)
{
return;
}
if(ds->data_id != target->GetNPCTypeID())
{
return;
}
if(entity_list.CheckNPCsClose(target) != 0)
{
target->Say("You're here to save me? I couldn't possibly risk leaving yet. There are "
"far too many of those horrid things out there waiting to recapture me! Please get"
" rid of some more of those vermin and then we can try to leave.");
return;
}
Mob *pet = GetPet();
if(pet)
{
if(pet->GetPetType() == petCharmed)
{
auto pet = GetPet();
if (pet) {
if (pet->GetPetType() == petCharmed) {
pet->BuffFadeByEffect(SE_Charm);
}
else if(pet->GetPetType() == petNPCFollow)
{
} else if (pet->GetPetType() == petNPCFollow) {
pet->SetOwnerID(0);
}
else
{
} else {
pet->Depop();
}
}
SetPet(target);
target->SetOwnerID(GetID());
target->Say("Wonderful! Someone to set me free! I feared for my life for so long,"
" never knowing when they might choose to end my life. Now that you're here though"
" I can rest easy. Please help me find my way out of here as soon as you can"
" I'll stay close behind you!");
SetPet(n);
n->SetOwnerID(GetID());
n->Say(
"Wonderful! Someone to set me free! I feared for my life for so long, "
"never knowing when they might choose to end my life. Now that you're here though "
"I can rest easy. Please help me find my way out of here as soon as you can "
"I'll stay close behind you!"
);
}
void Client::CheckEmoteHail(Mob *target, const char* message)
void Client::CheckEmoteHail(NPC* n, const char* message)
{
if(
(message[0] != 'H' &&
message[0] != 'h') ||
message[1] != 'a' ||
message[2] != 'i' ||
message[3] != 'l'){
if (
!Strings::BeginsWith(message, "hail") &&
!Strings::BeginsWith(message, "Hail")
) {
return;
}
if(!target || !target->IsNPC())
{
if (!n || n->GetOwnerID()) {
return;
}
if(target->GetOwnerID() != 0)
{
return;
const auto emote_id = n->GetEmoteID();
if (emote_id) {
n->DoNPCEmote(EQ::constants::EmoteEventTypes::Hailed, emote_id);
}
uint32 emoteid = target->GetEmoteID();
if(emoteid != 0)
target->CastToNPC()->DoNPCEmote(EQ::constants::EmoteEventTypes::Hailed, emoteid);
}
void Client::MarkSingleCompassLoc(float in_x, float in_y, float in_z, uint8 count)