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

Migrate NPC spells, emotes, merchantlist [skip ci]

Browse Source
This commit is contained in:
Akkadius 2020-03-12 02:34:02 -05:00
parent ca49f3902f
commit 951a77716c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zone/mob_ai.cpp
View File

@ -2464,12 +2464,12 @@ bool NPC::AI_AddNPCSpells(uint32 iDBSpellsID) {
AIautocastspell_timer->Disable(); AIautocastspell_timer->Disable();
return false; return false;
} }
DBnpcspells_Struct* spell_list = database.GetNPCSpells(iDBSpellsID); DBnpcspells_Struct* spell_list = content_db.GetNPCSpells(iDBSpellsID);
if (!spell_list) { if (!spell_list) {
AIautocastspell_timer->Disable(); AIautocastspell_timer->Disable();
return false; return false;
} }
DBnpcspells_Struct* parentlist = database.GetNPCSpells(spell_list->parent_list); DBnpcspells_Struct* parentlist = content_db.GetNPCSpells(spell_list->parent_list);
#if MobAI_DEBUG_Spells >= 10 #if MobAI_DEBUG_Spells >= 10
std::string debug_msg = StringFormat("Loading NPCSpells onto %s: dbspellsid=%u, level=%u", this->GetName(), iDBSpellsID, this->GetLevel()); std::string debug_msg = StringFormat("Loading NPCSpells onto %s: dbspellsid=%u, level=%u", this->GetName(), iDBSpellsID, this->GetLevel());
if (spell_list) { if (spell_list) {
@ -2636,13 +2636,13 @@ bool NPC::AI_AddNPCSpellsEffects(uint32 iDBSpellsEffectsID) {
if (iDBSpellsEffectsID == 0) if (iDBSpellsEffectsID == 0)
return false; return false;
DBnpcspellseffects_Struct* spell_effects_list = database.GetNPCSpellsEffects(iDBSpellsEffectsID); DBnpcspellseffects_Struct* spell_effects_list = content_db.GetNPCSpellsEffects(iDBSpellsEffectsID);
if (!spell_effects_list) { if (!spell_effects_list) {
return false; return false;
} }
DBnpcspellseffects_Struct* parentlist = database.GetNPCSpellsEffects(spell_effects_list->parent_list); DBnpcspellseffects_Struct* parentlist = content_db.GetNPCSpellsEffects(spell_effects_list->parent_list);
uint32 i; uint32 i;
#if MobAI_DEBUG_Spells >= 10 #if MobAI_DEBUG_Spells >= 10

2
zone/npc_scale_manager.cpp
View File

@ -166,7 +166,7 @@ void NpcScaleManager::ScaleNPC(NPC *npc)
bool NpcScaleManager::LoadScaleData() bool NpcScaleManager::LoadScaleData()
{ {
auto results = database.QueryDatabase( auto results = content_db.QueryDatabase(
"SELECT " "SELECT "
"type," "type,"
"level," "level,"

4
zone/zone.cpp
View File

@ -468,7 +468,7 @@ void Zone::LoadNewMerchantData(uint32 merchantid) {
std::list<MerchantList> merlist; std::list<MerchantList> merlist;
std::string query = StringFormat("SELECT item, slot, faction_required, level_required, alt_currency_cost, " std::string query = StringFormat("SELECT item, slot, faction_required, level_required, alt_currency_cost, "
"classes_required, probability FROM merchantlist WHERE merchantid=%d ORDER BY slot", merchantid); "classes_required, probability FROM merchantlist WHERE merchantid=%d ORDER BY slot", merchantid);
auto results = database.QueryDatabase(query); auto results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
return; return;
} }
@ -2311,7 +2311,7 @@ void Zone::LoadNPCEmotes(LinkedList<NPC_Emote_Struct*>* NPCEmoteList)
NPCEmoteList->Clear(); NPCEmoteList->Clear();
const std::string query = "SELECT emoteid, event_, type, text FROM npc_emotes"; const std::string query = "SELECT emoteid, event_, type, text FROM npc_emotes";
auto results = database.QueryDatabase(query); auto results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
return; return;
} }