pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 15:41:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Doors] Have NPCs trigger double doors (#2821)

Browse Source
This commit is contained in:
Chris Miles 2023-02-06 17:47:03 -06:00 committed by GitHub
parent 2b224d42ad
commit 0a114fae9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/strings.cpp
View File

@ -770,3 +770,16 @@ int Strings::ToInt(const std::string &s, int fallback)
{ {
return Strings::IsNumber(s) ? std::stoi(s) : fallback; return Strings::IsNumber(s) ? std::stoi(s) : fallback;
} }
std::string Strings::RemoveNumbers(std::string s)
{
int current = 0;
for (int i = 0; i < s.length(); i++) {
if (!isdigit(s[i])) {
s[current] = s[i];
current++;
}
}
return s.substr(0, current);
}

1
common/strings.h
View File

@ -88,6 +88,7 @@ public:
static bool Contains(const std::string& subject, const std::string& search); static bool Contains(const std::string& subject, const std::string& search);
static int ToInt(const std::string &s, int fallback = 0); static int ToInt(const std::string &s, int fallback = 0);
static bool IsNumber(const std::string &s); static bool IsNumber(const std::string &s);
static std::string RemoveNumbers(std::string s);
static bool IsFloat(const std::string &s); static bool IsFloat(const std::string &s);
static const std::string ToLower(std::string s); static const std::string ToLower(std::string s);
static const std::string ToUpper(std::string s); static const std::string ToUpper(std::string s);

6
zone/mob_ai.cpp
View File

@ -999,8 +999,14 @@ void Mob::AI_Process() {
} }
if (door->GetTriggerDoorID() > 0) { if (door->GetTriggerDoorID() > 0) {
auto trigger_door = entity_list.GetDoorsByDoorID(door->GetTriggerDoorID());
if (trigger_door) {
if (Strings::RemoveNumbers(door->GetDoorName()) !=
Strings::RemoveNumbers(trigger_door->GetDoorName())) {
continue; continue;
} }
}
}
if (door->GetDoorParam() > 0) { if (door->GetDoorParam() > 0) {
continue; continue;