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 ldon traps and #hotfix [skip ci]

Browse Source
This commit is contained in:
Akkadius 2020-03-12 02:40:04 -05:00
parent 951a77716c
commit d360c60289
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zone/worldserver.cpp
View File

@ -1984,32 +1984,32 @@ void WorldServer::HandleMessage(uint16 opcode, const EQ::Net::Packet &p)
{ {
std::string hotfix_name = std::string((char*)pack->pBuffer); std::string hotfix_name = std::string((char*)pack->pBuffer);
LogInfo("Loading items"); LogInfo("Loading items");
if (!database.LoadItems(hotfix_name)) { if (!content_db.LoadItems(hotfix_name)) {
LogError("Loading items failed!"); LogError("Loading items failed!");
} }
LogInfo("Loading npc faction lists"); LogInfo("Loading npc faction lists");
if (!database.LoadNPCFactionLists(hotfix_name)) { if (!content_db.LoadNPCFactionLists(hotfix_name)) {
LogError("Loading npcs faction lists failed!"); LogError("Loading npcs faction lists failed!");
} }
LogInfo("Loading loot tables"); LogInfo("Loading loot tables");
if (!database.LoadLoot(hotfix_name)) { if (!content_db.LoadLoot(hotfix_name)) {
LogError("Loading loot failed!"); LogError("Loading loot failed!");
} }
LogInfo("Loading skill caps"); LogInfo("Loading skill caps");
if (!database.LoadSkillCaps(std::string(hotfix_name))) { if (!content_db.LoadSkillCaps(std::string(hotfix_name))) {
LogError("Loading skill caps failed!"); LogError("Loading skill caps failed!");
} }
LogInfo("Loading spells"); LogInfo("Loading spells");
if (!database.LoadSpells(hotfix_name, &SPDAT_RECORDS, &spells)) { if (!content_db.LoadSpells(hotfix_name, &SPDAT_RECORDS, &spells)) {
LogError("Loading spells failed!"); LogError("Loading spells failed!");
} }
LogInfo("Loading base data"); LogInfo("Loading base data");
if (!database.LoadBaseData(hotfix_name)) { if (!content_db.LoadBaseData(hotfix_name)) {
LogError("Loading base data failed!"); LogError("Loading base data failed!");
} }
break; break;

4
zone/zone.cpp
View File

@ -2082,7 +2082,7 @@ void Zone::SetInstanceTimer(uint32 new_duration)
void Zone::LoadLDoNTraps() void Zone::LoadLDoNTraps()
{ {
const std::string query = "SELECT id, type, spell_id, skill, locked FROM ldon_trap_templates"; const std::string query = "SELECT id, type, spell_id, skill, locked FROM ldon_trap_templates";
auto results = database.QueryDatabase(query); auto results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
return; return;
} }
@ -2102,7 +2102,7 @@ void Zone::LoadLDoNTraps()
void Zone::LoadLDoNTrapEntries() void Zone::LoadLDoNTrapEntries()
{ {
const std::string query = "SELECT id, trap_id FROM ldon_trap_entries"; const std::string query = "SELECT id, trap_id FROM ldon_trap_entries";
auto results = database.QueryDatabase(query); auto results = content_db.QueryDatabase(query);
if (!results.Success()) { if (!results.Success()) {
return; return;
} }