pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-08-28 20:07:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move functions out of mob.h and cleanup

Browse Source
This commit is contained in:
nytmyr
2025-01-30 22:25:54 -06:00
parent 9b72672945
commit e039ce2e37
32 changed files with 1312 additions and 1260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot_commands/cast.cpp
+7 -7
View File
@@ -34,7 +34,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
fmt::format(
"{} {}",
sep->arg[0],
c->GetSpellTypeShortNameByID(BotSpellTypes::Nuke)
Bot::GetSpellTypeShortNameByID(BotSpellTypes::Nuke)
),
fmt::format(
"{} {}",
@@ -208,7 +208,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
if (sep->IsNumber(1)) {
spell_type = atoi(sep->arg[1]);
if (!c->IsValidSpellType(spell_type)) {
if (!Bot::IsValidBotSpellType(spell_type)) {
c->Message(
Chat::Yellow,
fmt::format(
@@ -223,8 +223,8 @@ void bot_command_cast(Client* c, const Seperator* sep)
}
}
else {
if (c->GetSpellTypeIDByShortName(arg1) != UINT16_MAX) {
spell_type = c->GetSpellTypeIDByShortName(arg1);
if (Bot::GetSpellTypeIDByShortName(arg1) != UINT16_MAX) {
spell_type = Bot::GetSpellTypeIDByShortName(arg1);
}
else {
c->Message(
@@ -347,7 +347,7 @@ void bot_command_cast(Client* c, const Seperator* sep)
fmt::format(
"[{}] is an invalid target. {} requires a pet to be targeted.",
tar->GetCleanName(),
tar->GetSpellTypeNameByID(spell_type)
Bot::GetSpellTypeNameByID(spell_type)
).c_str()
);
@@ -589,10 +589,10 @@ void bot_command_cast(Client* c, const Seperator* sep)
}
else {
if (sub_type == UINT16_MAX) {
type = c->GetSpellTypeNameByID(spell_type);
type = Bot::GetSpellTypeNameByID(spell_type);
}
else {
type = c->GetSubTypeNameByID(sub_type);
type = Bot::GetSubTypeNameByID(sub_type);
}
}