diff --git a/zone/bot.cpp b/zone/bot.cpp index 09b786669..5527875a0 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -119,7 +119,15 @@ Bot::Bot(NPCType *npcTypeData, Client* botOwner) : NPC(npcTypeData, nullptr, glm } // This constructor is used when the bot is loaded out of the database -Bot::Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double totalPlayTime, uint32 lastZoneId, NPCType *npcTypeData) +Bot::Bot( + uint32 botID, + uint32 botOwnerCharacterID, + uint32 botSpellsID, + double totalPlayTime, + uint32 lastZoneId, + NPCType *npcTypeData, + int32 expansion_bitmask +) : NPC(npcTypeData, nullptr, glm::vec4(), Ground, false), rest_timer(1), ping_timer(1) { GiveNPCTypeData(npcTypeData); @@ -161,6 +169,7 @@ Bot::Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double to RestRegenHP = 0; RestRegenMana = 0; RestRegenEndurance = 0; + m_expansion_bitmask = expansion_bitmask; SetBotID(botID); SetBotSpellID(botSpellsID); SetSpawnStatus(false); diff --git a/zone/bot.h b/zone/bot.h index 5cd5323a9..55f3fa3e5 100644 --- a/zone/bot.h +++ b/zone/bot.h @@ -130,7 +130,7 @@ public: // Class Constructors Bot(NPCType *npcTypeData, Client* botOwner); - Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double totalPlayTime, uint32 lastZoneId, NPCType *npcTypeData); + Bot(uint32 botID, uint32 botOwnerCharacterID, uint32 botSpellsID, double totalPlayTime, uint32 lastZoneId, NPCType *npcTypeData, int32 expansion_bitmask); //abstract virtual override function implementations requird by base abstract class bool Death(Mob* killerMob, int64 damage, uint16 spell_id, EQ::skills::SkillType attack_skill) override; diff --git a/zone/bot_database.cpp b/zone/bot_database.cpp index e44bca40d..4107fcf9a 100644 --- a/zone/bot_database.cpp +++ b/zone/bot_database.cpp @@ -464,7 +464,8 @@ bool BotDatabase::LoadBot(const uint32 bot_id, Bot*& loaded_bot) l.spells_id, l.time_spawned, l.zone_id, - t + t, + l.expansion_bitmask ); if (loaded_bot) { @@ -479,8 +480,6 @@ bool BotDatabase::LoadBot(const uint32 bot_id, Bot*& loaded_bot) loaded_bot->SetStopMeleeLevel(l.stop_melee_level); - loaded_bot->SetExpansionBitmask(l.expansion_bitmask, false); - loaded_bot->SetBotEnforceSpellSetting((l.enforce_spell_settings ? true : false)); loaded_bot->SetBotArcherySetting((l.archery_setting ? true : false));