yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

[BattleGrounds] fix for mac/linux build failing

Browse Source
This commit is contained in:
Fuzz
2024-07-22 16:03:12 +10:00
parent be551a5618
commit d1f8b2f9dd
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/strategy/actions/BattleGroundTactics.cpp
View File

@@ -2419,13 +2419,14 @@ bool BGTactics::HandleConsoleCommand(ChatHandler* handler, char const* args)
handler->PSendSysMessage("Command can only be used from an active session"); handler->PSendSysMessage("Command can only be used from an active session");
return true; return true;
} }
std::string const commandOutput = HandleConsoleCommand(session, args); std::string const commandOutput = HandleConsoleCommandPrivate(session, args);
if (!commandOutput.empty()) if (!commandOutput.empty())
handler->PSendSysMessage(commandOutput.c_str()); handler->PSendSysMessage(commandOutput.c_str());
return true; return true;
} }
std::string const BGTactics::HandleConsoleCommand(WorldSession* session, char const* args) // has different name to above as some compilers get confused
std::string const BGTactics::HandleConsoleCommandPrivate(WorldSession* session, char const* args)
{ {
Player* player = session->GetPlayer(); Player* player = session->GetPlayer();
if (!player) if (!player)
@@ -2477,7 +2478,7 @@ std::string const BGTactics::HandleConsoleCommand(WorldSession* session, char co
} }
} }
} }
if (num >= (*vPaths).size()) if (num >= vPaths->size())
return fmt::format("Path out of range of 0 - {}", vPaths->size() - 1); return fmt::format("Path out of range of 0 - {}", vPaths->size() - 1);
auto const& path = (*vPaths)[num]; auto const& path = (*vPaths)[num];
for (uint32 i = 0; i < path->size(); i++) for (uint32 i = 0; i < path->size(); i++)
@@ -2494,6 +2495,8 @@ std::string const BGTactics::HandleConsoleCommand(WorldSession* session, char co
uint32 num; uint32 num;
if (sscanf(cmd, "showcreature=%u", &num) == -1) if (sscanf(cmd, "showcreature=%u", &num) == -1)
return "Bad showcreature parameter"; return "Bad showcreature parameter";
if (num >= bg->BgCreatures.size())
return fmt::format("Creature out of range of 0 - {}", bg->BgCreatures.size() - 1);
Creature* c = bg->GetBGCreature(num); Creature* c = bg->GetBGCreature(num);
if (!c) if (!c)
return "Creature not found"; return "Creature not found";
@@ -2507,6 +2510,8 @@ std::string const BGTactics::HandleConsoleCommand(WorldSession* session, char co
uint32 num; uint32 num;
if (sscanf(cmd, "showobject=%u", &num) == -1) if (sscanf(cmd, "showobject=%u", &num) == -1)
return "Bad showobject parameter"; return "Bad showobject parameter";
if (num >= bg->BgObjects.size())
return fmt::format("Object out of range of 0 - {}", bg->BgObjects.size() - 1);
GameObject* o = bg->GetBGObject(num); GameObject* o = bg->GetBGObject(num);
if (!o) if (!o)
return "GameObject not found"; return "GameObject not found";

1
src/strategy/actions/BattleGroundTactics.h
View File

@@ -44,6 +44,7 @@ class BGTactics : public MovementAction
bool Execute(Event event) override; bool Execute(Event event) override;
private: private:
static std::string const HandleConsoleCommandPrivate(WorldSession* session, char const* args);
bool moveToStart(bool force = false); bool moveToStart(bool force = false);
bool selectObjective(bool reset = false); bool selectObjective(bool reset = false);
bool moveToObjective(); bool moveToObjective();