diff --git a/zone/bot.h b/zone/bot.h index 39c505417..d59f34031 100644 --- a/zone/bot.h +++ b/zone/bot.h @@ -472,7 +472,9 @@ public: bool IsBotArcher() { return m_bot_archery_setting; } bool IsBotCharmer() { return _botCharmer; } bool IsBot() const override { return true; } + bool IsOfClientBot() const override { return true; } bool IsOfClientBotMerc() const override { return true; } + bool GetRangerAutoWeaponSelect() { return _rangerAutoWeaponSelect; } BotRoleType GetBotRole() { return _botRole; } EQ::constants::StanceType GetBotStance() { return _botStance; } diff --git a/zone/client.h b/zone/client.h index f6b384117..9c8990d63 100644 --- a/zone/client.h +++ b/zone/client.h @@ -277,7 +277,8 @@ public: void KeyRingAdd(uint32 item_id); bool KeyRingCheck(uint32 item_id); void KeyRingList(); - virtual bool IsClient() const { return true; } + bool IsClient() const override { return true; } + bool IsOfClientBot() const override { return true; } bool IsOfClientBotMerc() const override { return true; } void CompleteConnect(); bool TryStacking(EQ::ItemInstance* item, uint8 type = ItemPacketTrade, bool try_worn = true, bool try_cursor = true); diff --git a/zone/entity.h b/zone/entity.h index 24b2ddbe2..cb04bf619 100644 --- a/zone/entity.h +++ b/zone/entity.h @@ -81,6 +81,7 @@ public: virtual bool IsEncounter() const { return false; } virtual bool IsBot() const { return false; } virtual bool IsAura() const { return false; } + virtual bool IsOfClientBot() const { return false; } virtual bool IsOfClientBotMerc() const { return false; } virtual bool Process() { return false; } diff --git a/zone/merc.h b/zone/merc.h index 9c6a7b4ae..42fba3098 100644 --- a/zone/merc.h +++ b/zone/merc.h @@ -122,7 +122,7 @@ public: bool HasOrMayGetAggro(); bool UseDiscipline(int32 spell_id, int32 target); - virtual bool IsMerc() const { return true; } + bool IsMerc() const override { return true; } bool IsOfClientBotMerc() const override { return true; } virtual void FillSpawnStruct(NewSpawn_Struct* ns, Mob* ForWho);